From 421e2bd33adf3943a33acf0988725ada05366078 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Wed, 13 Mar 2019 10:52:19 +1300 Subject: [PATCH] acl_read: Fix regression caused by db15fcfa899e1fe4d6994f68ceb299921b8aa6f1 for empty lists The original code never dereferenced attrs and only added "*" if attrs was NULL (not if attrs[0] was NULL). This causes significant performance issues with the new paged_results module introduced for 4.10 as the initial GUID search requests no attributes. This GUID search turns into a search for "*" and ends up allocating memory for the entire database. This never appears to cause changes in the final result set, only intermediate processing. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13836 Signed-off-by: Garming Sam --- source4/dsdb/samdb/ldb_modules/acl_read.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/acl_read.c b/source4/dsdb/samdb/ldb_modules/acl_read.c index 5a193e6d925..1e016b970ee 100644 --- a/source4/dsdb/samdb/ldb_modules/acl_read.c +++ b/source4/dsdb/samdb/ldb_modules/acl_read.c @@ -797,9 +797,6 @@ static int aclread_search(struct ldb_module *module, struct ldb_request *req) if (attrs == NULL) { all_attrs = true; attrs = _all_attrs; - } else if (attrs[0] == NULL) { - all_attrs = true; - attrs = _all_attrs; } else if (ldb_attr_in_list(attrs, "*")) { all_attrs = true; } -- 2.17.1