s4-dsdb: rename dsdb_module_search_handle_flags to dsdb_request_add_controls

This function will be used for non-search controls, like relax

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
index 3a531c00a5a1f9c95a7049d5b45cc49f4f1abc17..0b9a105be6b7fc2920d36f9221f0a4a472422e68 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
@@ -275,8 +275,8 @@ static int extended_store_replace(struct extended_dn_context *ac,
                return ret;
        }
 
-       ret = dsdb_module_search_handle_flags(ac->module, os->search_req, 
-                                             DSDB_SEARCH_SHOW_DELETED|DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT);
+       ret = dsdb_request_add_controls(ac->module, os->search_req,
+                                       DSDB_SEARCH_SHOW_DELETED|DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT);
        if (ret != LDB_SUCCESS) {
                talloc_free(os);
                return ret;

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index e49b493a984b6a4f23dc06f538fbeed061acd5d9..fc286c4d839743d82a56c8b456619f503e53fce3 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -1010,7 +1010,7 @@ static int samldb_find_for_defaultObjectCategory(struct samldb_ctx *ac)
                if (ret != LDB_SUCCESS) {
                        return ret;
                }
-               ret = dsdb_module_search_handle_flags(ac->module, req, DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT);
+               ret = dsdb_request_add_controls(ac->module, req, DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT);
                if (ret != LDB_SUCCESS) {
                        return ret;
                }

diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index df3b0a9e80c0ac5d96e328383889bcb433b1b5b6..ebc2d9476a80621499c010a0faa2f1828ef2cd6f 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -25,7 +25,11 @@
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "dsdb/samdb/samdb.h"
 
-int dsdb_module_search_handle_flags(struct ldb_module *module, struct ldb_request *req, int dsdb_flags) 
+/*
+  add a set of controls to a ldb_request structure based on a set of
+  flags. See util.h for a list of available flags
+ */
+int dsdb_request_add_controls(struct ldb_module *module, struct ldb_request *req, uint32_t dsdb_flags)
 {
        int ret;
        if (dsdb_flags & DSDB_SEARCH_SEARCH_ALL_PARTITIONS) {
@@ -120,7 +124,7 @@ int dsdb_module_search_dn(struct ldb_module *module,
                return ret;
        }
 
-       ret = dsdb_module_search_handle_flags(module, req, dsdb_flags);
+       ret = dsdb_request_add_controls(module, req, dsdb_flags);
        if (ret != LDB_SUCCESS) {
                talloc_free(tmp_ctx);
                return ret;
@@ -186,7 +190,7 @@ int dsdb_module_search(struct ldb_module *module,
                return ret;
        }
 
-       ret = dsdb_module_search_handle_flags(module, req, dsdb_flags);
+       ret = dsdb_request_add_controls(module, req, dsdb_flags);
        if (ret != LDB_SUCCESS) {
                talloc_free(tmp_ctx);
                return ret;