summaryrefslogtreecommitdiff
path: root/source4/libnet
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2015-12-09 17:04:14 +1300
committerAndrew Bartlett <abartlet@samba.org>2016-06-06 08:50:09 +0200
commitca2e038aa5221d80a2a84aa1d65c3c246502ddc5 (patch)
treeea66ad1333357e98bdefac898ee444ad4c3c7e15 /source4/libnet
parentd103aabcf59cf376b21b7714d14878359fb3e157 (diff)
downloadsamba-ca2e038aa5221d80a2a84aa1d65c3c246502ddc5.tar.gz
samba-tool domain join: Set drsuapi.DRSUAPI_DRS_GET_ANC during initial repl
This is needed so that we get parents before children. We need this to ensure that we always know the correct parent for a new child object, rather than just trusting the DN string Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/libnet')
-rw-r--r--source4/libnet/libnet_become_dc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 36e70c5228f..9cfb9933dbf 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -2806,7 +2806,8 @@ static void becomeDC_drsuapi3_pull_schema_send(struct libnet_BecomeDC_state *s)
| DRSUAPI_DRS_PER_SYNC
| DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS
| DRSUAPI_DRS_NEVER_SYNCED
- | DRSUAPI_DRS_USE_COMPRESSION;
+ | DRSUAPI_DRS_USE_COMPRESSION
+ | DRSUAPI_DRS_GET_ANC;
if (s->rodc_join) {
s->schema_part.replica_flags &= ~DRSUAPI_DRS_WRIT_REP;
}
@@ -2866,7 +2867,8 @@ static void becomeDC_drsuapi3_pull_config_send(struct libnet_BecomeDC_state *s)
| DRSUAPI_DRS_PER_SYNC
| DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS
| DRSUAPI_DRS_NEVER_SYNCED
- | DRSUAPI_DRS_USE_COMPRESSION;
+ | DRSUAPI_DRS_USE_COMPRESSION
+ | DRSUAPI_DRS_GET_ANC;
if (s->rodc_join) {
s->schema_part.replica_flags &= ~DRSUAPI_DRS_WRIT_REP;
}
@@ -2924,9 +2926,10 @@ static void becomeDC_drsuapi3_pull_domain_send(struct libnet_BecomeDC_state *s)
| DRSUAPI_DRS_PER_SYNC
| DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS
| DRSUAPI_DRS_NEVER_SYNCED
- | DRSUAPI_DRS_USE_COMPRESSION;
+ | DRSUAPI_DRS_USE_COMPRESSION
+ | DRSUAPI_DRS_GET_ANC;
if (s->critical_only) {
- s->domain_part.replica_flags |= DRSUAPI_DRS_CRITICAL_ONLY | DRSUAPI_DRS_GET_ANC;
+ s->domain_part.replica_flags |= DRSUAPI_DRS_CRITICAL_ONLY;
}
if (s->rodc_join) {
s->schema_part.replica_flags &= ~DRSUAPI_DRS_WRIT_REP;