Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

(This used to be commit 08645826817d42c9d4b42ea0fd5e633d7fd08d35)

1 files changed, 139 insertions, 40 deletions

diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c
index 2d6187a937..d2ef574821 100644
--- a/source3/librpc/gen_ndr/cli_echo.c
+++ b/source3/librpc/gen_ndr/cli_echo.c
@@ -6,7 +6,10 @@
 #include "includes.h"
 #include "librpc/gen_ndr/cli_echo.h"
 
-NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t in_data, uint32_t *out_data)
+NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
+			    TALLOC_CTX *mem_ctx,
+			    uint32_t in_data,
+			    uint32_t *out_data)
 {
 	struct echo_AddOne r;
 	NTSTATUS status;
@@ -14,17 +17,24 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui
 	/* In parameters */
 	r.in.in_data = in_data;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_AddOne, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ADDONE, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_ADDONE,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_AddOne, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -37,7 +47,11 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t *out_data)
+NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
+			      TALLOC_CTX *mem_ctx,
+			      uint32_t len,
+			      uint8_t *in_data,
+			      uint8_t *out_data)
 {
 	struct echo_EchoData r;
 	NTSTATUS status;
@@ -46,17 +60,24 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	r.in.len = len;
 	r.in.in_data = in_data;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_EchoData, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ECHODATA, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_ECHODATA,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_EchoData, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -69,7 +90,10 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data)
+NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
+			      TALLOC_CTX *mem_ctx,
+			      uint32_t len,
+			      uint8_t *data)
 {
 	struct echo_SinkData r;
 	NTSTATUS status;
@@ -78,17 +102,24 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	r.in.len = len;
 	r.in.data = data;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_SinkData, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SINKDATA, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_SINKDATA,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_SinkData, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -100,7 +131,10 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data)
+NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
+				TALLOC_CTX *mem_ctx,
+				uint32_t len,
+				uint8_t *data)
 {
 	struct echo_SourceData r;
 	NTSTATUS status;
@@ -108,17 +142,24 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx
 	/* In parameters */
 	r.in.len = len;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_SourceData, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SOURCEDATA, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_SOURCEDATA,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_SourceData, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -131,7 +172,10 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *s1, const char **s2)
+NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
+			      TALLOC_CTX *mem_ctx,
+			      const char *s1,
+			      const char **s2)
 {
 	struct echo_TestCall r;
 	NTSTATUS status;
@@ -139,17 +183,24 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	/* In parameters */
 	r.in.s1 = s1;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestCall, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTCALL,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestCall, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -162,7 +213,10 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t level, union echo_Info *info)
+NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
+			       TALLOC_CTX *mem_ctx,
+			       uint16_t level,
+			       union echo_Info *info)
 {
 	struct echo_TestCall2 r;
 	NTSTATUS status;
@@ -170,17 +224,24 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	/* In parameters */
 	r.in.level = level;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestCall2, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL2, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTCALL2,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestCall2, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -193,7 +254,9 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return r.out.result;
 }
 
-NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t seconds)
+NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
+			       TALLOC_CTX *mem_ctx,
+			       uint32_t seconds)
 {
 	struct echo_TestSleep r;
 	NTSTATUS status;
@@ -201,17 +264,24 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	/* In parameters */
 	r.in.seconds = seconds;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestSleep, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSLEEP, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTSLEEP,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestSleep, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -223,7 +293,11 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, enum echo_Enum1 *foo1, struct echo_Enum2 *foo2, union echo_Enum3 *foo3)
+NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
+			      TALLOC_CTX *mem_ctx,
+			      enum echo_Enum1 *foo1,
+			      struct echo_Enum2 *foo2,
+			      union echo_Enum3 *foo3)
 {
 	struct echo_TestEnum r;
 	NTSTATUS status;
@@ -233,17 +307,24 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	r.in.foo2 = foo2;
 	r.in.foo3 = foo3;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestEnum, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTENUM, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTENUM,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestEnum, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -258,7 +339,9 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct echo_Surrounding *data)
+NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
+				     TALLOC_CTX *mem_ctx,
+				     struct echo_Surrounding *data)
 {
 	struct echo_TestSurrounding r;
 	NTSTATUS status;
@@ -266,17 +349,24 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me
 	/* In parameters */
 	r.in.data = data;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSURROUNDING, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTSURROUNDING,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -289,7 +379,9 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t ***data)
+NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli,
+				       TALLOC_CTX *mem_ctx,
+				       uint16_t ***data)
 {
 	struct echo_TestDoublePointer r;
 	NTSTATUS status;
@@ -297,17 +389,24 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX *
 	/* In parameters */
 	r.in.data = data;
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r);
+	}
 
-	status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTDOUBLEPOINTER, &r);
+	status = cli_do_rpc_ndr(cli,
+				mem_ctx,
+				PI_RPCECHO,
+				&ndr_table_rpcecho,
+				NDR_ECHO_TESTDOUBLEPOINTER,
+				&r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
-	if (DEBUGLEVEL >= 10)
+	if (DEBUGLEVEL >= 10) {
 		NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, &r);
+	}
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;