Make sudo_auth_{init,cleanup} return TRUE on success and check for

sudo_auth_init() return value in check_user().

diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
index 7f49322d53e45c8c2943cecb698e08eb4f91c7dc..cd0408394d005c0fe38617091dd0f5f6c24b4e6d 100644 (file)
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -107,10 +107,10 @@ int
 sudo_auth_init(struct passwd *pw)
 {
     sudo_auth *auth;
-    int status;
+    int status = AUTH_SUCCESS;
 
     if (auth_switch[0].name == NULL)
-       return AUTH_SUCCESS;
+       return TRUE;
 
     /* Make sure we haven't mixed standalone and shared auth methods. */
     standalone = IS_STANDALONE(&auth_switch[0]);
@@ -141,18 +141,18 @@ sudo_auth_init(struct passwd *pw)
            else if (status == AUTH_FATAL) {
                /* XXX log */
                audit_failure(NewArgv, "authentication failure");
-               return -1;              /* assume error msg already printed */
+               break;          /* assume error msg already printed */
            }
        }
     }
-    return AUTH_SUCCESS;
+    return status == AUTH_FATAL ? -1 : TRUE;
 }
 
 int
 sudo_auth_cleanup(struct passwd *pw)
 {
     sudo_auth *auth;
-    int status;
+    int status = AUTH_SUCCESS;
 
     /* Call cleanup routines. */
     for (auth = auth_switch; auth->name; auth++) {
@@ -168,11 +168,11 @@ sudo_auth_cleanup(struct passwd *pw)
            if (status == AUTH_FATAL) {
                /* XXX log */
                audit_failure(NewArgv, "authentication failure");
-               return -1;              /* assume error msg already printed */
+               break;          /* assume error msg already printed */
            }
        }
     }
-    return AUTH_SUCCESS;
+    return status == AUTH_FATAL ? -1 : TRUE;
 }
 
 int

diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c
index 96d3c1e76eb8aaf2663460a2b68ae834d1b23649..f263c441f86f48dd6652453d647a60397054fdb7 100644 (file)
--- a/plugins/sudoers/check.c
+++ b/plugins/sudoers/check.c
@@ -116,7 +116,11 @@ check_user(int validated, int mode)
 
     /* Init authentication system regardless of whether we need a password. */
     auth_pw = get_authpw();
-    sudo_auth_init(auth_pw);
+    if (sudo_auth_init(auth_pw) == -1) {
+       pw_delref(auth_pw);
+       rval = -1;
+       goto done;
+    }
     pw_delref(auth_pw);
 
     /* Always prompt for a password when -k was specified with the command. */