s4:dsdb/repl: set working_schema->resolving_in_progress during schema creation

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12128

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 288bcc111c2ff18677b577c3a188abf0ae9f5f3e..f3aade2342028c94ce5242c4ae307aa89420dcd9 100644 (file)
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -300,6 +300,7 @@ WERROR dsdb_repl_make_working_schema(struct ldb_context *ldb,
                DEBUG(0,(__location__ ": schema copy failed!\n"));
                return WERR_NOMEM;
        }
+       working_schema->resolving_in_progress = true;
 
        /* we are going to need remote prefixMap for decoding */
        werr = dsdb_schema_pfm_from_drsuapi_pfm(mapping_ctr, true,
@@ -359,6 +360,8 @@ WERROR dsdb_repl_make_working_schema(struct ldb_context *ldb,
                return werr;
        }
 
+       working_schema->resolving_in_progress = false;
+
        *_schema_out = working_schema;
 
        return WERR_OK;

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 60bfa419f90b544fe68840492f518f66bc1ba80e..8d68f8f2c8e7e0e429a31c6c7c2ffdb033d1ca0f 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -332,6 +332,9 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
                                                 "become dc",
                                                 "schema convert retrial", 1);
 
+       provision_schema->resolving_in_progress = true;
+       s->self_made_schema->resolving_in_progress = true;
+
        status = dsdb_repl_resolve_working_schema(s->ldb,
                                                  pfm_remote,
                                                  cycle_before_switching,
@@ -348,6 +351,8 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
        /* free temp objects for 1st conversion phase */
        talloc_unlink(s, provision_schema);
 
+       s->self_made_schema->resolving_in_progress = false;
+
        /*
         * attach the schema we just brought over DRS to the ldb,
         * so we can use it in dsdb_convert_object_ex below