From 3a3ff8ebe7b7de24a7d3e2c9dd105d9fbeeb5d42 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 31 Jan 2008 09:48:46 +1100
Subject: merged tdb transaction fix (This used to be commit
 eb3af24926977208a8099c848a510704d2ae3524)

---
 source4/lib/tdb/common/transaction.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib')

diff --git a/source4/lib/tdb/common/transaction.c b/source4/lib/tdb/common/transaction.c
index c3e7a4e2c0..4e2127be64 100644
--- a/source4/lib/tdb/common/transaction.c
+++ b/source4/lib/tdb/common/transaction.c
@@ -321,6 +321,9 @@ static int transaction_write_existing(struct tdb_context *tdb, tdb_off_t off,
 
 	if (blk == tdb->transaction->num_blocks-1 &&
 	    off + len > tdb->transaction->last_block_size) {
+		if (off >= tdb->transaction->last_block_size) {
+			return 0;
+		}
 		len = tdb->transaction->last_block_size - off;
 	}
 
-- 
cgit