sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

dsdb repl_meta_data: Use dsdb_request_add_controls()

Browse Source 
This makes the code easier to read.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Jun 13 11:15:01 CEST 2013 on sn-devel-104
This commit is contained in:
Andrew Bartlett 2013-05-31 15:36:34 +10:00 committed by Stefan Metzmacher
parent 5c488cfb79
commit 6c8cccc1fb
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -4462,7 +4462,6 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
char *tmp_str; char *tmp_str;
char *filter; char *filter;
struct ldb_request *search_req; struct ldb_request *search_req;
struct ldb_search_options_control *options;
if (ar->index_current >= ar->objs->num_objects) { if (ar->index_current >= ar->objs->num_objects) {
/* done with it, go to next stage */ /* done with it, go to next stage */
@ -4492,24 +4491,8 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
ar->req); ar->req);
LDB_REQ_SET_LOCATION(search_req); LDB_REQ_SET_LOCATION(search_req);
ret = ldb_request_add_control(search_req, LDB_CONTROL_SHOW_RECYCLED_OID, ret = dsdb_request_add_controls(search_req, DSDB_SEARCH_SEARCH_ALL_PARTITIONS|DSDB_SEARCH_SHOW_RECYCLED);
true, NULL);
if (ret != LDB_SUCCESS) {
return ret;
}
/* we need to cope with cross-partition links, so search for
the GUID over all partitions */
options = talloc(search_req, struct ldb_search_options_control);
if (options == NULL) {
DEBUG(0, (__location__ ": out of memory\n"));
return LDB_ERR_OPERATIONS_ERROR;
}
options->search_options = LDB_SEARCH_OPTION_PHANTOM_ROOT;
ret = ldb_request_add_control(search_req,
LDB_CONTROL_SEARCH_OPTIONS_OID,
true, options);
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
return ret; return ret;
} }