The branch, v4-0-test has been updated via f6a5848e5e211d4d4d66b7eca46b4b0ad4c9daab (commit) via eb3af24926977208a8099c848a510704d2ae3524 (commit) from fc69e3f829a83aae311b4849d91509fcfa47816b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit f6a5848e5e211d4d4d66b7eca46b4b0ad4c9daab Merge: eb3af24926977208a8099c848a510704d2ae3524 fc69e3f829a83aae311b4849d91509fcfa47816b Author: Andrew Tridgell <[EMAIL PROTECTED]> Date: Thu Jan 31 09:49:15 2008 +1100 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test commit eb3af24926977208a8099c848a510704d2ae3524 Author: Andrew Tridgell <[EMAIL PROTECTED]> Date: Thu Jan 31 09:48:46 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