diff options
author | Greg Hudson <ghudson@mit.edu> | 2013-04-01 13:25:33 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2013-04-01 13:25:33 -0400 |
commit | f9c5d2277c23e40b2e929cef6e4654113b66da68 (patch) | |
tree | 00d2e3882db74ca5cb11b4e9a31b5a8408eac9a2 /src/lib/gssapi | |
parent | f43dfa88148724fb8a9543015c69fa1b2b24bb66 (diff) | |
download | krb5-f9c5d2277c23e40b2e929cef6e4654113b66da68.tar.gz krb5-f9c5d2277c23e40b2e929cef6e4654113b66da68.tar.xz krb5-f9c5d2277c23e40b2e929cef6e4654113b66da68.zip |
Add krb5_kt_dup API and use it in two places
Add an API to duplicate keytab handles, mirroring krb5_cc_dup. Use it
to simplify the krb5 GSS acquire_cred code.
ticket: 7599 (new)
Diffstat (limited to 'src/lib/gssapi')
-rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index c4c596b871..dbc5a701aa 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -194,15 +194,7 @@ acquire_accept_cred(krb5_context context, assert(cred->keytab == NULL); if (req_keytab != NULL) { - char ktname[BUFSIZ]; - - /* Duplicate keytab handle */ - code = krb5_kt_get_name(context, req_keytab, ktname, sizeof(ktname)); - if (code) { - *minor_status = code; - return GSS_S_CRED_UNAVAIL; - } - code = krb5_kt_resolve(context, ktname, &kt); + code = krb5_kt_dup(context, req_keytab, &kt); } else { code = k5_mutex_lock(&gssint_krb5_keytab_lock); if (code) { @@ -660,23 +652,12 @@ acquire_init_cred(krb5_context context, goto error; } - if (client_keytab != NULL) { - char ktname[BUFSIZ]; - - /* Duplicate keytab handle */ - code = krb5_kt_get_name(context, client_keytab, ktname, - sizeof(ktname)); - if (code) - goto error; - - code = krb5_kt_resolve(context, ktname, &cred->client_keytab); - if (code) - goto error; - } else { + if (client_keytab != NULL) + code = krb5_kt_dup(context, client_keytab, &cred->client_keytab); + else code = krb5_kt_client_default(context, &cred->client_keytab); - if (code) - goto error; - } + if (code) + goto error; if (password != GSS_C_NO_BUFFER) { pwdata = make_data(password->value, password->length); |