s3-spoolss: fix rpcclient after setprinter IDL fixes.
[ira/wip.git] / source3 / rpcclient / cmd_srvsvc.c
index 8c85372bf5a6d9521a3ea5a6630b99cd91a073af..866b68111d81380a454debb4c3cf504b06ebfad4 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /* Display server query info */
 
@@ -172,7 +173,6 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
        union srvsvc_NetSrvInfo info;
        WERROR result;
        NTSTATUS status;
-       const char *server_name;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -182,12 +182,8 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
        if (argc == 2)
                info_level = atoi(argv[1]);
 
-       server_name = talloc_asprintf_strupper_m(mem_ctx, "\\\\%s",
-                                                cli->cli->desthost);
-       W_ERROR_HAVE_NO_MEMORY(server_name);
-
        status = rpccli_srvsvc_NetSrvGetInfo(cli, mem_ctx,
-                                            server_name,
+                                            cli->srv_name_slash,
                                             info_level,
                                             &info,
                                             &result);
@@ -243,8 +239,8 @@ static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
        printf("\tmax_uses:\t%d\n", r->max_users);
        printf("\tnum_uses:\t%d\n", r->current_users);
 
-       if (r->sd)
-               display_sec_desc(r->sd);
+       if (r->sd_buf.sd)
+               display_sec_desc(r->sd_buf.sd);
 
 }
 
@@ -269,6 +265,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
        NTSTATUS status;
        uint32_t totalentries = 0;
        uint32_t resume_handle = 0;
+       uint32_t *resume_handle_p = NULL;
        uint32 preferred_len = 0xffffffff, i;
 
        if (argc > 3) {
@@ -282,6 +279,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
 
        if (argc == 3) {
                resume_handle = atoi(argv[2]);
+               resume_handle_p = &resume_handle;
        }
 
        ZERO_STRUCT(info_ctr);
@@ -334,20 +332,20 @@ 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,
-                                                           cli->cli->desthost,
+                                                           cli->desthost,
                                                            &info_ctr,
                                                            preferred_len,
                                                            &totalentries,
-                                                           &resume_handle,
+                                                           resume_handle_p,
                                                            &result);
                        break;
                case NDR_SRVSVC_NETSHAREENUMALL:
                        status = rpccli_srvsvc_NetShareEnumAll(cli, mem_ctx,
-                                                              cli->cli->desthost,
+                                                              cli->desthost,
                                                               &info_ctr,
                                                               preferred_len,
                                                               &totalentries,
-                                                              &resume_handle,
+                                                              resume_handle_p,
                                                               &result);
                        break;
                default:
@@ -418,7 +416,7 @@ static WERROR cmd_srvsvc_net_share_get_info(struct rpc_pipe_client *cli,
                info_level = atoi(argv[2]);
 
        status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
-                                              cli->cli->desthost,
+                                              cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info,
@@ -466,7 +464,7 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
 
        /* retrieve share info */
        status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
-                                              cli->cli->desthost,
+                                              cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info_get,
@@ -480,7 +478,7 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
 
        /* set share info */
        status = rpccli_srvsvc_NetShareSetInfo(cli, mem_ctx,
-                                              cli->cli->desthost,
+                                              cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info_get,
@@ -493,7 +491,7 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
 
        /* re-retrieve share info and display */
        status = rpccli_srvsvc_NetShareGetInfo(cli, mem_ctx,
-                                              cli->cli->desthost,
+                                              cli->desthost,
                                               argv[1],
                                               info_level,
                                               &info_get,
@@ -514,7 +512,6 @@ static WERROR cmd_srvsvc_net_remote_tod(struct rpc_pipe_client *cli,
                                           int argc, const char **argv)
 {
        struct srvsvc_NetRemoteTODInfo *tod = NULL;
-       fstring srv_name_slash;
        WERROR result;
        NTSTATUS status;
 
@@ -523,9 +520,8 @@ static WERROR cmd_srvsvc_net_remote_tod(struct rpc_pipe_client *cli,
                return WERR_OK;
        }
 
-       fstr_sprintf(srv_name_slash, "\\\\%s", cli->cli->desthost);
        status = rpccli_srvsvc_NetRemoteTOD(cli, mem_ctx,
-                                           srv_name_slash,
+                                           cli->srv_name_slash,
                                            &tod,
                                            &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -545,10 +541,13 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
                                         int argc, const char **argv)
 {
        uint32 info_level = 3;
-       SRV_FILE_INFO_CTR ctr;
+       struct srvsvc_NetFileInfoCtr info_ctr;
+       struct srvsvc_NetFileCtr3 ctr3;
        WERROR result;
-       ENUM_HND hnd;
+       NTSTATUS status;
        uint32 preferred_len = 0xffff;
+       uint32_t total_entries = 0;
+       uint32_t resume_handle = 0;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -558,14 +557,23 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
        if (argc == 2)
                info_level = atoi(argv[1]);
 
-       init_enum_hnd(&hnd, 0);
-
-       ZERO_STRUCT(ctr);
-
-       result = rpccli_srvsvc_net_file_enum(
-               cli, mem_ctx, info_level, NULL, &ctr, preferred_len, &hnd);
+       ZERO_STRUCT(info_ctr);
+       ZERO_STRUCT(ctr3);
 
-       if (!W_ERROR_IS_OK(result))
+       info_ctr.level = info_level;
+       info_ctr.ctr.ctr3 = &ctr3;
+
+       status = rpccli_srvsvc_NetFileEnum(cli, mem_ctx,
+                                          cli->desthost,
+                                          NULL,
+                                          NULL,
+                                          &info_ctr,
+                                          preferred_len,
+                                          &total_entries,
+                                          &resume_handle,
+                                          &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result))
                goto done;
 
  done:
@@ -591,7 +599,7 @@ static WERROR cmd_srvsvc_net_name_validate(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_srvsvc_NetNameValidate(cli, mem_ctx,
-                                              cli->cli->desthost,
+                                              cli->desthost,
                                               argv[1],
                                               name_type,
                                               flags,
@@ -604,6 +612,261 @@ static WERROR cmd_srvsvc_net_name_validate(struct rpc_pipe_client *cli,
        return result;
 }
 
+static WERROR cmd_srvsvc_net_file_get_sec(struct rpc_pipe_client *cli,
+                                         TALLOC_CTX *mem_ctx,
+                                         int argc, const char **argv)
+{
+       WERROR result;
+       NTSTATUS status;
+       struct sec_desc_buf *sd_buf = NULL;
+
+       if (argc < 2 || argc > 4) {
+               printf("Usage: %s [sharename] [file]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       status = rpccli_srvsvc_NetGetFileSecurity(cli, mem_ctx,
+                                                 cli->desthost,
+                                                 argv[1],
+                                                 argv[2],
+                                                 SECINFO_DACL,
+                                                 &sd_buf,
+                                                 &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+               goto done;
+       }
+
+       display_sec_desc(sd_buf->sd);
+
+ done:
+       return result;
+}
+
+static WERROR cmd_srvsvc_net_sess_del(struct rpc_pipe_client *cli,
+                                     TALLOC_CTX *mem_ctx,
+                                     int argc, const char **argv)
+{
+       WERROR result;
+       NTSTATUS status;
+
+       if (argc < 2 || argc > 4) {
+               printf("Usage: %s [client] [user]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       status = rpccli_srvsvc_NetSessDel(cli, mem_ctx,
+                                         cli->desthost,
+                                         argv[1],
+                                         argv[2],
+                                         &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+               goto done;
+       }
+
+ done:
+       return result;
+}
+
+static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, const char **argv)
+{
+       WERROR result;
+       NTSTATUS status;
+       struct srvsvc_NetSessInfoCtr info_ctr;
+       struct srvsvc_NetSessCtr0 ctr0;
+       struct srvsvc_NetSessCtr1 ctr1;
+       struct srvsvc_NetSessCtr2 ctr2;
+       struct srvsvc_NetSessCtr10 ctr10;
+       struct srvsvc_NetSessCtr502 ctr502;
+       uint32_t total_entries = 0;
+       uint32_t resume_handle = 0;
+       uint32_t *resume_handle_p = NULL;
+       uint32_t level = 1;
+       const char *client = NULL;
+       const char *user = NULL;
+
+       if (argc > 6) {
+               printf("Usage: %s [client] [user] [level] [resume_handle]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       if (argc >= 2) {
+               client = argv[1];
+       }
+
+       if (argc >= 3) {
+               user = argv[2];
+       }
+
+       if (argc >= 4) {
+               level = atoi(argv[3]);
+       }
+
+       if (argc >= 5) {
+               resume_handle = atoi(argv[4]);
+               resume_handle_p = &resume_handle;
+       }
+
+       ZERO_STRUCT(info_ctr);
+
+       info_ctr.level = level;
+
+       d_printf("trying level: %d\n", level);
+
+       switch (level) {
+       case 0:
+               ZERO_STRUCT(ctr0);
+               info_ctr.ctr.ctr0 = &ctr0;
+               break;
+       case 1:
+               ZERO_STRUCT(ctr1);
+               info_ctr.ctr.ctr1 = &ctr1;
+               break;
+       case 2:
+               ZERO_STRUCT(ctr2);
+               info_ctr.ctr.ctr2 = &ctr2;
+               break;
+       case 10:
+               ZERO_STRUCT(ctr10);
+               info_ctr.ctr.ctr10 = &ctr10;
+               break;
+       case 502:
+               ZERO_STRUCT(ctr502);
+               info_ctr.ctr.ctr502 = &ctr502;
+               break;
+       }
+
+       status = rpccli_srvsvc_NetSessEnum(cli, mem_ctx,
+                                         cli->desthost,
+                                         client,
+                                         user,
+                                         &info_ctr,
+                                         0xffffffff,
+                                         &total_entries,
+                                         resume_handle_p,
+                                         &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+               goto done;
+       }
+
+ done:
+       return result;
+}
+
+static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, const char **argv)
+{
+       struct srvsvc_NetDiskInfo info;
+       WERROR result;
+       NTSTATUS status;
+       uint32_t total_entries = 0;
+       uint32_t resume_handle = 0;
+       uint32_t level = 0;
+
+       if (argc > 4) {
+               printf("Usage: %s [level] [resume_handle]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       if (argc >= 2) {
+               level = atoi(argv[1]);
+       }
+
+       if (argc >= 3) {
+               resume_handle = atoi(argv[2]);
+       }
+
+       ZERO_STRUCT(info);
+
+       status = rpccli_srvsvc_NetDiskEnum(cli, mem_ctx,
+                                          cli->desthost,
+                                          level,
+                                          &info,
+                                          0xffffffff,
+                                          &total_entries,
+                                          &resume_handle,
+                                          &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+               goto done;
+       }
+
+ done:
+       return result;
+}
+
+static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
+                                      TALLOC_CTX *mem_ctx,
+                                      int argc, const char **argv)
+{
+       struct srvsvc_NetConnInfoCtr info_ctr;
+       struct srvsvc_NetConnCtr0 ctr0;
+       struct srvsvc_NetConnCtr1 ctr1;
+       WERROR result;
+       NTSTATUS status;
+       uint32_t total_entries = 0;
+       uint32_t resume_handle = 0;
+       uint32_t *resume_handle_p = NULL;
+       uint32_t level = 1;
+       const char *path = "IPC$";
+
+       if (argc > 4) {
+               printf("Usage: %s [level] [path] [resume_handle]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       if (argc >= 2) {
+               level = atoi(argv[1]);
+       }
+
+       if (argc >= 3) {
+               path = argv[2];
+       }
+
+       if (argc >= 4) {
+               resume_handle = atoi(argv[3]);
+               resume_handle_p = &resume_handle;
+       }
+
+       ZERO_STRUCT(info_ctr);
+
+       info_ctr.level = level;
+
+       switch (level) {
+               case 0:
+                       ZERO_STRUCT(ctr0);
+                       info_ctr.ctr.ctr0 = &ctr0;
+                       break;
+               case 1:
+                       ZERO_STRUCT(ctr1);
+                       info_ctr.ctr.ctr1 = &ctr1;
+                       break;
+               default:
+                       return WERR_INVALID_PARAM;
+       }
+
+       status = rpccli_srvsvc_NetConnEnum(cli, mem_ctx,
+                                          cli->desthost,
+                                          path,
+                                          &info_ctr,
+                                          0xffffffff,
+                                          &total_entries,
+                                          resume_handle_p,
+                                          &result);
+
+       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+               goto done;
+       }
+
+ done:
+       return result;
+}
+
 
 /* List of commands exported by this module */
 
@@ -611,14 +874,19 @@ struct cmd_set srvsvc_commands[] = {
 
        { "SRVSVC" },
 
-       { "srvinfo",     RPC_RTYPE_WERROR, NULL, cmd_srvsvc_srv_query_info, PI_SRVSVC, NULL, "Server query info", "" },
-       { "netshareenum",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum, PI_SRVSVC, NULL, "Enumerate shares", "" },
-       { "netshareenumall",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_enum_all, PI_SRVSVC, NULL, "Enumerate all shares", "" },
-       { "netsharegetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_get_info, PI_SRVSVC, NULL, "Get Share Info", "" },
-       { "netsharesetinfo",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_share_set_info, PI_SRVSVC, NULL, "Set Share Info", "" },
-       { "netfileenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_enum,  PI_SRVSVC, NULL, "Enumerate open files", "" },
-       { "netremotetod",RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_remote_tod, PI_SRVSVC, NULL, "Fetch remote time of day", "" },
-       { "netnamevalidate", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_name_validate, PI_SRVSVC, NULL, "Validate sharename", "" },
+       { "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", "" },
 
        { NULL }
 };