diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-06-10 14:00:01 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-08-05 20:25:08 +0200 |
| commit | 071b36bf14d4688b5eb549b8dded6a983f65b00a (patch) | |
| tree | 346ef3a18e4a3bc1bfae4a41a46419b7ef7bb041 /source4 | |
| parent | 55f07795e6ccaf986146a071df86c80a3346fe8a (diff) | |
| download | samba-071b36bf14d4688b5eb549b8dded6a983f65b00a.tar.gz | |
dsdb/samdb: use RECYCLED it implies DELETED...
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 63c05e820f1449b2dfa6e4f096d8270284a60bbb)
Diffstat (limited to 'source4')
| -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 15463a78757..0c4cdfc2d3f 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 eb57f91e6d8..63ccbde896b 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) { |