From: Michael Adam <obnox@samba.org>
Date: Wed, 13 Jan 2010 22:51:34 +0000 (+0100)
Subject: s3:dbwrap_ctdb: fix brown paperbag bug in ctdb_transaction_commit.
X-Git-Tag: release-3-6-0pre1~5377
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=1d594bd734a2f7146ed52872456a16c5e41816f1

s3:dbwrap_ctdb: fix brown paperbag bug in ctdb_transaction_commit.

I carefully prepared the return value only to "return 0;" at the bottom. :-(
This may well have hit us for instance in the nested cancel case
and produced random errors.

Michael
---

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 4e97d26ae82..c0b5fd51ed5 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -840,7 +840,7 @@ again:
 done:
 	h->ctx->transaction = NULL;
 	talloc_free(h);
-	return 0;
+	return ret;
 }