From: Matthieu Patou <mat@matws.net>
Date: Sun, 29 Apr 2012 04:51:12 +0000 (-0700)
Subject: dsdb: more RELAX to DBCHECK control shift so that only dbcheck can do uncontrolled... 
X-Git-Tag: samba-4.0.0alpha20~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=361673501039e3252db39696af116b2e03ff6427;p=thirdparty%2Fsamba.git

dsdb: more RELAX to DBCHECK control shift so that only dbcheck can do uncontrolled changes
---

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
index 3b8d2ecd395..1fd850ab90a 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
@@ -219,7 +219,7 @@ static int attr_handler(struct oc_context *ac)
 			werr = attr->syntax->validate_ldb(&syntax_ctx, attr,
 							  &msg->elements[i]);
 			if (!W_ERROR_IS_OK(werr) &&
-			    !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
+			    !ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK)) {
 				ldb_asprintf_errstring(ldb, "objectclass_attrs: attribute '%s' on entry '%s' contains at least one invalid value!",
 						       msg->elements[i].name,
 						       ldb_dn_get_linearized(msg->dn));
@@ -384,7 +384,7 @@ static int attr_handler2(struct oc_context *ac)
 		attr = dsdb_attribute_by_lDAPDisplayName(ac->schema,
 							 msg->elements[i].name);
 		if (attr == NULL) {
-			if (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
+			if (ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK)) {
 				/* allow this to make it possible for dbcheck
 				   to remove bad attributes */
 				continue;