From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 3 Feb 2011 17:39:57 +0000 (+0000)
Subject: Remove an unnecessary statement in acquire_init_cred().  We never set
X-Git-Tag: krb5-1.10-alpha1~606
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b9f54b07b54d4229c24171cdeb65cd05628ac48;p=krb5.git

Remove an unnecessary statement in acquire_init_cred().  We never set
an acceptor name different from desired_princ.

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

diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index a328a3db8..4fe9ebcea 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -354,13 +354,6 @@ acquire_init_cred(krb5_context context,
         return GSS_S_CRED_UNAVAIL;
     }
 
-    /*
-     * Credentials cache principal must match either the acceptor principal
-     * name or the desired_princ argument (they may be the same).
-     */
-    if (cred->name != NULL && desired_princ == NULL)
-        desired_princ = cred->name->princ;
-
     code = krb5_cc_get_principal(context, ccache, &ccache_princ);
     if (code != 0) {
         krb5_cc_close(context, ccache);
@@ -368,6 +361,7 @@ acquire_init_cred(krb5_context context,
         return GSS_S_FAILURE;
     }
 
+    /* Credentials cache principal must match the initiator name. */
     if (desired_princ != NULL) {
         if (!krb5_principal_compare(context, ccache_princ, desired_princ)) {
             krb5_free_principal(context, ccache_princ);