summaryrefslogtreecommitdiffstats
path: root/tdb/common/tdb.c
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-09-25 01:51:49 -0400
committerSimo Sorce <idra@samba.org>2008-09-25 02:30:18 -0400
commitf698831f0ae0cd86225eb647ae4aeb813f08d3b5 (patch)
tree55689de966245292e6ae517480c668ce993caf70 /tdb/common/tdb.c
parentcced59be44cbc2204314bdf77a35b41b81bf4097 (diff)
downloadsssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.tar.gz
sssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.tar.xz
sssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.zip
Sync with upstream changes
Diffstat (limited to 'tdb/common/tdb.c')
-rw-r--r--tdb/common/tdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdb/common/tdb.c b/tdb/common/tdb.c
index 767452c9b..c7cec297f 100644
--- a/tdb/common/tdb.c
+++ b/tdb/common/tdb.c
@@ -243,7 +243,7 @@ int tdb_do_delete(struct tdb_context *tdb, tdb_off_t rec_ptr, struct list_struct
if (tdb->read_only || tdb->traverse_read) return -1;
- if (tdb->traverse_write != 0 ||
+ if (((tdb->traverse_write != 0) && (!TDB_DEAD(rec))) ||
tdb_write_lock_record(tdb, rec_ptr) == -1) {
/* Someone traversing here: mark it as dead */
rec->magic = TDB_DEAD_MAGIC;