diff options
| author |   millert <millert@openbsd.org> | 2008-07-31 16:44:03 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2008-07-31 16:44:03 +0000 |
| commit | 8c9a63b7ad7479c3a474f9302883486596b46bcd (patch) | |
| tree | 5780176a3732662ec2cfa0d3de94c270abaa5a96 /usr.bin/sudo/auth/pam.c | |
| parent | - Don't relay on bFormatIndex as an internal array index, since this (diff) | |
| download | wireguard-openbsd-8c9a63b7ad7479c3a474f9302883486596b46bcd.tar.xz wireguard-openbsd-8c9a63b7ad7479c3a474f9302883486596b46bcd.zip | |
Update to sudo 1.6.9p17
Diffstat (limited to 'usr.bin/sudo/auth/pam.c')
| -rw-r--r-- | usr.bin/sudo/auth/pam.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/sudo/auth/pam.c b/usr.bin/sudo/auth/pam.c index f6024785bd8..b2fe41a7456 100644 --- a/usr.bin/sudo/auth/pam.c +++ b/usr.bin/sudo/auth/pam.c @@ -72,7 +72,7 @@ #endif #ifndef lint -__unused static const char rcsid[] = "$Sudo: pam.c,v 1.43.2.9 2007/12/02 17:13:52 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: pam.c,v 1.43.2.10 2008/02/22 20:19:45 millert Exp $"; #endif /* lint */ static int sudo_conv __P((int, PAM_CONST struct pam_message **, @@ -257,11 +257,6 @@ sudo_conv(num_msg, msg, response, appdata_ptr) return(PAM_CONV_ERR); zero_bytes(*response, num_msg * sizeof(struct pam_response)); - /* Is the sudo prompt standard? (If so, we'l just use PAM's) */ - std_prompt = strncmp(def_prompt, "Password:", 9) == 0 && - (def_prompt[9] == '\0' || - (def_prompt[9] == ' ' && def_prompt[10] == '\0')); - for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) { flags = tgetpass_flags; switch (pm->msg_style) { @@ -269,6 +264,12 @@ sudo_conv(num_msg, msg, response, appdata_ptr) SET(flags, TGP_ECHO); case PAM_PROMPT_ECHO_OFF: prompt = def_prompt; + + /* Is the sudo prompt standard? (If so, we'l just use PAM's) */ + std_prompt = strncmp(def_prompt, "Password:", 9) == 0 && + (def_prompt[9] == '\0' || + (def_prompt[9] == ' ' && def_prompt[10] == '\0')); + /* Only override PAM prompt if it matches /^Password: ?/ */ #if defined(PAM_TEXT_DOMAIN) && defined(HAVE_DGETTEXT) if (!def_passprompt_override && (std_prompt || |