Imported Upstream version 1.7.6p1

[debian/sudo] / auth / pam.c

diff --git a/auth/pam.c b/auth/pam.c
index ca2ef10695754e0c49c4610ed2f67567b6b92e0e..265de36e3ca47838f0e8270fea716eb6ae2cb01d 100644 (file)
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -102,7 +102,7 @@ pam_init(pw, promptp, auth)
 
     if (pam_status != PAM_SUCCESS) {
        log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM");
-       return(AUTH_FATAL);
+       return AUTH_FATAL;
     }
 
     /*
@@ -124,7 +124,7 @@ pam_init(pw, promptp, auth)
     else
        (void) pam_set_item(pamh, PAM_TTY, user_ttypath);
 
-    return(AUTH_SUCCESS);
+    return AUTH_SUCCESS;
 }
 
 int
@@ -145,11 +145,11 @@ pam_verify(pw, prompt, auth)
            *pam_status = pam_acct_mgmt(pamh, PAM_SILENT);
            switch (*pam_status) {
                case PAM_SUCCESS:
-                   return(AUTH_SUCCESS);
+                   return AUTH_SUCCESS;
                case PAM_AUTH_ERR:
-                   log_error(NO_EXIT|NO_MAIL, "pam_acct_mgmt: %d",
-                       *pam_status);
-                   return(AUTH_FAILURE);
+                   log_error(NO_EXIT|NO_MAIL,
+                       "account validation failure, is your account locked?");
+                   return AUTH_FATAL;
                case PAM_NEW_AUTHTOK_REQD:
                    log_error(NO_EXIT|NO_MAIL, "%s, %s",
                        "Account or password is expired",
@@ -157,33 +157,33 @@ pam_verify(pw, prompt, auth)
                    *pam_status = pam_chauthtok(pamh,
                        PAM_CHANGE_EXPIRED_AUTHTOK);
                    if (*pam_status == PAM_SUCCESS)
-                       return(AUTH_SUCCESS);
+                       return AUTH_SUCCESS;
                    if ((s = pam_strerror(pamh, *pam_status)))
                        log_error(NO_EXIT|NO_MAIL, "pam_chauthtok: %s", s);
-                   return(AUTH_FAILURE);
+                   return AUTH_FAILURE;
                case PAM_AUTHTOK_EXPIRED:
                    log_error(NO_EXIT|NO_MAIL,
                        "Password expired, contact your system administrator");
-                   return(AUTH_FATAL);
+                   return AUTH_FATAL;
                case PAM_ACCT_EXPIRED:
                    log_error(NO_EXIT|NO_MAIL, "%s %s",
                        "Account expired or PAM config lacks an \"account\"",
                        "section for sudo, contact your system administrator");
-                   return(AUTH_FATAL);
+                   return AUTH_FATAL;
            }
            /* FALLTHROUGH */
        case PAM_AUTH_ERR:
            if (gotintr) {
                /* error or ^C from tgetpass() */
-               return(AUTH_INTR);
+               return AUTH_INTR;
            }
        case PAM_MAXTRIES:
        case PAM_PERM_DENIED:
-           return(AUTH_FAILURE);
+           return AUTH_FAILURE;
        default:
            if ((s = pam_strerror(pamh, *pam_status)))
                log_error(NO_EXIT|NO_MAIL, "pam_authenticate: %s", s);
-           return(AUTH_FATAL);
+           return AUTH_FATAL;
     }
 }
 
@@ -196,10 +196,10 @@ pam_cleanup(pw, auth)
 
     /* If successful, we can't close the session until pam_prep_user() */
     if (auth->status == AUTH_SUCCESS)
-       return(AUTH_SUCCESS);
+       return AUTH_SUCCESS;
 
     *pam_status = pam_end(pamh, *pam_status | PAM_DATA_SILENT);
-    return(*pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE);
+    return *pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE;
 }
 
 int
@@ -235,7 +235,7 @@ pam_begin_session(pw)
        pamh = NULL;
     }
 #endif
-    return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE);
+    return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE;
 }
 
 int
@@ -249,7 +249,7 @@ pam_end_session()
 #endif
        status = pam_end(pamh, PAM_SUCCESS | PAM_DATA_SILENT);
     }
-    return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE);
+    return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE;
 }
 
 /*
@@ -270,7 +270,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
     int n, flags, std_prompt;
 
     if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
-       return(PAM_SYSTEM_ERR);
+       return PAM_SYSTEM_ERR;
     zero_bytes(*response, num_msg * sizeof(struct pam_response));
 
     for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) {
@@ -332,7 +332,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
        }
     }
 
-    return(PAM_SUCCESS);
+    return PAM_SUCCESS;
 
 err:
     /* Zero and free allocated memory and return an error. */
@@ -346,5 +346,5 @@ err:
     zero_bytes(*response, num_msg * sizeof(struct pam_response));
     free(*response);
     *response = NULL;
-    return(gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR);
+    return gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR;
 }