diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-01-31 16:08:57 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-01-31 16:08:57 +0300 |
| commit | 4259d115478750d7b38cd6c2f20777b27f017e69 (patch) | |
| tree | 289563bcfe29c2892c1b77aa95292530b7e3c69a /source3/lib | |
| parent | 2763b90d242119d25d9f5afa91a403e85425da06 (diff) | |
| parent | 09454362cf75ecb7db58560604b567611e89d5ef (diff) | |
| download | samba-4259d115478750d7b38cd6c2f20777b27f017e69.tar.gz samba-4259d115478750d7b38cd6c2f20777b27f017e69.tar.bz2 samba-4259d115478750d7b38cd6c2f20777b27f017e69.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit d46fc35dd4e22ecd777800a8cdb6c31763d0fac4)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/tdb/common/transaction.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/lib/tdb/common/transaction.c b/source3/lib/tdb/common/transaction.c index c3e7a4e2c0..4e2127be64 100644 --- a/source3/lib/tdb/common/transaction.c +++ b/source3/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; } |