From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 25 Jun 2015 15:12:15 +0000 (-0600)
Subject: When checking whether the PAM prompt matches "Password:", also check
X-Git-Tag: SUDO_1_8_14^2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea5ce39c929fcc97106128ac5cd68d1e192bc54c;p=sudo

When checking whether the PAM prompt matches "Password:", also check
for the untranslated version.  The PAM module might not be using the
localized string even though it exists.  From Joel Pelaez Jorge.
Fixes Bug #701
---

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index 5df068f85..9dee74ea9 100644
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -299,8 +299,9 @@ sudo_pam_end_session(struct passwd *pw, sudo_auth *auth)
 
 #ifdef PAM_TEXT_DOMAIN
 # define PAM_PROMPT_IS_PASSWORD(_p) \
-    (strcmp((_p), dgt(PAM_TEXT_DOMAIN, "Password: ")) == 0 || \
-	strcmp((_p), dgt(PAM_TEXT_DOMAIN, "Password:")) == 0)
+    (strcmp((_p), dgt(PAM_TEXT_DOMAIN, "Password:")) == 0 || \
+	strcmp((_p), dgt(PAM_TEXT_DOMAIN, "Password: ")) == 0 || \
+	PROMPT_IS_PASSWORD(_p))
 #else
 # define PAM_PROMPT_IS_PASSWORD(_p)	PROMPT_IS_PASSWORD(_p)
 #endif /* PAM_TEXT_DOMAIN */