diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-06-10 14:00:01 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-07-25 09:01:08 +0200 |
| commit | 63c05e820f1449b2dfa6e4f096d8270284a60bbb (patch) | |
| tree | c5fa58fd97cefd7bdc0f6c670f84512d63c8a795 /source4/dsdb | |
| parent | 6016ba3a02c5418b44bb61d434f3a25d6e5991b8 (diff) | |
| download | samba-63c05e820f1449b2dfa6e4f096d8270284a60bbb.tar.gz samba-63c05e820f1449b2dfa6e4f096d8270284a60bbb.tar.bz2 samba-63c05e820f1449b2dfa6e4f096d8270284a60bbb.zip | |
dsdb/samdb: use RECYCLED it implies DELETED...
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/cracknames.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/linked_attributes.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 15463a7875..0c4cdfc2d3 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -945,7 +945,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ real_search_dn = NULL; } if (format_desired == DRSUAPI_DS_NAME_FORMAT_GUID){ - dsdb_flags = dsdb_flags| DSDB_SEARCH_SHOW_DELETED; + dsdb_flags |= DSDB_SEARCH_SHOW_RECYCLED; } /* search with the 'phantom root' flag */ diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c index eb57f91e6d..63ccbde896 100644 --- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c +++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c @@ -642,7 +642,7 @@ static int linked_attributes_modify(struct ldb_module *module, struct ldb_reques /* We need to figure out our own extended DN, to fill in as the backlink target */ if (ret == LDB_SUCCESS) { ret = dsdb_request_add_controls(search_req, - DSDB_SEARCH_SHOW_DELETED | + DSDB_SEARCH_SHOW_RECYCLED | DSDB_SEARCH_SHOW_EXTENDED_DN); } if (ret == LDB_SUCCESS) { @@ -1000,7 +1000,7 @@ static int la_add_callback(struct ldb_request *req, struct ldb_reply *ares) if (ret == LDB_SUCCESS) { ret = dsdb_request_add_controls(search_req, - DSDB_SEARCH_SHOW_DELETED | + DSDB_SEARCH_SHOW_RECYCLED | DSDB_SEARCH_SHOW_EXTENDED_DN); } if (ret != LDB_SUCCESS) { |