diff options
| author | Luke Howard <lukeh@padl.com> | 2011-04-09 01:34:09 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2011-04-09 01:34:09 +0000 |
| commit | fd5fcc564787d7443de79626027fc16bf802eb4d (patch) | |
| tree | f12c69861e04fb3e90514c0b8813200705811632 /src/lib/gssapi | |
| parent | 272ae4ad1240fa21535389a05f68c47dbe45a3da (diff) | |
| download | krb5-fd5fcc564787d7443de79626027fc16bf802eb4d.zip krb5-fd5fcc564787d7443de79626027fc16bf802eb4d.tar.gz krb5-fd5fcc564787d7443de79626027fc16bf802eb4d.tar.bz2 | |
Merge branch 'master' into users/lhoward/moonshot-mechglue-fixes
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/moonshot-mechglue-fixes@24865 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/inq_cred.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c index 493dd03..4ef94c7 100644 --- a/src/lib/gssapi/krb5/inq_cred.c +++ b/src/lib/gssapi/krb5/inq_cred.c @@ -88,6 +88,7 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, krb5_timestamp now; krb5_deltat lifetime; krb5_gss_name_t ret_name; + krb5_principal princ; gss_OID_set mechs; OM_uint32 ret; @@ -144,9 +145,24 @@ krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret, lifetime = GSS_C_INDEFINITE; if (name) { - if (cred->name && - (code = kg_duplicate_name(context, cred->name, - KG_INIT_NAME_INTERN, &ret_name))) { + if (cred->name) { + code = kg_duplicate_name(context, cred->name, KG_INIT_NAME_INTERN, + &ret_name); + } else if ((cred->usage == GSS_C_ACCEPT || cred->usage == GSS_C_BOTH) + && cred->keytab != NULL) { + /* This is a default acceptor cred; use a name from the keytab if + * we can. */ + code = k5_kt_get_principal(context, cred->keytab, &princ); + if (code == 0) { + code = kg_init_name(context, princ, NULL, NULL, NULL, + KG_INIT_NAME_NO_COPY | KG_INIT_NAME_INTERN, + &ret_name); + if (code) + krb5_free_principal(context, princ); + } else if (code == KRB5_KT_NOTFOUND) + code = 0; + } + if (code) { k5_mutex_unlock(&cred->lock); *minor_status = code; save_error_info(*minor_status, context); |