Changeset 740 for vendor/current/source3/lib/netapi/serverinfo.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/netapi/serverinfo.c (modified) (10 diffs)

vendor/current/source3/lib/netapi/serverinfo.c

@@ -24 +24 @@
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "libnet/libnet.h"
-#include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_srvsvc_c.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 /****************************************************************
@@ -480 +481 @@
                           struct NetServerGetInfo *r)
 {
-        struct rpc_pipe_client *pipe_cli = NULL;
         NTSTATUS status;
         WERROR werr;
         union srvsvc_NetSrvInfo info;
+
 
         if (!r->out.buffer) {
@@ -502 +503 @@
         }
 
-        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;
         }
 
-        status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                              r->in.server_name,
                                              r->in.level,
@@ -519 +520 @@
         }
 
+
+
+
+
         status = map_server_info_to_SERVER_INFO_buffer(ctx, r->in.level, &info,
                                                        r->out.buffer);
@@ -536 +541 @@
                                       struct NetServerSetInfo *r)
 {
-        WERROR werr;
+        WERROR werr = WERR_OK;
+        sbcErr err;
         struct smbconf_ctx *conf_ctx;
         struct srvsvc_NetSrvInfo1005 *info1005;
@@ -559 +565 @@
         }
 
-        werr = smbconf_init_reg(ctx, &conf_ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
-
-        werr = smbconf_set_global_parameter(conf_ctx, "server string",
+        err = smbconf_init_reg(ctx, &conf_ctx, NULL);
+        if (!SBC_ERROR_IS_OK(err)) {
+                libnetapi_set_error_string(ctx,
+                        "Could not initialize backend: %s",
+                        sbcErrorString(err));
+                werr = WERR_NO_SUCH_SERVICE;
+                goto done;
+        }
+
+        err = smbconf_set_global_parameter(conf_ctx, "server string",
                                             info1005->comment);
+
+
+
+
+
+
+
 
  done:
@@ -594 +611 @@
                           struct NetServerSetInfo *r)
 {
-        struct rpc_pipe_client *pipe_cli = NULL;
         NTSTATUS status;
         WERROR werr;
         union srvsvc_NetSrvInfo info;
-
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
+        struct dcerpc_binding_handle *b;
+
+        werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
+                                            &ndr_table_srvsvc.syntax_id,
+                                            &b);
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -615 +632 @@
         }
 
-        status = rpccli_srvsvc_NetSrvSetInfo(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                              r->in.server_name,
                                              r->in.level,
@@ -636 +653 @@
                       struct NetRemoteTOD *r)
 {
-        struct rpc_pipe_client *pipe_cli = NULL;
         NTSTATUS status;
         WERROR werr;
         struct srvsvc_NetRemoteTODInfo *info = NULL;
-
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_srvsvc.syntax_id,
-                                   &pipe_cli);
+        struct dcerpc_binding_handle *b;
+
+        werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
+                                            &ndr_table_srvsvc.syntax_id,
+                                            &b);
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
         }
 
-        status = rpccli_srvsvc_NetRemoteTOD(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                             r->in.server_name,
                                             &info,
@@ -657 +674 @@
         }
 
+
+
+
+
         *r->out.buffer = (uint8_t *)talloc_memdup(ctx, info,
                           sizeof(struct srvsvc_NetRemoteTODInfo));