summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-04-14 22:02:48 +0400
committerNadezhda Ivanova <nivanova@samba.org>2011-04-15 16:28:08 +0300
commitcf4a3081cbba88b00a3e224ce0ba61eb3d067985 (patch)
tree7d861f325a08a8d635a4e4b8153590f68fd1a141
parent0e18a59ed0aa48a8a9dee856faf05c1ad624e264 (diff)
downloadsamba-cf4a3081cbba88b00a3e224ce0ba61eb3d067985.tar.gz
samba-cf4a3081cbba88b00a3e224ce0ba61eb3d067985.tar.bz2
samba-cf4a3081cbba88b00a3e224ce0ba61eb3d067985.zip
s4-dsdb: If current attribute list is empty use the one from the request
This will avoid overwritting attribute list made by upper modules. Signed-off-by: Nadezhda Ivanova <nivanova@samba.org>
-rw-r--r--source4/dsdb/samdb/ldb_modules/acl_read.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/acl_read.c b/source4/dsdb/samdb/ldb_modules/acl_read.c
index cde6d11c75..359b39f09b 100644
--- a/source4/dsdb/samdb/ldb_modules/acl_read.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_read.c
@@ -305,7 +305,7 @@ static int aclread_search(struct ldb_module *module, struct ldb_request *req)
/* avoid replacing all attributes with nTSecurityDescriptor
* if attribute list is empty */
if (!attrs) {
- attrs = ldb_attr_list_copy_add(ac, attrs, "*");
+ attrs = ldb_attr_list_copy_add(ac, req->op.search.attrs, "*");
}
attrs = ldb_attr_list_copy_add(ac, attrs, "nTSecurityDescriptor");
}