From 0caf347098913e9d224d1db4b48887e2b78bae03 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 Aug 2010 12:04:45 +1000 Subject: s4-ldb: added LDB_FLAG_INTERNAL_DISABLE_VALIDATION When this flag is set on an element in an add/modify request then the normal validate_ldb() call that checks the element against schema constraints is disabled Pair-Programmed-With: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 16 +++++++++------- source4/lib/ldb/include/ldb_module.h | 6 ++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c index b9436e3a04..070d8585ae 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c @@ -113,13 +113,15 @@ static int attr_handler(struct oc_context *ac) return LDB_ERR_UNWILLING_TO_PERFORM; } - werr = attr->syntax->validate_ldb(ldb, ac->schema, attr, - &msg->elements[i]); - if (!W_ERROR_IS_OK(werr)) { - 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)); - return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + if (!(msg->elements[i].flags & LDB_FLAG_INTERNAL_DISABLE_VALIDATION)) { + werr = attr->syntax->validate_ldb(ldb, ac->schema, attr, + &msg->elements[i]); + if (!W_ERROR_IS_OK(werr)) { + 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)); + return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; + } } if ((attr->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED) != 0) { diff --git a/source4/lib/ldb/include/ldb_module.h b/source4/lib/ldb/include/ldb_module.h index 55121a8106..18982b975f 100644 --- a/source4/lib/ldb/include/ldb_module.h +++ b/source4/lib/ldb/include/ldb_module.h @@ -38,6 +38,12 @@ struct ldb_context; struct ldb_module; +/** + internal flag bits on message elements. Must be within LDB_FLAG_INTERNAL_MASK + */ +#define LDB_FLAG_INTERNAL_DISABLE_VALIDATION 0x10 + + /* these function pointers define the operations that a ldb module can intercept */ -- cgit