From: Andrew Bartlett Date: Fri, 29 Jun 2018 02:53:19 +0000 (+1200) Subject: dbcheck: Use symbolic control name for DSDB_CONTROL_DBCHECK_FIX_DUPLICATE_LINKS X-Git-Tag: samba-4.8.8~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8c9c93c90b70455ad39ae4acd78a8f71c290fb7;p=thirdparty%2Fsamba.git dbcheck: Use symbolic control name for DSDB_CONTROL_DBCHECK_FIX_DUPLICATE_LINKS While we do not wish to encourage use of this control, manually typed OIDs are even more trouble, so pass out via pydsdb. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer (cherry picked from commit c7fd68088d84232a2f4074ca278b5448ef624afd) --- diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index b2b8b0c9558..df2f6f614a3 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -759,7 +759,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) m = ldb.Message() m.dn = obj.dn m['value'] = ldb.MessageElement(forward_vals, ldb.FLAG_MOD_REPLACE, forward_attr) - if self.do_modify(m, ["local_oid:1.3.6.1.4.1.7165.4.3.19.2:1"], + if self.do_modify(m, ["local_oid:%s:1" % dsdb.DSDB_CONTROL_DBCHECK_FIX_DUPLICATE_LINKS], "Failed to fix duplicate links in attribute '%s'" % forward_attr): self.report("Fixed duplicate links in attribute '%s'" % (forward_attr)) duplicate_cache_key = "%s:%s" % (str(obj.dn), forward_attr) diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index 8cf3ef5e4f6..afc5394b641 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -1569,6 +1569,7 @@ void initdsdb(void) ADD_DSDB_STRING(DSDB_SYNTAX_OR_NAME); ADD_DSDB_STRING(DSDB_CONTROL_DBCHECK); ADD_DSDB_STRING(DSDB_CONTROL_DBCHECK_MODIFY_RO_REPLICA); + ADD_DSDB_STRING(DSDB_CONTROL_DBCHECK_FIX_DUPLICATE_LINKS); ADD_DSDB_STRING(DSDB_CONTROL_REPLMD_VANISH_LINKS); ADD_DSDB_STRING(DSDB_CONTROL_PERMIT_INTERDOMAIN_TRUST_UAC_OID); ADD_DSDB_STRING(DSDB_CONTROL_SKIP_DUPLICATES_CHECK_OID);