sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-27 05:49:32 +03:00
Code Activity

s4:samldb LDB module - don't create multiple "ac" module contexts on modify operations

Browse Source 
Since we do now run sequentially through all checks we don't need multiple "ac"
contexts anymore.
This commit is contained in:
Matthias Dieter Wallnöfer
2010-06-10 16:08:23 +02:00
parent 9f95298864
commit 13ca999b3b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source4/dsdb/samdb/ldb_modules/samldb.c
View File

@ -1395,6 +1395,7 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
{
struct ldb_context *ldb;
struct samldb_ctx *ac;
struct ldb_message *msg;
struct ldb_message_element *el, *el2;
int ret;
@ -1421,6 +1422,11 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
}
}
ac = samldb_ctx_init(module, req);
if (ac == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
/* TODO: do not modify original request, create a new one */
el = ldb_msg_find_element(req->op.mod.message, "groupType");
@ -1447,12 +1453,6 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
el = ldb_msg_find_element(req->op.mod.message, "primaryGroupID");
if (el && (el->flags == LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
struct samldb_ctx *ac;
ac = samldb_ctx_init(module, req);
if (ac == NULL)
return LDB_ERR_OPERATIONS_ERROR;
req->op.mod.message = ac->msg = ldb_msg_copy_shallow(req,
req->op.mod.message);
@ -1511,12 +1511,6 @@ static int samldb_modify(struct ldb_module *module, struct ldb_request *req)
el = ldb_msg_find_element(req->op.mod.message, "member");
if (el && el->flags & (LDB_FLAG_MOD_ADD|LDB_FLAG_MOD_REPLACE) && el->num_values == 1) {
struct samldb_ctx *ac;
ac = samldb_ctx_init(module, req);
if (ac == NULL)
return LDB_ERR_OPERATIONS_ERROR;
req->op.mod.message = ac->msg = ldb_msg_copy_shallow(req,
req->op.mod.message);