diff -u sudo-1.6.9p6/debian/changelog sudo-1.6.9p6/debian/changelog
--- sudo-1.6.9p6/debian/changelog
+++ sudo-1.6.9p6/debian/changelog
@@ -1,3 +1,10 @@
+sudo (1.6.9p6-1+0) UNRELEASED; urgency=low
+
+  * auth/pam.c: don't use the PAM prompt if the user explicitly 
+    requested a custom prompt. Closes: #448628.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 10 Nov 2007 01:45:37 +0100
+
 sudo (1.6.9p6-1) unstable; urgency=low
 
   * new upstream version, closes: #442815, #446146, #438699, #435768, #435314
only in patch2:
unchanged:
--- sudo-1.6.9p6.orig/auth/pam.c
+++ sudo-1.6.9p6/auth/pam.c
@@ -254,9 +254,11 @@
 	    case PAM_PROMPT_ECHO_ON:
 		SET(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')))
+		/* Only override PAM prompt if it matches /^Password: ?/ *
+		 * or if the user explicitly requested a prompt.         */
+		if (!user_prompt &&
+		    (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_passwd_timeout * 60, flags);