summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules/samldb.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-25 08:27:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-25 08:27:06 +1000
commit9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93 (patch)
tree28d045a42a9b09b42e34b9009a6635026ff3d9c8 /source4/dsdb/samdb/ldb_modules/samldb.c
parent5631ebaf78fee35880aafe29578b8925c655e5f4 (diff)
parenta22b9d648553e5e7e0ee19606d9bceeb3b356241 (diff)
downloadsamba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.tar.gz
samba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.tar.bz2
samba-9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a555334db67527b57bc6172e3d08f65caf1e6760)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/samldb.c')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 88590f306b..bd491bd011 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -768,6 +768,10 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
struct ldb_message_element *el, *el2;
int ret;
unsigned int group_type, user_account_control, account_type;
+ if (ldb_dn_is_special(req->op.mod.message->dn)) { /* do not manipulate our control entries */
+ return ldb_next_request(module, req);
+ }
+
if (ldb_msg_find_element(req->op.mod.message, "sAMAccountType") != NULL) {
ldb_asprintf_errstring(module->ldb, "sAMAccountType must not be specified");
return LDB_ERR_UNWILLING_TO_PERFORM;