summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2012-04-28 21:51:12 -0700
committerMatthieu Patou <mat@samba.org>2012-04-29 07:35:10 +0200
commit361673501039e3252db39696af116b2e03ff6427 (patch)
tree25923c0ec6d42d649b6d014b19e11a9c944b6984
parent441b20872bd4eebc47bf68223694a1f71f833bb5 (diff)
downloadsamba-361673501039e3252db39696af116b2e03ff6427.tar.gz
samba-361673501039e3252db39696af116b2e03ff6427.tar.bz2
samba-361673501039e3252db39696af116b2e03ff6427.zip
dsdb: more RELAX to DBCHECK control shift so that only dbcheck can do uncontrolled changes
-rw-r--r--source4/dsdb/samdb/ldb_modules/objectclass_attrs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
index 3b8d2ecd39..1fd850ab90 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;