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>

diff --git a/selftest/knownfail.d/samdb b/selftest/knownfail.d/samdb
deleted file mode 100644 (file)
index d2b076a..0000000
--- 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 ae99ebbe9edb8dcf55cb6da703ad2fa998279f12..a8ea6c8845955963ed93aac2730aa06aaaadeab0 100644 (file)
--- 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;
        }