git.samba.org / ira / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3:smbcacls: add switch "--sddl" to output acls as sddl encoded strings
[ira/wip.git] / source3 / rpcclient / cmd_srvsvc.c
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index a5eb69c41c944b63d9a14b90e03cedcd673afb1c..866b68111d81380a454debb4c3cf504b06ebfad4 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -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)) {
@@ -568,7 +564,7 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
        info_ctr.ctr.ctr3 = &ctr3;
 
        status = rpccli_srvsvc_NetFileEnum(cli, mem_ctx,
-                                          cli->cli->desthost,
+                                          cli->desthost,
                                           NULL,
                                           NULL,
                                           &info_ctr,
@@ -603,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,
@@ -630,7 +626,7 @@ static WERROR cmd_srvsvc_net_file_get_sec(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_srvsvc_NetGetFileSecurity(cli, mem_ctx,
-                                                 cli->cli->desthost,
+                                                 cli->desthost,
                                                  argv[1],
                                                  argv[2],
                                                  SECINFO_DACL,
@@ -660,7 +656,7 @@ static WERROR cmd_srvsvc_net_sess_del(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_srvsvc_NetSessDel(cli, mem_ctx,
-                                         cli->cli->desthost,
+                                         cli->desthost,
                                          argv[1],
                                          argv[2],
                                          &result);
@@ -687,12 +683,13 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
        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 > 5) {
-               printf("Usage: %s [client] [user]\n", argv[0]);
+       if (argc > 6) {
+               printf("Usage: %s [client] [user] [level] [resume_handle]\n", argv[0]);
                return WERR_OK;
        }
 
@@ -708,6 +705,11 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
                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;
@@ -738,13 +740,13 @@ static WERROR cmd_srvsvc_net_sess_enum(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_srvsvc_NetSessEnum(cli, mem_ctx,
-                                         cli->cli->desthost,
+                                         cli->desthost,
                                          client,
                                          user,
                                          &info_ctr,
                                          0xffffffff,
                                          &total_entries,
-                                         &resume_handle,
+                                         resume_handle_p,
                                          &result);
 
        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
@@ -766,7 +768,7 @@ static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
        uint32_t resume_handle = 0;
        uint32_t level = 0;
 
-       if (argc > 2) {
+       if (argc > 4) {
                printf("Usage: %s [level] [resume_handle]\n", argv[0]);
                return WERR_OK;
        }
@@ -782,7 +784,7 @@ static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
        ZERO_STRUCT(info);
 
        status = rpccli_srvsvc_NetDiskEnum(cli, mem_ctx,
-                                          cli->cli->desthost,
+                                          cli->desthost,
                                           level,
                                           &info,
                                           0xffffffff,
@@ -809,6 +811,7 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
        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$";
 
@@ -827,6 +830,7 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
 
        if (argc >= 4) {
                resume_handle = atoi(argv[3]);
+               resume_handle_p = &resume_handle;
        }
 
        ZERO_STRUCT(info_ctr);
@@ -847,12 +851,12 @@ static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_srvsvc_NetConnEnum(cli, mem_ctx,
-                                          cli->cli->desthost,
+                                          cli->desthost,
                                           path,
                                           &info_ctr,
                                           0xffffffff,
                                           &total_entries,
-                                          &resume_handle,
+                                          resume_handle_p,
                                           &result);
 
        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
@@ -870,19 +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", "" },
-       { "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec, PI_SRVSVC, NULL, "Get File security", "" },
-       { "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del, PI_SRVSVC, NULL, "Delete Session", "" },
-       { "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum, PI_SRVSVC, NULL, "Enumerate Sessions", "" },
-       { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum, PI_SRVSVC, NULL, "Enumerate Disks", "" },
-       { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum, PI_SRVSVC, NULL, "Enumerate Connections", "" },
+       { "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 }
 };
Unnamed repository; edit this file 'description' to name the repository.