s3: Do not directly reference the ndr_table_* in rpcclient
[kai/samba.git] / source3 / rpcclient / cmd_dfs.c
index 44e97f9881e7bba20d4b6ed5cd2aca5422b6b52f..8fdc77215ecf9f425bcf876e90cc28cadb36beea 100644 (file)
@@ -3,10 +3,11 @@
    RPC pipe client
 
    Copyright (C) Tim Potter 2000
+   Copyright (C) Jelmer Vernooij       2005.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
 /* Check DFS is supported by the remote server */
 
-static NTSTATUS cmd_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                              int argc, const char **argv)
+static WERROR cmd_dfs_version(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             int argc, const char **argv)
 {
-       BOOL dfs_exists;
+       enum dfs_ManagerVersion version;
        NTSTATUS result;
 
        if (argc != 1) {
                printf("Usage: %s\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
-       result = cli_dfs_exist(cli, mem_ctx, &dfs_exists);
+       result = rpccli_dfs_GetManagerVersion(cli, mem_ctx, &version);
 
-       if (NT_STATUS_IS_OK(result))
-               printf("dfs is %spresent\n", dfs_exists ? "" : "not ");
+       if (!NT_STATUS_IS_OK(result)) {
+               return ntstatus_to_werror(result);
+       }
+
+       if (version > 0) {
+               printf("dfs is present (%d)\n", version);
+       } else {
+               printf("dfs is not present\n");
+       }
 
-       return result;
+       return WERR_OK;
 }
 
-static NTSTATUS cmd_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                            int argc, const char **argv)
+static WERROR cmd_dfs_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const char **argv)
 {
        NTSTATUS result;
-       const char *entrypath, *servername, *sharename, *comment;
+       WERROR werr;
+       const char *path, *servername, *sharename, *comment;
        uint32 flags = 0;
 
        if (argc != 5) {
-               printf("Usage: %s entrypath servername sharename comment\n", 
+               printf("Usage: %s path servername sharename comment\n", 
                       argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
-       entrypath = argv[1];
+       path = argv[1];
        servername = argv[2];
        sharename = argv[3];
        comment = argv[4];
 
-       result = cli_dfs_add(cli, mem_ctx, entrypath, servername, 
-                            sharename, comment, flags);
+       result = rpccli_dfs_Add(cli, mem_ctx, path, servername,
+                               sharename, comment, flags, &werr);
+       if (!NT_STATUS_IS_OK(result)) {
+               return ntstatus_to_werror(result);
+       }
 
-       return result;
+       return werr;
 }
 
-static NTSTATUS cmd_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                               int argc, const char **argv)
+static WERROR cmd_dfs_remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                            int argc, const char **argv)
 {
        NTSTATUS result;
-       const char *entrypath, *servername, *sharename;
+       WERROR werr;
+       const char *path, *servername, *sharename;
 
        if (argc != 4) {
-               printf("Usage: %s entrypath servername sharename\n", argv[0]);
-               return NT_STATUS_OK;
+               printf("Usage: %s path servername sharename\n", argv[0]);
+               return WERR_OK;
        }
 
-       entrypath = argv[1];
+       path = argv[1];
        servername = argv[2];
        sharename = argv[3];
 
-       result = cli_dfs_remove(cli, mem_ctx, entrypath, servername, 
-                               sharename);
+       result = rpccli_dfs_Remove(cli, mem_ctx, path, servername,
+                                  sharename, &werr);
+       if (!NT_STATUS_IS_OK(result)) {
+               return ntstatus_to_werror(result);
+       }
 
-       return result;
+       return werr;
 }
 
 /* Display a DFS_INFO_1 structure */
 
-static void display_dfs_info_1(DFS_INFO_1 *info1)
+static void display_dfs_info_1(struct dfs_Info1 *info1)
 {
-       fstring temp;
-
-       unistr2_to_ascii(temp, &info1->entrypath, sizeof(temp) - 1);
-       printf("entrypath: %s\n", temp);
+       printf("path: %s\n", info1->path);
 }
 
 /* Display a DFS_INFO_2 structure */
 
-static void display_dfs_info_2(DFS_INFO_2 *info2)
+static void display_dfs_info_2(struct dfs_Info2 *info2)
 {
-       fstring temp;
-
-       unistr2_to_ascii(temp, &info2->entrypath, sizeof(temp) - 1);
-       printf("entrypath: %s\n", temp);
-
-       unistr2_to_ascii(temp, &info2->comment, sizeof(temp) - 1);
-       printf("\tcomment: %s\n", temp);
+       printf("path: %s\n", info2->path);
+       printf("\tcomment: %s\n", info2->comment);
 
        printf("\tstate: %d\n", info2->state);
-       printf("\tnum_storages: %d\n", info2->num_storages);
+       printf("\tnum_stores: %d\n", info2->num_stores);
 }
 
 /* Display a DFS_INFO_3 structure */
 
-static void display_dfs_info_3(DFS_INFO_3 *info3)
+static void display_dfs_info_3(struct dfs_Info3 *info3)
 {
-       fstring temp;
        int i;
 
-       unistr2_to_ascii(temp, &info3->entrypath, sizeof(temp) - 1);
-       printf("entrypath: %s\n", temp);
+       printf("path: %s\n", info3->path);
 
-       unistr2_to_ascii(temp, &info3->comment, sizeof(temp) - 1);
-       printf("\tcomment: %s\n", temp);
+       printf("\tcomment: %s\n", info3->comment);
 
        printf("\tstate: %d\n", info3->state);
-       printf("\tnum_storages: %d\n", info3->num_storages);
+       printf("\tnum_stores: %d\n", info3->num_stores);
 
-       for (i = 0; i < info3->num_storages; i++) {
-               DFS_STORAGE_INFO *dsi = &info3->storages[i];
+       for (i = 0; i < info3->num_stores; i++) {
+               struct dfs_StorageInfo *dsi = &info3->stores[i];
 
-               unistr2_to_ascii(temp, &dsi->servername, sizeof(temp) - 1);
-               printf("\t\tstorage[%d] servername: %s\n", i, temp);
+               printf("\t\tstorage[%d] server: %s\n", i, dsi->server);
 
-               unistr2_to_ascii(temp, &dsi->sharename, sizeof(temp) - 1);
-               printf("\t\tstorage[%d] sharename: %s\n", i, temp);
+               printf("\t\tstorage[%d] share: %s\n", i, dsi->share);
        }
 }
 
-/* Display a DFS_INFO_CTR structure */
 
-static void display_dfs_info_ctr(DFS_INFO_CTR *ctr)
+/* Display a DFS_INFO_CTR structure */
+static void display_dfs_info(uint32 level, union dfs_Info *ctr)
 {
-       int i;
-
-       for (i = 0; i < ctr->num_entries; i++) {
-               switch (ctr->switch_value) {
+       switch (level) {
                case 0x01:
-                       display_dfs_info_1(&ctr->dfs.info1[i]);
+                       display_dfs_info_1(ctr->info1);
                        break;
                case 0x02:
-                       display_dfs_info_2(&ctr->dfs.info2[i]);
+                       display_dfs_info_2(ctr->info2);
                        break;
                case 0x03:
-                       display_dfs_info_3(&ctr->dfs.info3[i]);
+                       display_dfs_info_3(ctr->info3);
                        break;
                default:
                        printf("unsupported info level %d\n", 
-                              ctr->switch_value);
+                              level);
                        break;
+       }
+}
+
+static void display_dfs_enumstruct(struct dfs_EnumStruct *ctr)
+{
+       int i;
+       
+       /* count is always the first element, so we can just use info1 here */
+       for (i = 0; i < ctr->e.info1->count; i++) {
+               switch (ctr->level) {
+               case 1: display_dfs_info_1(&ctr->e.info1->s[i]); break;
+               case 2: display_dfs_info_2(&ctr->e.info2->s[i]); break;
+               case 3: display_dfs_info_3(&ctr->e.info3->s[i]); break;
+               default:
+                               printf("unsupported info level %d\n", 
+                              ctr->level);
+                               return;
                }
        }
 }
 
 /* Enumerate dfs shares */
 
-static NTSTATUS cmd_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                             int argc, const char **argv)
+static WERROR cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                          int argc, const char **argv)
 {
-       DFS_INFO_CTR ctr;
+       struct dfs_EnumStruct str;
+       struct dfs_EnumArray1 info1;
+       struct dfs_EnumArray2 info2;
+       struct dfs_EnumArray3 info3;
+       struct dfs_EnumArray4 info4;
+       struct dfs_EnumArray200 info200;
+       struct dfs_EnumArray300 info300;
+
        NTSTATUS result;
-       uint32 info_level = 1;
+       WERROR werr;
+       uint32 total = 0;
 
        if (argc > 2) {
                printf("Usage: %s [info_level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
+       str.level = 1;
        if (argc == 2)
-               info_level = atoi(argv[1]);
+               str.level = atoi(argv[1]);
+
+       switch (str.level) {
+       case 1: str.e.info1 = &info1; ZERO_STRUCT(info1); break;
+       case 2: str.e.info2 = &info2; ZERO_STRUCT(info2); break;
+       case 3: str.e.info3 = &info3; ZERO_STRUCT(info3); break;
+       case 4: str.e.info4 = &info4; ZERO_STRUCT(info4); break;
+       case 200: str.e.info200 = &info200; ZERO_STRUCT(info200); break;
+       case 300: str.e.info300 = &info300; ZERO_STRUCT(info300); break;
+       default:
+                         printf("Unknown info level %d\n", str.level);
+                         break;
+       }
 
-       result = cli_dfs_enum(cli, mem_ctx, info_level, &ctr);
+       result = rpccli_dfs_Enum(cli, mem_ctx, str.level, 0xFFFFFFFF, &str,
+                                &total, &werr);
 
-       if (NT_STATUS_IS_OK(result))
-               display_dfs_info_ctr(&ctr);
+       if (NT_STATUS_IS_OK(result)) {
+               display_dfs_enumstruct(&str);
+       }
 
-       return result;
+       return werr;
 }
 
-static NTSTATUS cmd_dfs_getinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                int argc, const char **argv)
+/* Enumerate dfs shares */
+
+static WERROR cmd_dfs_enumex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                            int argc, const char **argv)
 {
+       struct dfs_EnumStruct str;
+       struct dfs_EnumArray1 info1;
+       struct dfs_EnumArray2 info2;
+       struct dfs_EnumArray3 info3;
+       struct dfs_EnumArray4 info4;
+       struct dfs_EnumArray200 info200;
+       struct dfs_EnumArray300 info300;
+
        NTSTATUS result;
-       const char *entrypath, *servername, *sharename;
+       WERROR werr;
+       uint32 total = 0;
+
+       if (argc < 2 || argc > 3) {
+               printf("Usage: %s dfs_name [info_level]\n", argv[0]);
+               return WERR_OK;
+       }
+
+       str.level = 1;
+
+       if (argc == 3)
+               str.level = atoi(argv[2]);
+
+       switch (str.level) {
+       case 1: str.e.info1 = &info1; ZERO_STRUCT(info1); break;
+       case 2: str.e.info2 = &info2; ZERO_STRUCT(info2); break;
+       case 3: str.e.info3 = &info3; ZERO_STRUCT(info3); break;
+       case 4: str.e.info4 = &info4; ZERO_STRUCT(info4); break;
+       case 200: str.e.info200 = &info200; ZERO_STRUCT(info200); break;
+       case 300: str.e.info300 = &info300; ZERO_STRUCT(info300); break;
+       default:
+                 printf("Unknown info level %d\n", str.level);
+                 break;
+       }
+
+       result = rpccli_dfs_EnumEx(cli, mem_ctx, argv[1], str.level,
+                                  0xFFFFFFFF, &str, &total, &werr);
+
+       if (NT_STATUS_IS_OK(result)) {
+               display_dfs_enumstruct(&str);
+       }
+
+       return werr;
+}
+
+
+static WERROR cmd_dfs_getinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
+                             int argc, const char **argv)
+{
+       NTSTATUS result;
+       WERROR werr;
+       const char *path, *servername, *sharename;
        uint32 info_level = 1;
-       DFS_INFO_CTR ctr;
+       union dfs_Info ctr;
 
        if (argc < 4 || argc > 5) {
-               printf("Usage: %s entrypath servername sharename "
+               printf("Usage: %s path servername sharename "
                        "[info_level]\n", argv[0]);
-               return NT_STATUS_OK;
+               return WERR_OK;
        }
 
-       entrypath = argv[1];
+       path = argv[1];
        servername = argv[2];
        sharename = argv[3];
 
        if (argc == 5)
                info_level = atoi(argv[4]);
 
-       result = cli_dfs_get_info(cli, mem_ctx, entrypath, servername, 
-                                 sharename, info_level, &ctr);
+       result = rpccli_dfs_GetInfo(cli, mem_ctx, path, servername,
+                                   sharename, info_level, &ctr, &werr);
 
-       if (NT_STATUS_IS_OK(result))
-               display_dfs_info_ctr(&ctr);
+       if (NT_STATUS_IS_OK(result)) {
+               display_dfs_info(info_level, &ctr);
+       }
 
-       return result;
+       return werr;
 }
 
 /* List of commands exported by this module */
@@ -227,11 +318,24 @@ struct cmd_set dfs_commands[] = {
 
        { "DFS" },
 
-       { "dfsexist",  RPC_RTYPE_NTSTATUS, cmd_dfs_exist,   NULL, PI_NETDFS, "Query DFS support",    "" },
-       { "dfsadd",    RPC_RTYPE_NTSTATUS, cmd_dfs_add,     NULL, PI_NETDFS, "Add a DFS share",      "" },
-       { "dfsremove", RPC_RTYPE_NTSTATUS, cmd_dfs_remove,  NULL, PI_NETDFS, "Remove a DFS share",   "" },
-       { "dfsgetinfo",RPC_RTYPE_NTSTATUS, cmd_dfs_getinfo, NULL, PI_NETDFS, "Query DFS share info", "" },
-       { "dfsenum",   RPC_RTYPE_NTSTATUS, cmd_dfs_enum,    NULL, PI_NETDFS, "Enumerate dfs shares", "" },
+       { "dfsversion", RPC_RTYPE_WERROR, NULL, cmd_dfs_version,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Query DFS support",    "" },
+       { "dfsadd",     RPC_RTYPE_WERROR, NULL, cmd_dfs_add,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Add a DFS share",      "" },
+       { "dfsremove",  RPC_RTYPE_WERROR, NULL, cmd_dfs_remove,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Remove a DFS share",   "" },
+       { "dfsgetinfo", RPC_RTYPE_WERROR, NULL, cmd_dfs_getinfo,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Query DFS share info", "" },
+       { "dfsenum",    RPC_RTYPE_WERROR, NULL, cmd_dfs_enum,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Enumerate dfs shares", "" },
+       { "dfsenumex",  RPC_RTYPE_WERROR, NULL, cmd_dfs_enumex,
+         NDR_NETDFS_UUID, NDR_NETDFS_VERSION, NULL,
+         "Enumerate dfs shares", "" },
 
        { NULL }
 };