From: Michael Adam <obnox@samba.org>
Date: Fri, 11 Sep 2009 11:23:34 +0000 (+0200)
Subject: s3:dbwrap_ctdb: set dmaster in ctdb_transaction_store() also when updating an existin... 
X-Git-Tag: talloc-2.0.1~523^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1cf12e1f69a9c1f062ca12e2981a45f9ea27d37;p=thirdparty%2Fsamba.git

s3:dbwrap_ctdb: set dmaster in ctdb_transaction_store() also when updating an existing record

not only when creating a record.

This matches commit e9194a130327d6b05a8ab90bd976475b0e93b06d from ctdb-master.

Michael
---

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index e38f76fcf6e..07dde1e4087 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -478,7 +478,6 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 		   This is only safe because we are in a transaction and this
 		   is a persistent database */
 		ZERO_STRUCT(header);
-		header.dmaster = get_my_vnn();
 	} else {
 		memcpy(&header, rec.dptr, sizeof(struct ctdb_ltdb_header));
 		rec.dsize -= sizeof(struct ctdb_ltdb_header);
@@ -492,6 +491,7 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 		SAFE_FREE(rec.dptr);
 	}
 
+	header.dmaster = get_my_vnn();
 	header.rsn++;
 
 	if (!h->in_replay) {