Attachment #194306 for bug #263579

View | Details | Raw Unified | Return to bug 263579
Collapse All | Expand All

Lines 87-93 pam_get_pass(pam_handle_t *pamh, const c Link Here

(-)pam_ssh-1.97/pam_get_pass.c (-1 / +1 lines)
87	* Always use standard prompt for the first time.	87	* Always use standard prompt for the first time.
88	*/	88	*/
89	if (item == NULL)	89	if (item == NULL)
90	prompt = "Password: ";	90	prompt = NEED_PASSPHRASE;
91	if (pam_test_option(options, PAM_OPT_TRY_FIRST_PASS, NULL) \|\|	91	if (pam_test_option(options, PAM_OPT_TRY_FIRST_PASS, NULL) \|\|
92	pam_test_option(options, PAM_OPT_USE_FIRST_PASS, NULL)) {	92	pam_test_option(options, PAM_OPT_USE_FIRST_PASS, NULL)) {
93	if (retval != PAM_SUCCESS)	93	if (retval != PAM_SUCCESS)

Lines 29-31 Link Here

(-)pam_ssh-1.97/pam_get_pass.h (+2 lines)
29	__BEGIN_DECLS	29	__BEGIN_DECLS
30	int pam_get_pass(pam_handle_t , const char , const char , struct options *);	30	int pam_get_pass(pam_handle_t , const char , const char , struct options *);
31	__END_DECLS	31	__END_DECLS
		32
		33	#define NEED_PASSPHRASE "Passphrase: "

Lines 105-111 Link Here

(-)pam_ssh-1.97/pam_ssh.c (-1 / +3 lines)
105	#endif	105	#endif
106		106
107	#define MODULE_NAME PACKAGE_NAME	107	#define MODULE_NAME PACKAGE_NAME
108	#define NEED_PASSPHRASE "SSH passphrase: "	108	#if !defined(NEED_PASSPHRASE)
		109	#define NEED_PASSPHRASE "Passphrase: "
		110	#endif
109	#define DEF_KEYFILES "id_dsa,id_rsa,identity"	111	#define DEF_KEYFILES "id_dsa,id_rsa,identity"
110	#define ENV_PID_SUFFIX "_AGENT_PID"	112	#define ENV_PID_SUFFIX "_AGENT_PID"
111	#define ENV_SOCKET_SUFFIX "_AUTH_SOCK"	113	#define ENV_SOCKET_SUFFIX "_AUTH_SOCK"

Return to bug 263579