Changeset 740 for vendor/current/source3/lib/netapi/netlogon.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/netlogon.c (modified) (10 diffs)

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

@@ -20 +20 @@
 #include "includes.h"
 
+
 #include "librpc/gen_ndr/libnetapi.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
 
 static WERROR construct_data(enum netr_LogonControlCode function_code,
@@ -44 +44 @@
                 data_out->debug_level = atoi((const char *)data_in);
                 break;
+
+
+
         default:
                 return WERR_INVALID_PARAM;
@@ -127 +130 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         union netr_CONTROL_QUERY_INFORMATION query;
-
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_netlogon.syntax_id,
-                                   &pipe_cli);
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
-
-        status = rpccli_netr_LogonControl(pipe_cli, talloc_tos(),
+        struct dcerpc_binding_handle *b;
+
+        werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
+                                            &ndr_table_netlogon.syntax_id,
+                                            &b);
+        if (!W_ERROR_IS_OK(werr)) {
+                goto done;
+        }
+
+        status = dcerpc_netr_LogonControl(b, talloc_tos(),
                                           r->in.server_name,
                                           r->in.function_code,
@@ -147 +150 @@
                 goto done;
         }
+
+
+
 
         werr = construct_buffer(ctx, r->in.query_level, &query,
@@ -175 +181 @@
         WERROR werr;
         NTSTATUS status;
-        struct rpc_pipe_client *pipe_cli = NULL;
         union netr_CONTROL_DATA_INFORMATION data;
         union netr_CONTROL_QUERY_INFORMATION query;
+
 
         werr = construct_data(r->in.function_code, r->in.data, &data);
@@ -184 +190 @@
         }
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_netlogon.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_netlogon.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
@@ -194 +200 @@
         case NETLOGON_CONTROL_TC_VERIFY:
         case NETLOGON_CONTROL_SET_DBFLAG:
-                status = rpccli_netr_LogonControl2Ex(pipe_cli, talloc_tos(),
+        case NETLOGON_CONTROL_FORCE_DNS_REG:
+                status = dcerpc_netr_LogonControl2Ex(b, talloc_tos(),
                                                      r->in.server_name,
                                                      r->in.function_code,
@@ -203 +210 @@
                 break;
         default:
-                status = rpccli_netr_LogonControl2(pipe_cli, talloc_tos(),
+                status = , talloc_tos(),
                                                    r->in.server_name,
                                                    r->in.function_code,
@@ -213 +220 @@
         }
 
-        if (!W_ERROR_IS_OK(werr)) {
-                goto done;
-        }
-
         if (!NT_STATUS_IS_OK(status)) {
                 werr = ntstatus_to_werror(status);
@@ -222 +225 @@
         }
 
+
+
+
+
         werr = construct_buffer(ctx, r->in.query_level, &query,
                                 r->out.buffer);