From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 23 Nov 1999 18:06:45 +0000 (+0000)
Subject: fix a warning on redhat and spew an error if pam_authenticate() returns an error... 
X-Git-Tag: SUDO_1_6_1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dab213c3ee5e1968a48ad9d0dc76b6ac25c1dd2a;p=sudo

fix a warning on redhat and spew an error if pam_authenticate() returns an error other than AUTH_SUCCESS or PAM_PERM_DENIED
---

diff --git a/auth/pam.c b/auth/pam.c
index 376ee96d7..3cdb218ae 100644
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -90,15 +90,21 @@ pam_verify(pw, prompt, auth)
     char *prompt;
     sudo_auth *auth;
 {
+    int error;
+    const char *s;
     pam_handle_t *pamh = (pam_handle_t *) auth->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)
+    if ((error = pam_authenticate(pamh, PAM_SILENT)) == PAM_SUCCESS)
 	return(AUTH_SUCCESS);
-    else
-	return(AUTH_FAILURE);
+
+    if (error != PAM_PERM_DENIED) {
+	if ((s = pam_strerror(pamh, error)))
+	    log_error(NO_EXIT|NO_MAIL, "pam_authenticate: %s\n", s);
+    }
+    return(AUTH_FAILURE);
 }
 
 int
@@ -125,7 +131,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
     VOID *appdata_ptr;
 {
     struct pam_response *pr;
-    struct pam_message *pm;
+    PAM_CONST struct pam_message *pm;
     char *p = def_prompt;
     int echo = 0;
     extern int nil_pw;