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

standardize on "return foo;" rather than "return(foo);" or "return (foo);"

Browse Source
This commit is contained in:
Todd C. Miller
2011-01-24 15:15:18 -05:00
parent 3316ac8ebc
commit ae2f7638f5
68 changed files with 843 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ afs_verify(struct passwd *pw, char *pass, sudo_auth *auth)
0, /* lifetime */
&afs_token, /* token */
0) == 0) /* new */
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
/* Fall back on old method XXX - needed? */
setpag();
@@ -77,7 +77,7 @@ afs_verify(struct passwd *pw, char *pass, sudo_auth *auth)
NULL, /* expiration ptr (unused) */
0, /* spare */
NULL) == 0) /* reason */
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
return(AUTH_FAILURE);
return AUTH_FAILURE;
}

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

@@ -65,7 +65,7 @@ aixauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
free(message);
zero_bytes(pass, strlen(pass));
}
return(rval);
return rval;
}
int
@@ -74,5 +74,5 @@ aixauth_cleanup(struct passwd *pw, sudo_auth *auth)
/* Unset AUTHSTATE as it may not be correct for the runas user. */
unsetenv("AUTHSTATE");
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}

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

@@ -62,7 +62,7 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth)
if ((as = auth_open()) == NULL) {
log_error(USE_ERRNO|NO_EXIT|NO_MAIL,
"unable to begin bsd authentication");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/* XXX - maybe sanity check the auth style earlier? */
@@ -70,7 +70,7 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth)
if (login_style == NULL) {
log_error(NO_EXIT|NO_MAIL, "invalid authentication type");
auth_close(as);
return(AUTH_FATAL);
return AUTH_FATAL;
}
if (auth_setitem(as, AUTHV_STYLE, login_style) < 0 ||
@@ -78,11 +78,11 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth)
auth_setitem(as, AUTHV_CLASS, login_class) < 0) {
log_error(NO_EXIT|NO_MAIL, "unable to setup authentication");
auth_close(as);
return(AUTH_FATAL);
return AUTH_FATAL;
}
auth->data = (void *) as;
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -140,14 +140,14 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
(void) sigaction(SIGCHLD, &osa, NULL);
if (authok)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
if (!pass)
return(AUTH_INTR);
return AUTH_INTR;
if ((s = auth_getvalue(as, "errormsg")) != NULL)
log_error(NO_EXIT|NO_MAIL, "%s", s);
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
int
@@ -157,5 +157,5 @@ bsdauth_cleanup(struct passwd *pw, sudo_auth *auth)
auth_close(as);
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}

28
plugins/sudoers/auth/dce.c
View File

@@ -86,7 +86,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
sec_login_no_flags, &login_context, &status)) {
if (check_dce_status(status, "sec_login_setup_identity(1):"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
password_rec.key.key_type = sec_passwd_plain;
password_rec.key.tagged_union.plain = (idl_char *) plain_pw;
@@ -98,7 +98,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
&reset_passwd, &auth_src, &status)) {
if (check_dce_status(status, "sec_login_validate_identity(1):"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
/*
* Certify that the DCE Security Server used to set
@@ -108,10 +108,10 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
if (!sec_login_certify_identity(login_context, &status)) {
(void) fprintf(stderr, "Whoa! Bogus authentication server!\n");
(void) check_dce_status(status,"sec_login_certify_identity(1):");
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
if (check_dce_status(status, "sec_login_certify_identity(2):"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
/*
* Sets the network credentials to those specified
@@ -119,7 +119,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
*/
sec_login_set_context(login_context, &status);
if (check_dce_status(status, "sec_login_set_context:"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
/*
* Oops, your credentials were no good. Possibly
@@ -129,13 +129,13 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
if (auth_src != sec_login_auth_src_network) {
(void) fprintf(stderr,
"You have no network credentials.\n");
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
/* Check if the password has aged and is thus no good */
if (reset_passwd) {
(void) fprintf(stderr,
"Your DCE password needs resetting.\n");
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
/*
@@ -147,7 +147,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
sec_login_get_pwent(login_context, (sec_login_passwd_t) &temp_pw,
&status);
if (check_dce_status(status, "sec_login_get_pwent:"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
/*
* If we get to here, then the pwent above properly fetched
@@ -169,17 +169,17 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth)
* somewhere later in the program.
*/
sec_login_purge_context(&login_context, &status);
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
} else {
if(check_dce_status(status, "sec_login_validate_identity(2):"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
sec_login_purge_context(&login_context, &status);
if(check_dce_status(status, "sec_login_purge_context:"))
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
}
(void) check_dce_status(status, "sec_login_setup_identity(2):");
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
/* Returns 0 for DCE "ok" status, 1 otherwise */
@@ -190,8 +190,8 @@ check_dce_status(error_status_t input_status, char *comment)
unsigned char error_string[dce_c_error_string_len];
if (input_status == rpc_s_ok)
return(0);
return 0;
dce_error_inq_text(input_status, error_string, &error_stat);
(void) fprintf(stderr, "%s %s\n", comment, error_string);
return(1);
return 1;
}

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

@@ -57,25 +57,25 @@ fwtk_init(struct passwd *pw, char **promptp, sudo_auth *auth)
if ((confp = cfg_read("sudo")) == (Cfg *)-1) {
warningx("cannot read fwtk config");
return(AUTH_FATAL);
return AUTH_FATAL;
}
if (auth_open(confp)) {
warningx("cannot connect to authentication server");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/* Get welcome message from auth server */
if (auth_recv(resp, sizeof(resp))) {
warningx("lost connection to authentication server");
return(AUTH_FATAL);
return AUTH_FATAL;
}
if (strncmp(resp, "Authsrv ready", 13) != 0) {
warningx("authentication server error:\n%s", resp);
return(AUTH_FATAL);
return AUTH_FATAL;
}
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -91,7 +91,7 @@ fwtk_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
restart:
if (auth_send(buf) || auth_recv(resp, sizeof(resp))) {
warningx("lost connection to authentication server");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/* Get the password/response from the user. */
@@ -114,10 +114,10 @@ restart:
goto restart;
} else {
warningx("%s", resp);
return(AUTH_FATAL);
return AUTH_FATAL;
}
if (!pass) { /* ^C or error */
return(AUTH_INTR);
return AUTH_INTR;
}
/* Send the user's response to the server */
@@ -140,7 +140,7 @@ restart:
done:
zero_bytes(pass, strlen(pass));
zero_bytes(buf, strlen(buf));
return(error);
return error;
}
int
@@ -148,5 +148,5 @@ fwtk_cleanup(struct passwd *pw, sudo_auth *auth)
{
auth_close();
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}

10
plugins/sudoers/auth/kerb4.c
View File

@@ -54,16 +54,16 @@ kerb4_init(struct passwd *pw, char **promptp, sudo_auth *auth)
/* Don't try to verify root */
if (pw->pw_uid == 0)
return(AUTH_FAILURE);
return AUTH_FAILURE;
/* Get the local realm, or retrun failure (no krb.conf) */
if (krb_get_lrealm(realm, 1) != KSUCCESS)
return(AUTH_FAILURE);
return AUTH_FAILURE;
/* Stash a pointer to the realm (used in kerb4_verify) */
auth->data = (void *) realm;
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -88,7 +88,7 @@ kerb4_verify(struct passwd *pw, char *pass, sudo_auth *auth)
switch (error) {
case INTK_OK:
dest_tkt(); /* we are done with the temp ticket */
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
break;
case INTK_BADPW:
case KDC_PR_UNKNOWN:
@@ -98,5 +98,5 @@ kerb4_verify(struct passwd *pw, char *pass, sudo_auth *auth)
krb_err_txt[error]);
}
return(AUTH_FAILURE);
return AUTH_FAILURE;
}

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

@@ -105,7 +105,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth)
error = krb5_init_context(&(sudo_krb5_data.sudo_context));
#endif
if (error)
return(AUTH_FAILURE);
return AUTH_FAILURE;
sudo_context = sudo_krb5_data.sudo_context;
if ((error = krb5_parse_name(sudo_context, pw->pw_name,
@@ -113,7 +113,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth)
log_error(NO_EXIT|NO_MAIL,
"%s: unable to parse '%s': %s", auth->name, pw->pw_name,
error_message(error));
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
princ = sudo_krb5_data.princ;
@@ -126,7 +126,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth)
log_error(NO_EXIT|NO_MAIL,
"%s: unable to unparse princ ('%s'): %s", auth->name,
pw->pw_name, error_message(error));
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
/* Only rewrite prompt if user didn't specify their own. */
@@ -143,11 +143,11 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth)
log_error(NO_EXIT|NO_MAIL,
"%s: unable to resolve ccache: %s", auth->name,
error_message(error));
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
ccache = sudo_krb5_data.ccache;
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
#ifdef HAVE_KRB5_VERIFY_USER
@@ -164,7 +164,7 @@ kerb5_verify(struct passwd *pw, char *pass, sudo_auth *auth)
ccache = ((sudo_krb5_datap) auth->data)->ccache;
error = krb5_verify_user(sudo_context, princ, ccache, pass, 1, NULL);
return (error ? AUTH_FAILURE : AUTH_SUCCESS);
return error ? AUTH_FAILURE : AUTH_SUCCESS;
}
#else
int
@@ -232,7 +232,7 @@ done:
}
if (creds)
krb5_free_cred_contents(sudo_context, creds);
return (error ? AUTH_FAILURE : AUTH_SUCCESS);
return error ? AUTH_FAILURE : AUTH_SUCCESS;
}
#endif
@@ -255,7 +255,7 @@ kerb5_cleanup(struct passwd *pw, sudo_auth *auth)
krb5_free_context(sudo_context);
}
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
#ifndef HAVE_KRB5_VERIFY_USER
@@ -283,7 +283,7 @@ verify_krb_v5_tgt(krb5_context sudo_context, krb5_creds *cred, char *auth_name)
log_error(NO_EXIT|NO_MAIL,
"%s: unable to get host principal: %s", auth_name,
error_message(error));
return(-1);
return -1;
}
/* Initialize verify opts and set secure mode */
@@ -298,6 +298,6 @@ verify_krb_v5_tgt(krb5_context sudo_context, krb5_creds *cred, char *auth_name)
log_error(NO_EXIT|NO_MAIL,
"%s: Cannot verify TGT! Possible attack!: %s", auth_name,
error_message(error));
return(error);
return error;
}
#endif

36
plugins/sudoers/auth/pam.c
View File

@@ -98,7 +98,7 @@ pam_init(struct passwd *pw, char **promptp, sudo_auth *auth)
pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh);
if (pam_status != PAM_SUCCESS) {
log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/*
@@ -120,7 +120,7 @@ pam_init(struct passwd *pw, char **promptp, sudo_auth *auth)
else
(void) pam_set_item(pamh, PAM_TTY, user_ttypath);
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -138,11 +138,11 @@ pam_verify(struct passwd *pw, char *prompt, sudo_auth *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,
"account validation failure, is your account locked?");
return(AUTH_FATAL);
return AUTH_FATAL;
case PAM_NEW_AUTHTOK_REQD:
log_error(NO_EXIT|NO_MAIL, "%s, %s",
"Account or password is expired",
@@ -150,33 +150,33 @@ pam_verify(struct passwd *pw, char *prompt, sudo_auth *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;
}
}
@@ -187,10 +187,10 @@ pam_cleanup(struct passwd *pw, sudo_auth *auth)
/* If successful, we can't close the session until pam_end_session() */
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
@@ -240,7 +240,7 @@ pam_begin_session(struct passwd *pw, sudo_auth *auth)
#endif
done:
return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE);
return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE;
}
int
@@ -254,7 +254,7 @@ pam_end_session(sudo_auth *auth)
#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;
}
/*
@@ -272,7 +272,7 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
int n, type, 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++) {
@@ -334,7 +334,7 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
}
}
return(PAM_SUCCESS);
return PAM_SUCCESS;
err:
/* Zero and free allocated memory and return an error. */
@@ -348,5 +348,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;
}

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

@@ -53,12 +53,12 @@ passwd_init(struct passwd *pw, char **promptp, sudo_auth *auth)
{
#ifdef HAVE_SKEYACCESS
if (skeyaccess(pw, user_tty, NULL, NULL) == 0)
return(AUTH_FAILURE);
return AUTH_FAILURE;
#endif
sudo_setspent();
auth->data = sudo_getepw(pw);
sudo_endspent();
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -75,7 +75,7 @@ passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth)
/* Ultrix shadow passwords may use crypt16() */
error = strcmp(pw_epasswd, (char *) crypt16(pass, pw_epasswd));
if (!error)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
#endif /* HAVE_GETAUTHUID */
/*
@@ -98,7 +98,7 @@ passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth)
else
error = strcmp(pw_epasswd, epass);
return(error ? AUTH_FAILURE : AUTH_SUCCESS);
return error ? AUTH_FAILURE : AUTH_SUCCESS;
}
int
@@ -112,5 +112,5 @@ passwd_cleanup(pw, auth)
zero_bytes(pw_epasswd, strlen(pw_epasswd));
efree(pw_epasswd);
}
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}

10
plugins/sudoers/auth/rfc1938.c
View File

@@ -101,9 +101,9 @@ rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
if (rfc1938challenge(&rfc1938, pw->pw_name, challenge, sizeof(challenge))) {
if (IS_ONEANDONLY(auth)) {
warningx("you do not exist in the %s database", auth->name);
return(AUTH_FATAL);
return AUTH_FATAL;
} else {
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
}
@@ -120,7 +120,7 @@ rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
orig_prompt, challenge);
*promptp = new_prompt;
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -128,7 +128,7 @@ rfc1938_verify(struct passwd *pw, char *pass, sudo_auth *auth)
{
if (rfc1938verify((struct RFC1938 *) auth->data, pass) == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
else
return(AUTH_FAILURE);
return AUTH_FAILURE;
}

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

@@ -59,12 +59,12 @@ secureware_init(struct passwd *pw, char **promptp, sudo_auth *auth)
extern int crypt_type;
if (crypt_type == INT_MAX)
return(AUTH_FAILURE); /* no shadow */
return AUTH_FAILURE; /* no shadow */
#endif
sudo_setspent();
auth->data = sudo_getepw(pw);
sudo_endspent();
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -76,22 +76,22 @@ secureware_verify(struct passwd *pw, char *pass, sudo_auth *auth)
# ifdef HAVE_DISPCRYPT
if (strcmp(pw_epasswd, dispcrypt(pass, pw_epasswd, crypt_type)) == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
# else
if (crypt_type == AUTH_CRYPT_BIGCRYPT) {
if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
} else if (crypt_type == AUTH_CRYPT_CRYPT16) {
if (strcmp(pw_epasswd, crypt(pass, pw_epasswd)) == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
# endif /* HAVE_DISPCRYPT */
#elif defined(HAVE_BIGCRYPT)
if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
#endif /* __alpha */
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
int
@@ -105,5 +105,5 @@ secureware_cleanup(pw, auth)
zero_bytes(pw_epasswd, strlen(pw_epasswd));
efree(pw_epasswd);
}
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}

12
plugins/sudoers/auth/securid.c
View File

@@ -63,9 +63,9 @@ securid_init(struct passwd *pw, char **promptp, sudo_auth *auth)
auth->data = (void *) &sd_dat; /* For method-specific data */
if (creadcfg() == 0)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
else
return(AUTH_FATAL);
return AUTH_FATAL;
}
int
@@ -77,10 +77,10 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
if (sd_init(sd) == 0) {
/* The programmer's guide says username is 32 bytes */
strlcpy(sd->username, pw->pw_name, 32);
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
} else {
warningx("unable to contact the SecurID server");
return(AUTH_FATAL);
return AUTH_FATAL;
}
}
@@ -93,7 +93,7 @@ securid_verify(struct passwd *pw, char *pass, sudo_auth *auth)
rval = sd_auth(sd);
sd_close();
if (rval == ACM_OK)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
else
return(AUTH_FAILURE);
return AUTH_FAILURE;
}

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

@@ -76,10 +76,10 @@ securid_init(struct passwd *pw, char **promptp, sudo_auth *auth)
/* Start communications */
if (AceInitialize() != SD_FALSE)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
warningx("failed to initialise the ACE API library");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/*
@@ -104,7 +104,7 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
/* Re-initialize SecurID every time. */
if (SD_Init(sd) != ACM_OK) {
warningx("unable to contact the SecurID server");
return(AUTH_FATAL);
return AUTH_FATAL;
}
/* Lock new PIN code */
@@ -113,23 +113,23 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
switch (retval) {
case ACM_OK:
warningx("User ID locked for SecurID Authentication");
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
case ACE_UNDEFINED_USERNAME:
warningx("invalid username length for SecurID");
return(AUTH_FATAL);
return AUTH_FATAL;
case ACE_ERR_INVALID_HANDLE:
warningx("invalid Authentication Handle for SecurID");
return(AUTH_FATAL);
return AUTH_FATAL;
case ACM_ACCESS_DENIED:
warningx("SecurID communication failed");
return(AUTH_FATAL);
return AUTH_FATAL;
default:
warningx("unknown SecurID error");
return(AUTH_FATAL);
return AUTH_FATAL;
}
}
@@ -219,5 +219,5 @@ then enter the new token code.\n", \
SD_Close(*sd);
/* Return stored state to calling process */
return(rval);
return rval;
}

10
plugins/sudoers/auth/sia.c
View File

@@ -94,11 +94,11 @@ sia_setup(struct passwd *pw, char **promptp, sudo_auth *auth)
log_error(USE_ERRNO|NO_EXIT|NO_MAIL,
"unable to initialize SIA session");
return(AUTH_FATAL);
return AUTH_FATAL;
}
auth->data = (void *) siah;
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}
int
@@ -110,9 +110,9 @@ sia_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
/* XXX - need a way to detect user hitting return or EOF at prompt */
if (sia_ses_reauthent(sudo_collect, siah) == SIASUCCESS)
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
else
return(AUTH_FAILURE);
return AUTH_FAILURE;
}
int
@@ -121,5 +121,5 @@ sia_cleanup(struct passwd *pw, sudo_auth *auth)
SIAENTITY *siah = (SIAENTITY *) auth->data;
(void) sia_ses_release(&siah);
return(AUTH_SUCCESS);
return AUTH_SUCCESS;
}