From owner-p4-projects@FreeBSD.ORG  Fri Dec  9 15:51:31 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B7CB716A422; Fri,  9 Dec 2005 15:51:30 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 92CF216A41F
	for <perforce@freebsd.org>; Fri,  9 Dec 2005 15:51:30 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3041743D49
	for <perforce@freebsd.org>; Fri,  9 Dec 2005 15:51:30 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB9FpUFx005230
	for <perforce@freebsd.org>; Fri, 9 Dec 2005 15:51:30 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB9FpUMT005227
	for perforce@freebsd.org; Fri, 9 Dec 2005 15:51:30 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 9 Dec 2005 15:51:30 GMT
Message-Id: <200512091551.jB9FpUMT005227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87949 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Dec 2005 15:51:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=87949

Change 87949 by millert@millert_ibook on 2005/12/09 15:50:48

	Add pam_sedarwin.  We need to be able to prompt the user
	for the role to choose from in keyboard-interactive mode
	but this has to happen *after* actual system authentication
	which makes things a bit messy.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/sshd#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/pam/pam.d/sshd#4 (text+ko) ====

@@ -1,9 +1,11 @@
 # login: auth account password session
 auth       required       pam_nologin.so
-auth       sufficient     pam_securityserver.so
-auth       sufficient     pam_unix.so
+auth       success=1default=2  pam_securityserver.so
+auth       success=okdefault=1 pam_unix.so
+auth       default=done   pam_sedarwin.so
 auth       required       pam_deny.so
 account    required       pam_permit.so
 password   required       pam_deny.so
 session    required       pam_permit.so
 session    required       pam_lctx.so
+session    required       pam_sedarwin.so