diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-08-08 12:11:53 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-08-11 00:49:15 +0200 |
| commit | cff6111d2fe5b3999447eaa870c5ddee158226aa (patch) | |
| tree | 6d397a6de9aa86cc7956434969a12e4d2ad015e2 /source4 | |
| parent | 6bc007a9143a57525732792bb1fcb934fcb2c91c (diff) | |
| download | samba-cff6111d2fe5b3999447eaa870c5ddee158226aa.tar.gz | |
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>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 3 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 288bcc111c2..f3aade23420 100644 --- 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 60bfa419f90..8d68f8f2c8e 100644 --- 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 |