From b6fe5cdfdd83319b894eeeecbc2abf40c56c33ba Mon Sep 17 00:00:00 2001 From: Nadezhda Ivanova Date: Wed, 3 Nov 2010 15:14:06 +0200 Subject: [PATCH] s4-dsdb: Implemented value restrictions for the dSHeuristics attribute --- .../samdb/ldb_modules/objectclass_attrs.c | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c index cb4f7d9ae990..120357cf9ec4 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c @@ -70,6 +70,25 @@ static struct oc_context *oc_init_context(struct ldb_module *module, static int oc_op_callback(struct ldb_request *req, struct ldb_reply *ares); +/* checks correctness of dSHeuristics attribute + * as described in MS-ADTS 7.1.1.2.4.1.2 dSHeuristics */ + +static int oc_validate_dsheuristics(struct ldb_message_element *el) +{ + if (LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_DELETE || + el->num_values < 1) { + return LDB_SUCCESS; + } + if (el->values[0].length > DS_HR_LDAP_BYPASS_UPPER_LIMIT_BOUNDS) { + return LDB_ERR_CONSTRAINT_VIOLATION; + } else if (el->values[0].length >= DS_HR_TENTH_CHAR + && el->values[0].data[DS_HR_TENTH_CHAR-1] != '1') { + return LDB_ERR_CONSTRAINT_VIOLATION; + } else { + return LDB_SUCCESS; + } +} + static int attr_handler(struct oc_context *ac) { struct ldb_context *ldb; @@ -181,7 +200,14 @@ 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)) { + 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; } -- 2.34.1