summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-09-11 13:23:34 +0200
committerMichael Adam <obnox@samba.org>2009-09-11 15:39:53 +0200
commita1cf12e1f69a9c1f062ca12e2981a45f9ea27d37 (patch)
tree13bad8ef2130acb4eaa48be8b9e8e3afa4b01c3c /source3/lib
parent9741cb7638d4da777aa7dfa0eb7618b26795a657 (diff)
downloadsamba-a1cf12e1f69a9c1f062ca12e2981a45f9ea27d37.tar.gz
samba-a1cf12e1f69a9c1f062ca12e2981a45f9ea27d37.tar.bz2
samba-a1cf12e1f69a9c1f062ca12e2981a45f9ea27d37.zip
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
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/dbwrap_ctdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index e38f76fcf6..07dde1e408 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) {