rpms/pam_ssh/F-9 pam_ssh-1.92-prompt.patch, NONE, 1.1 pam_ssh.spec, 1.19, 1.20

[Dmitry Butskoy]

Author: buc

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

Modified Files:
	pam_ssh.spec 
Added Files:
	pam_ssh-1.92-prompt.patch 
Log Message:
Always use standard "Password:" prompt for the first password's inquire
in a PAM chain (#492153)


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) {


Index: pam_ssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_ssh/F-9/pam_ssh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pam_ssh.spec	19 Feb 2008 18:25:04 -0000	1.19
+++ pam_ssh.spec	26 Mar 2009 15:20:19 -0000	1.20
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.92
-Release: 8%{?dist}
+Release: 10%{?dist}
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://downloads.sourceforge.net/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -14,6 +14,8 @@
 Patch4: pam_ssh-1.91-include_syslog.diff
 # include a pam header
 Patch5: pam_ssh-1.92-include_pam.patch
+# always use standard prompt for the first time
+Patch6: pam_ssh-1.92-prompt.patch
 
 License: BSD
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +39,7 @@
 %patch2 -p0 -b .man_agent_files
 %patch4 -p1
 %patch5 -p1 -b .include_pam
+%patch6 -p1
 chmod a-x pam_ssh.c
 touch -r pam_ssh.8.man_agent_files pam_ssh.8
 
@@ -64,6 +67,10 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
+* Thu Mar 26 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.92-10
+- Always use standard "Password:" prompt for the first password's inquire
+  in a PAM chain (#492153)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.92-8
 - Autorebuild for GCC 4.3