svn rev #25373: branches/krb5-1-9/src/lib/gssapi/mechglue/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25373
Commit By: tlyu
Log Message:
ticket: 6932
version_fixed: 1.9.2
status: resolved

pull up r25037 from trunk

 ------------------------------------------------------------------------
 r25037 | ghudson | 2011-07-22 12:56:36 -0400 (Fri, 22 Jul 2011) | 9 lines

 Fix gss_set_cred_option cred creation with no name.

 When creating a cred in the mechglue with gss_acquire_cred, the
 mechanism is allowed to return no name from gss_inquire_cred.  But in
 the analagous operation in gss_set_cred_option, that would result in
 an error from gss_display_name.  Make the call to gss_display_name
 conditional on the mechanism name being set.  Reported by Andrew
 Bartlett.


Changed Files:
U   branches/krb5-1-9/src/lib/gssapi/mechglue/g_set_cred_option.c
Modified: branches/krb5-1-9/src/lib/gssapi/mechglue/g_set_cred_option.c
===================================================================
--- branches/krb5-1-9/src/lib/gssapi/mechglue/g_set_cred_option.c	2011-10-18 20:18:37 UTC (rev 25372)
+++ branches/krb5-1-9/src/lib/gssapi/mechglue/g_set_cred_option.c	2011-10-18 20:18:41 UTC (rev 25373)
@@ -88,12 +88,14 @@
     if (status != GSS_S_COMPLETE)
 	goto cleanup;
 
-    status = mech->gss_display_name(minor_status,
-				    mech_name,
-				    &cred->auxinfo.name,
-				    &cred->auxinfo.name_type);
-    if (status != GSS_S_COMPLETE)
-	goto cleanup;
+    if (mech_name != GSS_C_NO_NAME) {
+	status = mech->gss_display_name(minor_status,
+					mech_name,
+					&cred->auxinfo.name,
+					&cred->auxinfo.name_type);
+	if (status != GSS_S_COMPLETE)
+	    goto cleanup;
+    }
 
     status = GSS_S_COMPLETE;
     *pcred = cred;