Merge commit 'origin/v3-2-test' into v3-2-stable

Conflicts:

	WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)

1 files changed, 10 insertions, 10 deletions

diff --git a/source3/librpc/gen_ndr/srv_echo.c b/source3/librpc/gen_ndr/srv_echo.c
index de5fc9cd46..3f725049cd 100644
--- a/source3/librpc/gen_ndr/srv_echo.c
+++ b/source3/librpc/gen_ndr/srv_echo.c
@@ -17,7 +17,7 @@ static bool api_echo_AddOne(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_ADDONE];
 
-	r = talloc(NULL, struct echo_AddOne);
+	r = talloc(talloc_tos(), struct echo_AddOne);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_echo_EchoData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_ECHODATA];
 
-	r = talloc(NULL, struct echo_EchoData);
+	r = talloc(talloc_tos(), struct echo_EchoData);
 	if (r == NULL) {
 		return false;
 	}
@@ -177,7 +177,7 @@ static bool api_echo_SinkData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_SINKDATA];
 
-	r = talloc(NULL, struct echo_SinkData);
+	r = talloc(talloc_tos(), struct echo_SinkData);
 	if (r == NULL) {
 		return false;
 	}
@@ -250,7 +250,7 @@ static bool api_echo_SourceData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_SOURCEDATA];
 
-	r = talloc(NULL, struct echo_SourceData);
+	r = talloc(talloc_tos(), struct echo_SourceData);
 	if (r == NULL) {
 		return false;
 	}
@@ -330,7 +330,7 @@ static bool api_echo_TestCall(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL];
 
-	r = talloc(NULL, struct echo_TestCall);
+	r = talloc(talloc_tos(), struct echo_TestCall);
 	if (r == NULL) {
 		return false;
 	}
@@ -410,7 +410,7 @@ static bool api_echo_TestCall2(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL2];
 
-	r = talloc(NULL, struct echo_TestCall2);
+	r = talloc(talloc_tos(), struct echo_TestCall2);
 	if (r == NULL) {
 		return false;
 	}
@@ -490,7 +490,7 @@ static bool api_echo_TestSleep(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSLEEP];
 
-	r = talloc(NULL, struct echo_TestSleep);
+	r = talloc(talloc_tos(), struct echo_TestSleep);
 	if (r == NULL) {
 		return false;
 	}
@@ -563,7 +563,7 @@ static bool api_echo_TestEnum(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTENUM];
 
-	r = talloc(NULL, struct echo_TestEnum);
+	r = talloc(talloc_tos(), struct echo_TestEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -640,7 +640,7 @@ static bool api_echo_TestSurrounding(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSURROUNDING];
 
-	r = talloc(NULL, struct echo_TestSurrounding);
+	r = talloc(talloc_tos(), struct echo_TestSurrounding);
 	if (r == NULL) {
 		return false;
 	}
@@ -715,7 +715,7 @@ static bool api_echo_TestDoublePointer(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTDOUBLEPOINTER];
 
-	r = talloc(NULL, struct echo_TestDoublePointer);
+	r = talloc(talloc_tos(), struct echo_TestDoublePointer);
 	if (r == NULL) {
 		return false;
 	}