git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1d5ec3
)
repl: Use DSDB_REPL_FLAG_PRIORITISE_INCOMING in samba-tool drs replicate --local
author
Andrew Bartlett
<abartlet@samba.org>
Wed, 19 Aug 2015 01:30:55 +0000
(13:30 +1200)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 26 Oct 2015 04:11:21 +0000
(
05:11
+0100)
Previously this would only be set when we did server-to-server replication
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
source4/libnet/libnet_vampire.c
patch
|
blob
|
history
diff --git
a/source4/libnet/libnet_vampire.c
b/source4/libnet/libnet_vampire.c
index 1d649fc33d0cb9105795b02a2f4ce9a6bb9090bc..97c6d1a009d481034005f20648843feecfae8585 100644
(file)
--- a/
source4/libnet/libnet_vampire.c
+++ b/
source4/libnet/libnet_vampire.c
@@
-680,6
+680,10
@@
NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
return NT_STATUS_INTERNAL_ERROR;
}
+ if (req_replica_flags & DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS) {
+ dsdb_repl_flags |= DSDB_REPL_FLAG_PRIORITISE_INCOMING;
+ }
+
if (req_replica_flags & DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING) {
dsdb_repl_flags |= DSDB_REPL_FLAG_EXPECT_NO_SECRETS;
}