diff options
author | Simo Sorce <simo@redhat.com> | 2014-01-16 23:01:37 -0500 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2014-01-17 11:51:44 -0500 |
commit | 94bc961961096bd614d37a5ecd6bee474340aa79 (patch) | |
tree | d28d5d476200a367a7c0d638c81b330625ed8d9c | |
parent | 1c3089d57036f276976273a01d03d3cea6eab0bb (diff) | |
download | nfs-utils-gss-fixes.tar.gz nfs-utils-gss-fixes.tar.xz nfs-utils-gss-fixes.zip |
Remove unused argumentsgss-fixes
The name variable is always set to NULL now in all callers, so just
sto passing it around needlessly.
The uid_t variable is not used at all, so chuck it out too.
Signed-off-by: Simo Sorce <simo@redhat.com>
-rw-r--r-- | utils/gssd/gssd_proc.c | 2 | ||||
-rw-r--r-- | utils/gssd/krb5_util.c | 10 | ||||
-rw-r--r-- | utils/gssd/krb5_util.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index 2a6ea97..33cfeb2 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -1095,7 +1095,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname, /* Tell krb5 gss which credentials cache to use */ /* Try first to acquire credentials directly via GSSAPI */ - err = gssd_acquire_user_cred(uid, &gss_cred); + err = gssd_acquire_user_cred(&gss_cred); if (!err) create_resp = create_auth_rpc_client(clp, tgtname, &rpc_clnt, &auth, uid, AUTHTYPE_KRB5, gss_cred); diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index 230b909..208c72b 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -1359,12 +1359,12 @@ gssd_k5_get_default_realm(char **def_realm) } static int -gssd_acquire_krb5_cred(gss_name_t name, gss_cred_id_t *gss_cred) +gssd_acquire_krb5_cred(gss_cred_id_t *gss_cred) { OM_uint32 maj_stat, min_stat; gss_OID_set_desc desired_mechs = { 1, &krb5oid }; - maj_stat = gss_acquire_cred(&min_stat, name, GSS_C_INDEFINITE, + maj_stat = gss_acquire_cred(&min_stat, GSS_C_NO_NAME, GSS_C_INDEFINITE, &desired_mechs, GSS_C_INITIATE, gss_cred, NULL, NULL); @@ -1379,12 +1379,12 @@ gssd_acquire_krb5_cred(gss_name_t name, gss_cred_id_t *gss_cred) } int -gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred) +gssd_acquire_user_cred(gss_cred_id_t *gss_cred) { OM_uint32 min_stat; int ret; - ret = gssd_acquire_krb5_cred(GSS_C_NO_NAME, gss_cred); + ret = gssd_acquire_krb5_cred(gss_cred); /* force validation of cred to check for expiry */ if (ret == 0) { @@ -1423,7 +1423,7 @@ limit_krb5_enctypes(struct rpc_gss_sec *sec) int err = -1; if (sec->cred == GSS_C_NO_CREDENTIAL) { - err = gssd_acquire_krb5_cred(GSS_C_NO_NAME, &sec->cred); + err = gssd_acquire_krb5_cred(&sec->cred); if (err) return -1; } diff --git a/utils/gssd/krb5_util.h b/utils/gssd/krb5_util.h index 3f0723e..a319588 100644 --- a/utils/gssd/krb5_util.h +++ b/utils/gssd/krb5_util.h @@ -35,7 +35,7 @@ int gssd_refresh_krb5_machine_credential(char *hostname, char *gssd_k5_err_msg(krb5_context context, krb5_error_code code); void gssd_k5_get_default_realm(char **def_realm); -int gssd_acquire_user_cred(uid_t uid, gss_cred_id_t *gss_cred); +int gssd_acquire_user_cred(gss_cred_id_t *gss_cred); #ifdef HAVE_SET_ALLOWABLE_ENCTYPES extern int limit_to_legacy_enctypes; |