svn commit: samba r24024 - in branches: SAMBA_3_2/source/libgpo SAMBA_3_2_0/source/libgpo

gd at samba.org gd at samba.org
Tue Jul 24 09:46:23 GMT 2007


Author: gd
Date: 2007-07-24 09:46:21 +0000 (Tue, 24 Jul 2007)
New Revision: 24024

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

Log:
Minor cleanup in ads_parse_gp_ext().

Guenther

Modified:
   branches/SAMBA_3_2/source/libgpo/gpo_ldap.c
   branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c


Changeset:
Modified: branches/SAMBA_3_2/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_2/source/libgpo/gpo_ldap.c	2007-07-24 09:42:15 UTC (rev 24023)
+++ branches/SAMBA_3_2/source/libgpo/gpo_ldap.c	2007-07-24 09:46:21 UTC (rev 24024)
@@ -29,6 +29,7 @@
 			    const char *extension_raw,
 			    struct GP_EXT **gp_ext)
 {
+	ADS_STATUS status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
 	struct GP_EXT *ext = NULL;
 	char **ext_list;
 	char **ext_strings = NULL;
@@ -131,16 +132,9 @@
 		}
 	}
 
-	if (ext_list) {
-		str_list_free_talloc(mem_ctx, &ext_list); 
-	}
-	if (ext_strings) {
-		str_list_free_talloc(mem_ctx, &ext_strings); 
-	}
-
 	*gp_ext = ext;
 
-	return ADS_ERROR(LDAP_SUCCESS);
+	status = ADS_ERROR_NT(NT_STATUS_OK);
 
 parse_error:
 	if (ext_list) {
@@ -150,7 +144,7 @@
 		str_list_free_talloc(mem_ctx, &ext_strings); 
 	}
 
-	return ADS_ERROR(LDAP_NO_MEMORY);
+	return status;
 }
 
 /****************************************************************

Modified: branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c
===================================================================
--- branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c	2007-07-24 09:42:15 UTC (rev 24023)
+++ branches/SAMBA_3_2_0/source/libgpo/gpo_ldap.c	2007-07-24 09:46:21 UTC (rev 24024)
@@ -29,6 +29,7 @@
 			    const char *extension_raw,
 			    struct GP_EXT **gp_ext)
 {
+	ADS_STATUS status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
 	struct GP_EXT *ext = NULL;
 	char **ext_list;
 	char **ext_strings = NULL;
@@ -131,16 +132,9 @@
 		}
 	}
 
-	if (ext_list) {
-		str_list_free_talloc(mem_ctx, &ext_list); 
-	}
-	if (ext_strings) {
-		str_list_free_talloc(mem_ctx, &ext_strings); 
-	}
-
 	*gp_ext = ext;
 
-	return ADS_ERROR(LDAP_SUCCESS);
+	status = ADS_ERROR_NT(NT_STATUS_OK);
 
 parse_error:
 	if (ext_list) {
@@ -150,7 +144,7 @@
 		str_list_free_talloc(mem_ctx, &ext_strings); 
 	}
 
-	return ADS_ERROR(LDAP_NO_MEMORY);
+	return status;
 }
 
 /****************************************************************



More information about the samba-cvs mailing list