summaryrefslogtreecommitdiffstats
path: root/source/smbd/blocking.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-08-17 23:30:18 +0000
committerAndrew Tridgell <tridge@samba.org>2002-08-17 23:30:18 +0000
commit5d4df58b6d4de548d8aa0a49ec307dce7cd1515a (patch)
treeecbc20b1aab6bae4e163e48afd11ababdfb887bc /source/smbd/blocking.c
parent227472286f479bddfac7ea958b779fc4459a9e1e (diff)
downloadsamba-5d4df58b6d4de548d8aa0a49ec307dce7cd1515a.tar.gz
samba-5d4df58b6d4de548d8aa0a49ec307dce7cd1515a.tar.xz
samba-5d4df58b6d4de548d8aa0a49ec307dce7cd1515a.zip
amazing! we've had a reversed comparison in our blocking lock code
since 1998 and nobody noticed. It means that sometimes smbd would sit there forever, and smbd would never get the timing part of blocking locks right.
Diffstat (limited to 'source/smbd/blocking.c')
-rw-r--r--source/smbd/blocking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c
index 6623c6df646..cb69b60144c 100644
--- a/source/smbd/blocking.c
+++ b/source/smbd/blocking.c
@@ -576,7 +576,7 @@ void process_blocking_lock_queue(time_t t)
DEBUG(5,("process_blocking_lock_queue: examining pending lock fnum = %d for file %s\n",
fsp->fnum, fsp->fsp_name ));
- if((blr->expire_time != -1) && (blr->expire_time > t)) {
+ if((blr->expire_time != -1) && (blr->expire_time <= t)) {
/*
* Lock expired - throw away all previously
* obtained locks and return lock error.