sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
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>
This commit is contained in:
Stefan Metzmacher 2016-08-08 12:11:53 +02:00 committed by Jeremy Allison
parent 6bc007a914
commit cff6111d2f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/dsdb/repl/replicated_objects.c
View File

@ -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;

5
source4/libnet/libnet_vampire.c
View File

@ -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