svn rev #21597: branches/mskrb-integ/src/lib/gssapi/mechglue/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21597
Commit By: lhoward
Log Message:
cleanup


Changed Files:
U   branches/mskrb-integ/src/lib/gssapi/mechglue/g_initialize.c
U   branches/mskrb-integ/src/lib/gssapi/mechglue/mglueP.h
Modified: branches/mskrb-integ/src/lib/gssapi/mechglue/g_initialize.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/mechglue/g_initialize.c	2008-12-26 06:56:55 UTC (rev 21596)
+++ branches/mskrb-integ/src/lib/gssapi/mechglue/g_initialize.c	2008-12-26 10:22:45 UTC (rev 21597)
@@ -644,7 +644,6 @@
 	new_cf->mech_type = &new_cf->mech->mech_type;
 	new_cf->priority = template->priority;
 	new_cf->freeMech = 1;
-	new_cf->freeMechOID = 0;
 	new_cf->next = NULL;
 
 	if (template->kmodName != NULL) {
@@ -788,7 +787,7 @@
 			free(cf->mechNameStr);
 		if (cf->optionStr != NULL)
 			free(cf->optionStr);
-		if (cf->mech_type != GSS_C_NO_OID && cf->freeMechOID)
+		if (cf->mech_type != &cf->mech->mech_type)
 			generic_gss_release_oid(&minor, &cf->mech_type);
 		if (cf->mech != NULL && cf->freeMech)
 			free(cf->mech);
@@ -1169,7 +1168,6 @@
 		aMech->uLibName = strdup(sharedPath);
 		aMech->mechNameStr = strdup(oidStr);
 		aMech->freeMech = 0;
-		aMech->freeMechOID = 1;
 
 		/* check if any memory allocations failed - bad news */
 		if (aMech->uLibName == NULL || aMech->mechNameStr == NULL) {

Modified: branches/mskrb-integ/src/lib/gssapi/mechglue/mglueP.h
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/mechglue/mglueP.h	2008-12-26 06:56:55 UTC (rev 21596)
+++ branches/mskrb-integ/src/lib/gssapi/mechglue/mglueP.h	2008-12-26 10:22:45 UTC (rev 21597)
@@ -513,7 +513,6 @@
  	gss_mechanism_ext mech_ext;	/* extensions */
  	int priority;			/* mechanism preference order */
 	int freeMech;			/* free mech table */
-	int freeMechOID;		/* free mech OID */
 	struct gss_mech_config *next;	/* next element in the list */
 } *gss_mech_info;