From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 8 Jul 2016 19:47:15 +0000 (+1200)
Subject: dsdb: Avoid search on * in replmd_replicated_apply_next()
X-Git-Tag: tdb-1.3.10~413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba8e8687bd978092d8f74f283d008b9a5b3ff122;p=thirdparty%2Fsamba.git

dsdb: Avoid search on * in replmd_replicated_apply_next()

A search on * can be quite expensive if we have to post-process any of the results

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 9a1ff166b30..c6dc6c663fe 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -5296,9 +5296,10 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
 	char *tmp_str;
 	char *filter;
 	struct ldb_request *search_req;
-	static const char *attrs[] = { "*", "parentGUID", "instanceType",
+	static const char *attrs[] = { "repsFrom", "replUpToDateVector",
+				       "parentGUID", "instanceType",
 				       "replPropertyMetaData", "nTSecurityDescriptor",
-				       NULL };
+				       "isDeleted", NULL };
 	struct GUID_txt_buf guid_str_buf;
 
 	if (ar->index_current >= ar->objs->num_objects) {