* use the new auto-generated debug code method.

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

1 files changed, 518 insertions, 189 deletions

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;
 }