diff -Nru sudo-1.8.12/debian/changelog sudo-1.8.12/debian/changelog --- sudo-1.8.12/debian/changelog 2015-06-05 15:12:36.000000000 +0000 +++ sudo-1.8.12/debian/changelog 2015-09-22 15:57:46.000000000 +0000 @@ -1,3 +1,11 @@ +sudo (1.8.12-1ubuntu3) wily; urgency=medium + + * debian/patches/pam_check_untranslated_prompt.patch: also check the un- + translated version of the prompt when checking if the PAM prompt matches + "Password:". Patch from Joel Pelaez Jorge. (LP: #1414303) + + -- Mathieu Trudel-Lapierre Tue, 22 Sep 2015 11:57:43 -0400 + sudo (1.8.12-1ubuntu2) wily; urgency=medium * Use tmpfs location to store timestamp files (LP: #1458031) diff -Nru sudo-1.8.12/debian/patches/pam_check_untranslated_prompt.patch sudo-1.8.12/debian/patches/pam_check_untranslated_prompt.patch --- sudo-1.8.12/debian/patches/pam_check_untranslated_prompt.patch 1970-01-01 00:00:00.000000000 +0000 +++ sudo-1.8.12/debian/patches/pam_check_untranslated_prompt.patch 2015-09-22 15:57:26.000000000 +0000 @@ -0,0 +1,29 @@ +From: Joel Pelaez Jorge +Subject: Check untranslated PAM prompt to match Password: + +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 + +Origin: upstream, http://www.sudo.ws/repos/sudo/rev/d87f6f2ccb42 +Bug: http://bugzilla.sudo.ws/show_bug.cgi?id=701 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sudo/+bug/1414303 +Last-Update: 2015-09-22 + +diff -r 09e400445ca2 -r d87f6f2ccb42 plugins/sudoers/auth/pam.c +--- a/plugins/sudoers/auth/pam.c Wed Jun 24 10:32:08 2015 -0600 ++++ b/plugins/sudoers/auth/pam.c Thu Jun 25 09:12:15 2015 -0600 +@@ -299,8 +299,9 @@ + + #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 */ + diff -Nru sudo-1.8.12/debian/patches/series sudo-1.8.12/debian/patches/series --- sudo-1.8.12/debian/patches/series 2015-05-13 19:59:41.000000000 +0000 +++ sudo-1.8.12/debian/patches/series 2015-09-22 15:52:08.000000000 +0000 @@ -3,3 +3,4 @@ paths-in-samples.diff keep_home_by_default.patch also_check_sudo_group.diff +pam_check_untranslated_prompt.patch