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

s4-dsdb: allow modification of some deleted object if the show-deleted control is presented

Browse Source 
Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sat May 19 20:28:01 CEST 2012 on sn-devel-104
This commit is contained in:
Matthieu Patou 2012-05-11 14:25:49 -07:00 committed by Matthieu Patou
parent db866864f7
commit 1d53e57bbf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/dsdb/samdb/ldb_modules/descriptor.c
View File

@ -581,7 +581,7 @@ static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
{
struct ldb_context *ldb;
struct ldb_control *sd_recalculate_control, *sd_flags_control;
struct ldb_control *sd_recalculate_control, *sd_flags_control, *show_deleted_control;
struct ldb_request *mod_req;
struct ldb_message *msg;
struct ldb_result *current_res, *parent_res;
@ -591,7 +591,7 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
struct ldb_dn *parent_dn, *dn;
struct ldb_message_element *objectclass_element;
int ret;
uint32_t instanceType, sd_flags = 0;
uint32_t instanceType, sd_flags = 0, flags;
const struct dsdb_schema *schema;
DATA_BLOB *sd;
const struct dsdb_class *objectclass;
@ -604,6 +604,8 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
user_sd = ldb_msg_find_ldb_val(req->op.mod.message, "nTSecurityDescriptor");
/* This control forces the recalculation of the SD also when
* no modification is performed. */
show_deleted_control = ldb_request_get_control(req,
LDB_CONTROL_SHOW_DELETED_OID);
sd_recalculate_control = ldb_request_get_control(req,
LDB_CONTROL_RECALCULATE_SD_OID);
if (!user_sd && !sd_recalculate_control) {
@ -616,10 +618,13 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
if (ldb_dn_is_special(dn)) {
return ldb_next_request(module, req);
}
flags = DSDB_FLAG_NEXT_MODULE;
if (show_deleted_control) {
flags |= DSDB_SEARCH_SHOW_DELETED;
}
ret = dsdb_module_search_dn(module, req, &current_res, dn,
current_attrs,
DSDB_FLAG_NEXT_MODULE,
flags,
req);
if (ret != LDB_SUCCESS) {
ldb_debug(ldb, LDB_DEBUG_ERROR,"descriptor_modify: Could not find %s\n",