]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
dsdb:samdb: schemainfo update with relax control
authorAaron Haslett <aaronhaslett@catalyst.net.nz>
Wed, 3 Apr 2019 03:34:42 +0000 (16:34 +1300)
committerKarolin Seeger <kseeger@samba.org>
Thu, 13 Jun 2019 10:21:59 +0000 (10:21 +0000)
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>
(cherry picked from commit b7c1752754da1e8a83a53670cf4a410ec6e9d7b7)

source4/dsdb/samdb/ldb_modules/samldb.c

index e69228c32c75da1d8c644cabf78fe09cc59070eb..02eb2fa90494b865e07e476fab40991d089f3b96 100644 (file)
@@ -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;
        }