diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-07-07 22:53:19 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-09 08:42:07 +0200 |
| commit | fa177273b87d980f81f19acb2f1a9154f8c6bfd9 (patch) | |
| tree | 7e602ee387545aad5bd16745621577cf33024179 | |
| parent | 26fa0b97d0270456becb86d93723a3c8e5d58585 (diff) | |
| download | samba-fa177273b87d980f81f19acb2f1a9154f8c6bfd9.tar.gz samba-fa177273b87d980f81f19acb2f1a9154f8c6bfd9.tar.xz samba-fa177273b87d980f81f19acb2f1a9154f8c6bfd9.zip | |
s4:dsdb/kcc: use SHOW_RECYCLED instead of SHOW_DELETED in when deleting tombstone/deleted objects
SHOW_RECYCLED implies SHOW_DELETED.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10694
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/kcc/kcc_deleted.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/kcc/kcc_deleted.c b/source4/dsdb/kcc/kcc_deleted.c index 331d4fbe67..93d74ca3a3 100644 --- a/source4/dsdb/kcc/kcc_deleted.c +++ b/source4/dsdb/kcc/kcc_deleted.c @@ -128,7 +128,7 @@ NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) whenChanged = ldb_string_to_time(tstring); } if (t - whenChanged > tombstoneLifetime*60*60*24) { - ret = dsdb_delete(s->samdb, res->msgs[i]->dn, DSDB_SEARCH_SHOW_DELETED|DSDB_MODIFY_RELAX); + ret = dsdb_delete(s->samdb, res->msgs[i]->dn, DSDB_SEARCH_SHOW_RECYCLED|DSDB_MODIFY_RELAX); if (ret != LDB_SUCCESS) { DEBUG(1,(__location__ ": Failed to remove deleted object %s\n", ldb_dn_get_linearized(res->msgs[i]->dn))); |