git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3: Use dbwrap_parse_record in fetch_share_mode_unlocked
[kai/samba.git] / source3 / rpcclient / cmd_srvsvc.c
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 890151e2b4ab2d5cd1b9df079159e749bb6c7df2..0d67639959fc7490f3bd3a0f9017ae4a024647f7 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -22,7 +22,9 @@
 
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc_c.h"
+#include "../libcli/security/display_sec.h"
 
 /* Display server query info */
 
@@ -174,6 +176,7 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
        WERROR result;
        NTSTATUS status;
        const char *server_unc = cli->srv_name_slash;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 3) {
                printf("Usage: %s [infolevel] [server_unc]\n", argv[0]);
@@ -188,7 +191,7 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
                server_unc = argv[2];
        }
 
-       status = rpccli_srvsvc_NetSrvGetInfo(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetSrvGetInfo(b, mem_ctx,
                                             server_unc,
                                             info_level,
                                             &info,
@@ -273,6 +276,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
        uint32_t resume_handle = 0;
        uint32_t *resume_handle_p = NULL;
        uint32 preferred_len = 0xffffffff, i;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 3) {
                printf("Usage: %s [infolevel] [resume_handle]\n", argv[0]);
@@ -337,7 +341,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
 
        switch (opcode) {
                case NDR_SRVSVC_NETSHAREENUM:
-                       status = rpccli_srvsvc_NetShareEnum(cli, mem_ctx,
+                       status = dcerpc_srvsvc_NetShareEnum(b, mem_ctx,
                                                            cli->desthost,
                                                            &info_ctr,
                                                            preferred_len,
@@ -346,7 +350,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
                                                            &result);
                        break;
                case NDR_SRVSVC_NETSHAREENUMALL:
-                       status = rpccli_srvsvc_NetShareEnumAll(cli, mem_ctx,
+                       status = dcerpc_srvsvc_NetShareEnumAll(b, mem_ctx,
                                                               cli->desthost,
                                                               &info_ctr,
                                                               preferred_len,
@@ -358,7 +362,11 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
                        return WERR_INVALID_PARAM;
        }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -412,6 +420,7 @@ static WERROR cmd_srvsvc_net_share_get_info(struct rpc_pipe_client *cli,
        union srvsvc_NetShareInfo info;
        WERROR result;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 3) {
                printf("Usage: %s [sharename] [infolevel]\n", argv[0]);
@@ -421,14 +430,18 @@ static WERROR cmd_srvsvc_net_share_get_info(struct rpc_pipe_client *cli,
        if (argc == 3)
                info_level = atoi(argv[2]);
 
-       status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetShareGetInfo(b, mem_ctx,
                                               cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info,
                                               &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -462,6 +475,7 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
        WERROR result;
        NTSTATUS status;
        uint32_t parm_err = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 3) {
                printf("Usage: %s [sharename] [comment]\n", argv[0]);
@@ -469,21 +483,25 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
        }
 
        /* retrieve share info */
-       status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetShareGetInfo(b, mem_ctx,
                                               cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info_get,
                                               &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
        info_get.info502->comment = argv[2];
 
        /* set share info */
-       status = rpccli_srvsvc_NetShareSetInfo(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetShareSetInfo(b, mem_ctx,
                                               cli->desthost,
                                               argv[1],
                                               info_level,
@@ -491,19 +509,26 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
                                               &parm_err,
                                               &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
        /* re-retrieve share info and display */
-       status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetShareGetInfo(b, mem_ctx,
                                               cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info_get,
                                               &result);
-
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -520,13 +545,14 @@ static WERROR cmd_srvsvc_net_remote_tod(struct rpc_pipe_client *cli,
        struct srvsvc_NetRemoteTODInfo *tod = NULL;
        WERROR result;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 1) {
                printf("Usage: %s\n", argv[0]);
                return WERR_OK;
        }
 
-       status = rpccli_srvsvc_NetRemoteTOD(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetRemoteTOD(b, mem_ctx,
                                            cli->srv_name_slash,
                                            &tod,
                                            &result);
@@ -554,6 +580,7 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
        uint32 preferred_len = 0xffff;
        uint32_t total_entries = 0;
        uint32_t resume_handle = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -569,7 +596,7 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
        info_ctr.level = info_level;
        info_ctr.ctr.ctr3 = &ctr3;
 
-       status = rpccli_srvsvc_NetFileEnum(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetFileEnum(b, mem_ctx,
                                           cli->desthost,
                                           NULL,
                                           NULL,
@@ -578,9 +605,14 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
                                           &total_entries,
                                           &resume_handle,
                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result))
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
+       }
 
  done:
        return result;
@@ -594,6 +626,7 @@ static WERROR cmd_srvsvc_net_name_validate(struct rpc_pipe_client *cli,
        NTSTATUS status;
        uint32_t name_type = 9;
        uint32_t flags = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 3) {
                printf("Usage: %s [sharename] [type]\n", argv[0]);
@@ -604,12 +637,16 @@ static WERROR cmd_srvsvc_net_name_validate(struct rpc_pipe_client *cli,
                name_type = atoi(argv[2]);
        }
 
-       status = rpccli_srvsvc_NetNameValidate(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetNameValidate(b, mem_ctx,
                                               cli->desthost,
                                               argv[1],
                                               name_type,
                                               flags,
                                               &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
 
        if (!W_ERROR_IS_OK(result))
                goto done;
@@ -625,21 +662,26 @@ static WERROR cmd_srvsvc_net_file_get_sec(struct rpc_pipe_client *cli,
        WERROR result;
        NTSTATUS status;
        struct sec_desc_buf *sd_buf = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 4) {
                printf("Usage: %s [sharename] [file]\n", argv[0]);
                return WERR_OK;
        }
 
-       status = rpccli_srvsvc_NetGetFileSecurity(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetGetFileSecurity(b, mem_ctx,
                                                  cli->desthost,
                                                  argv[1],
                                                  argv[2],
                                                  SECINFO_DACL,
                                                  &sd_buf,
                                                  &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -655,19 +697,24 @@ static WERROR cmd_srvsvc_net_sess_del(struct rpc_pipe_client *cli,
 {
        WERROR result;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc < 2 || argc > 4) {
                printf("Usage: %s [client] [user]\n", argv[0]);
                return WERR_OK;
        }
 
-       status = rpccli_srvsvc_NetSessDel(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetSessDel(b, mem_ctx,
                                          cli->desthost,
                                          argv[1],
                                          argv[2],
                                          &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -693,6 +740,7 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
        uint32_t level = 1;
        const char *client = NULL;
        const char *user = NULL;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 6) {
                printf("Usage: %s [client] [user] [level] [resume_handle]\n", argv[0]);
@@ -745,7 +793,7 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
                break;
        }
 
-       status = rpccli_srvsvc_NetSessEnum(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetSessEnum(b, mem_ctx,
                                          cli->desthost,
                                          client,
                                          user,
@@ -755,7 +803,12 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
                                          resume_handle_p,
                                          &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -773,6 +826,7 @@ static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
        uint32_t total_entries = 0;
        uint32_t resume_handle = 0;
        uint32_t level = 0;
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 4) {
                printf("Usage: %s [level] [resume_handle]\n", argv[0]);
@@ -789,7 +843,7 @@ static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
 
        ZERO_STRUCT(info);
 
-       status = rpccli_srvsvc_NetDiskEnum(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetDiskEnum(b, mem_ctx,
                                           cli->desthost,
                                           level,
                                           &info,
@@ -797,8 +851,12 @@ static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
                                           &total_entries,
                                           &resume_handle,
                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -820,6 +878,7 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
        uint32_t *resume_handle_p = NULL;
        uint32_t level = 1;
        const char *path = "IPC$";
+       struct dcerpc_binding_handle *b = cli->binding_handle;
 
        if (argc > 4) {
                printf("Usage: %s [level] [path] [resume_handle]\n", argv[0]);
@@ -856,7 +915,7 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
                        return WERR_INVALID_PARAM;
        }
 
-       status = rpccli_srvsvc_NetConnEnum(cli, mem_ctx,
+       status = dcerpc_srvsvc_NetConnEnum(b, mem_ctx,
                                           cli->desthost,
                                           path,
                                           &info_ctr,
@@ -865,7 +924,12 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
                                           resume_handle_p,
                                           &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -880,19 +944,19 @@ struct cmd_set srvsvc_commands[] = {
 
        { "SRVSVC" },
 
-       { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, &ndr_table_srvsvc.syntax_id, NULL, "Server query info", "" },
-       { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate shares", "" },
-       { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate all shares", "" },
-       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, &ndr_table_srvsvc.syntax_id, NULL, "Get Share Info", "" },
-       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, &ndr_table_srvsvc.syntax_id, NULL, "Set Share Info", "" },
-       { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  &ndr_table_srvsvc.syntax_id, NULL, "Enumerate open files", "" },
-       { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, &ndr_table_srvsvc.syntax_id, NULL, "Fetch remote time of day", "" },
-       { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, &ndr_table_srvsvc.syntax_id, NULL, "Validate sharename", "" },
-       { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, &ndr_table_srvsvc.syntax_id, NULL, "Get File security", "" },
-       { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, &ndr_table_srvsvc.syntax_id, NULL, "Delete Session", "" },
-       { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Sessions", "" },
-       { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Disks", "" },
-       { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, &ndr_table_srvsvc.syntax_id, NULL, "Enumerate Connections", "" },
+       { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, &ndr_table_srvsvc, NULL, "Server query info", "" },
+       { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, &ndr_table_srvsvc, NULL, "Enumerate shares", "" },
+       { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, &ndr_table_srvsvc, NULL, "Enumerate all shares", "" },
+       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, &ndr_table_srvsvc, NULL, "Get Share Info", "" },
+       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, &ndr_table_srvsvc, NULL, "Set Share Info", "" },
+       { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  &ndr_table_srvsvc, NULL, "Enumerate open files", "" },
+       { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, &ndr_table_srvsvc, NULL, "Fetch remote time of day", "" },
+       { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, &ndr_table_srvsvc, NULL, "Validate sharename", "" },
+       { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, &ndr_table_srvsvc, NULL, "Get File security", "" },
+       { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, &ndr_table_srvsvc, NULL, "Delete Session", "" },
+       { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, &ndr_table_srvsvc, NULL, "Enumerate Sessions", "" },
+       { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, &ndr_table_srvsvc, NULL, "Enumerate Disks", "" },
+       { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, &ndr_table_srvsvc, NULL, "Enumerate Connections", "" },
 
        { NULL }
 };
Kai's WIP code