sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s4:instancetype LDB module - "instanceType" is single-valued - MS-ADTS 3.1.1.5.2.2

Browse Source
This commit is contained in:
Matthias Dieter Wallnöfer 2010-06-19 19:33:16 +02:00
parent 3055ead4cf
commit 131be8da0f
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/dsdb/samdb/ldb_modules/instancetype.c
View File

@ -84,6 +84,7 @@ static int instancetype_add(struct ldb_module *module, struct ldb_request *req)
struct ldb_context *ldb; struct ldb_context *ldb;
struct ldb_request *down_req; struct ldb_request *down_req;
struct ldb_message *msg; struct ldb_message *msg;
struct ldb_message_element *el;
struct it_context *ac; struct it_context *ac;
uint32_t instance_type; uint32_t instance_type;
int ret; int ret;
@ -97,8 +98,17 @@ static int instancetype_add(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req); return ldb_next_request(module, req);
} }
if (ldb_msg_find_element(req->op.add.message, "instanceType")) { el = ldb_msg_find_element(req->op.add.message, "instanceType");
unsigned int instanceType = ldb_msg_find_attr_as_uint(req->op.add.message, "instanceType", 0); if (el != NULL) {
unsigned int instanceType;
if (el->num_values != 1) {
ldb_set_errstring(ldb, "instancetype: the 'instanceType' attribute is single-valued!");
return LDB_ERR_UNWILLING_TO_PERFORM;
}
instanceType = ldb_msg_find_attr_as_uint(req->op.add.message,
"instanceType", 0);
if (!(instanceType & INSTANCE_TYPE_IS_NC_HEAD)) { if (!(instanceType & INSTANCE_TYPE_IS_NC_HEAD)) {
return ldb_next_request(module, req); return ldb_next_request(module, req);
} }

9
source4/lib/ldb/tests/python/ldap.py
View File

@ -652,6 +652,15 @@ class BasicTests(unittest.TestCase):
"""Tests the 'instanceType' attribute""" """Tests the 'instanceType' attribute"""
print "Tests the 'instanceType' attribute""" print "Tests the 'instanceType' attribute"""
try:
self.ldb.add({
"dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
"objectclass": "group",
"instanceType": ["0", "1"]})
self.fail()
except LdbError, (num, _):
self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
self.ldb.add({ self.ldb.add({
"dn": "cn=ldaptestgroup,cn=users," + self.base_dn, "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
"objectclass": "group"}) "objectclass": "group"})