* use the new auto-generated debug code method.

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

7 files changed, 468 insertions, 22 deletions

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 {