s3: Remove procid_self() from do_lock()

[samba.git] / source3 / rpcclient / cmd_ntsvcs.c

diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index 88018258df2abb6d666583e2ff9e557bd3b2e0e1..95b905ab2ddf3330a8d5df0d0f38246a4b3e3703 100644 (file)
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_ntsvcs.h"
 
 static WERROR cmd_ntsvcs_get_version(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,
@@ -275,33 +276,12 @@ static WERROR cmd_ntsvcs_get_dev_list(struct rpc_pipe_client *cli,
 struct cmd_set ntsvcs_commands[] = {
 
        { "NTSVCS" },
-       { "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_get_version,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS version", "" },
-       { "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_validate_dev_inst,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS device instance", "" },
-       { "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_hw_prof_flags,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS HW prof flags", "" },
-       { "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_get_hw_prof_info,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS HW prof info", "" },
-       { "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_get_dev_reg_prop,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS device registry property", "" },
-       { "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_get_dev_list_size,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS device list size", "" },
-       { "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL,
-         cmd_ntsvcs_get_dev_list,
-         NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION, NULL,
-         "Query NTSVCS device list", "" },
+       { "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_version, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS version", "" },
+       { "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_validate_dev_inst, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device instance", "" },
+       { "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_hw_prof_flags, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof flags", "" },
+       { "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_hw_prof_info, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS HW prof info", "" },
+       { "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_reg_prop, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device registry property", "" },
+       { "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list_size, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list size", "" },
+       { "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list, &ndr_table_ntsvcs.syntax_id, NULL, "Query NTSVCS device list", "" },
        { NULL }
 };