Changeset 745 for trunk/server/source3/libnet/libnet_samsync.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/libnet/libnet_samsync.c (modified) (11 diffs)

trunk/server/source3/libnet/libnet_samsync.c

@@ -23 +23 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
-#include "../lib/crypto/crypto.h"
+#include "libnet/libnet_samsync.h"
 #include "../libcli/samsync/samsync.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
+#include "rpc_client/rpc_client.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "../libcli/security/security.h"
+#include "messages.h"
 
 /**
@@ -72 +75 @@
 
         if (domain_sid) {
-                ctx->domain_sid = sid_dup_talloc(mem_ctx, domain_sid);
+                ctx->domain_sid = dom_sid_dup(mem_ctx, domain_sid);
                 NT_STATUS_HAVE_NO_MEMORY(ctx->domain_sid);
 
@@ -78 +81 @@
                 NT_STATUS_HAVE_NO_MEMORY(ctx->domain_sid_str);
         }
+
+        ctx->msg_ctx = messaging_init(ctx, procid_self(),
+                                      event_context_init(ctx));
+        NT_STATUS_HAVE_NO_MEMORY(ctx->msg_ctx);
 
         *ctx_p = ctx;
@@ -194 +201 @@
                                      struct netr_ChangeLogEntry *e)
 {
-        NTSTATUS result;
+        NTSTATUS result, status;
         NTSTATUS callback_status;
         const char *logon_server = ctx->cli->desthost;
@@ -202 +209 @@
         uint16_t restart_state = 0;
         uint32_t sync_context = 0;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         ZERO_STRUCT(return_authenticator);
@@ -212 +220 @@
                 if (ctx->single_object_replication &&
                     !ctx->force_full_replication) {
-                        result = rpccli_netr_DatabaseRedo(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseRedo(b, mem_ctx,
                                                           logon_server,
                                                           computername,
@@ -219 +227 @@
                                                           *e,
                                                           0,
-                                                          &delta_enum_array);
+                                                          &delta_enum_array,
+                                                          &result);
                 } else if (!ctx->force_full_replication &&
                            sequence_num && (*sequence_num > 0)) {
-                        result = rpccli_netr_DatabaseDeltas(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseDeltas(b, mem_ctx,
                                                             logon_server,
                                                             computername,
@@ -230 +239 @@
                                                             sequence_num,
                                                             &delta_enum_array,
-                                                            0xffff);
+                                                            0xffff,
+                                                            &result);
                 } else {
-                        result = rpccli_netr_DatabaseSync2(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseSync2(b, mem_ctx,
                                                            logon_server,
                                                            computername,
@@ -241 +251 @@
                                                            &sync_context,
                                                            &delta_enum_array,
-                                                           0xffff);
-                }
-
-                if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
-                        return result;
+                                                           0xffff,
+                                                           &result);
+                }
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
                 }
 
@@ -253 +264 @@
                         DEBUG(0,("credentials chain check failed\n"));
                         return NT_STATUS_ACCESS_DENIED;
+                }
+
+                if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
+                        return result;
                 }
 
@@ -397 +412 @@
         blob = data_blob_const(r->array, r->length);
 
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, str,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, str,
                        (ndr_pull_flags_fn_t)ndr_pull_netr_AcctLockStr);