r3583: - seperate the ldap client code and the ldap parsing code

  (vl: we should only sync the parsing code with trunk)

- use hierachical talloc in the ldap client code

metze
(This used to be commit 1e9c0b68ca9ddb28877d45fc1b47653b13a7446d)

1 files changed, 5 insertions, 5 deletions

diff --git a/source4/libcli/ldap/ldap_ldif.c b/source4/libcli/ldap/ldap_ldif.c
index 19f4e56e73..c276b7e917 100644
--- a/source4/libcli/ldap/ldap_ldif.c
+++ b/source4/libcli/ldap/ldap_ldif.c
@@ -307,7 +307,7 @@ static BOOL fill_mods(struct ldap_message *msg, char **chunk)
 /*
  read from a LDIF source, creating a ldap_message
 */
-static struct ldap_message *ldif_read(int (*fgetc_fn)(void *),
+static struct ldap_message *ldif_read(TALLOC_CTX *mem_ctx, int (*fgetc_fn)(void *),
 				      void *private_data)
 {
 	struct ldap_message *msg;
@@ -318,7 +318,7 @@ static struct ldap_message *ldif_read(int (*fgetc_fn)(void *),
 
 	value.data = NULL;
 
-	msg = new_ldap_message();
+	msg = new_ldap_message(mem_ctx);
 	if (msg == NULL)
 		return NULL;
 
@@ -383,7 +383,7 @@ static struct ldap_message *ldif_read(int (*fgetc_fn)(void *),
 	DEBUG(3, ("changetype %s not supported\n", (char *)value.data));
 
 failed:
-	destroy_ldap_message(msg);
+	talloc_free(msg);
 	return NULL;
 }
 
@@ -403,10 +403,10 @@ static int fgetc_string(void *private_data)
 	return EOF;
 }
 
-struct ldap_message *ldap_ldif2msg(const char *s)
+struct ldap_message *ldap_ldif2msg(TALLOC_CTX *mem_ctx, const char *s)
 {
 	struct ldif_read_string_state state;
 	state.s = s;
-	return ldif_read(fgetc_string, &state);
+	return ldif_read(mem_ctx, fgetc_string, &state);
 }