summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-03 16:21:37 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-03 16:36:42 +0100
commitb841d12a138a4b9a73f159a7056b0efd64de1289 (patch)
tree8fabb1fecbc969e1c913738efbae39f03c2ec482 /source4/dsdb/samdb/ldb_modules
parent3f4380993e75774c0c5d30171097f701b4227db7 (diff)
downloadsamba-b841d12a138a4b9a73f159a7056b0efd64de1289.tar.gz
samba-b841d12a138a4b9a73f159a7056b0efd64de1289.tar.bz2
samba-b841d12a138a4b9a73f159a7056b0efd64de1289.zip
s4:objectclass_attrs LDB module - simplify the invoke of the "dSHeuristics" checker
It's always invoked on add and modify operations.
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
-rw-r--r--source4/dsdb/samdb/ldb_modules/objectclass_attrs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
index 120357cf9e..f609e9210b 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
@@ -200,14 +200,15 @@ static int attr_handler(struct oc_context *ac)
talloc_free(res);
}
}
-/* dSHeuristics syntax check */
- if ((ac->req->operation == LDB_ADD || ac->req->operation == LDB_MODIFY) &&
- (ldb_attr_cmp(attr->lDAPDisplayName, "dSHeuristics") == 0)) {
+
+ /* "dSHeuristics" syntax check */
+ if (ldb_attr_cmp(attr->lDAPDisplayName, "dSHeuristics") == 0) {
ret = oc_validate_dsheuristics(&(msg->elements[i]));
if (ret != LDB_SUCCESS) {
return ret;
}
}
+
/* Substitute the attribute name to match in case */
msg->elements[i].name = attr->lDAPDisplayName;
}