sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

tdb_transaction_commit: check returns for 0, not -1.

Browse Source 
TDB2 returns a negative error number on failure.  This is compatible
if we always check for != 0 instead of == -1.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2011-06-20 18:40:31 +09:30
parent 6bc59d77b6
commit 2b1452b2fc
2 changed files with 5 additions and 5 deletions

2
source3/lib/dbwrap_tdb.c

@ -323,7 +323,7 @@ static int db_tdb_transaction_commit(struct db_context *db)
{
struct db_tdb_ctx *db_ctx =
talloc_get_type_abort(db->private_data, struct db_tdb_ctx);
return tdb_transaction_commit(db_ctx->wtdb->tdb);
return tdb_transaction_commit(db_ctx->wtdb->tdb) == 0 ? 0 : -1;
}
static int db_tdb_transaction_cancel(struct db_context *db)

8
source3/lib/gencache.c

@ -461,7 +461,7 @@ bool gencache_stabilize(void)
}
res = tdb_transaction_start_nonblock(cache);
if (res == -1) {
if (res != 0) {
if (tdb_error(cache) == TDB_ERR_NOLOCK) {
/*
@ -476,7 +476,7 @@ bool gencache_stabilize(void)
return false;
}
res = tdb_transaction_start(cache_notrans);
if (res == -1) {
if (res != 0) {
tdb_transaction_cancel(cache);
DEBUG(10, ("Could not start transaction on "
"gencache_notrans.tdb: %s\n",
@ -505,7 +505,7 @@ bool gencache_stabilize(void)
}
res = tdb_transaction_commit(cache);
if (res == -1) {
if (res != 0) {
DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: "
"%s\n", tdb_errorstr(cache)));
if (tdb_transaction_cancel(cache_notrans) == -1) {
@ -515,7 +515,7 @@ bool gencache_stabilize(void)
}
res = tdb_transaction_commit(cache_notrans);
if (res == -1) {
if (res != 0) {
DEBUG(10, ("tdb_transaction_commit on gencache.tdb failed: "
"%s\n", tdb_errorstr(cache)));
return false;