* use the new auto-generated debug code method.

* add a couple more info levels to wkssvc
(This used to be commit c69161bdb13745f271b0cfa9a9af349f7a95edc6)

22 files changed, 3035 insertions, 992 deletions

diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index 8f76a862f3..10412c8f3d 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -10,15 +10,36 @@
 	/******************/
 	/* Function: 0x00 */
 	typedef struct {
-		uint32 platform_id;          /* 0x0000 01f4 - unknown */
-		unistr *uni_compname;      /* unicode server name */
-		unistr *uni_lan_grp;      /* unicode domain name */
-		uint32 ver_major;          /* 4 - unknown */
-		uint32 ver_minor;          /* 0 - unknown */
+		uint32 platform_id;
+		unistr *server;
+		unistr *domain;
+		uint32 ver_major;
+		uint32 ver_minor;
 	} wks_Info100;
 
+	typedef struct {
+		uint32 platform_id;
+		unistr *server;
+		unistr *domain;
+		uint32 ver_major;
+		uint32 ver_minor;
+		unistr *unknown;
+	} wks_Info101;
+
+	typedef struct {
+		uint32 platform_id;
+		unistr *server;
+		unistr *domain;
+		uint32 ver_major;
+		uint32 ver_minor;
+		unistr *unknown;
+		uint32 unknown2;
+	} wks_Info102;
+
 	typedef union {
 		case (100) wks_Info100 *info100;
+		case (101) wks_Info101 *info101;
+		case (102) wks_Info102 *info102;
 	} wks_Info;
 
 	NTSTATUS wks_QueryInfo(
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index 3d87b9efc6..a2f0309acd 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -83,6 +83,11 @@ NTSTATUS ndr_pull_NTSTATUS(struct ndr_pull *ndr, NTSTATUS *status)
 	return NT_STATUS_OK;
 }
 
+void ndr_print_NTSTATUS(struct ndr_print *ndr, const char *name, NTSTATUS *r)
+{
+	ndr->print(ndr, "%-25s: %s", name, nt_errstr(*r));
+}
+
 /*
   pull a WERROR
 */
@@ -94,6 +99,11 @@ NTSTATUS ndr_pull_WERROR(struct ndr_pull *ndr, WERROR *status)
 	return NT_STATUS_OK;
 }
 
+void ndr_print_WERROR(struct ndr_print *ndr, const char *name, WERROR *r)
+{
+	ndr->print(ndr, "%-25s: %s", name, win_errstr(*r));
+}
+
 /*
   parse a set of bytes
 */
diff --git a/source4/librpc/ndr/ndr_dfs.c b/source4/librpc/ndr/ndr_dfs.c
index 90357c0455..c6f508536c 100644
--- a/source4/librpc/ndr/ndr_dfs.c
+++ b/source4/librpc/ndr/ndr_dfs.c
@@ -1330,6 +1330,7 @@ void ndr_print_dfs_Add(struct ndr_print *ndr, const char *name, int flags, struc
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "dfs_Add");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1363,6 +1364,7 @@ void ndr_print_dfs_Remove(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "dfs_Remove");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1380,6 +1382,7 @@ void ndr_print_dfs_SetInfo(struct ndr_print *ndr, const char *name, int flags, s
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "dfs_SetInfo");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1671,6 +1674,7 @@ void ndr_print_dfs_GetInfo(struct ndr_print *ndr, const char *name, int flags, s
 		ndr_print_struct(ndr, "out", "dfs_GetInfo");
 	ndr->depth++;
 	ndr_print_dfs_Info(ndr, "info", r->in.level, &r->out.info);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1876,6 +1880,7 @@ void ndr_print_dfs_Enum(struct ndr_print *ndr, const char *name, int flags, stru
 		ndr_print_uint32(ndr, "total", *r->out.total);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_lsa.c b/source4/librpc/ndr/ndr_lsa.c
index 992c26a61c..f40fbcf0f5 100644
--- a/source4/librpc/ndr/ndr_lsa.c
+++ b/source4/librpc/ndr/ndr_lsa.c
@@ -1705,6 +1705,7 @@ void ndr_print_lsa_Close(struct ndr_print *ndr, const char *name, int flags, str
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1726,6 +1727,7 @@ void ndr_print_lsa_Delete(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_Delete");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1799,6 +1801,7 @@ void ndr_print_lsa_EnumPrivs(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth++;
 		ndr_print_lsa_PrivArray(ndr, "privs", r->out.privs);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1841,6 +1844,7 @@ void ndr_print_lsa_QuerySecObj(struct ndr_print *ndr, const char *name, int flag
 		ndr_print_sec_desc_buf(ndr, "sd", r->out.sd);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1858,6 +1862,7 @@ void ndr_print_lsa_SetSecObj(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_SetSecObj");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1875,6 +1880,7 @@ void ndr_print_lsa_ChangePassword(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_ChangePassword");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -1951,6 +1957,7 @@ void ndr_print_lsa_OpenPolicy(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2171,6 +2178,7 @@ void ndr_print_lsa_QueryInfoPolicy(struct ndr_print *ndr, const char *name, int
 	ndr_print_lsa_PolicyInformation(ndr, "info", r->in.level, r->out.info);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2188,6 +2196,7 @@ void ndr_print_lsa_SetInfoPolicy(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_SetInfoPolicy");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2205,6 +2214,7 @@ void ndr_print_lsa_ClearAuditLog(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_ClearAuditLog");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2222,6 +2232,7 @@ void ndr_print_lsa_CreateAccount(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_CreateAccount");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2283,6 +2294,7 @@ void ndr_print_lsa_EnumAccounts(struct ndr_print *ndr, const char *name, int fla
 	ndr->depth++;
 		ndr_print_lsa_SidArray(ndr, "sids", r->out.sids);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2300,6 +2312,7 @@ void ndr_print_lsa_CreateTrustDom(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "lsa_CreateTrustDom");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2362,6 +2375,7 @@ void ndr_print_lsa_EnumTrustDom(struct ndr_print *ndr, const char *name, int fla
 	ndr->depth++;
 		ndr_print_lsa_DomainList(ndr, "domains", r->out.domains);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2464,6 +2478,7 @@ void ndr_print_lsa_LookupNames(struct ndr_print *ndr, const char *name, int flag
 	ndr->depth++;
 		ndr_print_uint32(ndr, "count", *r->out.count);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2536,6 +2551,7 @@ void ndr_print_lsa_LookupSids(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth++;
 		ndr_print_uint32(ndr, "count", *r->out.count);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2553,6 +2569,7 @@ void ndr_print_CREATESECRET(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "CREATESECRET");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2583,6 +2600,7 @@ void ndr_print_lsa_OpenAccount(struct ndr_print *ndr, const char *name, int flag
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2641,6 +2659,7 @@ void ndr_print_lsa_EnumPrivsAccount(struct ndr_print *ndr, const char *name, int
 		ndr_print_lsa_PrivilegeSet(ndr, "privs", r->out.privs);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2658,6 +2677,7 @@ void ndr_print_ADDPRIVS(struct ndr_print *ndr, const char *name, int flags, stru
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "ADDPRIVS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2675,6 +2695,7 @@ void ndr_print_REMOVEPRIVS(struct ndr_print *ndr, const char *name, int flags, s
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "REMOVEPRIVS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2692,6 +2713,7 @@ void ndr_print_GETQUOTAS(struct ndr_print *ndr, const char *name, int flags, str
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "GETQUOTAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2709,6 +2731,7 @@ void ndr_print_SETQUOTAS(struct ndr_print *ndr, const char *name, int flags, str
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "SETQUOTAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2726,6 +2749,7 @@ void ndr_print_GETSYSTEMACCOUNT(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "GETSYSTEMACCOUNT");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2743,6 +2767,7 @@ void ndr_print_SETSYSTEMACCOUNT(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "SETSYSTEMACCOUNT");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2760,6 +2785,7 @@ void ndr_print_OPENTRUSTDOM(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "OPENTRUSTDOM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2777,6 +2803,7 @@ void ndr_print_QUERYTRUSTDOM(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "QUERYTRUSTDOM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2794,6 +2821,7 @@ void ndr_print_SETINFOTRUSTDOM(struct ndr_print *ndr, const char *name, int flag
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "SETINFOTRUSTDOM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2811,6 +2839,7 @@ void ndr_print_OPENSECRET(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "OPENSECRET");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2828,6 +2857,7 @@ void ndr_print_SETSECRET(struct ndr_print *ndr, const char *name, int flags, str
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "SETSECRET");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2845,6 +2875,7 @@ void ndr_print_QUERYSECRET(struct ndr_print *ndr, const char *name, int flags, s
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "QUERYSECRET");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2862,6 +2893,7 @@ void ndr_print_LOOKUPPRIVVALUE(struct ndr_print *ndr, const char *name, int flag
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "LOOKUPPRIVVALUE");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2893,6 +2925,7 @@ void ndr_print_lsa_LookupPrivName(struct ndr_print *ndr, const char *name, int f
 		ndr_print_lsa_Name(ndr, "name", r->out.name);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2910,6 +2943,7 @@ void ndr_print_PRIV_GET_DISPNAME(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PRIV_GET_DISPNAME");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2927,6 +2961,7 @@ void ndr_print_DELETEOBJECT(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "DELETEOBJECT");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2944,6 +2979,7 @@ void ndr_print_ENUMACCTWITHRIGHT(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "ENUMACCTWITHRIGHT");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3000,6 +3036,7 @@ void ndr_print_lsa_EnumAccountRights(struct ndr_print *ndr, const char *name, in
 	ndr->depth++;
 		ndr_print_lsa_RightSet(ndr, "rights", r->out.rights);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3017,6 +3054,7 @@ void ndr_print_ADDACCTRIGHTS(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "ADDACCTRIGHTS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3034,6 +3072,7 @@ void ndr_print_REMOVEACCTRIGHTS(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "REMOVEACCTRIGHTS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3051,6 +3090,7 @@ void ndr_print_QUERYTRUSTDOMINFO(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "QUERYTRUSTDOMINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3068,6 +3108,7 @@ void ndr_print_SETTRUSTDOMINFO(struct ndr_print *ndr, const char *name, int flag
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "SETTRUSTDOMINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3085,6 +3126,7 @@ void ndr_print_DELETETRUSTDOM(struct ndr_print *ndr, const char *name, int flags
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "DELETETRUSTDOM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3102,6 +3144,7 @@ void ndr_print_STOREPRIVDATA(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "STOREPRIVDATA");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3119,6 +3162,7 @@ void ndr_print_RETRPRIVDATA(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "RETRPRIVDATA");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3151,6 +3195,7 @@ void ndr_print_lsa_OpenPolicy2(struct ndr_print *ndr, const char *name, int flag
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3168,6 +3213,7 @@ void ndr_print_UNK_GET_CONNUSER(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "UNK_GET_CONNUSER");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3185,6 +3231,7 @@ void ndr_print_QUERYINFO2(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "QUERYINFO2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_samr.c b/source4/librpc/ndr/ndr_samr.c
index 03dec72356..8e9956618b 100644
--- a/source4/librpc/ndr/ndr_samr.c
+++ b/source4/librpc/ndr/ndr_samr.c
@@ -2302,6 +2302,7 @@ void ndr_print_samr_Connect(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2327,6 +2328,7 @@ void ndr_print_samr_Close(struct ndr_print *ndr, const char *name, int flags, st
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2344,6 +2346,7 @@ void ndr_print_samr_SetSecurity(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SetSecurity");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2361,6 +2364,7 @@ void ndr_print_samr_QuerySecurity(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QuerySecurity");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2378,6 +2382,7 @@ void ndr_print_samr_Shutdown(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_Shutdown");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2424,6 +2429,7 @@ void ndr_print_samr_LookupDomain(struct ndr_print *ndr, const char *name, int fl
 		ndr_print_dom_sid2(ndr, "sid", r->out.sid);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2487,6 +2493,7 @@ void ndr_print_samr_EnumDomains(struct ndr_print *ndr, const char *name, int fla
 	ndr->depth++;
 		ndr_print_uint32(ndr, "num_entries", *r->out.num_entries);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2517,6 +2524,7 @@ void ndr_print_samr_OpenDomain(struct ndr_print *ndr, const char *name, int flag
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "domain_handle", r->out.domain_handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2731,6 +2739,7 @@ void ndr_print_samr_QueryDomainInfo(struct ndr_print *ndr, const char *name, int
 	ndr_print_samr_DomainInfo(ndr, "info", r->in.level, r->out.info);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2748,6 +2757,7 @@ void ndr_print_samr_SET_DOMAIN_INFO(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_DOMAIN_INFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2765,6 +2775,7 @@ void ndr_print_samr_CREATE_DOM_GROUP(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CREATE_DOM_GROUP");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2802,6 +2813,7 @@ void ndr_print_samr_EnumDomainGroups(struct ndr_print *ndr, const char *name, in
 	}
 	ndr->depth--;
 	ndr_print_uint32(ndr, "num_entries", r->out.num_entries);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2819,6 +2831,7 @@ void ndr_print_samr_CREATE_USER_IN_DOMAIN(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CREATE_USER_IN_DOMAIN");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2857,6 +2870,7 @@ void ndr_print_samr_EnumDomainUsers(struct ndr_print *ndr, const char *name, int
 	}
 	ndr->depth--;
 	ndr_print_uint32(ndr, "num_entries", r->out.num_entries);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2874,6 +2888,7 @@ void ndr_print_samr_CREATE_DOM_ALIAS(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CREATE_DOM_ALIAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2911,6 +2926,7 @@ void ndr_print_samr_EnumDomainAliases(struct ndr_print *ndr, const char *name, i
 	}
 	ndr->depth--;
 	ndr_print_uint32(ndr, "num_entries", r->out.num_entries);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2928,6 +2944,7 @@ void ndr_print_samr_GET_ALIAS_MEMBERSHIP(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_ALIAS_MEMBERSHIP");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2945,6 +2962,7 @@ void ndr_print_samr_LOOKUP_NAMES(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_LOOKUP_NAMES");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2962,6 +2980,7 @@ void ndr_print_samr_LOOKUP_RIDS(struct ndr_print *ndr, const char *name, int fla
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_LOOKUP_RIDS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2989,6 +3008,7 @@ void ndr_print_samr_OpenGroup(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3077,6 +3097,7 @@ void ndr_print_samr_QueryGroupInfo(struct ndr_print *ndr, const char *name, int
 	ndr_print_samr_GroupInfo(ndr, "info", r->in.level, r->out.info);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3094,6 +3115,7 @@ void ndr_print_samr_SET_GROUPINFO(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_GROUPINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3111,6 +3133,7 @@ void ndr_print_samr_ADD_GROUPMEM(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_ADD_GROUPMEM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3128,6 +3151,7 @@ void ndr_print_samr_DELETE_DOM_GROUP(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_DELETE_DOM_GROUP");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3145,6 +3169,7 @@ void ndr_print_samr_DEL_GROUPMEM(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_DEL_GROUPMEM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3162,6 +3187,7 @@ void ndr_print_samr_QUERY_GROUPMEM(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_GROUPMEM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3179,6 +3205,7 @@ void ndr_print_samr_SET_MEMBER_ATTRIBUTES_OF_GROUP(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_MEMBER_ATTRIBUTES_OF_GROUP");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3206,6 +3233,7 @@ void ndr_print_samr_OpenAlias(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3281,6 +3309,7 @@ void ndr_print_samr_QueryAliasInfo(struct ndr_print *ndr, const char *name, int
 	ndr_print_samr_AliasInfo(ndr, "info", r->in.level, r->out.info);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3298,6 +3327,7 @@ void ndr_print_samr_SET_ALIASINFO(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_ALIASINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3315,6 +3345,7 @@ void ndr_print_samr_DELETE_DOM_ALIAS(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_DELETE_DOM_ALIAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3332,6 +3363,7 @@ void ndr_print_samr_ADD_ALIASMEM(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_ADD_ALIASMEM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3349,6 +3381,7 @@ void ndr_print_samr_DEL_ALIASMEM(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_DEL_ALIASMEM");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3366,6 +3399,7 @@ void ndr_print_samr_GET_MEMBERS_IN_ALIAS(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_MEMBERS_IN_ALIAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3393,6 +3427,7 @@ void ndr_print_samr_OpenUser(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3410,6 +3445,7 @@ void ndr_print_samr_DELETE_DOM_USER(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_DELETE_DOM_USER");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3768,6 +3804,7 @@ void ndr_print_samr_QueryUserInfo(struct ndr_print *ndr, const char *name, int f
 	ndr_print_samr_UserInfo(ndr, "info", r->in.level, r->out.info);
 	}
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3785,6 +3822,7 @@ void ndr_print_samr_SET_USERINFO(struct ndr_print *ndr, const char *name, int fl
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_USERINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3802,6 +3840,7 @@ void ndr_print_samr_CHANGE_PASSWORD_USER(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CHANGE_PASSWORD_USER");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3819,6 +3858,7 @@ void ndr_print_samr_GET_GROUPS_FOR_USER(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_GROUPS_FOR_USER");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3836,6 +3876,7 @@ void ndr_print_samr_QUERY_DISPINFO(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_DISPINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3853,6 +3894,7 @@ void ndr_print_samr_GET_DISPLAY_ENUMERATION_INDEX(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_DISPLAY_ENUMERATION_INDEX");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3870,6 +3912,7 @@ void ndr_print_samr_TEST_PRIVATE_FUNCTIONS_DOMAIN(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_TEST_PRIVATE_FUNCTIONS_DOMAIN");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3887,6 +3930,7 @@ void ndr_print_samr_TEST_PRIVATE_FUNCTIONS_USER(struct ndr_print *ndr, const cha
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_TEST_PRIVATE_FUNCTIONS_USER");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3904,6 +3948,7 @@ void ndr_print_samr_GET_USRDOM_PWINFO(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_USRDOM_PWINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3921,6 +3966,7 @@ void ndr_print_samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN(struct ndr_print *ndr, con
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3938,6 +3984,7 @@ void ndr_print_samr_QUERY_INFORMATION_DOMAIN2(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_INFORMATION_DOMAIN2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3955,6 +4002,7 @@ void ndr_print_samr_QUERY_INFORMATION_USER2(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_INFORMATION_USER2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3972,6 +4020,7 @@ void ndr_print_samr_QUERY_DISPINFO2(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_DISPINFO2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3989,6 +4038,7 @@ void ndr_print_samr_GET_DISPLAY_ENUMERATION_INDEX2(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_DISPLAY_ENUMERATION_INDEX2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4006,6 +4056,7 @@ void ndr_print_samr_CREATE_USER2_IN_DOMAIN(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CREATE_USER2_IN_DOMAIN");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4023,6 +4074,7 @@ void ndr_print_samr_QUERY_DISPINFO3(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_QUERY_DISPINFO3");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4040,6 +4092,7 @@ void ndr_print_samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4057,6 +4110,7 @@ void ndr_print_samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS(struct ndr_print *ndr, co
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4074,6 +4128,7 @@ void ndr_print_samr_OEM_CHANGE_PASSWORD_USER2(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_OEM_CHANGE_PASSWORD_USER2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4091,6 +4146,7 @@ void ndr_print_samr_UNICODE_CHANGE_PASSWORD_USER2(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_UNICODE_CHANGE_PASSWORD_USER2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4108,6 +4164,7 @@ void ndr_print_samr_GET_DOM_PWINFO(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_DOM_PWINFO");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4125,6 +4182,7 @@ void ndr_print_samr_CONNECT2(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CONNECT2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4142,6 +4200,7 @@ void ndr_print_samr_SET_USERINFO2(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_USERINFO2");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4159,6 +4218,7 @@ void ndr_print_samr_SET_BOOT_KEY_INFORMATION(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_BOOT_KEY_INFORMATION");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4176,6 +4236,7 @@ void ndr_print_samr_GET_BOOT_KEY_INFORMATION(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_GET_BOOT_KEY_INFORMATION");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4193,6 +4254,7 @@ void ndr_print_samr_CONNECT3(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CONNECT3");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4222,6 +4284,7 @@ void ndr_print_samr_Connect4(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4239,6 +4302,7 @@ void ndr_print_samr_UNICODE_CHANGE_PASSWORD_USER3(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_UNICODE_CHANGE_PASSWORD_USER3");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4256,6 +4320,7 @@ void ndr_print_samr_CONNECT5(struct ndr_print *ndr, const char *name, int flags,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_CONNECT5");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4273,6 +4338,7 @@ void ndr_print_samr_RID_TO_SID(struct ndr_print *ndr, const char *name, int flag
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_RID_TO_SID");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4290,6 +4356,7 @@ void ndr_print_samr_SET_DSRM_PASSWORD(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_SET_DSRM_PASSWORD");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4307,6 +4374,7 @@ void ndr_print_samr_VALIDATE_PASSWORD(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "samr_VALIDATE_PASSWORD");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_spoolss.c b/source4/librpc/ndr/ndr_spoolss.c
index fe4aff53c6..285692a628 100644
--- a/source4/librpc/ndr/ndr_spoolss.c
+++ b/source4/librpc/ndr/ndr_spoolss.c
@@ -2207,6 +2207,7 @@ void ndr_print_spoolss_EnumPrinters(struct ndr_print *ndr, const char *name, int
 		ndr_print_uint32(ndr, "buf_size", *r->out.buf_size);
 	ndr->depth--;
 	ndr_print_uint32(ndr, "count", r->out.count);
+	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2247,6 +2248,7 @@ void ndr_print_spoolss_OpenPrinter(struct ndr_print *ndr, const char *name, int
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2264,6 +2266,7 @@ void ndr_print_spoolss_02(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_02");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2281,6 +2284,7 @@ void ndr_print_spoolss_03(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_03");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2326,6 +2330,7 @@ void ndr_print_spoolss_EnumJobs(struct ndr_print *ndr, const char *name, int fla
 		ndr_print_uint32(ndr, "buf_size", *r->out.buf_size);
 	ndr->depth--;
 	ndr_print_uint32(ndr, "numjobs", r->out.numjobs);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2343,6 +2348,7 @@ void ndr_print_spoolss_05(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_05");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2360,6 +2366,7 @@ void ndr_print_spoolss_06(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_06");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2377,6 +2384,7 @@ void ndr_print_spoolss_07(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_07");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2419,6 +2427,7 @@ void ndr_print_spoolss_GetPrinter(struct ndr_print *ndr, const char *name, int f
 	ndr->depth++;
 		ndr_print_uint32(ndr, "buf_size", *r->out.buf_size);
 	ndr->depth--;
+	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2436,6 +2445,7 @@ void ndr_print_spoolss_09(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_09");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2453,6 +2463,7 @@ void ndr_print_spoolss_0a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2470,6 +2481,7 @@ void ndr_print_spoolss_0b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2487,6 +2499,7 @@ void ndr_print_spoolss_0c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2504,6 +2517,7 @@ void ndr_print_spoolss_0d(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0d");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2521,6 +2535,7 @@ void ndr_print_spoolss_0e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2538,6 +2553,7 @@ void ndr_print_spoolss_0f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_0f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2555,6 +2571,7 @@ void ndr_print_spoolss_10(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_10");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2572,6 +2589,7 @@ void ndr_print_spoolss_11(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_11");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2593,6 +2611,7 @@ void ndr_print_spoolss_StartPagePrinter(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_StartPagePrinter");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2610,6 +2629,7 @@ void ndr_print_spoolss_13(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_13");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2631,6 +2651,7 @@ void ndr_print_spoolss_EndPagePrinter(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_EndPagePrinter");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2648,6 +2669,7 @@ void ndr_print_spoolss_15(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_15");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2665,6 +2687,7 @@ void ndr_print_spoolss_16(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_16");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2682,6 +2705,7 @@ void ndr_print_spoolss_EndDocPrinter(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_EndDocPrinter");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2699,6 +2723,7 @@ void ndr_print_spoolss_18(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_18");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2716,6 +2741,7 @@ void ndr_print_spoolss_19(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_19");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2733,6 +2759,7 @@ void ndr_print_spoolss_1a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_1a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2750,6 +2777,7 @@ void ndr_print_spoolss_1b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_1b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2767,6 +2795,7 @@ void ndr_print_spoolss_1c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_1c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2792,6 +2821,7 @@ void ndr_print_spoolss_ClosePrinter(struct ndr_print *ndr, const char *name, int
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2809,6 +2839,7 @@ void ndr_print_spoolss_1e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_1e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2826,6 +2857,7 @@ void ndr_print_spoolss_1f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_1f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2843,6 +2875,7 @@ void ndr_print_spoolss_20(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_20");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2860,6 +2893,7 @@ void ndr_print_spoolss_21(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_21");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2877,6 +2911,7 @@ void ndr_print_spoolss_22(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_22");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2894,6 +2929,7 @@ void ndr_print_spoolss_23(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_23");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2911,6 +2947,7 @@ void ndr_print_spoolss_24(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_24");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2928,6 +2965,7 @@ void ndr_print_spoolss_25(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_25");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2945,6 +2983,7 @@ void ndr_print_spoolss_26(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_26");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2962,6 +3001,7 @@ void ndr_print_spoolss_27(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_27");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2979,6 +3019,7 @@ void ndr_print_spoolss_28(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_28");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -2996,6 +3037,7 @@ void ndr_print_spoolss_29(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_29");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3013,6 +3055,7 @@ void ndr_print_spoolss_2a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3030,6 +3073,7 @@ void ndr_print_spoolss_2b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3047,6 +3091,7 @@ void ndr_print_spoolss_2c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3064,6 +3109,7 @@ void ndr_print_spoolss_2d(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2d");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3081,6 +3127,7 @@ void ndr_print_spoolss_2e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3098,6 +3145,7 @@ void ndr_print_spoolss_2f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_2f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3115,6 +3163,7 @@ void ndr_print_spoolss_30(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_30");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3132,6 +3181,7 @@ void ndr_print_spoolss_31(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_31");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3149,6 +3199,7 @@ void ndr_print_spoolss_32(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_32");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3166,6 +3217,7 @@ void ndr_print_spoolss_33(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_33");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3183,6 +3235,7 @@ void ndr_print_spoolss_34(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_34");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3200,6 +3253,7 @@ void ndr_print_spoolss_35(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_35");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3217,6 +3271,7 @@ void ndr_print_spoolss_36(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_36");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3234,6 +3289,7 @@ void ndr_print_spoolss_37(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_37");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3251,6 +3307,7 @@ void ndr_print_spoolss_38(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_38");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3268,6 +3325,7 @@ void ndr_print_spoolss_39(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_39");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3285,6 +3343,7 @@ void ndr_print_spoolss_3a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3302,6 +3361,7 @@ void ndr_print_spoolss_3b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3319,6 +3379,7 @@ void ndr_print_spoolss_3c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3336,6 +3397,7 @@ void ndr_print_spoolss_3d(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3d");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3353,6 +3415,7 @@ void ndr_print_spoolss_3e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3370,6 +3433,7 @@ void ndr_print_spoolss_3f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_3f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3387,6 +3451,7 @@ void ndr_print_spoolss_40(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_40");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3404,6 +3469,7 @@ void ndr_print_spoolss_41(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_41");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3421,6 +3487,7 @@ void ndr_print_spoolss_42(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_42");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3438,6 +3505,7 @@ void ndr_print_spoolss_43(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_43");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3455,6 +3523,7 @@ void ndr_print_spoolss_44(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_44");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3556,6 +3625,7 @@ void ndr_print_spoolss_OpenPrinterEx(struct ndr_print *ndr, const char *name, in
 	ndr->depth++;
 		ndr_print_policy_handle(ndr, "handle", r->out.handle);
 	ndr->depth--;
+	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3573,6 +3643,7 @@ void ndr_print_spoolss_46(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_46");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3590,6 +3661,7 @@ void ndr_print_spoolss_47(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_47");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3642,6 +3714,7 @@ void ndr_print_spoolss_EnumPrinterData(struct ndr_print *ndr, const char *name,
 	ndr->depth++;
 		ndr_print_uint32(ndr, "buf_size", *r->out.buf_size);
 	ndr->depth--;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3659,6 +3732,7 @@ void ndr_print_spoolss_49(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_49");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3676,6 +3750,7 @@ void ndr_print_spoolss_4a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3693,6 +3768,7 @@ void ndr_print_spoolss_4b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3710,6 +3786,7 @@ void ndr_print_spoolss_4c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3727,6 +3804,7 @@ void ndr_print_spoolss_4d(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4d");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3744,6 +3822,7 @@ void ndr_print_spoolss_4e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3761,6 +3840,7 @@ void ndr_print_spoolss_4f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_4f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3778,6 +3858,7 @@ void ndr_print_spoolss_50(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_50");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3795,6 +3876,7 @@ void ndr_print_spoolss_51(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_51");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3812,6 +3894,7 @@ void ndr_print_spoolss_52(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_52");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3829,6 +3912,7 @@ void ndr_print_spoolss_53(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_53");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3846,6 +3930,7 @@ void ndr_print_spoolss_54(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_54");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3863,6 +3948,7 @@ void ndr_print_spoolss_55(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_55");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3880,6 +3966,7 @@ void ndr_print_spoolss_56(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_56");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3897,6 +3984,7 @@ void ndr_print_spoolss_57(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_57");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3914,6 +4002,7 @@ void ndr_print_spoolss_58(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_58");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3931,6 +4020,7 @@ void ndr_print_spoolss_59(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_59");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3948,6 +4038,7 @@ void ndr_print_spoolss_5a(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5a");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3965,6 +4056,7 @@ void ndr_print_spoolss_5b(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5b");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3982,6 +4074,7 @@ void ndr_print_spoolss_5c(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5c");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -3999,6 +4092,7 @@ void ndr_print_spoolss_5d(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5d");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4016,6 +4110,7 @@ void ndr_print_spoolss_5e(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5e");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
@@ -4033,6 +4128,7 @@ void ndr_print_spoolss_5f(struct ndr_print *ndr, const char *name, int flags, st
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "spoolss_5f");
 	ndr->depth++;
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_wkssvc.c b/source4/librpc/ndr/ndr_wkssvc.c
index ff694de5d6..5f12faef0f 100644
--- a/source4/librpc/ndr/ndr_wkssvc.c
+++ b/source4/librpc/ndr/ndr_wkssvc.c
@@ -15,34 +15,125 @@ NTSTATUS ndr_push_wks_QueryInfo(struct ndr_push *ndr, struct wks_QueryInfo *r)
 
 NTSTATUS ndr_pull_wks_Info100(struct ndr_pull *ndr, int ndr_flags, struct wks_Info100 *r)
 {
-	uint32 _ptr_uni_compname;
-	uint32 _ptr_uni_lan_grp;
+	uint32 _ptr_server;
+	uint32 _ptr_domain;
 	NDR_CHECK(ndr_pull_struct_start(ndr));
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_pull_align(ndr, 4));
 	NDR_CHECK(ndr_pull_uint32(ndr, &r->platform_id));
-	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_uni_compname));
-	if (_ptr_uni_compname) {
-		NDR_ALLOC(ndr, r->uni_compname);
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_server));
+	if (_ptr_server) {
+		NDR_ALLOC(ndr, r->server);
 	} else {
-		r->uni_compname = NULL;
+		r->server = NULL;
 	}
-	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_uni_lan_grp));
-	if (_ptr_uni_lan_grp) {
-		NDR_ALLOC(ndr, r->uni_lan_grp);
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_domain));
+	if (_ptr_domain) {
+		NDR_ALLOC(ndr, r->domain);
 	} else {
-		r->uni_lan_grp = NULL;
+		r->domain = NULL;
 	}
 	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_major));
 	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_minor));
 	ndr_pull_struct_end(ndr);
 buffers:
 	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	if (r->uni_compname) {
-		NDR_CHECK(ndr_pull_unistr(ndr, &r->uni_compname));
+	if (r->server) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->server));
 	}
-	if (r->uni_lan_grp) {
-		NDR_CHECK(ndr_pull_unistr(ndr, &r->uni_lan_grp));
+	if (r->domain) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->domain));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_pull_wks_Info101(struct ndr_pull *ndr, int ndr_flags, struct wks_Info101 *r)
+{
+	uint32 _ptr_server;
+	uint32 _ptr_domain;
+	uint32 _ptr_unknown;
+	NDR_CHECK(ndr_pull_struct_start(ndr));
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_align(ndr, 4));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->platform_id));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_server));
+	if (_ptr_server) {
+		NDR_ALLOC(ndr, r->server);
+	} else {
+		r->server = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_domain));
+	if (_ptr_domain) {
+		NDR_ALLOC(ndr, r->domain);
+	} else {
+		r->domain = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_major));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_minor));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_unknown));
+	if (_ptr_unknown) {
+		NDR_ALLOC(ndr, r->unknown);
+	} else {
+		r->unknown = NULL;
+	}
+	ndr_pull_struct_end(ndr);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->server) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->server));
+	}
+	if (r->domain) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->domain));
+	}
+	if (r->unknown) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->unknown));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_pull_wks_Info102(struct ndr_pull *ndr, int ndr_flags, struct wks_Info102 *r)
+{
+	uint32 _ptr_server;
+	uint32 _ptr_domain;
+	uint32 _ptr_unknown;
+	NDR_CHECK(ndr_pull_struct_start(ndr));
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_align(ndr, 4));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->platform_id));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_server));
+	if (_ptr_server) {
+		NDR_ALLOC(ndr, r->server);
+	} else {
+		r->server = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_domain));
+	if (_ptr_domain) {
+		NDR_ALLOC(ndr, r->domain);
+	} else {
+		r->domain = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_major));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->ver_minor));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_unknown));
+	if (_ptr_unknown) {
+		NDR_ALLOC(ndr, r->unknown);
+	} else {
+		r->unknown = NULL;
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->unknown2));
+	ndr_pull_struct_end(ndr);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->server) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->server));
+	}
+	if (r->domain) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->domain));
+	}
+	if (r->unknown) {
+		NDR_CHECK(ndr_pull_unistr(ndr, &r->unknown));
 	}
 done:
 	return NT_STATUS_OK;
@@ -64,6 +155,26 @@ NTSTATUS ndr_pull_wks_Info(struct ndr_pull *ndr, int ndr_flags, uint16 *level, u
 	}
 	break; }
 
+	case 101: {
+		uint32 _ptr_info101;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_info101));
+	if (_ptr_info101) {
+		NDR_ALLOC(ndr, r->info101);
+	} else {
+		r->info101 = NULL;
+	}
+	break; }
+
+	case 102: {
+		uint32 _ptr_info102;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_info102));
+	if (_ptr_info102) {
+		NDR_ALLOC(ndr, r->info102);
+	} else {
+		r->info102 = NULL;
+	}
+	break; }
+
 	default:
 		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", *level);
 	}
@@ -77,6 +188,18 @@ buffers:
 	}
 	break;
 
+	case 101:
+	if (r->info101) {
+		NDR_CHECK(ndr_pull_wks_Info101(ndr, NDR_SCALARS|NDR_BUFFERS, r->info101));
+	}
+	break;
+
+	case 102:
+	if (r->info102) {
+		NDR_CHECK(ndr_pull_wks_Info102(ndr, NDR_SCALARS|NDR_BUFFERS, r->info102));
+	}
+	break;
+
 	default:
 		return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", *level);
 	}
@@ -100,20 +223,77 @@ void ndr_print_wks_Info100(struct ndr_print *ndr, const char *name, struct wks_I
 	ndr_print_struct(ndr, name, "wks_Info100");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "platform_id", r->platform_id);
-	ndr_print_ptr(ndr, "uni_compname", r->uni_compname);
+	ndr_print_ptr(ndr, "server", r->server);
+	ndr->depth++;
+	if (r->server) {
+		ndr_print_unistr(ndr, "server", r->server);
+	}
+	ndr->depth--;
+	ndr_print_ptr(ndr, "domain", r->domain);
+	ndr->depth++;
+	if (r->domain) {
+		ndr_print_unistr(ndr, "domain", r->domain);
+	}
+	ndr->depth--;
+	ndr_print_uint32(ndr, "ver_major", r->ver_major);
+	ndr_print_uint32(ndr, "ver_minor", r->ver_minor);
+	ndr->depth--;
+}
+
+void ndr_print_wks_Info101(struct ndr_print *ndr, const char *name, struct wks_Info101 *r)
+{
+	ndr_print_struct(ndr, name, "wks_Info101");
+	ndr->depth++;
+	ndr_print_uint32(ndr, "platform_id", r->platform_id);
+	ndr_print_ptr(ndr, "server", r->server);
+	ndr->depth++;
+	if (r->server) {
+		ndr_print_unistr(ndr, "server", r->server);
+	}
+	ndr->depth--;
+	ndr_print_ptr(ndr, "domain", r->domain);
+	ndr->depth++;
+	if (r->domain) {
+		ndr_print_unistr(ndr, "domain", r->domain);
+	}
+	ndr->depth--;
+	ndr_print_uint32(ndr, "ver_major", r->ver_major);
+	ndr_print_uint32(ndr, "ver_minor", r->ver_minor);
+	ndr_print_ptr(ndr, "unknown", r->unknown);
+	ndr->depth++;
+	if (r->unknown) {
+		ndr_print_unistr(ndr, "unknown", r->unknown);
+	}
+	ndr->depth--;
+	ndr->depth--;
+}
+
+void ndr_print_wks_Info102(struct ndr_print *ndr, const char *name, struct wks_Info102 *r)
+{
+	ndr_print_struct(ndr, name, "wks_Info102");
+	ndr->depth++;
+	ndr_print_uint32(ndr, "platform_id", r->platform_id);
+	ndr_print_ptr(ndr, "server", r->server);
 	ndr->depth++;
-	if (r->uni_compname) {
-		ndr_print_unistr(ndr, "uni_compname", r->uni_compname);
+	if (r->server) {
+		ndr_print_unistr(ndr, "server", r->server);
 	}
 	ndr->depth--;
-	ndr_print_ptr(ndr, "uni_lan_grp", r->uni_lan_grp);
+	ndr_print_ptr(ndr, "domain", r->domain);
 	ndr->depth++;
-	if (r->uni_lan_grp) {
-		ndr_print_unistr(ndr, "uni_lan_grp", r->uni_lan_grp);
+	if (r->domain) {
+		ndr_print_unistr(ndr, "domain", r->domain);
 	}
 	ndr->depth--;
 	ndr_print_uint32(ndr, "ver_major", r->ver_major);
 	ndr_print_uint32(ndr, "ver_minor", r->ver_minor);
+	ndr_print_ptr(ndr, "unknown", r->unknown);
+	ndr->depth++;
+	if (r->unknown) {
+		ndr_print_unistr(ndr, "unknown", r->unknown);
+	}
+	ndr->depth--;
+	ndr_print_uint32(ndr, "unknown2", r->unknown2);
 	ndr->depth--;
 }
 
@@ -130,6 +310,24 @@ void ndr_print_wks_Info(struct ndr_print *ndr, const char *name, uint16 level, u
 	ndr->depth--;
 	break;
 
+	case 101:
+	ndr_print_ptr(ndr, "info101", r->info101);
+	ndr->depth++;
+	if (r->info101) {
+		ndr_print_wks_Info101(ndr, "info101", r->info101);
+	}
+	ndr->depth--;
+	break;
+
+	case 102:
+	ndr_print_ptr(ndr, "info102", r->info102);
+	ndr->depth++;
+	if (r->info102) {
+		ndr_print_wks_Info102(ndr, "info102", r->info102);
+	}
+	ndr->depth--;
+	break;
+
 	default:
 		ndr_print_bad_level(ndr, name, level);
 	}
@@ -155,6 +353,7 @@ void ndr_print_wks_QueryInfo(struct ndr_print *ndr, const char *name, int flags,
 		ndr_print_struct(ndr, "out", "wks_QueryInfo");
 	ndr->depth++;
 	ndr_print_wks_Info(ndr, "info", r->in.level, &r->out.info);
+	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_wkssvc.h b/source4/librpc/ndr/ndr_wkssvc.h
index c8ad3fb7bc..f18ff11a83 100644
--- a/source4/librpc/ndr/ndr_wkssvc.h
+++ b/source4/librpc/ndr/ndr_wkssvc.h
@@ -2,14 +2,35 @@
 
 struct wks_Info100 {
 	uint32 platform_id;
-	const char *uni_compname;
-	const char *uni_lan_grp;
+	const char *server;
+	const char *domain;
 	uint32 ver_major;
 	uint32 ver_minor;
 };
 
+struct wks_Info101 {
+	uint32 platform_id;
+	const char *server;
+	const char *domain;
+	uint32 ver_major;
+	uint32 ver_minor;
+	const char *unknown;
+};
+
+struct wks_Info102 {
+	uint32 platform_id;
+	const char *server;
+	const char *domain;
+	uint32 ver_major;
+	uint32 ver_minor;
+	const char *unknown;
+	uint32 unknown2;
+};
+
 union wks_Info {
 /* [case(100)] */ struct wks_Info100 *info100;
+/* [case(101)] */ struct wks_Info101 *info101;
+/* [case(102)] */ struct wks_Info102 *info102;
 };
 
 struct wks_QueryInfo {
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 09ddc3625c..d67969e76c 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -37,6 +37,7 @@ struct dcerpc_pipe {
 	uint32 srv_max_xmit_frag;
 	uint32 srv_max_recv_frag;
 	struct cli_tree *tree;
+	unsigned flags;
 };
 
 /* dcerpc packet types */
@@ -51,6 +52,11 @@ struct dcerpc_pipe {
 #define DCERPC_PFC_FLAG_LAST    0x02
 #define DCERPC_PFC_FLAG_NOCALL  0x20
 
+/* dcerpc pipe flags */
+#define DCERPC_DEBUG_PRINT_IN 1
+#define DCERPC_DEBUG_PRINT_OUT 2
+#define DCERPC_DEBUG_PRINT_BOTH (DCERPC_DEBUG_PRINT_IN | DCERPC_DEBUG_PRINT_OUT)
+
 /*
   all dcerpc packets use this structure. 
 */
diff --git a/source4/librpc/rpc/rpc_dfs.c b/source4/librpc/rpc/rpc_dfs.c
index e4501676dd..4de98ad5f6 100644
--- a/source4/librpc/rpc/rpc_dfs.c
+++ b/source4/librpc/rpc/rpc_dfs.c
@@ -1,82 +1,129 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
 
 NTSTATUS dcerpc_dfs_Exist(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_Exist *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_DFS_EXIST, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_dfs_Exist,
-				  (ndr_pull_fn_t) ndr_pull_dfs_Exist,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_Exist, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_DFS_EXIST, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_dfs_Exist,
+				    (ndr_pull_fn_t) ndr_pull_dfs_Exist,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_Exist, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_dfs_Add(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_Add *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_Add, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DFS_ADD, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_dfs_Add,
 				    (ndr_pull_fn_t) ndr_pull_dfs_Add,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_Add, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_dfs_Remove(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_Remove *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_Remove, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DFS_REMOVE, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_dfs_Remove,
 				    (ndr_pull_fn_t) ndr_pull_dfs_Remove,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_Remove, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_dfs_SetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_SetInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_SetInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DFS_SETINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_dfs_SetInfo,
 				    (ndr_pull_fn_t) ndr_pull_dfs_SetInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_SetInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_dfs_GetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_GetInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_GetInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DFS_GETINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_dfs_GetInfo,
 				    (ndr_pull_fn_t) ndr_pull_dfs_GetInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_GetInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_dfs_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct dfs_Enum *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(dfs_Enum, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DFS_ENUM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_dfs_Enum,
 				    (ndr_pull_fn_t) ndr_pull_dfs_Enum,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(dfs_Enum, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
diff --git a/source4/librpc/rpc/rpc_echo.c b/source4/librpc/rpc/rpc_echo.c
index b7e3bf4e7c..38b394dbf6 100644
--- a/source4/librpc/rpc/rpc_echo.c
+++ b/source4/librpc/rpc/rpc_echo.c
@@ -1,44 +1,104 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
 
 NTSTATUS dcerpc_echo_AddOne(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct echo_AddOne *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_ECHO_ADDONE, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_echo_AddOne,
-				  (ndr_pull_fn_t) ndr_pull_echo_AddOne,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(echo_AddOne, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_ECHO_ADDONE, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_echo_AddOne,
+				    (ndr_pull_fn_t) ndr_pull_echo_AddOne,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(echo_AddOne, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_echo_EchoData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct echo_EchoData *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_ECHO_ECHODATA, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_echo_EchoData,
-				  (ndr_pull_fn_t) ndr_pull_echo_EchoData,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(echo_EchoData, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_ECHO_ECHODATA, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_echo_EchoData,
+				    (ndr_pull_fn_t) ndr_pull_echo_EchoData,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(echo_EchoData, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_echo_SinkData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct echo_SinkData *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_ECHO_SINKDATA, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_echo_SinkData,
-				  (ndr_pull_fn_t) ndr_pull_echo_SinkData,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(echo_SinkData, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_ECHO_SINKDATA, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_echo_SinkData,
+				    (ndr_pull_fn_t) ndr_pull_echo_SinkData,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(echo_SinkData, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_echo_SourceData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct echo_SourceData *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_ECHO_SOURCEDATA, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_echo_SourceData,
-				  (ndr_pull_fn_t) ndr_pull_echo_SourceData,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(echo_SourceData, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_ECHO_SOURCEDATA, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_echo_SourceData,
+				    (ndr_pull_fn_t) ndr_pull_echo_SourceData,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(echo_SourceData, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_TestCall(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct TestCall *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_TESTCALL, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_TestCall,
-				  (ndr_pull_fn_t) ndr_pull_TestCall,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(TestCall, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_TESTCALL, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_TestCall,
+				    (ndr_pull_fn_t) ndr_pull_TestCall,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(TestCall, r);		
+	}
+
+	return status;
 }
diff --git a/source4/librpc/rpc/rpc_lsa.c b/source4/librpc/rpc/rpc_lsa.c
index 1b5886b90f..c6e956abaf 100644
--- a/source4/librpc/rpc/rpc_lsa.c
+++ b/source4/librpc/rpc/rpc_lsa.c
@@ -1,4 +1,4 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
@@ -6,657 +6,986 @@
 NTSTATUS dcerpc_lsa_Close(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_Close *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_Close, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_CLOSE, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_Close,
 				    (ndr_pull_fn_t) ndr_pull_lsa_Close,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_Close, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_Delete(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_Delete *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_Delete, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_DELETE, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_Delete,
 				    (ndr_pull_fn_t) ndr_pull_lsa_Delete,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_Delete, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_EnumPrivs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_EnumPrivs *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_EnumPrivs, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_ENUMPRIVS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_EnumPrivs,
 				    (ndr_pull_fn_t) ndr_pull_lsa_EnumPrivs,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_EnumPrivs, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_QuerySecObj(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_QuerySecObj *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_QuerySecObj, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_QUERYSECOBJ, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_QuerySecObj,
 				    (ndr_pull_fn_t) ndr_pull_lsa_QuerySecObj,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_QuerySecObj, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_SetSecObj(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_SetSecObj *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_SetSecObj, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_SETSECOBJ, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_SetSecObj,
 				    (ndr_pull_fn_t) ndr_pull_lsa_SetSecObj,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_SetSecObj, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_ChangePassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_ChangePassword *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_ChangePassword, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_CHANGEPASSWORD, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_ChangePassword,
 				    (ndr_pull_fn_t) ndr_pull_lsa_ChangePassword,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_ChangePassword, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_OpenPolicy *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_OpenPolicy, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_OPENPOLICY, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_OpenPolicy,
 				    (ndr_pull_fn_t) ndr_pull_lsa_OpenPolicy,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_OpenPolicy, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_QueryInfoPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_QueryInfoPolicy *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_QueryInfoPolicy, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_QUERYINFOPOLICY, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_QueryInfoPolicy,
 				    (ndr_pull_fn_t) ndr_pull_lsa_QueryInfoPolicy,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_QueryInfoPolicy, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_SetInfoPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_SetInfoPolicy *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_SetInfoPolicy, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_SETINFOPOLICY, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_SetInfoPolicy,
 				    (ndr_pull_fn_t) ndr_pull_lsa_SetInfoPolicy,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_SetInfoPolicy, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_ClearAuditLog(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_ClearAuditLog *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_ClearAuditLog, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_CLEARAUDITLOG, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_ClearAuditLog,
 				    (ndr_pull_fn_t) ndr_pull_lsa_ClearAuditLog,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_ClearAuditLog, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_CreateAccount(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_CreateAccount *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_CreateAccount, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_CREATEACCOUNT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_CreateAccount,
 				    (ndr_pull_fn_t) ndr_pull_lsa_CreateAccount,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_CreateAccount, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_EnumAccounts(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_EnumAccounts *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_EnumAccounts, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_ENUMACCOUNTS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_EnumAccounts,
 				    (ndr_pull_fn_t) ndr_pull_lsa_EnumAccounts,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_EnumAccounts, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_CreateTrustDom(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_CreateTrustDom *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_CreateTrustDom, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_CREATETRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_CreateTrustDom,
 				    (ndr_pull_fn_t) ndr_pull_lsa_CreateTrustDom,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_CreateTrustDom, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_EnumTrustDom(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_EnumTrustDom *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_EnumTrustDom, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_ENUMTRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_EnumTrustDom,
 				    (ndr_pull_fn_t) ndr_pull_lsa_EnumTrustDom,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_EnumTrustDom, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_LookupNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_LookupNames *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_LookupNames, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_LOOKUPNAMES, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_LookupNames,
 				    (ndr_pull_fn_t) ndr_pull_lsa_LookupNames,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_LookupNames, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_LookupSids(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_LookupSids *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_LookupSids, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_LOOKUPSIDS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_LookupSids,
 				    (ndr_pull_fn_t) ndr_pull_lsa_LookupSids,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_LookupSids, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_CREATESECRET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct CREATESECRET *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(CREATESECRET, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_CREATESECRET, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_CREATESECRET,
 				    (ndr_pull_fn_t) ndr_pull_CREATESECRET,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(CREATESECRET, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_OpenAccount(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_OpenAccount *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_OpenAccount, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_OPENACCOUNT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_OpenAccount,
 				    (ndr_pull_fn_t) ndr_pull_lsa_OpenAccount,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_OpenAccount, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_EnumPrivsAccount(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_EnumPrivsAccount *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_EnumPrivsAccount, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_ENUMPRIVSACCOUNT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_EnumPrivsAccount,
 				    (ndr_pull_fn_t) ndr_pull_lsa_EnumPrivsAccount,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_EnumPrivsAccount, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_ADDPRIVS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct ADDPRIVS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(ADDPRIVS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_ADDPRIVS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_ADDPRIVS,
 				    (ndr_pull_fn_t) ndr_pull_ADDPRIVS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(ADDPRIVS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_REMOVEPRIVS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct REMOVEPRIVS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(REMOVEPRIVS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_REMOVEPRIVS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_REMOVEPRIVS,
 				    (ndr_pull_fn_t) ndr_pull_REMOVEPRIVS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(REMOVEPRIVS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_GETQUOTAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct GETQUOTAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(GETQUOTAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_GETQUOTAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_GETQUOTAS,
 				    (ndr_pull_fn_t) ndr_pull_GETQUOTAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(GETQUOTAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_SETQUOTAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct SETQUOTAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(SETQUOTAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SETQUOTAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_SETQUOTAS,
 				    (ndr_pull_fn_t) ndr_pull_SETQUOTAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(SETQUOTAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_GETSYSTEMACCOUNT(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct GETSYSTEMACCOUNT *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(GETSYSTEMACCOUNT, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_GETSYSTEMACCOUNT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_GETSYSTEMACCOUNT,
 				    (ndr_pull_fn_t) ndr_pull_GETSYSTEMACCOUNT,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(GETSYSTEMACCOUNT, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_SETSYSTEMACCOUNT(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct SETSYSTEMACCOUNT *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(SETSYSTEMACCOUNT, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SETSYSTEMACCOUNT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_SETSYSTEMACCOUNT,
 				    (ndr_pull_fn_t) ndr_pull_SETSYSTEMACCOUNT,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(SETSYSTEMACCOUNT, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_OPENTRUSTDOM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct OPENTRUSTDOM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(OPENTRUSTDOM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_OPENTRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_OPENTRUSTDOM,
 				    (ndr_pull_fn_t) ndr_pull_OPENTRUSTDOM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(OPENTRUSTDOM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_QUERYTRUSTDOM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct QUERYTRUSTDOM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(QUERYTRUSTDOM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_QUERYTRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_QUERYTRUSTDOM,
 				    (ndr_pull_fn_t) ndr_pull_QUERYTRUSTDOM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(QUERYTRUSTDOM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_SETINFOTRUSTDOM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct SETINFOTRUSTDOM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(SETINFOTRUSTDOM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SETINFOTRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_SETINFOTRUSTDOM,
 				    (ndr_pull_fn_t) ndr_pull_SETINFOTRUSTDOM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(SETINFOTRUSTDOM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_OPENSECRET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct OPENSECRET *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(OPENSECRET, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_OPENSECRET, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_OPENSECRET,
 				    (ndr_pull_fn_t) ndr_pull_OPENSECRET,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(OPENSECRET, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_SETSECRET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct SETSECRET *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(SETSECRET, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SETSECRET, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_SETSECRET,
 				    (ndr_pull_fn_t) ndr_pull_SETSECRET,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(SETSECRET, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_QUERYSECRET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct QUERYSECRET *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(QUERYSECRET, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_QUERYSECRET, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_QUERYSECRET,
 				    (ndr_pull_fn_t) ndr_pull_QUERYSECRET,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(QUERYSECRET, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_LOOKUPPRIVVALUE(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct LOOKUPPRIVVALUE *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(LOOKUPPRIVVALUE, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LOOKUPPRIVVALUE, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_LOOKUPPRIVVALUE,
 				    (ndr_pull_fn_t) ndr_pull_LOOKUPPRIVVALUE,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(LOOKUPPRIVVALUE, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_LookupPrivName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_LookupPrivName *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_LookupPrivName, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_LOOKUPPRIVNAME, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_LookupPrivName,
 				    (ndr_pull_fn_t) ndr_pull_lsa_LookupPrivName,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_LookupPrivName, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_PRIV_GET_DISPNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct PRIV_GET_DISPNAME *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(PRIV_GET_DISPNAME, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_PRIV_GET_DISPNAME, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_PRIV_GET_DISPNAME,
 				    (ndr_pull_fn_t) ndr_pull_PRIV_GET_DISPNAME,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(PRIV_GET_DISPNAME, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_DELETEOBJECT(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct DELETEOBJECT *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(DELETEOBJECT, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DELETEOBJECT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_DELETEOBJECT,
 				    (ndr_pull_fn_t) ndr_pull_DELETEOBJECT,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(DELETEOBJECT, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_ENUMACCTWITHRIGHT(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct ENUMACCTWITHRIGHT *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(ENUMACCTWITHRIGHT, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_ENUMACCTWITHRIGHT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_ENUMACCTWITHRIGHT,
 				    (ndr_pull_fn_t) ndr_pull_ENUMACCTWITHRIGHT,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(ENUMACCTWITHRIGHT, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_EnumAccountRights(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_EnumAccountRights *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_EnumAccountRights, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_ENUMACCOUNTRIGHTS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_EnumAccountRights,
 				    (ndr_pull_fn_t) ndr_pull_lsa_EnumAccountRights,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_EnumAccountRights, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_ADDACCTRIGHTS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct ADDACCTRIGHTS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(ADDACCTRIGHTS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_ADDACCTRIGHTS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_ADDACCTRIGHTS,
 				    (ndr_pull_fn_t) ndr_pull_ADDACCTRIGHTS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(ADDACCTRIGHTS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_REMOVEACCTRIGHTS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct REMOVEACCTRIGHTS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(REMOVEACCTRIGHTS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_REMOVEACCTRIGHTS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_REMOVEACCTRIGHTS,
 				    (ndr_pull_fn_t) ndr_pull_REMOVEACCTRIGHTS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(REMOVEACCTRIGHTS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_QUERYTRUSTDOMINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct QUERYTRUSTDOMINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(QUERYTRUSTDOMINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_QUERYTRUSTDOMINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_QUERYTRUSTDOMINFO,
 				    (ndr_pull_fn_t) ndr_pull_QUERYTRUSTDOMINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(QUERYTRUSTDOMINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_SETTRUSTDOMINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct SETTRUSTDOMINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(SETTRUSTDOMINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SETTRUSTDOMINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_SETTRUSTDOMINFO,
 				    (ndr_pull_fn_t) ndr_pull_SETTRUSTDOMINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(SETTRUSTDOMINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_DELETETRUSTDOM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct DELETETRUSTDOM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(DELETETRUSTDOM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_DELETETRUSTDOM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_DELETETRUSTDOM,
 				    (ndr_pull_fn_t) ndr_pull_DELETETRUSTDOM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(DELETETRUSTDOM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_STOREPRIVDATA(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct STOREPRIVDATA *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(STOREPRIVDATA, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_STOREPRIVDATA, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_STOREPRIVDATA,
 				    (ndr_pull_fn_t) ndr_pull_STOREPRIVDATA,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(STOREPRIVDATA, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_RETRPRIVDATA(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct RETRPRIVDATA *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(RETRPRIVDATA, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_RETRPRIVDATA, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_RETRPRIVDATA,
 				    (ndr_pull_fn_t) ndr_pull_RETRPRIVDATA,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(RETRPRIVDATA, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_lsa_OpenPolicy2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_OpenPolicy2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(lsa_OpenPolicy2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_LSA_OPENPOLICY2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_lsa_OpenPolicy2,
 				    (ndr_pull_fn_t) ndr_pull_lsa_OpenPolicy2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(lsa_OpenPolicy2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_UNK_GET_CONNUSER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct UNK_GET_CONNUSER *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(UNK_GET_CONNUSER, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_UNK_GET_CONNUSER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_UNK_GET_CONNUSER,
 				    (ndr_pull_fn_t) ndr_pull_UNK_GET_CONNUSER,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(UNK_GET_CONNUSER, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_QUERYINFO2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct QUERYINFO2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(QUERYINFO2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_QUERYINFO2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_QUERYINFO2,
 				    (ndr_pull_fn_t) ndr_pull_QUERYINFO2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(QUERYINFO2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
diff --git a/source4/librpc/rpc/rpc_misc.c b/source4/librpc/rpc/rpc_misc.c
index 50a5186a1f..473a9b0aa1 100644
--- a/source4/librpc/rpc/rpc_misc.c
+++ b/source4/librpc/rpc/rpc_misc.c
@@ -1,4 +1,4 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
diff --git a/source4/librpc/rpc/rpc_samr.c b/source4/librpc/rpc/rpc_samr.c
index 6a1ed98fbb..4ae1977c78 100644
--- a/source4/librpc/rpc/rpc_samr.c
+++ b/source4/librpc/rpc/rpc_samr.c
@@ -1,4 +1,4 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
@@ -6,951 +6,1427 @@
 NTSTATUS dcerpc_samr_Connect(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Connect *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_Connect, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CONNECT, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_Connect,
 				    (ndr_pull_fn_t) ndr_pull_samr_Connect,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_Connect, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_Close(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Close *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_Close, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CLOSE, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_Close,
 				    (ndr_pull_fn_t) ndr_pull_samr_Close,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_Close, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SetSecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SetSecurity *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SetSecurity, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SETSECURITY, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SetSecurity,
 				    (ndr_pull_fn_t) ndr_pull_samr_SetSecurity,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SetSecurity, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QuerySecurity(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QuerySecurity *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QuerySecurity, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERYSECURITY, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QuerySecurity,
 				    (ndr_pull_fn_t) ndr_pull_samr_QuerySecurity,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QuerySecurity, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_Shutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Shutdown *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_Shutdown, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SHUTDOWN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_Shutdown,
 				    (ndr_pull_fn_t) ndr_pull_samr_Shutdown,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_Shutdown, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_LookupDomain *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_LookupDomain, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_LOOKUPDOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_LookupDomain,
 				    (ndr_pull_fn_t) ndr_pull_samr_LookupDomain,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_LookupDomain, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_EnumDomains(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_EnumDomains *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_EnumDomains, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ENUMDOMAINS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_EnumDomains,
 				    (ndr_pull_fn_t) ndr_pull_samr_EnumDomains,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_EnumDomains, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OpenDomain *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_OpenDomain, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_OPENDOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_OpenDomain,
 				    (ndr_pull_fn_t) ndr_pull_samr_OpenDomain,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_OpenDomain, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QueryDomainInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QueryDomainInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERYDOMAININFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QueryDomainInfo,
 				    (ndr_pull_fn_t) ndr_pull_samr_QueryDomainInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QueryDomainInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_DOMAIN_INFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_DOMAIN_INFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_DOMAIN_INFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_DOMAIN_INFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_DOMAIN_INFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_DOMAIN_INFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_DOMAIN_INFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CREATE_DOM_GROUP(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CREATE_DOM_GROUP *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CREATE_DOM_GROUP, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATE_DOM_GROUP, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CREATE_DOM_GROUP,
 				    (ndr_pull_fn_t) ndr_pull_samr_CREATE_DOM_GROUP,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CREATE_DOM_GROUP, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_EnumDomainGroups(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_EnumDomainGroups *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_EnumDomainGroups, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ENUMDOMAINGROUPS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_EnumDomainGroups,
 				    (ndr_pull_fn_t) ndr_pull_samr_EnumDomainGroups,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_EnumDomainGroups, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CREATE_USER_IN_DOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CREATE_USER_IN_DOMAIN *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CREATE_USER_IN_DOMAIN, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATE_USER_IN_DOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CREATE_USER_IN_DOMAIN,
 				    (ndr_pull_fn_t) ndr_pull_samr_CREATE_USER_IN_DOMAIN,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CREATE_USER_IN_DOMAIN, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_EnumDomainUsers *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_EnumDomainUsers, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ENUMDOMAINUSERS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_EnumDomainUsers,
 				    (ndr_pull_fn_t) ndr_pull_samr_EnumDomainUsers,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_EnumDomainUsers, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CREATE_DOM_ALIAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CREATE_DOM_ALIAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CREATE_DOM_ALIAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATE_DOM_ALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CREATE_DOM_ALIAS,
 				    (ndr_pull_fn_t) ndr_pull_samr_CREATE_DOM_ALIAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CREATE_DOM_ALIAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_EnumDomainAliases(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_EnumDomainAliases *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_EnumDomainAliases, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ENUMDOMAINALIASES, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_EnumDomainAliases,
 				    (ndr_pull_fn_t) ndr_pull_samr_EnumDomainAliases,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_EnumDomainAliases, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_ALIAS_MEMBERSHIP(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_ALIAS_MEMBERSHIP *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_ALIAS_MEMBERSHIP, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_ALIAS_MEMBERSHIP, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_ALIAS_MEMBERSHIP,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_ALIAS_MEMBERSHIP,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_ALIAS_MEMBERSHIP, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_LOOKUP_NAMES(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_LOOKUP_NAMES *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_LOOKUP_NAMES, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_LOOKUP_NAMES, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_LOOKUP_NAMES,
 				    (ndr_pull_fn_t) ndr_pull_samr_LOOKUP_NAMES,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_LOOKUP_NAMES, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_LOOKUP_RIDS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_LOOKUP_RIDS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_LOOKUP_RIDS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_LOOKUP_RIDS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_LOOKUP_RIDS,
 				    (ndr_pull_fn_t) ndr_pull_samr_LOOKUP_RIDS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_LOOKUP_RIDS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OpenGroup *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_OpenGroup, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_OPENGROUP, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_OpenGroup,
 				    (ndr_pull_fn_t) ndr_pull_samr_OpenGroup,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_OpenGroup, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QueryGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QueryGroupInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QueryGroupInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERYGROUPINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QueryGroupInfo,
 				    (ndr_pull_fn_t) ndr_pull_samr_QueryGroupInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QueryGroupInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_GROUPINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_GROUPINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_GROUPINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_GROUPINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_GROUPINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_GROUPINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_GROUPINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_ADD_GROUPMEM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_ADD_GROUPMEM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_ADD_GROUPMEM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ADD_GROUPMEM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_ADD_GROUPMEM,
 				    (ndr_pull_fn_t) ndr_pull_samr_ADD_GROUPMEM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_ADD_GROUPMEM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_DELETE_DOM_GROUP(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DELETE_DOM_GROUP *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_DELETE_DOM_GROUP, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_DELETE_DOM_GROUP, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_DELETE_DOM_GROUP,
 				    (ndr_pull_fn_t) ndr_pull_samr_DELETE_DOM_GROUP,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_DELETE_DOM_GROUP, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_DEL_GROUPMEM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DEL_GROUPMEM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_DEL_GROUPMEM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_DEL_GROUPMEM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_DEL_GROUPMEM,
 				    (ndr_pull_fn_t) ndr_pull_samr_DEL_GROUPMEM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_DEL_GROUPMEM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_GROUPMEM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_GROUPMEM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_GROUPMEM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_GROUPMEM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_GROUPMEM,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_GROUPMEM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_GROUPMEM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_MEMBER_ATTRIBUTES_OF_GROUP(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_MEMBER_ATTRIBUTES_OF_GROUP *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_MEMBER_ATTRIBUTES_OF_GROUP, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_MEMBER_ATTRIBUTES_OF_GROUP, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_MEMBER_ATTRIBUTES_OF_GROUP,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_MEMBER_ATTRIBUTES_OF_GROUP,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_MEMBER_ATTRIBUTES_OF_GROUP, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_OpenAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OpenAlias *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_OpenAlias, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_OPENALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_OpenAlias,
 				    (ndr_pull_fn_t) ndr_pull_samr_OpenAlias,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_OpenAlias, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QueryAliasInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QueryAliasInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERYALIASINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QueryAliasInfo,
 				    (ndr_pull_fn_t) ndr_pull_samr_QueryAliasInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QueryAliasInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_ALIASINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_ALIASINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_ALIASINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_ALIASINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_ALIASINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_ALIASINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_ALIASINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_DELETE_DOM_ALIAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DELETE_DOM_ALIAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_DELETE_DOM_ALIAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_DELETE_DOM_ALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_DELETE_DOM_ALIAS,
 				    (ndr_pull_fn_t) ndr_pull_samr_DELETE_DOM_ALIAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_DELETE_DOM_ALIAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_ADD_ALIASMEM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_ADD_ALIASMEM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_ADD_ALIASMEM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ADD_ALIASMEM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_ADD_ALIASMEM,
 				    (ndr_pull_fn_t) ndr_pull_samr_ADD_ALIASMEM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_ADD_ALIASMEM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_DEL_ALIASMEM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DEL_ALIASMEM *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_DEL_ALIASMEM, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_DEL_ALIASMEM, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_DEL_ALIASMEM,
 				    (ndr_pull_fn_t) ndr_pull_samr_DEL_ALIASMEM,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_DEL_ALIASMEM, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_MEMBERS_IN_ALIAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_MEMBERS_IN_ALIAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_MEMBERS_IN_ALIAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_MEMBERS_IN_ALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_MEMBERS_IN_ALIAS,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_MEMBERS_IN_ALIAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_MEMBERS_IN_ALIAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OpenUser *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_OpenUser, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_OPENUSER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_OpenUser,
 				    (ndr_pull_fn_t) ndr_pull_samr_OpenUser,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_OpenUser, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_DELETE_DOM_USER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DELETE_DOM_USER *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_DELETE_DOM_USER, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_DELETE_DOM_USER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_DELETE_DOM_USER,
 				    (ndr_pull_fn_t) ndr_pull_samr_DELETE_DOM_USER,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_DELETE_DOM_USER, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QueryUserInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QueryUserInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERYUSERINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QueryUserInfo,
 				    (ndr_pull_fn_t) ndr_pull_samr_QueryUserInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QueryUserInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_USERINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_USERINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_USERINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_USERINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_USERINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_USERINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_USERINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CHANGE_PASSWORD_USER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CHANGE_PASSWORD_USER *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CHANGE_PASSWORD_USER, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CHANGE_PASSWORD_USER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CHANGE_PASSWORD_USER,
 				    (ndr_pull_fn_t) ndr_pull_samr_CHANGE_PASSWORD_USER,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CHANGE_PASSWORD_USER, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_GROUPS_FOR_USER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_GROUPS_FOR_USER *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_GROUPS_FOR_USER, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_GROUPS_FOR_USER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_GROUPS_FOR_USER,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_GROUPS_FOR_USER,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_GROUPS_FOR_USER, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_DISPINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_DISPINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_DISPINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_DISPINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_DISPINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_DISPINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_DISPINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_DISPLAY_ENUMERATION_INDEX(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_DISPLAY_ENUMERATION_INDEX *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_DISPLAY_ENUMERATION_INDEX, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_DISPLAY_ENUMERATION_INDEX, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_DISPLAY_ENUMERATION_INDEX,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_DISPLAY_ENUMERATION_INDEX,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_DISPLAY_ENUMERATION_INDEX, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_TEST_PRIVATE_FUNCTIONS_DOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_TEST_PRIVATE_FUNCTIONS_DOMAIN *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_TEST_PRIVATE_FUNCTIONS_DOMAIN, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_TEST_PRIVATE_FUNCTIONS_DOMAIN,
 				    (ndr_pull_fn_t) ndr_pull_samr_TEST_PRIVATE_FUNCTIONS_DOMAIN,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_TEST_PRIVATE_FUNCTIONS_DOMAIN, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_TEST_PRIVATE_FUNCTIONS_USER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_TEST_PRIVATE_FUNCTIONS_USER *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_TEST_PRIVATE_FUNCTIONS_USER, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_TEST_PRIVATE_FUNCTIONS_USER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_TEST_PRIVATE_FUNCTIONS_USER,
 				    (ndr_pull_fn_t) ndr_pull_samr_TEST_PRIVATE_FUNCTIONS_USER,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_TEST_PRIVATE_FUNCTIONS_USER, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_USRDOM_PWINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_USRDOM_PWINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_USRDOM_PWINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_USRDOM_PWINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_USRDOM_PWINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_USRDOM_PWINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_USRDOM_PWINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN,
 				    (ndr_pull_fn_t) ndr_pull_samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_INFORMATION_DOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_INFORMATION_DOMAIN2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_INFORMATION_DOMAIN2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_INFORMATION_DOMAIN2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_INFORMATION_DOMAIN2,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_INFORMATION_DOMAIN2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_INFORMATION_DOMAIN2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_INFORMATION_USER2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_INFORMATION_USER2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_INFORMATION_USER2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_INFORMATION_USER2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_INFORMATION_USER2,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_INFORMATION_USER2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_INFORMATION_USER2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_DISPINFO2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_DISPINFO2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_DISPINFO2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_DISPINFO2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_DISPINFO2,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_DISPINFO2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_DISPINFO2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_DISPLAY_ENUMERATION_INDEX2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_DISPLAY_ENUMERATION_INDEX2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_DISPLAY_ENUMERATION_INDEX2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_DISPLAY_ENUMERATION_INDEX2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_DISPLAY_ENUMERATION_INDEX2,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_DISPLAY_ENUMERATION_INDEX2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_DISPLAY_ENUMERATION_INDEX2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CREATE_USER2_IN_DOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CREATE_USER2_IN_DOMAIN *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CREATE_USER2_IN_DOMAIN, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATE_USER2_IN_DOMAIN, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CREATE_USER2_IN_DOMAIN,
 				    (ndr_pull_fn_t) ndr_pull_samr_CREATE_USER2_IN_DOMAIN,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CREATE_USER2_IN_DOMAIN, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_QUERY_DISPINFO3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_QUERY_DISPINFO3 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_QUERY_DISPINFO3, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_QUERY_DISPINFO3, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_QUERY_DISPINFO3,
 				    (ndr_pull_fn_t) ndr_pull_samr_QUERY_DISPINFO3,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_QUERY_DISPINFO3, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_ADD_MULTIPLE_MEMBERS_TO_ALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS,
 				    (ndr_pull_fn_t) ndr_pull_samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_ADD_MULTIPLE_MEMBERS_TO_ALIAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS,
 				    (ndr_pull_fn_t) ndr_pull_samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_OEM_CHANGE_PASSWORD_USER2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OEM_CHANGE_PASSWORD_USER2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_OEM_CHANGE_PASSWORD_USER2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_OEM_CHANGE_PASSWORD_USER2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_OEM_CHANGE_PASSWORD_USER2,
 				    (ndr_pull_fn_t) ndr_pull_samr_OEM_CHANGE_PASSWORD_USER2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_OEM_CHANGE_PASSWORD_USER2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_UNICODE_CHANGE_PASSWORD_USER2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_UNICODE_CHANGE_PASSWORD_USER2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_UNICODE_CHANGE_PASSWORD_USER2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_UNICODE_CHANGE_PASSWORD_USER2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_UNICODE_CHANGE_PASSWORD_USER2,
 				    (ndr_pull_fn_t) ndr_pull_samr_UNICODE_CHANGE_PASSWORD_USER2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_UNICODE_CHANGE_PASSWORD_USER2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_DOM_PWINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_DOM_PWINFO *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_DOM_PWINFO, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_DOM_PWINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_DOM_PWINFO,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_DOM_PWINFO,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_DOM_PWINFO, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CONNECT2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CONNECT2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CONNECT2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CONNECT2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CONNECT2,
 				    (ndr_pull_fn_t) ndr_pull_samr_CONNECT2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CONNECT2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_USERINFO2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_USERINFO2 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_USERINFO2, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_USERINFO2, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_USERINFO2,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_USERINFO2,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_USERINFO2, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_BOOT_KEY_INFORMATION(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_BOOT_KEY_INFORMATION *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_BOOT_KEY_INFORMATION, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_BOOT_KEY_INFORMATION, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_BOOT_KEY_INFORMATION,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_BOOT_KEY_INFORMATION,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_BOOT_KEY_INFORMATION, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_GET_BOOT_KEY_INFORMATION(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_BOOT_KEY_INFORMATION *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_GET_BOOT_KEY_INFORMATION, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_BOOT_KEY_INFORMATION, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_GET_BOOT_KEY_INFORMATION,
 				    (ndr_pull_fn_t) ndr_pull_samr_GET_BOOT_KEY_INFORMATION,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_GET_BOOT_KEY_INFORMATION, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CONNECT3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CONNECT3 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CONNECT3, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CONNECT3, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CONNECT3,
 				    (ndr_pull_fn_t) ndr_pull_samr_CONNECT3,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CONNECT3, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_Connect4(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_Connect4 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_Connect4, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CONNECT4, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_Connect4,
 				    (ndr_pull_fn_t) ndr_pull_samr_Connect4,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_Connect4, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_UNICODE_CHANGE_PASSWORD_USER3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_UNICODE_CHANGE_PASSWORD_USER3 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_UNICODE_CHANGE_PASSWORD_USER3, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_UNICODE_CHANGE_PASSWORD_USER3, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_UNICODE_CHANGE_PASSWORD_USER3,
 				    (ndr_pull_fn_t) ndr_pull_samr_UNICODE_CHANGE_PASSWORD_USER3,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_UNICODE_CHANGE_PASSWORD_USER3, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_CONNECT5(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CONNECT5 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_CONNECT5, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_CONNECT5, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_CONNECT5,
 				    (ndr_pull_fn_t) ndr_pull_samr_CONNECT5,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_CONNECT5, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_RID_TO_SID(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_RID_TO_SID *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_RID_TO_SID, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_RID_TO_SID, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_RID_TO_SID,
 				    (ndr_pull_fn_t) ndr_pull_samr_RID_TO_SID,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_RID_TO_SID, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_SET_DSRM_PASSWORD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_SET_DSRM_PASSWORD *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_SET_DSRM_PASSWORD, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_SET_DSRM_PASSWORD, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_SET_DSRM_PASSWORD,
 				    (ndr_pull_fn_t) ndr_pull_samr_SET_DSRM_PASSWORD,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_SET_DSRM_PASSWORD, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_samr_VALIDATE_PASSWORD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_VALIDATE_PASSWORD *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(samr_VALIDATE_PASSWORD, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SAMR_VALIDATE_PASSWORD, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_samr_VALIDATE_PASSWORD,
 				    (ndr_pull_fn_t) ndr_pull_samr_VALIDATE_PASSWORD,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(samr_VALIDATE_PASSWORD, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
diff --git a/source4/librpc/rpc/rpc_spoolss.c b/source4/librpc/rpc/rpc_spoolss.c
index 026798df70..19dd3be336 100644
--- a/source4/librpc/rpc/rpc_spoolss.c
+++ b/source4/librpc/rpc/rpc_spoolss.c
@@ -1,1318 +1,2015 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
 
 NTSTATUS dcerpc_spoolss_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_EnumPrinters *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENUMPRINTERS, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_spoolss_EnumPrinters,
-				  (ndr_pull_fn_t) ndr_pull_spoolss_EnumPrinters,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_EnumPrinters, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENUMPRINTERS, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_spoolss_EnumPrinters,
+				    (ndr_pull_fn_t) ndr_pull_spoolss_EnumPrinters,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_EnumPrinters, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_OpenPrinter *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_SPOOLSS_OPENPRINTER, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_spoolss_OpenPrinter,
-				  (ndr_pull_fn_t) ndr_pull_spoolss_OpenPrinter,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_OpenPrinter, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_OPENPRINTER, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_spoolss_OpenPrinter,
+				    (ndr_pull_fn_t) ndr_pull_spoolss_OpenPrinter,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_OpenPrinter, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_02(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_02 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_02, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_02, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_02,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_02,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_02, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_03(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_03 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_03, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_03, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_03,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_03,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_03, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_EnumJobs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_EnumJobs *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_EnumJobs, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENUMJOBS, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_EnumJobs,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_EnumJobs,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_EnumJobs, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_05(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_05 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_05, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_05, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_05,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_05,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_05, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_06(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_06 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_06, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_06, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_06,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_06,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_06, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_07(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_07 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_07, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_07, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_07,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_07,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_07, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_GetPrinter *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_SPOOLSS_GETPRINTER, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_spoolss_GetPrinter,
-				  (ndr_pull_fn_t) ndr_pull_spoolss_GetPrinter,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_GetPrinter, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_GETPRINTER, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_spoolss_GetPrinter,
+				    (ndr_pull_fn_t) ndr_pull_spoolss_GetPrinter,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_GetPrinter, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_09(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_09 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_09, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_09, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_09,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_09,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_09, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0d(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0d *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0d, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0D, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0d,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0d,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0d, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_0f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_0f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_0f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_0F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_0f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_0f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_0f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_10(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_10 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_10, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_10, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_10,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_10,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_10, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_11(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_11 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_11, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_11, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_11,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_11,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_11, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_StartPagePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_StartPagePrinter *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_StartPagePrinter, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_STARTPAGEPRINTER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_StartPagePrinter,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_StartPagePrinter,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_StartPagePrinter, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_13(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_13 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_13, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_13, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_13,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_13,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_13, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_EndPagePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_EndPagePrinter *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_EndPagePrinter, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENDPAGEPRINTER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_EndPagePrinter,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_EndPagePrinter,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_EndPagePrinter, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_15(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_15 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_15, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_15, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_15,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_15,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_15, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_16(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_16 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_16, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_16, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_16,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_16,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_16, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_EndDocPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_EndDocPrinter *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_EndDocPrinter, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENDDOCPRINTER, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_EndDocPrinter,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_EndDocPrinter,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_EndDocPrinter, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_18(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_18 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_18, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_18, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_18,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_18,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_18, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_19(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_19 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_19, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_19, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_19,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_19,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_19, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_1a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_1a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_1a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_1A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_1a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_1a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_1a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_1b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_1b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_1b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_1B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_1b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_1b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_1b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_1c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_1c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_1c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_1C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_1c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_1c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_1c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_ClosePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_ClosePrinter *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_SPOOLSS_CLOSEPRINTER, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_spoolss_ClosePrinter,
-				  (ndr_pull_fn_t) ndr_pull_spoolss_ClosePrinter,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_ClosePrinter, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_CLOSEPRINTER, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_spoolss_ClosePrinter,
+				    (ndr_pull_fn_t) ndr_pull_spoolss_ClosePrinter,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_ClosePrinter, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_1e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_1e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_1e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_1E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_1e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_1e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_1e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_1f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_1f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_1f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_1F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_1f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_1f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_1f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_20(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_20 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_20, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_20, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_20,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_20,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_20, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_21(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_21 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_21, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_21, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_21,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_21,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_21, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_22(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_22 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_22, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_22, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_22,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_22,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_22, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_23 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_23, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_23, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_23,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_23,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_23, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_24(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_24 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_24, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_24, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_24,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_24,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_24, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_25 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_25, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_25, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_25,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_25,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_25, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_26(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_26 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_26, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_26, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_26,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_26,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_26, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_27(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_27 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_27, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_27, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_27,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_27,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_27, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_28(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_28 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_28, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_28, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_28,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_28,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_28, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_29(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_29 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_29, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_29, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_29,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_29,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_29, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2d(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2d *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2d, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2D, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2d,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2d,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2d, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_2f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_2f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_2f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_2F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_2f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_2f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_2f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_30(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_30 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_30, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_30, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_30,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_30,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_30, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_31(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_31 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_31, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_31, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_31,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_31,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_31, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_32(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_32 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_32, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_32, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_32,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_32,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_32, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_33(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_33 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_33, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_33, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_33,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_33,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_33, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_34(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_34 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_34, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_34, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_34,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_34,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_34, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_35(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_35 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_35, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_35, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_35,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_35,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_35, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_36(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_36 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_36, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_36, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_36,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_36,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_36, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_37(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_37 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_37, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_37, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_37,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_37,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_37, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_38(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_38 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_38, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_38, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_38,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_38,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_38, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_39(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_39 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_39, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_39, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_39,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_39,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_39, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3d(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3d *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3d, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3D, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3d,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3d,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3d, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_3f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_3f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_3f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_3F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_3f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_3f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_3f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_40(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_40 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_40, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_40, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_40,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_40,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_40, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_41(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_41 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_41, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_41, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_41,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_41,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_41, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_42(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_42 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_42, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_42, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_42,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_42,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_42, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_43(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_43 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_43, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_43, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_43,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_43,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_43, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_44(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_44 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_44, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_44, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_44,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_44,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_44, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_OpenPrinterEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_OpenPrinterEx *r)
 {
-	return dcerpc_ndr_request(p, DCERPC_SPOOLSS_OPENPRINTEREX, mem_ctx,
-				  (ndr_push_fn_t) ndr_push_spoolss_OpenPrinterEx,
-				  (ndr_pull_fn_t) ndr_pull_spoolss_OpenPrinterEx,
-				  r);
+	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_OpenPrinterEx, r);		
+	}
+
+	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_OPENPRINTEREX, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_spoolss_OpenPrinterEx,
+				    (ndr_pull_fn_t) ndr_pull_spoolss_OpenPrinterEx,
+				    r);
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_OpenPrinterEx, r);		
+	}
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_46(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_46 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_46, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_46, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_46,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_46,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_46, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_47(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_47 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_47, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_47, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_47,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_47,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_47, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_EnumPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_EnumPrinterData *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_EnumPrinterData, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_ENUMPRINTERDATA, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_EnumPrinterData,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_EnumPrinterData,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_EnumPrinterData, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_49(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_49 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_49, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_49, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_49,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_49,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_49, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4d(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4d *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4d, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4D, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4d,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4d,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4d, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_4f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_4f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_4f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_4F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_4f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_4f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_4f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_50(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_50 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_50, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_50, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_50,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_50,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_50, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_51(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_51 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_51, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_51, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_51,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_51,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_51, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_52(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_52 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_52, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_52, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_52,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_52,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_52, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_53(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_53 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_53, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_53, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_53,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_53,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_53, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_54(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_54 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_54, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_54, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_54,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_54,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_54, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_55(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_55 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_55, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_55, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_55,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_55,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_55, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_56(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_56 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_56, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_56, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_56,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_56,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_56, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_57(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_57 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_57, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_57, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_57,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_57,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_57, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_58(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_58 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_58, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_58, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_58,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_58,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_58, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_59(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_59 *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_59, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_59, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_59,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_59,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_59, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5a(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5a *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5a, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5A, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5a,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5a,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5a, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5b(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5b *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5b, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5B, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5b,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5b,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5b, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5c(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5c *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5c, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5C, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5c,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5c,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5c, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5d(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5d *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5d, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5D, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5d,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5d,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5d, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5e(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5e *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5e, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5E, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5e,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5e,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5e, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
 
 NTSTATUS dcerpc_spoolss_5f(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_5f *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(spoolss_5f, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_5F, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_spoolss_5f,
 				    (ndr_pull_fn_t) ndr_pull_spoolss_5f,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(spoolss_5f, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
diff --git a/source4/librpc/rpc/rpc_wkssvc.c b/source4/librpc/rpc/rpc_wkssvc.c
index 0549a35128..1a4b154842 100644
--- a/source4/librpc/rpc/rpc_wkssvc.c
+++ b/source4/librpc/rpc/rpc_wkssvc.c
@@ -1,4 +1,4 @@
-/* dcerpc client calls auto-generated by pidl */
+/* dcerpc client calls generated by pidl */
 
 #include "includes.h"
 
@@ -6,13 +6,20 @@
 NTSTATUS dcerpc_wks_QueryInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wks_QueryInfo *r)
 {
 	NTSTATUS status;
+
+        if (p->flags & DCERPC_DEBUG_PRINT_IN) {
+		NDR_PRINT_IN_DEBUG(wks_QueryInfo, r);		
+	}
+
 	status = dcerpc_ndr_request(p, DCERPC_WKS_QUERYINFO, mem_ctx,
 				    (ndr_push_fn_t) ndr_push_wks_QueryInfo,
 				    (ndr_pull_fn_t) ndr_pull_wks_QueryInfo,
 				    r);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+
+        if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
+		NDR_PRINT_OUT_DEBUG(wks_QueryInfo, r);		
 	}
-	
-	return r->out.result;
+	if (NT_STATUS_IS_OK(status)) status = r->out.result;
+
+	return status;
 }
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 889abbdc78..7d851675e0 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -36,8 +36,6 @@ static BOOL test_Exist(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(dfs_Exist, &r);
-
 	return True;
 }
 
@@ -60,8 +58,6 @@ static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(dfs_GetInfo, &r);
-
 	return True;
 }
 
@@ -106,8 +102,6 @@ static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(dfs_Enum, &r);
-
 	if (level == 1 && r.out.total) {
 		int i;
 		for (i=0;i<*r.out.total;i++) {
@@ -182,6 +176,8 @@ BOOL torture_rpc_dfs(int dummy)
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
+
+	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
 	
 	if (!test_Exist(p, mem_ctx)) {
 		ret = False;
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 3ae0c76a74..3e674a21b8 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -198,11 +198,6 @@ BOOL torture_rpc_echo(int dummy)
 		return False;
 	}
 
-	if (!test_testcall(p, mem_ctx)) {
-		ret = False;
-	}
-	return ret;
-
 	if (!test_addone(p, mem_ctx)) {
 		ret = False;
 	}
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index bcefde24d9..e810ffa585 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -134,8 +134,6 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_LookupNames, &r);
-
 	printf("\n");
 
 	return True;
@@ -171,8 +169,6 @@ static BOOL test_LookupSids(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_LookupSids, &r);
-
 	printf("\n");
 
 	if (!test_LookupNames(p, mem_ctx, handle, &names)) {
@@ -199,8 +195,6 @@ static BOOL test_LookupPrivName(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_LookupPrivName, &r);
-
 	return True;
 }
 
@@ -222,8 +216,6 @@ static BOOL test_EnumPrivsAccount(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumPrivsAccount, &r);
-
 	if (r.out.privs) {
 		int i;
 		for (i=0;i<r.out.privs->count;i++) {
@@ -256,8 +248,6 @@ static BOOL test_EnumAccountRights(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumAccountRights, &r);
-
 	return True;
 }
 
@@ -281,8 +271,6 @@ static BOOL test_QuerySecObj(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_QuerySecObj, &r);
-
 	return True;
 }
 
@@ -344,8 +332,6 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumAccounts, &r);
-
 	if (!test_LookupSids(p, mem_ctx, handle, &sids1)) {
 		return False;
 	}
@@ -372,8 +358,6 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumAccounts, &r);
-
 	if (sids2.num_sids != 1) {
 		printf("Returned wrong number of entries (%d)\n", sids2.num_sids);
 		return False;
@@ -407,8 +391,6 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumPrivs, &r);
-
 	return True;
 }
 
@@ -436,8 +418,6 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(lsa_EnumTrustDom, &r);
-
 	return True;
 }
 
@@ -464,8 +444,6 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
 			ret = False;
 			continue;
 		}
-
-		NDR_PRINT_BOTH_DEBUG(lsa_QueryInfoPolicy, &r);
 	}
 
 	return ret;
@@ -538,6 +516,8 @@ BOOL torture_rpc_lsa(int dummy)
 		return False;
 	}
 	
+	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
+
 	if (!test_OpenPolicy(p, mem_ctx)) {
 		ret = False;
 	}
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 60c55f01be..fb00cc56df 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -30,16 +30,12 @@ static BOOL test_Close(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.handle = handle;
 	r.out.handle = handle;
 
-	NDR_PRINT_IN_DEBUG(samr_Close, &r);
-
 	status = dcerpc_samr_Close(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Close handle failed - %s\n", nt_errstr(status));
 		return False;
 	}
 
-	NDR_PRINT_OUT_DEBUG(samr_Close, &r);
-
 	return True;
 }
 
@@ -66,8 +62,6 @@ static BOOL test_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			       levels[i], nt_errstr(status));
 			ret = False;
 		}
-
-		NDR_PRINT_BOTH_DEBUG(samr_QueryAliasInfo, &r);
 	}
 
 	return ret;
@@ -94,8 +88,6 @@ static BOOL test_QueryGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			       levels[i], nt_errstr(status));
 			ret = False;
 		}
-
-		NDR_PRINT_BOTH_DEBUG(samr_QueryGroupInfo, &r);
 	}
 
 	return ret;
@@ -123,8 +115,6 @@ static BOOL test_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			       levels[i], nt_errstr(status));
 			ret = False;
 		}
-
-		NDR_PRINT_BOTH_DEBUG(samr_QueryUserInfo, &r);
 	}
 
 	return ret;
@@ -249,8 +239,6 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 	
-	NDR_PRINT_BOTH_DEBUG(samr_EnumDomainUsers, &r);
-
 	if (!r.out.sam) {
 		return False;
 	}
@@ -286,8 +274,6 @@ static BOOL test_EnumDomainGroups(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 	
-	NDR_PRINT_BOTH_DEBUG(samr_EnumDomainGroups, &r);
-
 	if (!r.out.sam) {
 		return False;
 	}
@@ -323,8 +309,6 @@ static BOOL test_EnumDomainAliases(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 	
-	NDR_PRINT_BOTH_DEBUG(samr_EnumDomainAliases, &r);
-
 	if (!r.out.sam) {
 		return False;
 	}
@@ -360,8 +344,6 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			ret = False;
 			continue;
 		}
-
-		NDR_PRINT_BOTH_DEBUG(samr_QueryDomainInfo, &r);
 	}
 
 	return True;	
@@ -428,8 +410,6 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(samr_LookupDomain, &r);
-
 	if (!test_OpenDomain(p, mem_ctx, handle, r.out.sid)) {
 		return False;
 	}
@@ -460,8 +440,6 @@ static BOOL test_EnumDomains(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 
-	NDR_PRINT_BOTH_DEBUG(samr_EnumDomains, &r);
-
 	if (!r.out.sam) {
 		return False;
 	}
@@ -524,6 +502,8 @@ BOOL torture_rpc_samr(int dummy)
 		return False;
 	}
 	
+	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
+
 	if (!test_Connect(p, mem_ctx, &handle)) {
 		ret = False;
 	}
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index df001e7721..feaeae7b79 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -61,8 +61,6 @@ BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			ret = False;
 			continue;
 		}
-
-		NDR_PRINT_FUNCTION_DEBUG(spoolss_GetPrinter, NDR_BOTH, &r);
 	}
 
 	return ret;
@@ -267,6 +265,8 @@ BOOL torture_rpc_spoolss(int dummy)
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
+
+	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
 	
 	if (!test_EnumPrinters(p, mem_ctx)) {
 		ret = False;
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 436062fafe..73b3f5c527 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -27,20 +27,21 @@ static BOOL test_QueryInfo(struct dcerpc_pipe *p,
 {
 	NTSTATUS status;
 	struct wks_QueryInfo r;
-
-	printf("testing QueryInfo\n");
+	uint16 levels[] = {100, 101, 102};
+	int i;
 
 	r.in.server_name = dcerpc_server_name(p);
-	r.in.level = 100;
 
-	status = dcerpc_wks_QueryInfo(p, mem_ctx, &r);
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("QueryInfo failed - %s\n", nt_errstr(status));
-		return False;
+	for (i=0;i<ARRAY_SIZE(levels);i++) {
+		r.in.level = levels[i];
+		printf("testing QueryInfo level %u\n", r.in.level);
+		status = dcerpc_wks_QueryInfo(p, mem_ctx, &r);
+		if (!NT_STATUS_IS_OK(status)) {
+			printf("QueryInfo level %u failed - %s\n", r.in.level, nt_errstr(status));
+			return False;
+		}
 	}
 
-	NDR_PRINT_BOTH_DEBUG(wks_QueryInfo, &r);
-
 	return True;
 }
 
@@ -57,6 +58,8 @@ BOOL torture_rpc_wkssvc(int dummy)
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
 	}
+
+	p->flags |= DCERPC_DEBUG_PRINT_BOTH;
 	
 	if (!test_QueryInfo(p, mem_ctx)) {
 		ret = False;