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

trunk/server/source4/libnet/libnet_samsync.c

@@ -27 +27 @@
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
-#include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/schannel.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
@@ -46 +46 @@
         struct libnet_SamSync_state *state;
         const enum netr_SamDatabaseID database_ids[] = {SAM_DATABASE_DOMAIN, SAM_DATABASE_BUILTIN, SAM_DATABASE_PRIVS}; 
-        int i;
+        unsigned int i;
 
         samsync_ctx = talloc_named(mem_ctx, 0, "SamSync top context");
@@ -210 +210 @@
                 
                 do {
-                        int d;
+                        uint32_t d;
                         loop_ctx = talloc_named(samsync_ctx, 0, "DatabaseSync loop context");
                         netlogon_creds_client_authenticator(creds, &credential);
@@ -216 +216 @@
                         dbsync.in.credential = &credential;
                         
-                        dbsync_nt_status = dcerpc_netr_DatabaseSync(p, loop_ctx, &dbsync);
+                        dbsync_nt_status = dcerpc_netr_DatabaseSync_r(p->binding_handle, loop_ctx, &dbsync);
+                        if (NT_STATUS_IS_OK(dbsync_nt_status) && !NT_STATUS_IS_OK(dbsync.out.result)) {
+                                dbsync_nt_status = dbsync.out.result;
+                        }
                         if (!NT_STATUS_IS_OK(dbsync_nt_status) &&
                             !NT_STATUS_EQUAL(dbsync_nt_status, STATUS_MORE_ENTRIES)) {