s3-security: use shared SECINFO_DACL define.

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

diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index d32a4c591f7d8cd7787e1fe03fd024cc9317a5b3..147501049aef620ce3f199095b4147e06c1d0c9e 100644 (file)
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
 
 static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx,
@@ -41,7 +42,7 @@ static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
                level = atoi(argv[1]);
        }
 
-       server_name = cli->cli->desthost;
+       server_name = cli->desthost;
 
        status = rpccli_wkssvc_NetWkstaGetInfo(cli, mem_ctx,
                                               server_name,
@@ -64,20 +65,25 @@ static WERROR cmd_wkssvc_getjoininformation(struct rpc_pipe_client *cli,
        const char *name_buffer;
        enum wkssvc_NetJoinStatus name_type;
        NTSTATUS status;
+       WERROR werr;
 
-       server_name = cli->cli->desthost;
+       server_name = cli->desthost;
        name_buffer = "";
 
        status = rpccli_wkssvc_NetrGetJoinInformation(cli, mem_ctx,
-                                                     server_name, &name_buffer,
-                                                     &name_type);
+                                                     server_name,
+                                                     &name_buffer,
+                                                     &name_type,
+                                                     &werr);
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
        }
 
-       printf("%s (%d)\n", name_buffer, name_type);
+       if (W_ERROR_IS_OK(werr)) {
+               printf("%s (%d)\n", name_buffer, name_type);
+       }
 
-       return WERR_OK;
+       return werr;
 }
 
 static WERROR cmd_wkssvc_messagebuffersend(struct rpc_pipe_client *cli,
@@ -85,18 +91,22 @@ static WERROR cmd_wkssvc_messagebuffersend(struct rpc_pipe_client *cli,
                                           int argc,
                                           const char **argv)
 {
-       const char *server_name = cli->cli->desthost;
-       const char *message_name = cli->cli->desthost;
-       const char *message_sender_name = cli->cli->desthost;
+       const char *server_name = cli->desthost;
+       const char *message_name = cli->desthost;
+       const char *message_sender_name = cli->desthost;
        smb_ucs2_t *message_buffer = NULL;
        size_t message_size = 0;
+       const char *message = "my message";
        NTSTATUS status;
        WERROR werr;
 
-       message_size = push_ucs2_talloc(mem_ctx,
-                                       &message_buffer,
-                                       "my message");
-       if (message_size == -1) {
+       if (argc > 1) {
+               message = argv[1];
+       }
+
+       if (!push_ucs2_talloc(mem_ctx, &message_buffer, message,
+                             &message_size))
+       {
                return WERR_NOMEM;
        }
 
@@ -114,11 +124,99 @@ static WERROR cmd_wkssvc_messagebuffersend(struct rpc_pipe_client *cli,
        return werr;
 }
 
+static WERROR cmd_wkssvc_enumeratecomputernames(struct rpc_pipe_client *cli,
+                                               TALLOC_CTX *mem_ctx,
+                                               int argc,
+                                               const char **argv)
+{
+       const char *server_name;
+       enum wkssvc_ComputerNameType name_type = NetAllComputerNames;
+       NTSTATUS status;
+       struct wkssvc_ComputerNamesCtr *ctr = NULL;
+       WERROR werr;
+
+       server_name = cli->desthost;
+
+       if (argc >= 2) {
+               name_type = atoi(argv[1]);
+       }
+
+       status = rpccli_wkssvc_NetrEnumerateComputerNames(cli, mem_ctx,
+                                                         server_name,
+                                                         name_type, 0,
+                                                         &ctr,
+                                                         &werr);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
+
+       if (W_ERROR_IS_OK(werr)) {
+               int i=0;
+               for (i = 0; i < ctr->count; i++) {
+                       printf("name: %d %s\n", i, ctr->computer_name->string);
+               }
+       }
+
+       return werr;
+}
+
+static WERROR cmd_wkssvc_enumerateusers(struct rpc_pipe_client *cli,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       const char *server_name;
+       NTSTATUS status;
+       struct wkssvc_NetWkstaEnumUsersInfo info;
+       WERROR werr;
+       uint32_t i, num_entries, resume_handle;
+
+       server_name = cli->desthost;
+
+       ZERO_STRUCT(info);
+
+       if (argc >= 2) {
+               info.level = atoi(argv[1]);
+       }
+
+       status = rpccli_wkssvc_NetWkstaEnumUsers(cli, mem_ctx, server_name,
+                                                &info, 1000, &num_entries,
+                                                &resume_handle, &werr);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
+       if (!W_ERROR_IS_OK(werr)) {
+               return werr;
+       }
+
+       for (i=0; i<num_entries; i++) {
+               const char *user = NULL;
+               switch (info.level) {
+               case 0:
+                       user = info.ctr.user0->user0[i].user_name;
+                       break;
+               case 1:
+                       user = talloc_asprintf(
+                               talloc_tos(), "%s\\%s",
+                               info.ctr.user1->user1[i].logon_domain,
+                               info.ctr.user1->user1[i].user_name);
+                       break;
+               }
+               printf("%s\n", user ? user : "(null)");
+       }
+
+       return werr;
+}
+
 struct cmd_set wkssvc_commands[] = {
 
        { "WKSSVC" },
-       { "wkssvc_wkstagetinfo", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_wkstagetinfo, PI_WKSSVC, NULL, "Query WKSSVC Workstation Information", "" },
-       { "wkssvc_getjoininformation", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_getjoininformation, PI_WKSSVC, NULL, "Query WKSSVC Join Information", "" },
-       { "wkssvc_messagebuffersend", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_messagebuffersend, PI_WKSSVC, NULL, "Send WKSSVC message", "" },
+       { "wkssvc_wkstagetinfo", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_wkstagetinfo, &ndr_table_wkssvc.syntax_id, NULL, "Query WKSSVC Workstation Information", "" },
+       { "wkssvc_getjoininformation", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_getjoininformation, &ndr_table_wkssvc.syntax_id, NULL, "Query WKSSVC Join Information", "" },
+       { "wkssvc_messagebuffersend", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_messagebuffersend, &ndr_table_wkssvc.syntax_id, NULL, "Send WKSSVC message", "" },
+       { "wkssvc_enumeratecomputernames", RPC_RTYPE_WERROR, NULL, cmd_wkssvc_enumeratecomputernames, &ndr_table_wkssvc.syntax_id, NULL, "Enumerate WKSSVC computer names", "" },
+       { "wkssvc_enumerateusers", RPC_RTYPE_WERROR, NULL,
+         cmd_wkssvc_enumerateusers, &ndr_table_wkssvc.syntax_id, NULL,
+         "Enumerate WKSSVC users", "" },
        { NULL }
 };