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

Avoid reinitializing other auth methods.

Browse Source
This commit is contained in:
Todd C. Miller
2021-09-21 20:05:35 -06:00
parent 4a49f16967
commit b9b8451830
6 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/sudoers/auth/bsdauth.c
View File

@@ -60,6 +60,10 @@ bsdauth_init(struct passwd *pw, sudo_auth *auth)
static struct bsdauth_state state;
debug_decl(bsdauth_init, SUDOERS_DEBUG_AUTH);
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
/* Get login class based on auth user, which may not be invoking user. */
if (pw->pw_class && *pw->pw_class)
state.lc = login_getclass(pw->pw_class);

5
plugins/sudoers/auth/fwtk.c
View File

@@ -50,6 +50,10 @@ sudo_fwtk_init(struct passwd *pw, sudo_auth *auth)
char resp[128]; /* Response from the server */
debug_decl(sudo_fwtk_init, SUDOERS_DEBUG_AUTH);
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
if ((confp = cfg_read("sudo")) == (Cfg *)-1) {
sudo_warnx("%s", U_("unable to read fwtk config"));
debug_return_int(AUTH_FATAL);
@@ -69,6 +73,7 @@ sudo_fwtk_init(struct passwd *pw, sudo_auth *auth)
sudo_warnx(U_("authentication server error:\n%s"), resp);
debug_return_int(AUTH_FATAL);
}
auth->data = (void *) confp;
debug_return_int(AUTH_SUCCESS);
}

6
plugins/sudoers/auth/kerb5.c
View File

@@ -135,7 +135,9 @@ sudo_krb5_init(struct passwd *pw, sudo_auth *auth)
char cache_name[64], *pname = pw->pw_name;
debug_decl(sudo_krb5_init, SUDOERS_DEBUG_AUTH);
auth->data = (void *) &sudo_krb5_data; /* Stash all our data here */
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
if (sudo_krb5_instance != NULL) {
int len = asprintf(&pname, "%s%s%s", pw->pw_name,
@@ -171,6 +173,8 @@ sudo_krb5_init(struct passwd *pw, sudo_auth *auth)
goto done;
}
auth->data = (void *) &sudo_krb5_data; /* Stash all our data here */
done:
if (sudo_krb5_instance != NULL)
free(pname);

4
plugins/sudoers/auth/passwd.c
View File

@@ -45,6 +45,10 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth)
{
debug_decl(sudo_passwd_init, SUDOERS_DEBUG_AUTH);
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
#ifdef HAVE_SKEYACCESS
if (skeyaccess(pw, user_tty, NULL, NULL) == 0)
debug_return_int(AUTH_FAILURE);

4
plugins/sudoers/auth/secureware.c
View File

@@ -55,6 +55,10 @@ sudo_secureware_init(struct passwd *pw, sudo_auth *auth)
{
debug_decl(sudo_secureware_init, SUDOERS_DEBUG_AUTH);
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
#ifdef __alpha
if (crypt_type == INT_MAX)
debug_return_int(AUTH_FAILURE); /* no shadow */

17
plugins/sudoers/auth/securid5.c
View File

@@ -63,14 +63,19 @@ sudo_securid_init(struct passwd *pw, sudo_auth *auth)
static SDI_HANDLE sd_dat; /* SecurID handle */
debug_decl(sudo_securid_init, SUDOERS_DEBUG_AUTH);
auth->data = (void *) &sd_dat; /* For method-specific data */
/* Start communications */
if (AceInitialize() != SD_FALSE)
/* Only initialize once. */
if (auth->data != NULL)
debug_return_int(AUTH_SUCCESS);
sudo_warnx("%s", U_("failed to initialise the ACE API library"));
debug_return_int(AUTH_FATAL);
/* Start communications */
if (AceInitialize() == SD_FALSE) {
sudo_warnx("%s", U_("failed to initialise the ACE API library"));
debug_return_int(AUTH_FATAL);
}
auth->data = (void *) &sd_dat; /* For method-specific data */
debug_return_int(AUTH_SUCCESS);
}
/*