[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1721-g1a1c795

Andrew Tridgell tridge at samba.org
Wed Jan 30 22:48:56 GMT 2008


The branch, v3-2-test has been updated
       via  1a1c7954368a7f168a57f86f4f857cf70258e37a (commit)
      from  0341b0be49fef5e6003a170100388b5c47a41e67 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 1a1c7954368a7f168a57f86f4f857cf70258e37a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Jan 31 09:48:20 2008 +1100

    merged tdb transaction fix

-----------------------------------------------------------------------

Summary of changes:
 source/lib/tdb/common/transaction.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
index c3e7a4e..4e2127b 100644
--- a/source/lib/tdb/common/transaction.c
+++ b/source/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;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list