diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 31 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/ktbase.c | 10 | ||||
| -rw-r--r-- | src/lib/krb5/libkrb5.exports | 1 | ||||
| -rw-r--r-- | src/lib/krb5_32.def | 1 |
4 files changed, 18 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); diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index 0f3562f339..848b047f45 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -218,6 +218,16 @@ cleanup: return err; } +krb5_error_code KRB5_CALLCONV +krb5_kt_dup(krb5_context context, krb5_keytab in, krb5_keytab *out) +{ + krb5_error_code err; + char name[BUFSIZ]; + + err = in->ops->get_name(context, in, name, sizeof(name)); + return err ? err : krb5_kt_resolve(context, name, out); +} + /* * Routines to deal with externalizingt krb5_keytab. * keytab_size(); diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index b0547d52af..03273df1ab 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -411,6 +411,7 @@ krb5_kt_close krb5_kt_default krb5_kt_default_name krb5_kt_dfl_ops +krb5_kt_dup krb5_kt_end_seq_get krb5_kt_free_entry krb5_kt_get_entry diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def index 57604ade49..9bff8a7ebc 100644 --- a/src/lib/krb5_32.def +++ b/src/lib/krb5_32.def @@ -446,3 +446,4 @@ EXPORTS ; new in 1.12 krb5_free_enctypes @419 + krb5_kt_dup @420 |