From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 13 Dec 2002 16:33:26 +0000 (+0000)
Subject: Keep a local copy of tgetpass_flags so we don't add in TGP_ECHO to
X-Git-Tag: SUDO_1_6_7~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b49046433aa5817667a8976fddc9fe2943910fac;p=sudo

Keep a local copy of tgetpass_flags so we don't add in TGP_ECHO to
the global copy.  Problem noted by Peter Pentchev.
---

diff --git a/auth/pam.c b/auth/pam.c
index 9496063b9..6b63f23cd 100644
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -205,7 +205,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
     PAM_CONST struct pam_message *pm;
     const char *p = def_prompt;
     volatile char *pass;
-    int n;
+    int n, flags;
     extern int nil_pw;
 
     if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
@@ -213,17 +213,17 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
     (void) memset(*response, 0, num_msg * sizeof(struct pam_response));
 
     for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) {
+	flags = tgetpass_flags;
 	switch (pm->msg_style) {
 	    case PAM_PROMPT_ECHO_ON:
-		tgetpass_flags |= TGP_ECHO;
+		flags |= TGP_ECHO;
 	    case PAM_PROMPT_ECHO_OFF:
 		/* Only override PAM prompt if it matches /^Password: ?/ */
 		if (strncmp(pm->msg, "Password:", 9) || (pm->msg[9] != '\0'
 		    && (pm->msg[9] != ' ' || pm->msg[10] != '\0')))
 		    p = pm->msg;
 		/* Read the password. */
-		pass = tgetpass(p, def_ival(I_PASSWD_TIMEOUT) * 60,
-		    tgetpass_flags);
+		pass = tgetpass(p, def_ival(I_PASSWD_TIMEOUT) * 60, flags);
 		pr->resp = estrdup(pass ? pass : "");
 		if (*pr->resp == '\0')
 		    nil_pw = 1;		/* empty password */