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)

23 files changed, 30 insertions, 30 deletions

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index cc99b40050..fd1ea0f340 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -1449,6 +1449,6 @@ BOOL torture_raw_acls(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index a59fa1af9b..191b3240d1 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -260,6 +260,6 @@ BOOL torture_raw_chkpath(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index f6884f37c9..5f2b7040d9 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -166,6 +166,6 @@ done:
 	smbcli_close(cli->tree, fnum);
 	smbcli_unlink(cli->tree, fname);
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 38941b8c56..d32c9393c2 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -226,6 +226,6 @@ BOOL torture_raw_composite(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 5b6a2dd2ad..cdf8388e93 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -424,7 +424,7 @@ BOOL torture_raw_context(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 
 	return ret;
 }
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 2361091a9b..a74237146f 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -76,7 +76,7 @@ static BOOL test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	setfile.generic.level = RAW_SFILEINFO_EA_SET;
 	setfile.generic.file.fnum = fnum;
 	setfile.ea_set.in.num_eas = 2;
-	setfile.ea_set.in.eas = talloc_array_p(mem_ctx, struct ea_struct, 2);
+	setfile.ea_set.in.eas = talloc_array(mem_ctx, struct ea_struct, 2);
 	setfile.ea_set.in.eas[0].flags = 0;
 	setfile.ea_set.in.eas[0].name.s = "EAONE";
 	setfile.ea_set.in.eas[0].value = data_blob_string_const("VALUE1");
@@ -244,6 +244,6 @@ BOOL torture_raw_eas(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index f050d220eb..70a0b2b528 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -158,6 +158,6 @@ BOOL torture_raw_ioctl(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 478c0a5a42..f2cd5b7cf7 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -675,6 +675,6 @@ BOOL torture_raw_lock(void)
 	ret &= test_changetype(cli, mem_ctx);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index eea5b20ffa..5cdc839194 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -108,7 +108,7 @@ static BOOL test_mkdir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	md.t2mkdir.level = RAW_MKDIR_T2MKDIR;
 	md.t2mkdir.in.path = path;
 	md.t2mkdir.in.num_eas = 3;
-	md.t2mkdir.in.eas = talloc_array_p(mem_ctx, struct ea_struct, md.t2mkdir.in.num_eas);
+	md.t2mkdir.in.eas = talloc_array(mem_ctx, struct ea_struct, md.t2mkdir.in.num_eas);
 	md.t2mkdir.in.eas[0].flags = 0;
 	md.t2mkdir.in.eas[0].name.s = "EAONE";
 	md.t2mkdir.in.eas[0].value = data_blob_talloc(mem_ctx, "blah", 4);
@@ -158,6 +158,6 @@ BOOL torture_raw_mkdir(void)
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index fce036a5e6..e8f7e4a712 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -335,6 +335,6 @@ BOOL torture_raw_mux(void)
 	smb_raw_exit(cli->session);
 	smbcli_deltree(cli->tree, BASEDIR);
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 2a5a0ca074..0877931d06 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -133,6 +133,6 @@ done:
 	smb_raw_exit(cli->session);
 	smbcli_deltree(cli->tree, BASEDIR);
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 3fa248e0a4..17a7f18505 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -506,7 +506,7 @@ static BOOL test_t2open(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	io.t2open.in.timeout = 0;
 
 	io.t2open.in.num_eas = 3;
-	io.t2open.in.eas = talloc_array_p(mem_ctx, struct ea_struct, io.t2open.in.num_eas);
+	io.t2open.in.eas = talloc_array(mem_ctx, struct ea_struct, io.t2open.in.num_eas);
 	io.t2open.in.eas[0].flags = 0;
 	io.t2open.in.eas[0].name.s = ".CLASSINFO";
 	io.t2open.in.eas[0].value = data_blob_talloc(mem_ctx, "first value", 11);
@@ -1268,6 +1268,6 @@ BOOL torture_raw_open(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 9dcf6341c0..b167cb0903 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -345,6 +345,6 @@ BOOL torture_raw_oplock(void)
 	}
 
 	torture_close_connection(cli1);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index d398026a18..9a1a8a1144 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -711,6 +711,6 @@ done:
 	smbcli_unlink(cli->tree, fname);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index d302435a6c..258f127d61 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -292,6 +292,6 @@ BOOL torture_raw_qfsinfo(void)
 
 done:
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index fb2e2ddec2..e8e305d01c 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -737,6 +737,6 @@ BOOL torture_raw_read(void)
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 3d71790736..42f5903508 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -430,6 +430,6 @@ BOOL torture_raw_rename(void)
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 84466d0cde..be54aecb3d 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -411,7 +411,7 @@ static BOOL multiple_search_callback(void *private, union smb_search_data *file)
 
 
 	data->count++;
-	data->list = talloc_realloc_p(data->mem_ctx,
+	data->list = talloc_realloc(data->mem_ctx,
 				      data->list, 
 				      union smb_search_data,
 				      data->count);
@@ -1209,7 +1209,7 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	setfile.generic.level = RAW_SFILEINFO_EA_SET;
 	setfile.generic.file.fname = BASEDIR "\\file2.txt";
 	setfile.ea_set.in.num_eas = 2;
-	setfile.ea_set.in.eas = talloc_array_p(mem_ctx, struct ea_struct, 2);
+	setfile.ea_set.in.eas = talloc_array(mem_ctx, struct ea_struct, 2);
 	setfile.ea_set.in.eas[0].flags = 0;
 	setfile.ea_set.in.eas[0].name.s = "EA ONE";
 	setfile.ea_set.in.eas[0].value = data_blob_string_const("VALUE 1");
@@ -1234,7 +1234,7 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	io.t2ffirst.in.storage_type = 0;
 	io.t2ffirst.in.pattern = BASEDIR "\\*";
 	io.t2ffirst.in.num_names = 2;
-	io.t2ffirst.in.ea_names = talloc_array_p(mem_ctx, struct ea_name, 2);
+	io.t2ffirst.in.ea_names = talloc_array(mem_ctx, struct ea_name, 2);
 	io.t2ffirst.in.ea_names[0].name.s = "SECOND EA";
 	io.t2ffirst.in.ea_names[1].name.s = "THIRD EA";
 
@@ -1250,7 +1250,7 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	nxt.t2fnext.in.flags = FLAG_TRANS2_FIND_REQUIRE_RESUME | FLAG_TRANS2_FIND_CONTINUE;
 	nxt.t2fnext.in.last_name = "file2.txt";
 	nxt.t2fnext.in.num_names = 2;
-	nxt.t2fnext.in.ea_names = talloc_array_p(mem_ctx, struct ea_name, 2);
+	nxt.t2fnext.in.ea_names = talloc_array(mem_ctx, struct ea_name, 2);
 	nxt.t2fnext.in.ea_names[0].name.s = "SECOND EA";
 	nxt.t2fnext.in.ea_names[1].name.s = "THIRD EA";
 
@@ -1314,7 +1314,7 @@ BOOL torture_raw_search(void)
 	ret &= test_ea_list(cli, mem_ctx);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	
 	return ret;
 }
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index 716a73b8f7..0d34c831a5 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -246,6 +246,6 @@ BOOL torture_raw_seek(void)
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 53fbf5a0f3..cbfb6aa6a1 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -510,7 +510,7 @@ done:
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
 
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index dd03e1a125..54c83de896 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -233,6 +233,6 @@ BOOL torture_raw_streams(void)
 	smbcli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index d9c7ac6dfa..1c8c35d72f 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -183,6 +183,6 @@ BOOL torture_raw_unlink(void)
 	}
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 698520258d..7241f8c91a 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -690,6 +690,6 @@ BOOL torture_raw_write(void)
 	ret &= test_writex(cli, mem_ctx);
 
 	torture_close_connection(cli);
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return ret;
 }