From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 27 Jan 2005 07:08:20 +0000
Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies
 for the large commit. I thought this was worthwhile to get done for
 consistency. (This used to be commit
 ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

---
 source4/libads/ldap.c         | 28 ++++++++++++++--------------
 source4/libads/ldap_printer.c |  2 +-
 source4/libads/ldap_user.c    |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'source4/libads')

diff --git a/source4/libads/ldap.c b/source4/libads/ldap.c
index e4b371e2d5..d63d667777 100644
--- a/source4/libads/ldap.c
+++ b/source4/libads/ldap.c
@@ -277,7 +277,7 @@ static struct berval *dup_berval(TALLOC_CTX *ctx, const struct berval *in_val)
 
 	if (!in_val) return NULL;
 
-	value = talloc_zero_p(ctx, struct berval);
+	value = talloc_zero(ctx, struct berval);
 	if (value == NULL)
 		return NULL;
 	if (in_val->bv_len == 0) return value;
@@ -479,7 +479,7 @@ ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path,
 	ldap_controls_free(rcontrols);
 
 done:
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	/* if/when we decide to utf8-encode attrs, take out this next line */
 	str_list_free(&search_attrs);
 
@@ -641,7 +641,7 @@ ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope,
 	}
 
  done:
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	/* if/when we decide to utf8-encode attrs, take out this next line */
 	str_list_free(&search_attrs);
 	return ADS_ERROR(rc);
@@ -805,7 +805,7 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 		*mods = modlist;
 	}
 		
-	if (!(modlist[curmod] = talloc_zero_p(ctx, LDAPMod)))
+	if (!(modlist[curmod] = talloc_zero(ctx, LDAPMod)))
 		return ADS_ERROR(LDAP_NO_MEMORY);
 	modlist[curmod]->mod_type = talloc_strdup(ctx, name);
 	if (mod_op & LDAP_MOD_BVALUES) {
@@ -1088,7 +1088,7 @@ static ADS_STATUS ads_add_machine_acct(ADS_STRUCT *ads, const char *hostname,
 		}
 	}
 done:
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	return ret;
 }
 
@@ -1158,13 +1158,13 @@ static void dump_sd(const char *filed, struct berval **values)
 	/* parse secdesc */
 	if (!sec_io_desc("sd", &psd, &ps, 1)) {
 		prs_mem_free(&ps);
-		talloc_destroy(ctx);
+		talloc_free(ctx);
 		return;
 	}
 	if (psd) ads_disp_sd(psd);
 
 	prs_mem_free(&ps);
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 }
 
 /*
@@ -1292,7 +1292,7 @@ void ads_process_results(ADS_STRUCT *ads, void *res,
 		fn(NULL, NULL, data_area); /* completed an entry */
 
 	}
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 }
 
 /**
@@ -1514,7 +1514,7 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
 ads_set_sd_error:
 	ads_msgfree(ads, res);
 	prs_mem_free(&ps_wire);
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	return ret;
 }
 
@@ -1593,7 +1593,7 @@ char **ads_pull_strings(ADS_STRUCT *ads,
 
 	*num_values = ldap_count_values(values);
 
-	ret = talloc_array_p(mem_ctx, char *, *num_values+1);
+	ret = talloc_array(mem_ctx, char *, *num_values+1);
 	if (!ret) {
 		ldap_value_free(values);
 		return NULL;
@@ -1840,7 +1840,7 @@ int ads_pull_sids(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
 	for (i=0; values[i]; i++)
 		/* nop */ ;
 
-	(*sids) = talloc_array_p(mem_ctx, DOM_SID, i);
+	(*sids) = talloc_array(mem_ctx, DOM_SID, i);
 	if (!(*sids)) {
 		ldap_value_free_len(values);
 		return 0;
@@ -2000,7 +2000,7 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
 
 	p = strchr(value, ':');
 	if (!p) {
-		talloc_destroy(ctx);
+		talloc_free(ctx);
 		DEBUG(1, ("ads_server_info: returned ldap server name did not contain a ':' "
 			  "so was deemed invalid\n"));
 		return ADS_ERROR(LDAP_DECODING_ERROR);
@@ -2011,7 +2011,7 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
 	ads->config.ldap_server_name = strdup(p+1);
 	p = strchr(ads->config.ldap_server_name, '$');
 	if (!p || p[1] != '@') {
-		talloc_destroy(ctx);
+		talloc_free(ctx);
 		DEBUG(1, ("ads_server_info: returned ldap server name (%s) does not contain '$@'"
 			  " so was deemed invalid\n", ads->config.ldap_server_name));
 		SAFE_FREE(ads->config.ldap_server_name);
@@ -2037,7 +2037,7 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
 		DEBUG(4,("time offset is %d seconds\n", ads->auth.time_offset));
 	}
 
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 
 	return ADS_SUCCESS;
 }
diff --git a/source4/libads/ldap_printer.c b/source4/libads/ldap_printer.c
index 71cc8a531f..7ae19219b4 100644
--- a/source4/libads/ldap_printer.c
+++ b/source4/libads/ldap_printer.c
@@ -162,7 +162,7 @@ static BOOL map_multi_sz(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 	};
 
 	if (num_vals) {
-		str_values = talloc_array_p(ctx, char *, num_vals + 1);
+		str_values = talloc_array(ctx, char *, num_vals + 1);
 		cur_str = value->data_p;
 		for (i=0; i < num_vals; i++) {
 			pull_ucs2_talloc(ctx, &str_values[i], cur_str);
diff --git a/source4/libads/ldap_user.c b/source4/libads/ldap_user.c
index 56a0d8013b..0032f8c9ab 100644
--- a/source4/libads/ldap_user.c
+++ b/source4/libads/ldap_user.c
@@ -80,7 +80,7 @@ ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user,
 	status = ads_gen_add(ads, new_dn, mods);
 
  done:
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	return status;
 }
 
@@ -113,7 +113,7 @@ ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group,
 	status = ads_gen_add(ads, new_dn, mods);
 
  done:
-	talloc_destroy(ctx);
+	talloc_free(ctx);
 	return status;
 }
 #endif
-- 
cgit