sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

samdb: test for schemainfo update with relax control

Browse Source 
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.  This patch adds a failing test to expose the
problem.

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>
This commit is contained in:
Aaron Haslett
2019-04-04 14:39:41 +13:00
committed by Andrew Bartlett
parent 140a6733a4
commit e34abefb77
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source4/dsdb/tests/python/dsdb_schema_info.py
View File

@ -166,16 +166,17 @@ systemOnly: FALSE
"""
return ldif
def test_AddModifyClass(self):
def test_AddModifyClass(self, controls=[], class_pre="schemaInfo-Class-"):
# get initial schemaInfo
schi_before = self._getSchemaInfo()
# create names for a Class to add
(class_name, class_ldap_name, class_dn) = self._make_obj_names("schemaInfo-Class-")
(class_name, class_ldap_name, class_dn) =\
self._make_obj_names(class_pre)
ldif = self._make_class_ldif(class_name, class_dn, 1)
# add the new Class
self.sam_db.add_ldif(ldif)
self.sam_db.add_ldif(ldif, controls=controls)
self._ldap_schemaUpdateNow()
# compare resulting schemaInfo
schi_after = self._getSchemaInfo()
@ -184,7 +185,7 @@ systemOnly: FALSE
# rename the Class
class_dn_new = class_dn.replace(class_name, class_name + "-NEW")
try:
self.sam_db.rename(class_dn, class_dn_new)
self.sam_db.rename(class_dn, class_dn_new, controls=controls)
except LdbError as e1:
(num, _) = e1.args
self.fail("failed to change CN for %s: %s" % (class_name, _))
@ -192,3 +193,9 @@ systemOnly: FALSE
# compare resulting schemaInfo
schi_after = self._getSchemaInfo()
self._checkSchemaInfo(schi_before, schi_after)
def test_AddModifyClassLocalRelaxed(self):
lp = self.get_loadparm()
self.sam_db = samba.tests.connect_samdb(lp.samdb_url())
self.test_AddModifyClass(controls=["relax:0"],
class_pre="schemaInfo-Relaxed-")