s4:dsdb: Add extra attrs to search request even if replacement attribute is NULL

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 2eb349f3e82351359f1673360e69203cb5c64ea7..9b56de2ae5b99ef058d7e7ac86e15426a8a8dfdd 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -1830,9 +1830,6 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
 
                        ac->attrs_to_replace[ac->attrs_to_replace_size] = search_sub[i];
                        ac->attrs_to_replace_size++;
-                       if (!search_sub[i].replace) {
-                               continue;
-                       }
 
                        if (search_sub[i].extra_attrs && search_sub[i].extra_attrs[0]) {
                                unsigned int j;
@@ -1852,6 +1849,10 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
                                }
                        }
 
+                       if (!search_sub[i].replace) {
+                               continue;
+                       }
+
                        if (!search_attrs) {
                                search_attrs = ldb_attr_list_copy(req, ac->attrs);
                                if (search_attrs == NULL) {