diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-16 11:28:50 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-16 20:56:21 +1100 |
| commit | 57b10b664b49546234b8edc7efb64369460766ff (patch) | |
| tree | ceaa1f6cc80d5fbdf2c6f30760642b2c6b767ca0 /source4/dsdb | |
| parent | 951592687a29e15304d8e203b2b892aa40d7576f (diff) | |
| download | samba-57b10b664b49546234b8edc7efb64369460766ff.tar.gz samba-57b10b664b49546234b8edc7efb64369460766ff.tar.bz2 samba-57b10b664b49546234b8edc7efb64369460766ff.zip | |
s4-dsdb: rename dsdb_module_search_handle_flags to dsdb_request_add_controls
This function will be used for non-search controls, like relax
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/util.c | 10 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c index 3a531c00a5..0b9a105be6 100644 --- 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 e49b493a98..fc286c4d83 100644 --- 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 df3b0a9e80..ebc2d9476a 100644 --- 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; |