diff options
| author | Aaron Haslett <aaronhaslett@catalyst.net.nz> | 2019-04-03 16:34:42 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-04-11 04:17:10 +0000 |
| commit | b7c1752754da1e8a83a53670cf4a410ec6e9d7b7 (patch) | |
| tree | 3b3a94f78c1ee64b97e54dcaa5a4440d056fc928 | |
| parent | 7652439fa1aab92945f5540a43fc49568d446917 (diff) | |
| download | samba-b7c1752754da1e8a83a53670cf4a410ec6e9d7b7.tar.gz | |
dsdb:samdb: schemainfo update with relax control
Currently schema info's revision field isn't incremented if relax
control is present. This is so that no increment is done during
provision, but we need the relax control in other situations where
the increment is desired, so we should use the provision control instead
to disable schema info update.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13799
Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
| -rw-r--r-- | selftest/knownfail.d/samdb | 1 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/selftest/knownfail.d/samdb b/selftest/knownfail.d/samdb deleted file mode 100644 index d2b076a039d..00000000000 --- a/selftest/knownfail.d/samdb +++ /dev/null @@ -1 +0,0 @@ -samba4.schemaInfo.python.*SchemaInfoTestCase.test_AddModifyClassLocalRelaxed.* diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index ae99ebbe9ed..a8ea6c88459 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -1333,7 +1333,7 @@ static int samldb_schema_info_update(struct samldb_ctx *ac) } /* do not update schemaInfo during provisioning */ - if (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) { + if (ldb_request_get_control(ac->req, LDB_CONTROL_PROVISION_OID)) { return LDB_SUCCESS; } |