From owner-p4-projects  Sat Apr  6 11:24:32 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 219FB37B417; Sat,  6 Apr 2002 11:24:23 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3D77437B416
	for <perforce@freebsd.org>; Sat,  6 Apr 2002 11:24:22 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g36JOMA51904
	for perforce@freebsd.org; Sat, 6 Apr 2002 11:24:22 -0800 (PST)
	(envelope-from des@freebsd.org)
Date: Sat, 6 Apr 2002 11:24:22 -0800 (PST)
Message-Id: <200204061924.g36JOMA51904@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Subject: PERFORCE change 9220 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9220

Change 9220 by des@des.at.des.thinksec.com on 2002/04/06 11:23:26

	If PAM_OLDAUTHTOK is set, we're asked for PAM_AUTHTOK, and we have
	to prompt the user, prompt her twice and compare the responses.
	
	Sponsored by:	DARPA, NAI Labs

Affected files ...

... //depot/projects/openpam/lib/pam_get_authtok.c#15 edit

Differences ...

==== //depot/projects/openpam/lib/pam_get_authtok.c#15 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#14 $
+ * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#15 $
  */
 
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 
 const char authtok_prompt[] = "Password:";
 const char oldauthtok_prompt[] = "Old Password:";
+const char newauthtok_prompt[] = "New Password:";
 
 /*
  * OpenPAM extension
@@ -58,22 +59,30 @@
 	const char **authtok,
 	const char *prompt)
 {
+	const void *oldauthtok;
 	const char *default_prompt;
-	char *resp;
-	int pitem, r, style;
+	char *resp, *resp2;
+	int pitem, r, style, twice;
 
 	if (pamh == NULL || authtok == NULL)
 		return (PAM_SYSTEM_ERR);
 
 	*authtok = NULL;
+	twice = 0;
 	switch (item) {
 	case PAM_AUTHTOK:
 		pitem = PAM_AUTHTOK_PROMPT;
 		default_prompt = authtok_prompt;
+		r = pam_get_item(pamh, PAM_OLDAUTHTOK, &oldauthtok);
+		if (r == PAM_SUCCESS && oldauthtok != NULL) {
+			default_prompt = newauthtok_prompt;
+			twice = 1;
+		}
 		break;
 	case PAM_OLDAUTHTOK:
 		pitem = PAM_OLDAUTHTOK_PROMPT;
 		default_prompt = oldauthtok_prompt;
+		twice = 0;
 		break;
 	default:
 		return (PAM_SYMBOL_ERR);
@@ -97,6 +106,20 @@
 	r = pam_prompt(pamh, style, &resp, "%s", prompt);
 	if (r != PAM_SUCCESS)
 		return (r);
+	if (twice) {
+		r = pam_prompt(pamh, style, &resp2, "Retype %s", prompt);
+		if (r != PAM_SUCCESS) {
+			free(resp);
+			return (r);
+		}
+		if (strcmp(resp, resp2) != 0) {
+			free(resp);
+			resp = NULL;
+		}
+		free(resp2);
+	}
+	if (resp == NULL)
+		return (PAM_TRY_AGAIN);
 	r = pam_set_item(pamh, pitem, resp);
 	free(resp);
 	if (r != PAM_SUCCESS)
@@ -111,6 +134,7 @@
  *	=pam_prompt
  *	=pam_set_item
  *	!PAM_SYMBOL_ERR
+ *	PAM_TRY_AGAIN
  */
 
 /**
@@ -133,6 +157,11 @@
  * as appropriate, will be used.  If that item is also =NULL, a hardcoded
  * default prompt will be used.
  *
+ * If =item is set to =PAM_AUTHTOK and there is a non-null =PAM_OLDAUTHTOK
+ * item, =pam_get_authtok will ask the user to confirm the new token by
+ * retyping it.  If there is a mismatch, =pam_get_authtok will return
+ * =PAM_TRY_AGAIN.
+ *
  * >pam_get_item
  * >pam_get_user
  */

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message