s4:libnet: s/highestCommitedUSN/highestCommittedUSN

[sfrench/samba-autobuild/.git] / source4 / libnet / libnet_become_dc.c

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 55ac48cfdb250dd1e929606f23a62c29f3e90ad5..43a32099a547d228ffec534abb88d142d9bea764 100644 (file)
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -84,7 +84,7 @@
  *             supportedLDAPVersion:   3
  *                                     2
  *             supportedLDAPPolicies:  ...
- *             highestCommitedUSN:     ...
+ *             highestCommittedUSN:    ...
  *             supportedSASLMechanisms:GSSAPI
  *                                     GSS-SPNEGO
  *                                     EXTERNAL
@@ -1703,15 +1703,6 @@ static WERROR becomeDC_drsuapi_bind_recv(struct libnet_BecomeDC_state *s,
                        drsuapi->remote_info28.repl_epoch               = 0;
                        break;
                }
-               case 48: {
-                       struct drsuapi_DsBindInfo48 *info48;
-                       info48 = &drsuapi->bind_r.out.bind_info->info.info48;
-                       drsuapi->remote_info28.supported_extensions     = info48->supported_extensions;
-                       drsuapi->remote_info28.site_guid                = info48->site_guid;
-                       drsuapi->remote_info28.pid                      = info48->pid;
-                       drsuapi->remote_info28.repl_epoch               = info48->repl_epoch;
-                       break;
-               }
                case 28: {
                        drsuapi->remote_info28 = drsuapi->bind_r.out.bind_info->info.info28;
                        break;
@@ -1725,6 +1716,15 @@ static WERROR becomeDC_drsuapi_bind_recv(struct libnet_BecomeDC_state *s,
                        drsuapi->remote_info28.repl_epoch               = info32->repl_epoch;
                        break;
                }
+               case 48: {
+                       struct drsuapi_DsBindInfo48 *info48;
+                       info48 = &drsuapi->bind_r.out.bind_info->info.info48;
+                       drsuapi->remote_info28.supported_extensions     = info48->supported_extensions;
+                       drsuapi->remote_info28.site_guid                = info48->site_guid;
+                       drsuapi->remote_info28.pid                      = info48->pid;
+                       drsuapi->remote_info28.repl_epoch               = info48->repl_epoch;
+                       break;
+               }
                case 52: {
                        struct drsuapi_DsBindInfo52 *info52;
                        info52 = &drsuapi->bind_r.out.bind_info->info.info52;
@@ -2684,7 +2684,7 @@ static WERROR becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state
        struct GUID *source_dsa_invocation_id = NULL;
        struct drsuapi_DsReplicaHighWaterMark *new_highwatermark = NULL;
        bool more_data = false;
-       NTSTATUS nt_status;
+       WERROR werr;
 
        if (!W_ERROR_IS_OK(r->out.result)) {
                return r->out.result;
@@ -2783,9 +2783,9 @@ static WERROR becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state
         */
        s->_sc.gensec_skey      = &drsuapi_p->gensec_skey;
 
-       nt_status = partition->store_chunk(s->callbacks.private_data, &s->_sc);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               return ntstatus_to_werror(nt_status);
+       werr = partition->store_chunk(s->callbacks.private_data, &s->_sc);
+       if (!W_ERROR_IS_OK(werr)) {
+               return werr;
        }
 
        return WERR_OK;
@@ -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;