rpms/pam_ssh/F-10 pam_ssh-1.92-prompt.patch,NONE,1.1

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/pam_ssh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18419

Added Files:
	pam_ssh-1.92-prompt.patch 
Log Message:


pam_ssh-1.92-prompt.patch:

--- NEW FILE pam_ssh-1.92-prompt.patch ---
diff -Nrbu pam_ssh-1.92/pam_get_pass.c pam_ssh-1.92-OK/pam_get_pass.c
--- pam_ssh-1.92/pam_get_pass.c	2004-02-19 21:59:05.000000000 +0300
+++ pam_ssh-1.92-OK/pam_get_pass.c	2009-03-26 17:52:57.000000000 +0300
@@ -80,13 +80,20 @@
 	const void *item = NULL;
 
 	/*
-	 * Grab the already-entered password if we might want to use it.
+	 * Grab the already-entered password.
 	 */
+	retval = pam_get_item(pamh, PAM_AUTHTOK, &item);
+	/*
+	 * Always use standard prompt for the first time.
+	 */
+	if (item == NULL)  
+		prompt = "Password: ";
 	if (pam_test_option(options, PAM_OPT_TRY_FIRST_PASS, NULL) ||
 	    pam_test_option(options, PAM_OPT_USE_FIRST_PASS, NULL)) {
-		retval = pam_get_item(pamh, PAM_AUTHTOK, &item);
 		if (retval != PAM_SUCCESS)
 			return retval;
+	} else {
+		item = NULL;	/* Need own password. */
 	}
 
 	if (item == NULL) {