svn commit: samba r21855 - in branches: SAMBA_3_0/source/libads SAMBA_3_0_25/source/libads

[gd at samba.org]

Author: gd
Date: 2007-03-16 15:48:07 +0000 (Fri, 16 Mar 2007)
New Revision: 21855

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21855

Log:
Fix a memleak in the krb5 locator and comment out gfree_all() which doesn't
make sense as long as it doesn't work as an lp_unload().

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/smb_krb5_locator.c
   branches/SAMBA_3_0_25/source/libads/smb_krb5_locator.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/smb_krb5_locator.c
===================================================================
--- branches/SAMBA_3_0/source/libads/smb_krb5_locator.c	2007-03-16 14:13:46 UTC (rev 21854)
+++ branches/SAMBA_3_0/source/libads/smb_krb5_locator.c	2007-03-16 15:48:07 UTC (rev 21855)
@@ -239,7 +239,7 @@
 {
 	DEBUG(10,("smb_krb5_locator_close: called\n"));
 
-	gfree_all();
+	/* gfree_all(); */
 }
 
 /**
@@ -324,7 +324,7 @@
 	/* if we didn't found any KDCs on our site go to the main list */
 
 	if (NT_STATUS_IS_OK(status) && sitename && (count == 0)) {
-		ip_list = NULL;
+		SAFE_FREE(ip_list);
 		SAFE_FREE(sitename);
 		status = get_kdc_list(realm, NULL, &ip_list, &count);
 	}
@@ -365,6 +365,8 @@
 		}
 	}
 
+	SAFE_FREE(ip_list);
+
 	return ret;
 }
 

Modified: branches/SAMBA_3_0_25/source/libads/smb_krb5_locator.c
===================================================================
--- branches/SAMBA_3_0_25/source/libads/smb_krb5_locator.c	2007-03-16 14:13:46 UTC (rev 21854)
+++ branches/SAMBA_3_0_25/source/libads/smb_krb5_locator.c	2007-03-16 15:48:07 UTC (rev 21855)
@@ -239,7 +239,7 @@
 {
 	DEBUG(10,("smb_krb5_locator_close: called\n"));
 
-	gfree_all();
+	/* gfree_all(); */
 }
 
 /**
@@ -324,7 +324,7 @@
 	/* if we didn't found any KDCs on our site go to the main list */
 
 	if (NT_STATUS_IS_OK(status) && sitename && (count == 0)) {
-		ip_list = NULL;
+		SAFE_FREE(ip_list);
 		SAFE_FREE(sitename);
 		status = get_kdc_list(realm, NULL, &ip_list, &count);
 	}
@@ -365,6 +365,8 @@
 		}
 	}
 
+	SAFE_FREE(ip_list);
+
 	return ret;
 }