Revert "s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table"

This reverts commit 5fc9d93408effe75abcd231c45cbc14656692ebe.

12 files changed, 54 insertions, 61 deletions

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 813827d4dd..9baba7b824 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -179,11 +179,10 @@ static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
 
 WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
 			   const char *server_name,
-			   const char *interface, uint32_t interface_version,
+			   const struct ndr_syntax_id *interface,
 			   struct rpc_pipe_client **presult)
 {
 	struct rpc_pipe_client *result = NULL;
-	struct ndr_syntax_id syntax;
 	NTSTATUS status;
 	WERROR werr;
 	struct cli_state *cli = NULL;
@@ -192,19 +191,15 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
 		return WERR_INVALID_PARAM;
 	}
 
-	if (!ndr_syntax_from_string(interface, interface_version, &syntax)) {
-		return WERR_INVALID_PARAM;
-	}
-
 	werr = libnetapi_open_ipc_connection(ctx, server_name, &cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		return werr;
 	}
 
-	status = pipe_cm_open(ctx, cli, &syntax, &result);
+	status = pipe_cm_open(ctx, cli, interface, &result);
 	if (!NT_STATUS_IS_OK(status)) {
 		libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",
-			get_pipe_name_from_syntax(talloc_tos(), &syntax),
+			get_pipe_name_from_syntax(talloc_tos(), interface),
 			get_friendly_nt_error_msg(status));
 		return WERR_DEST_NOT_FOUND;
 	}
diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 7ec9f7939d..0d1bc08ad3 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -35,7 +35,7 @@ WERROR NetFileClose_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -129,7 +129,7 @@ WERROR NetFileGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -195,7 +195,7 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 848ccb8b62..d3f58f6684 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -45,7 +45,7 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
+				   &ndr_table_netlogon.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -85,7 +85,7 @@ WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
+				   &ndr_table_netlogon.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -140,7 +140,7 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
+				   &ndr_table_netlogon.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 0edf07bc45..77ed2e8485 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -71,7 +71,7 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -242,7 +242,7 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -407,7 +407,7 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -642,7 +642,7 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -758,7 +758,7 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -879,7 +879,7 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1157,7 +1157,7 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1288,7 +1288,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
 
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1440,7 +1440,7 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index c31b15d7fc..9970a0655a 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -106,7 +106,7 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 	unsigned int old_timeout = 0;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server,
-				   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
+				   &ndr_table_wkssvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -232,7 +232,7 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 	unsigned int old_timeout = 0;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
+				   &ndr_table_wkssvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -278,7 +278,7 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
 	const char *buffer = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
+				   &ndr_table_wkssvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -408,7 +408,7 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
+				   &ndr_table_wkssvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -450,7 +450,7 @@ WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
+				   &ndr_table_wkssvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index 4a9d5cdeec..d389c1f4a2 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -150,7 +150,7 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(alias_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -270,7 +270,7 @@ WERROR NetLocalGroupDel_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(alias_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -442,7 +442,7 @@ WERROR NetLocalGroupGetInfo_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(alias_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -613,7 +613,7 @@ WERROR NetLocalGroupSetInfo_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(alias_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -755,7 +755,7 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(alias_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1042,7 +1042,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 
 	if (r->in.level == 3) {
 		werr = libnetapi_open_pipe(ctx, r->in.server_name,
-					   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
+					   &ndr_table_lsarpc.syntax_id,
 					   &lsa_pipe);
 		if (!W_ERROR_IS_OK(werr)) {
 			goto done;
@@ -1061,7 +1061,7 @@ static WERROR NetLocalGroupModifyMembers_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index 1dcf7bf934..effe2eb9a0 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -53,7 +53,7 @@ NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx, char **debugl
 WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx);
 WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
 			   const char *server_name,
-			   const char *interface, uint32_t interface_version,
+			   const struct ndr_syntax_id *interface,
 			   struct rpc_pipe_client **presult);
 WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
 				  struct rpc_pipe_client *pipe_cli,
diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index 4f421eafb3..082938cadc 100644
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -129,7 +129,7 @@ WERROR I_NetLogonControl_r(struct libnetapi_ctx *ctx,
 	union netr_CONTROL_QUERY_INFORMATION query;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
+				   &ndr_table_netlogon.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -183,7 +183,7 @@ WERROR I_NetLogonControl2_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
+				   &ndr_table_netlogon.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 9109f446bb..cc2ff52ab5 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -501,7 +501,7 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -598,7 +598,7 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 	union srvsvc_NetSrvInfo info;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -640,7 +640,7 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 	struct srvsvc_NetRemoteTODInfo *info = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index 342406efc8..84c275248d 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -199,7 +199,7 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -252,7 +252,7 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -315,7 +315,7 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(info_ctr);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -416,7 +416,7 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -486,7 +486,7 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
+				   &ndr_table_srvsvc.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/shutdown.c b/source3/lib/netapi/shutdown.c
index aee253a3a4..f9eb93b125 100644
--- a/source3/lib/netapi/shutdown.c
+++ b/source3/lib/netapi/shutdown.c
@@ -36,8 +36,7 @@ WERROR NetShutdownInit_r(struct libnetapi_ctx *ctx,
 	struct lsa_StringLarge message;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_INITSHUTDOWN_UUID,
-				   NDR_INITSHUTDOWN_VERSION,
+				   &ndr_table_initshutdown.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -81,8 +80,7 @@ WERROR NetShutdownAbort_r(struct libnetapi_ctx *ctx,
 	struct rpc_pipe_client *pipe_cli = NULL;
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_INITSHUTDOWN_UUID,
-				   NDR_INITSHUTDOWN_VERSION,
+				   &ndr_table_initshutdown.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 2b2c0b132b..f95750fae7 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -381,7 +381,7 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -508,7 +508,7 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 	ZERO_STRUCT(user_handle);
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 
 	if (!W_ERROR_IS_OK(werr)) {
@@ -1215,7 +1215,7 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1514,7 +1514,7 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1640,7 +1640,7 @@ WERROR NetUserGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -1794,7 +1794,7 @@ WERROR NetUserSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2214,7 +2214,7 @@ WERROR NetUserModalsGet_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2692,7 +2692,7 @@ WERROR NetUserModalsSet_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2825,7 +2825,7 @@ WERROR NetUserGetGroups_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -2976,7 +2976,7 @@ WERROR NetUserSetGroups_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -3258,7 +3258,7 @@ WERROR NetUserGetLocalGroups_r(struct libnetapi_ctx *ctx,
 	}
 
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
-				   NDR_SAMR_UUID, NDR_SAMR_VERSION,
+				   &ndr_table_samr.syntax_id,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;