Changeset 745 for trunk/server/source3/rpcclient/cmd_dfs.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/rpcclient/cmd_dfs.c (modified) (13 diffs)

trunk/server/source3/rpcclient/cmd_dfs.c

@@ -22 +22 @@
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_dfs.h"
+#include "../librpc/gen_ndr/ndr_dfs_c.h"
 
 /* Check DFS is supported by the remote server */
@@ -31 +31 @@
         enum dfs_ManagerVersion version;
         NTSTATUS result;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         if (argc != 1) {
@@ -37 +38 @@
         }
 
-        result = rpccli_dfs_GetManagerVersion(cli, mem_ctx, &version);
+        result = dcerpc_dfs_GetManagerVersion(b, mem_ctx, &version);
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -59 +60 @@
         const char *path, *servername, *sharename, *comment;
         uint32 flags = 0;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         if (argc != 5) {
@@ -71 +73 @@
         comment = argv[4];
 
-        result = rpccli_dfs_Add(cli, mem_ctx, path, servername,
+        result = dcerpc_dfs_Add(b, mem_ctx, path, servername,
                                 sharename, comment, flags, &werr);
         if (!NT_STATUS_IS_OK(result)) {
@@ -86 +88 @@
         WERROR werr;
         const char *path, *servername, *sharename;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         if (argc != 4) {
@@ -96 +99 @@
         sharename = argv[3];
 
-        result = rpccli_dfs_Remove(cli, mem_ctx, path, servername,
+        result = dcerpc_dfs_Remove(b, mem_ctx, path, servername,
                                    sharename, &werr);
         if (!NT_STATUS_IS_OK(result)) {
@@ -196 +199 @@
         struct dfs_EnumArray200 info200;
         struct dfs_EnumArray300 info300;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         NTSTATUS result;
@@ -222 +226 @@
         }
 
-        result = rpccli_dfs_Enum(cli, mem_ctx, str.level, 0xFFFFFFFF, &str,
+        result = dcerpc_dfs_Enum(b, mem_ctx, str.level, 0xFFFFFFFF, &str,
                                  &total, &werr);
-
-        if (NT_STATUS_IS_OK(result)) {
+        if (!NT_STATUS_IS_OK(result)) {
+                return ntstatus_to_werror(result);
+        }
+        if (W_ERROR_IS_OK(werr)) {
                 display_dfs_enumstruct(&str);
         }
@@ -244 +250 @@
         struct dfs_EnumArray200 info200;
         struct dfs_EnumArray300 info300;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         NTSTATUS result;
@@ -271 +278 @@
         }
 
-        result = rpccli_dfs_EnumEx(cli, mem_ctx, argv[1], str.level,
+        result = dcerpc_dfs_EnumEx(b, mem_ctx, argv[1], str.level,
                                    0xFFFFFFFF, &str, &total, &werr);
-
-        if (NT_STATUS_IS_OK(result)) {
+        if (!NT_STATUS_IS_OK(result)) {
+                return ntstatus_to_werror(result);
+        }
+        if (W_ERROR_IS_OK(werr)) {
                 display_dfs_enumstruct(&str);
         }
@@ -290 +299 @@
         uint32 info_level = 1;
         union dfs_Info ctr;
+        struct dcerpc_binding_handle *b = cli->binding_handle;
 
         if (argc < 4 || argc > 5) {
@@ -304 +314 @@
                 info_level = atoi(argv[4]);
 
-        result = rpccli_dfs_GetInfo(cli, mem_ctx, path, servername,
+        result = dcerpc_dfs_GetInfo(b, mem_ctx, path, servername,
                                     sharename, info_level, &ctr, &werr);
-
-        if (NT_STATUS_IS_OK(result)) {
+        if (!NT_STATUS_IS_OK(result)) {
+                return ntstatus_to_werror(result);
+        }
+        if (W_ERROR_IS_OK(werr)) {
                 display_dfs_info(info_level, &ctr);
         }