svn rev #24612: trunk/src/lib/gssapi/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24612
Commit By: ghudson
Log Message:
Remove an unnecessary statement in acquire_init_cred().  We never set
an acceptor name different from desired_princ.



Changed Files:
U   trunk/src/lib/gssapi/krb5/acquire_cred.c
Modified: trunk/src/lib/gssapi/krb5/acquire_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/acquire_cred.c	2011-02-01 01:11:51 UTC (rev 24611)
+++ trunk/src/lib/gssapi/krb5/acquire_cred.c	2011-02-03 17:39:57 UTC (rev 24612)
@@ -354,13 +354,6 @@
         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 @@
         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);