From 3d506282e312c871ae6f648212de0ecec7057807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@des.no>
Date: Wed, 20 Feb 2002 15:22:09 +0000
Subject: [PATCH] Allow the PAM_AUTHTOK_PROMPT item to override the prompt
 specified by the module.

Sponsored by:	DARPA, NAI Labs


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@68 185d5e19-27fe-0310-9dcf-9bff6b9f3609
---
 lib/pam_get_authtok.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/pam_get_authtok.c b/lib/pam_get_authtok.c
index a1dd1a8..a8934a7 100644
--- a/lib/pam_get_authtok.c
+++ b/lib/pam_get_authtok.c
@@ -61,13 +61,12 @@ pam_get_authtok(pam_handle_t *pamh,
 	r = pam_get_item(pamh, PAM_AUTHTOK, (const void **)authtok);
 	if (r == PAM_SUCCESS && *authtok != NULL)
 		return (PAM_SUCCESS);
-	if (prompt == NULL) {
-		if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT,
-		    (const void **)&p) != PAM_SUCCESS || p == NULL)
+	if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT,
+	    (const void **)&p) != PAM_SUCCESS || p == NULL)
+		if (prompt == NULL)
 			prompt = "Password:";
-	}
 	r = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &resp,
-	    "%s", prompt ? prompt : p);
+	    "%s", p ? p : prompt);
 	if (r != PAM_SUCCESS)
 		return (r);
 	*authtok = resp;