summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-06-20 18:40:32 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-06-20 11:18:35 +0200
commit2c71e8596b295e7080eb936db705f452e1d7b9d9 (patch)
treee6f6f1eca7ee9401d23362de5e1bc55b4b2c74d2
parent5a7874e119acbc80410b2f2c1847371236c22a56 (diff)
downloadsamba-2c71e8596b295e7080eb936db705f452e1d7b9d9.tar.gz
samba-2c71e8596b295e7080eb936db705f452e1d7b9d9.tar.bz2
samba-2c71e8596b295e7080eb936db705f452e1d7b9d9.zip
tdb_unlockall/tdb_unlockall_read: ignore return value.
TDB2 returns void here. tdb_unlockall will *always* return with the database unlocked, but it will complain via the log function if it wasn't locked. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_tdb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 77b4b24a2e..16e556d78d 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -111,7 +111,8 @@ int ltdb_unlock_read(struct ldb_module *module)
void *data = ldb_module_get_private(module);
struct ltdb_private *ltdb = talloc_get_type(data, struct ltdb_private);
if (ltdb->in_transaction == 0 && ltdb->read_lock_count == 1) {
- return tdb_unlockall_read(ltdb->tdb);
+ tdb_unlockall_read(ltdb->tdb);
+ return 0;
}
ltdb->read_lock_count--;
return 0;