Revert "pidl: Fix selftest after s3 code changed"

This reverts commit 439050fb40e5ce9c476924b01f2254b9aab35a3e.

Not needed in this branch (yet).
(cherry picked from commit a656083180683cf93bc4c1b9885d2749e5d238b2)

1 files changed, 59 insertions, 27 deletions

diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index 1820a69bb3e..be4bf0a65c3 100755
--- a/pidl/tests/samba3-cli.pl
+++ b/pidl/tests/samba3-cli.pl
@@ -59,6 +59,10 @@ struct tevent_req *rpccli_bar_send(TALLOC_CTX *mem_ctx,
 
 	/* Out parameters */
 
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_IN_DEBUG(bar, &state->orig);
+	}
+
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -100,6 +104,10 @@ static void rpccli_bar_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_OUT_DEBUG(bar, &state->orig);
+	}
+
 	tevent_req_done(req);
 }
 
@@ -125,10 +133,14 @@ NTSTATUS rpccli_bar_recv(struct tevent_req *req,
 NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 		    TALLOC_CTX *mem_ctx)
 {
-	struct bar r;
-	NTSTATUS status;
+\tstruct bar r;
+\tNTSTATUS status;
 
-	/* In parameters */
+\t/* In parameters */
+
+\tif (DEBUGLEVEL >= 10) {
+\t\tNDR_PRINT_IN_DEBUG(bar, &r);
+\t}
 
 	status = cli->dispatch(cli,
 				mem_ctx,
@@ -136,18 +148,22 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 				NDR_BAR,
 				&r);
 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
+\tif (!NT_STATUS_IS_OK(status)) {
+\t\treturn status;
+\t}
 
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
+\tif (DEBUGLEVEL >= 10) {
+\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
+\t}
 
-	/* Return variables */
+\tif (NT_STATUS_IS_ERR(status)) {
+\t\treturn status;
+\t}
 
-	/* Return result */
-	return NT_STATUS_OK;
+\t/* Return variables */
+
+\t/* Return result */
+\treturn NT_STATUS_OK;
 }
 
 ");
@@ -189,6 +205,10 @@ struct tevent_req *rpccli_bar_send(TALLOC_CTX *mem_ctx,
 	/* Result */
 	ZERO_STRUCT(state->orig.out.result);
 
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_IN_DEBUG(bar, &state->orig);
+	}
+
 	/* make a temporary copy, that we pass to the dispatch function */
 	state->tmp = state->orig;
 
@@ -233,6 +253,10 @@ static void rpccli_bar_done(struct tevent_req *subreq)
 	/* Reset temporary structure */
 	ZERO_STRUCT(state->tmp);
 
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_OUT_DEBUG(bar, &state->orig);
+	}
+
 	tevent_req_done(req);
 }
 
@@ -263,10 +287,14 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 		    TALLOC_CTX *mem_ctx,
 		    WERROR *werror)
 {
-	struct bar r;
-	NTSTATUS status;
+\tstruct bar r;
+\tNTSTATUS status;
 
-	/* In parameters */
+\t/* In parameters */
+
+\tif (DEBUGLEVEL >= 10) {
+\t\tNDR_PRINT_IN_DEBUG(bar, &r);
+\t}
 
 	status = cli->dispatch(cli,
 				mem_ctx,
@@ -274,22 +302,26 @@ NTSTATUS rpccli_bar(struct rpc_pipe_client *cli,
 				NDR_BAR,
 				&r);
 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
+\tif (!NT_STATUS_IS_OK(status)) {
+\t\treturn status;
+\t}
 
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
+\tif (DEBUGLEVEL >= 10) {
+\t\tNDR_PRINT_OUT_DEBUG(bar, &r);
+\t}
 
-	/* Return variables */
+\tif (NT_STATUS_IS_ERR(status)) {
+\t\treturn status;
+\t}
 
-	/* Return result */
-	if (werror) {
-		*werror = r.out.result;
-	}
+\t/* Return variables */
+
+\t/* Return result */
+\tif (werror) {
+\t\t*werror = r.out.result;
+\t}
 
-	return werror_to_ntstatus(r.out.result);
+\treturn werror_to_ntstatus(r.out.result);
 }
 
 ");