summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-10-02 00:57:59 +0000
committerJeremy Allison <jra@samba.org>1997-10-02 00:57:59 +0000
commitc557bb0517c3d1ad908f906a60b43bd604289f88 (patch)
tree397845069c1bd9c21dd3ec199bac6c8ba0e9d55b /source3/smbd
parent5864551aef50295addd1c8aa690a52870f70626d (diff)
downloadsamba-c557bb0517c3d1ad908f906a60b43bd604289f88.tar.gz
samba-c557bb0517c3d1ad908f906a60b43bd604289f88.tar.bz2
samba-c557bb0517c3d1ad908f906a60b43bd604289f88.zip
Fixed problem with oplock_type being set with no port.
Jeremy (jallison@whistle.com) (This used to be commit 90484db0bfe25a096def627f94be24f3fa243375)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 5f59af1bf1..5477230943 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1849,8 +1849,16 @@ dev = %x, inode = %x\n", old_shares[i].op_type, fname, dev, inode));
DEBUG(5,("open_file_shared: granted oplock (%x) on file %s, \
dev = %x, inode = %x\n", oplock_request, fname, dev, inode));
- }
+ }
+ else
+ {
+ port = 0;
+ oplock_request = 0;
+ }
+#else /* USE_OPLOCKS */
+ oplock_request = 0;
+ port = 0;
#endif /* USE_OPLOCKS */
set_share_mode(token, fnum, port, oplock_request);
}
@@ -2764,7 +2772,7 @@ BOOL request_oplock_break(min_share_mode_entry *share_entry,
/* We are breaking our own oplock, make sure it's us. */
if(share_entry->op_port != oplock_port)
{
- DEBUG(0,("request_oplock_break: corrupt share mode entry - pid = %x, port = %d \
+ DEBUG(0,("request_oplock_break: corrupt share mode entry - pid = %d, port = %d \
should be %d\n", pid, share_entry->op_port, oplock_port));
return False;
}