Patches to get user-to-user credentials to work correctly

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2553 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index fd25f568dc89a7d3eb617d38a02a609189173b7c..80d3f039e5d8b99acb4588cb1028553e39cc7a44 100644 (file)
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -74,15 +74,15 @@ krb5_creds *creds;
           session key */
        fields |= KRB5_TC_MATCH_2ND_TKT|KRB5_TC_MATCH_IS_SKEY;
        mcreds.is_skey = TRUE;
+       mcreds.second_ticket = creds->second_ticket;
+       if (!creds->second_ticket.length)
+           return KRB5_NO_2ND_TKT;
     }
 
     retval = krb5_cc_retrieve_cred(ccache, fields, &mcreds, creds);
     if (retval != KRB5_CC_NOTFOUND || options & KRB5_GC_CACHED)
        return retval;
 
-    if (options & KRB5_GC_USER_USER && !creds->second_ticket.length)
-       return KRB5_NO_2ND_TKT;
-
     retval = krb5_get_cred_from_kdc(ccache, creds, &tgts);
     if (tgts) {
        register int i = 0;