summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-07-18 18:50:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:08 -0500
commit8ebef3f4c80cbf05dbadf71204c781c28e369ec9 (patch)
tree2cf5dbb908f4ce34d1127d87fe2b7f22dc8406db /source3/smbd
parentef0e98b757c484f8369fd2ede2fd7356b7b95830 (diff)
downloadsamba-8ebef3f4c80cbf05dbadf71204c781c28e369ec9.tar.gz
samba-8ebef3f4c80cbf05dbadf71204c781c28e369ec9.tar.bz2
samba-8ebef3f4c80cbf05dbadf71204c781c28e369ec9.zip
r8545: Fix oplock bug introduced by oplock code "simplification" :-).
We *always* reply to an exclusive oplock break message even if we have no record of the oplock (and we always did before 3.0.20pre2). Jeremy. (This used to be commit b1a94aadf25e94dcc168ea3a5ae008f4e84ff296)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/oplock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 6ee2454fab..de12003986 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -461,12 +461,12 @@ pid %d, port %d, dev = %x, inode = %.0f, file_id = %lu\n",
*/
DEBUG(3,("process_local_message: oplock break requested with "
"no outstanding oplocks. Returning success.\n"));
- return True;
- }
- if (!oplock_break(dev, inode, file_id, False)) {
- DEBUG(0,("process_local_message: oplock break failed.\n"));
- return False;
+ } else {
+ if (!oplock_break(dev, inode, file_id, False)) {
+ DEBUG(0,("process_local_message: oplock break failed.\n"));
+ return False;
+ }
}
/*