isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check_user: fix return value for intercept mode

Browse Source 
Also use early return on error to quiet a PVS-Studio warning.
This commit is contained in:
Todd C. Miller
2023-09-22 10:38:46 -06:00
parent 988d7f60f0
commit 1c7d757b79
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/sudoers/check.c
View File

@@ -108,7 +108,7 @@ check_user(struct sudoers_context *ctx, unsigned int validated,
*/ */
if (ISSET(ctx->mode, MODE_POLICY_INTERCEPTED)) { if (ISSET(ctx->mode, MODE_POLICY_INTERCEPTED)) {
if (!def_intercept_authenticate) { if (!def_intercept_authenticate) {
debug_return_int(true); debug_return_int(AUTH_SUCCESS);
} }
} }
@@ -117,9 +117,11 @@ check_user(struct sudoers_context *ctx, unsigned int validated,
* Required for proper PAM session support. * Required for proper PAM session support.
*/ */
if ((closure.auth_pw = get_authpw(ctx, mode)) == NULL) if ((closure.auth_pw = get_authpw(ctx, mode)) == NULL)
goto done; debug_return_int(AUTH_ERROR);
if (sudo_auth_init(ctx, closure.auth_pw, mode) != AUTH_SUCCESS) if (sudo_auth_init(ctx, closure.auth_pw, mode) != AUTH_SUCCESS) {
goto done; sudo_pw_delref(closure.auth_pw);
debug_return_int(AUTH_ERROR);
}
closure.ctx = ctx; closure.ctx = ctx;
/* /*
@@ -222,8 +224,7 @@ done:
} }
timestamp_close(closure.cookie); timestamp_close(closure.cookie);
sudo_auth_cleanup(ctx, closure.auth_pw, !ISSET(validated, VALIDATE_SUCCESS)); sudo_auth_cleanup(ctx, closure.auth_pw, !ISSET(validated, VALIDATE_SUCCESS));
if (closure.auth_pw != NULL) sudo_pw_delref(closure.auth_pw);
sudo_pw_delref(closure.auth_pw);
debug_return_int(ret); debug_return_int(ret);
} }