diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-06-07 10:44:50 +1200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-06-16 19:34:17 +0200 |
| commit | ec9b1e881c3eef503d6b4b311594113acf7d47d8 (patch) | |
| tree | b5e6e007ee4dfffaf432933054a843ad7b25e029 /source4 | |
| parent | 5067bceaa21fe86fa77a1aeb88a4bce3ba07e479 (diff) | |
| download | samba-ec9b1e881c3eef503d6b4b311594113acf7d47d8.tar.gz | |
dsdb: Do not run dsdb_replace() on the calculated difference between old and new schema
We can set the database @INDEXLIST and @ATTRIBUTES to the full calculated
values, not the difference, and let the ldb layer work it out under the
transaction lock.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/schema/schema_set.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c index 977c9e339b6..df27e19a944 100644 --- a/source4/dsdb/schema/schema_set.c +++ b/source4/dsdb/schema/schema_set.c @@ -174,7 +174,12 @@ int dsdb_schema_set_indices_and_attributes(struct ldb_context *ldb, goto op_error; } if (mod_msg->num_elements > 0) { - ret = dsdb_replace(ldb, mod_msg, 0); + /* + * Do the replace with the constructed message, + * to avoid needing a lock between this search + * and the replace + */ + ret = dsdb_replace(ldb, msg, 0); } talloc_free(mod_msg); } @@ -210,7 +215,12 @@ int dsdb_schema_set_indices_and_attributes(struct ldb_context *ldb, goto op_error; } if (mod_msg->num_elements > 0) { - ret = dsdb_replace(ldb, mod_msg, 0); + /* + * Do the replace with the constructed message, + * to avoid needing a lock between this search + * and the replace + */ + ret = dsdb_replace(ldb, msg_idx, 0); } talloc_free(mod_msg); } |