From c624a704be96488f0aee27930cbd4c8d99df464b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 9 Jul 2009 22:03:52 +0200
Subject: Make escape_ldap_string take a talloc context

---
 source3/lib/ldap_escape.c  | 25 ++++++++++++++-----------
 source3/lib/smbldap_util.c | 12 ++++++------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/ldap_escape.c b/source3/lib/ldap_escape.c
index d101bc5ecd..a731cb9864 100644
--- a/source3/lib/ldap_escape.c
+++ b/source3/lib/ldap_escape.c
@@ -32,10 +32,10 @@
  * and to be free()ed by the caller.
  **/
 
-char *escape_ldap_string_alloc(const char *s)
+char *escape_ldap_string(TALLOC_CTX *mem_ctx, const char *s)
 {
 	size_t len = strlen(s)+1;
-	char *output = (char *)SMB_MALLOC(len);
+	char *output = talloc_array(mem_ctx, char, len);
 	const char *sub;
 	int i = 0;
 	char *p = output;
@@ -43,7 +43,7 @@ char *escape_ldap_string_alloc(const char *s)
 	if (output == NULL) {
 		return NULL;
 	}
-	
+
 	while (*s)
 	{
 		switch (*s)
@@ -64,14 +64,17 @@ char *escape_ldap_string_alloc(const char *s)
 			sub = NULL;
 			break;
 		}
-		
+
 		if (sub) {
+			char *tmp;
 			len = len + 3;
-			output = (char *)SMB_REALLOC(output, len);
-			if (!output) { 
+			tmp = talloc_realloc(mem_ctx, output, char, len);
+			if (tmp == NULL) {
+				TALLOC_FREE(output);
 				return NULL;
 			}
-			
+			output = tmp;
+
 			p = &output[i];
 			strncpy (p, sub, 3);
 			p += 3;
@@ -84,7 +87,7 @@ char *escape_ldap_string_alloc(const char *s)
 		}
 		s++;
 	}
-	
+
 	*p = '\0';
 	return output;
 }
@@ -101,7 +104,7 @@ char *escape_rdn_val_string_alloc(const char *s)
 	}
 
 	p = output;
-	
+
 	while (*s)
 	{
 		switch (*s)
@@ -122,10 +125,10 @@ char *escape_rdn_val_string_alloc(const char *s)
 			*p = *s;
 			p++;
 		}
-		
+
 		s++;
 	}
-	
+
 	*p = '\0';
 
 	/* resize the string to the actual final size */
diff --git a/source3/lib/smbldap_util.c b/source3/lib/smbldap_util.c
index 66aef6ba66..478a3d24ca 100644
--- a/source3/lib/smbldap_util.c
+++ b/source3/lib/smbldap_util.c
@@ -126,7 +126,7 @@ static NTSTATUS add_new_domain_info(struct smbldap_state *ldap_state,
 	char *escape_domain_name;
 
 	/* escape for filter */
-	escape_domain_name = escape_ldap_string_alloc(domain_name);
+	escape_domain_name = escape_ldap_string(talloc_tos(), domain_name);
 	if (!escape_domain_name) {
 		DEBUG(0, ("Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
@@ -135,11 +135,11 @@ static NTSTATUS add_new_domain_info(struct smbldap_state *ldap_state,
 	if (asprintf(&filter, "(&(%s=%s)(objectclass=%s))",
 		get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
 			escape_domain_name, LDAP_OBJ_DOMINFO) < 0) {
-		SAFE_FREE(escape_domain_name);
+		TALLOC_FREE(escape_domain_name);
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	SAFE_FREE(escape_domain_name);
+	TALLOC_FREE(escape_domain_name);
 
 	attr_list = get_attr_list(NULL, dominfo_attr_list );
 	rc = smbldap_search_suffix(ldap_state, filter, attr_list, &result);
@@ -258,7 +258,7 @@ NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state,
 	int count;
 	char *escape_domain_name;
 
-	escape_domain_name = escape_ldap_string_alloc(domain_name);
+	escape_domain_name = escape_ldap_string(talloc_tos(), domain_name);
 	if (!escape_domain_name) {
 		DEBUG(0, ("Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
@@ -268,11 +268,11 @@ NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state,
 		LDAP_OBJ_DOMINFO,
 		get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
 		escape_domain_name) < 0) {
-		SAFE_FREE(escape_domain_name);
+		TALLOC_FREE(escape_domain_name);
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	SAFE_FREE(escape_domain_name);
+	TALLOC_FREE(escape_domain_name);
 
 	DEBUG(2, ("smbldap_search_domain_info: Searching for:[%s]\n", filter));
 
-- 
cgit