From 6aaf220f9e20815a32d166c1c5953e41152e1c99 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 Nov 2008 03:45:38 +0100
Subject: s3-libnet-samsync: use netr_DatabaseDeltas unless full replication
 enforced.

Guenther
---
 source3/libnet/libnet_samsync.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 43891ce829..5711b231c7 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -376,7 +376,8 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
 
 		netlogon_creds_client_step(ctx->cli->dc, &credential);
 
-		if (ctx->single_object_replication) {
+		if (ctx->single_object_replication &&
+		    !ctx->force_full_replication) {
 			result = rpccli_netr_DatabaseRedo(ctx->cli, mem_ctx,
 							  logon_server,
 							  computername,
@@ -385,6 +386,16 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
 							  *e,
 							  0,
 							  &delta_enum_array);
+		} else if (!ctx->force_full_replication && (sequence_num > 0)) {
+			result = rpccli_netr_DatabaseDeltas(ctx->cli, mem_ctx,
+							    logon_server,
+							    computername,
+							    &credential,
+							    &return_authenticator,
+							    database_id,
+							    &sequence_num,
+							    &delta_enum_array,
+							    0xffff);
 		} else {
 			result = rpccli_netr_DatabaseSync2(ctx->cli, mem_ctx,
 							   logon_server,
-- 
cgit