Changeset 745 for trunk/server/source3/lib/netapi/share.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/lib/netapi/share.c (modified) (20 diffs)

trunk/server/source3/lib/netapi/share.c

@@ -24 +24 @@
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "../librpc/gen_ndr/c.h"
 
 /****************************************************************
@@ -183 +183 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         union srvsvc_NetShareInfo info;
+
 
         if (!r->in.buffer) {
@@ -200 +200 @@
         }
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_srvsvc.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -216 +216 @@
         }
 
-        status = rpccli_srvsvc_NetShareAdd(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                            r->in.server_name,
                                            r->in.level,
@@ -222 +222 @@
                                            r->out.parm_err,
                                            &werr);
+
+
+
+
+
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -247 +252 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
+        struct ;
 
         if (!r->in.net_name) {
@@ -253 +258 @@
         }
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
-
-        status = rpccli_srvsvc_NetShareDel(pipe_cli, talloc_tos(),
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_srvsvc.syntax_id,
+                                );
+        if (!W_ERROR_IS_OK(werr)) {
+                goto done;
+        }
+
+        status = , talloc_tos(),
                                            r->in.server_name,
                                            r->in.net_name,
@@ -291 +296 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         struct srvsvc_NetShareInfoCtr info_ctr;
         struct srvsvc_NetShareCtr0 ctr0;
@@ -297 +301 @@
         struct srvsvc_NetShareCtr2 ctr2;
         uint32_t i;
+
 
         if (!r->out.buffer) {
@@ -316 +321 @@
         ZERO_STRUCT(info_ctr);
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_srvsvc.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -339 +344 @@
         }
 
-        status = rpccli_srvsvc_NetShareEnumAll(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                                r->in.server_name,
                                                &info_ctr,
@@ -346 +351 @@
                                                r->out.resume_handle,
                                                &werr);
-        if (NT_STATUS_IS_ERR(status)) {
+        if (!NT_STATUS_IS_OK(status)) {
+                werr = ntstatus_to_werror(status);
+                goto done;
+        }
+
+        if (!W_ERROR_IS_OK(werr) && !W_ERROR_EQUAL(werr, WERR_MORE_DATA)) {
                 goto done;
         }
@@ -371 +381 @@
                 if (!NT_STATUS_IS_OK(status)) {
                         werr = ntstatus_to_werror(status);
+
                 }
         }
@@ -395 +406 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         union srvsvc_NetShareInfo info;
         uint32_t num_entries = 0;
+
 
         if (!r->in.net_name || !r->out.buffer) {
@@ -417 +428 @@
         }
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
-
-        status = rpccli_srvsvc_NetShareGetInfo(pipe_cli, talloc_tos(),
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_srvsvc.syntax_id,
+                                );
+        if (!W_ERROR_IS_OK(werr)) {
+                goto done;
+        }
+
+        status = , talloc_tos(),
                                                r->in.server_name,
                                                r->in.net_name,
@@ -430 +441 @@
                                                &info,
                                                &werr);
+
+
+
+
 
         if (!W_ERROR_IS_OK(werr)) {
@@ -465 +480 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         union srvsvc_NetShareInfo info;
+
 
         if (!r->in.buffer) {
@@ -487 +502 @@
         }
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_srvsvc.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -503 +518 @@
         }
 
-        status = rpccli_srvsvc_NetShareSetInfo(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                                r->in.server_name,
                                                r->in.net_name,
@@ -510 +525 @@
                                                r->out.parm_err,
                                                &werr);
+
+
+
+
+
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;