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

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

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