summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-05-03 19:37:47 +0000
committerJeremy Allison <jra@samba.org>2000-05-03 19:37:47 +0000
commit756798d00050eea4468c2d8bb0c3b98390c0e8eb (patch)
tree1038e852f975c488169b229427cd2d1e521c0df5
parent0d917c6cd660e96a2046d86d9769af57ef2bd7e3 (diff)
downloadsamba-756798d00050eea4468c2d8bb0c3b98390c0e8eb.tar.gz
samba-756798d00050eea4468c2d8bb0c3b98390c0e8eb.tar.bz2
samba-756798d00050eea4468c2d8bb0c3b98390c0e8eb.zip
Fixed the bug locktest.c found, it was an off-by-one error in the non-overlap
case. Jeremy. (This used to be commit 65150c408a5254215de89c8c774c33c4d011c2c0)
-rw-r--r--source3/locking/posix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 5dd7f18470..752311e76f 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -957,7 +957,7 @@ static struct unlock_list *posix_unlock_list(TALLOC_CTX *ctx, struct unlock_list
(double)lock->start, (double)lock->size ));
if ( (ul_curr->start >= (lock->start + lock->size)) ||
- (lock->start > (ul_curr->start + ul_curr->size))) {
+ (lock->start >= (ul_curr->start + ul_curr->size))) {
/* No overlap with this lock - leave this range alone. */
/*********************************************