svn rev #23707: branches/krb5-1-8/src/lib/gssapi/mechglue/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23707
Commit By: tlyu
Log Message:
ticket: 6600
version_fixed: 1.8
status: resolved

pull up r23696 from trunk

 ------------------------------------------------------------------------
 r23696 | tlyu | 2010-02-04 22:25:49 -0500 (Thu, 04 Feb 2010) | 7 lines

 ticket: 6600
 tags: pullup
 target_version: 1.8

 Apply patch from Arlene Berry to avoid segfault if a mech
 gss_inquire_context returns GSS_C_NO_NAME for the target name.


Changed Files:
U   branches/krb5-1-8/src/lib/gssapi/mechglue/g_inq_context.c
Modified: branches/krb5-1-8/src/lib/gssapi/mechglue/g_inq_context.c
===================================================================
--- branches/krb5-1-8/src/lib/gssapi/mechglue/g_inq_context.c	2010-02-08 20:55:36 UTC (rev 23706)
+++ branches/krb5-1-8/src/lib/gssapi/mechglue/g_inq_context.c	2010-02-08 20:55:39 UTC (rev 23707)
@@ -141,6 +141,7 @@
     }
 
     if (targ_name) {
+        if (localTargName) {
 	    status = gssint_convert_name_to_union_name(minor_status, mech,
 						      localTargName, targ_name);
 
@@ -150,6 +151,10 @@
 
 		return (status);
 	    }
+        }
+        else {
+            *targ_name = GSS_C_NO_NAME;
+        }
     }
 
     /* spec says mech type must point to static storage */