s3:rpcclient: make use of dcerpc_binding_[g|s]et_*() in rpcclient.c

[vlendec/samba-autobuild/.git] / source3 / rpcclient / cmd_ntsvcs.c

diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index eb620d06b269f30a2bc5a9fceeb5ebf7037aaa18..faccbc8cf1b11c028a474531a2b230fa20a42b8e 100644 (file)
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -20,17 +20,19 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs_c.h"
 
 static WERROR cmd_ntsvcs_get_version(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,
                                     int argc,
                                     const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        uint16_t version;
 
-       status = rpccli_PNP_GetVersion(cli, mem_ctx,
+       status = dcerpc_PNP_GetVersion(b, mem_ctx,
                                       &version, &werr);
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
@@ -48,6 +50,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct rpc_pipe_client *cli,
                                           int argc,
                                           const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        const char *devicepath = NULL;
@@ -64,7 +67,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct rpc_pipe_client *cli,
                flags = atoi(argv[2]);
        }
 
-       status = rpccli_PNP_ValidateDeviceInstance(cli, mem_ctx,
+       status = dcerpc_PNP_ValidateDeviceInstance(b, mem_ctx,
                                                   devicepath,
                                                   flags,
                                                   &werr);
@@ -80,6 +83,7 @@ static WERROR cmd_ntsvcs_hw_prof_flags(struct rpc_pipe_client *cli,
                                       int argc,
                                       const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        const char *devicepath = NULL;
@@ -95,7 +99,7 @@ static WERROR cmd_ntsvcs_hw_prof_flags(struct rpc_pipe_client *cli,
 
        devicepath = argv[1];
 
-       status = rpccli_PNP_HwProfFlags(cli, mem_ctx,
+       status = dcerpc_PNP_HwProfFlags(b, mem_ctx,
                                        0,
                                        devicepath,
                                        0,
@@ -118,6 +122,7 @@ static WERROR cmd_ntsvcs_get_hw_prof_info(struct rpc_pipe_client *cli,
                                          int argc,
                                          const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        uint32_t idx = 0;
@@ -126,7 +131,7 @@ static WERROR cmd_ntsvcs_get_hw_prof_info(struct rpc_pipe_client *cli,
 
        ZERO_STRUCT(info);
 
-       status = rpccli_PNP_GetHwProfInfo(cli, mem_ctx,
+       status = dcerpc_PNP_GetHwProfInfo(b, mem_ctx,
                                          idx,
                                          &info,
                                          size,
@@ -144,6 +149,7 @@ static WERROR cmd_ntsvcs_get_dev_reg_prop(struct rpc_pipe_client *cli,
                                          int argc,
                                          const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        const char *devicepath = NULL;
@@ -169,7 +175,7 @@ static WERROR cmd_ntsvcs_get_dev_reg_prop(struct rpc_pipe_client *cli,
        buffer = talloc_array(mem_ctx, uint8_t, buffer_size);
        W_ERROR_HAVE_NO_MEMORY(buffer);
 
-       status = rpccli_PNP_GetDeviceRegProp(cli, mem_ctx,
+       status = dcerpc_PNP_GetDeviceRegProp(b, mem_ctx,
                                             devicepath,
                                             property,
                                             &reg_data_type,
@@ -190,6 +196,7 @@ static WERROR cmd_ntsvcs_get_dev_list_size(struct rpc_pipe_client *cli,
                                           int argc,
                                           const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        uint32_t size = 0;
@@ -209,7 +216,7 @@ static WERROR cmd_ntsvcs_get_dev_list_size(struct rpc_pipe_client *cli,
                flags = atoi(argv[2]);
        }
 
-       status = rpccli_PNP_GetDeviceListSize(cli, mem_ctx,
+       status = dcerpc_PNP_GetDeviceListSize(b, mem_ctx,
                                              filter,
                                              &size,
                                              flags,
@@ -228,6 +235,7 @@ static WERROR cmd_ntsvcs_get_dev_list(struct rpc_pipe_client *cli,
                                      int argc,
                                      const char **argv)
 {
+       struct dcerpc_binding_handle *b = cli->binding_handle;
        NTSTATUS status;
        WERROR werr;
        const char *filter = NULL;
@@ -235,17 +243,21 @@ static WERROR cmd_ntsvcs_get_dev_list(struct rpc_pipe_client *cli,
        uint32_t length = 0;
        uint32_t flags = 0;
 
-       if (argc > 3) {
-               printf("usage: %s [length] [filter]\n", argv[0]);
+       if (argc > 4) {
+               printf("usage: %s [filter] [length] [flags]\n", argv[0]);
                return WERR_OK;
        }
 
        if (argc >= 2) {
-               length = atoi(argv[1]);
+               filter = argv[1];
        }
 
        if (argc >= 3) {
-               filter = argv[2];
+               length = atoi(argv[2]);
+       }
+
+       if (argc >= 4) {
+               flags = atoi(argv[3]);
        }
 
        buffer = talloc(mem_ctx, uint16_t);
@@ -253,7 +265,7 @@ static WERROR cmd_ntsvcs_get_dev_list(struct rpc_pipe_client *cli,
                return WERR_NOMEM;
        }
 
-       status = rpccli_PNP_GetDeviceList(cli, mem_ctx,
+       status = dcerpc_PNP_GetDeviceList(b, mem_ctx,
                                          filter,
                                          buffer,
                                          &length,
@@ -271,12 +283,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_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", "" },
+       { "ntsvcs_getversion", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_version, &ndr_table_ntsvcs, NULL, "Query NTSVCS version", "" },
+       { "ntsvcs_validatedevinst", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_validate_dev_inst, &ndr_table_ntsvcs, NULL, "Query NTSVCS device instance", "" },
+       { "ntsvcs_hwprofflags", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_hw_prof_flags, &ndr_table_ntsvcs, NULL, "Query NTSVCS HW prof flags", "" },
+       { "ntsvcs_hwprofinfo", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_hw_prof_info, &ndr_table_ntsvcs, NULL, "Query NTSVCS HW prof info", "" },
+       { "ntsvcs_getdevregprop", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_reg_prop, &ndr_table_ntsvcs, NULL, "Query NTSVCS device registry property", "" },
+       { "ntsvcs_getdevlistsize", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list_size, &ndr_table_ntsvcs, NULL, "Query NTSVCS device list size", "" },
+       { "ntsvcs_getdevlist", RPC_RTYPE_WERROR, NULL, cmd_ntsvcs_get_dev_list, &ndr_table_ntsvcs, NULL, "Query NTSVCS device list", "" },
        { NULL }
 };