summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-07-24 09:46:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:57 -0500
commitbed567bffc6f2cb672a08509855b135b2e794f14 (patch)
tree2b0dab090cb6adcd507c403d98833238ede95e4c
parente14d97bd101e03280c8fc97cf38dfc9b10b94677 (diff)
downloadsamba-bed567bffc6f2cb672a08509855b135b2e794f14.tar.gz
samba-bed567bffc6f2cb672a08509855b135b2e794f14.tar.bz2
samba-bed567bffc6f2cb672a08509855b135b2e794f14.zip
r24024: Minor cleanup in ads_parse_gp_ext().
Guenther (This used to be commit 57aa0acb84a41a24ea89950bcb51b5ffc68b4564)
-rw-r--r--source3/libgpo/gpo_ldap.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c
index 4f983b261d..e32522ab5c 100644
--- a/source3/libgpo/gpo_ldap.c
+++ b/source3/libgpo/gpo_ldap.c
@@ -29,6 +29,7 @@ ADS_STATUS ads_parse_gp_ext(TALLOC_CTX *mem_ctx,
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 @@ ADS_STATUS ads_parse_gp_ext(TALLOC_CTX *mem_ctx,
}
}
- 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 @@ parse_error:
str_list_free_talloc(mem_ctx, &ext_strings);
}
- return ADS_ERROR(LDAP_NO_MEMORY);
+ return status;
}
/****************************************************************