don't use prompt global, it will go away

diff --git a/auth/pam.c b/auth/pam.c
index 8f3290dde541da3ffdea4bfbe3615acf5934b216..c269c3071e6da61e037075d24eac64fdf8473d5f 100644 (file)
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -63,9 +63,6 @@ pam_setup(pw, promptp, data)
     if (*data)
        return(AUTH_SUCCESS);           /* Already initialized */
 
-    /* Stash prompt */
-    def_prompt = *promptp;
-
     /* Initial PAM setup */
     pam_conv.conv = sudo_conv;
     PAM_nullpw = 0;
@@ -80,13 +77,15 @@ pam_setup(pw, promptp, data)
 }
 
 int
-pam_verify(pw, pass, data)
+pam_verify(pw, prompt, data)
     struct passwd *pw;
-    char *pass;
+    char *prompt;
     void **data;
 {
     pam_handle_t *pamh = (pam_handle_t *)(*data);
 
+    def_prompt = prompt;       /* for sudo_conv */
+
     /* PAM_SILENT prevents error messages from going to syslog(3) */
     if (pam_authenticate(pamh, PAM_SILENT) == PAM_SUCCESS)
        return(AUTH_SUCCESS);
@@ -122,7 +121,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
 {
     struct pam_response *pr;
     struct pam_message *pm;
-    char *p = prompt;
+    char *p = def_prompt;
     int echo = 0;
     extern int nil_pw;