summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-10-03 23:45:34 +0000
committerJeremy Allison <jra@samba.org>1997-10-03 23:45:34 +0000
commitc89eaa20d14c46c70980598345d7aa9394bcd854 (patch)
tree2f120710a851ca01cee54a1f1fe1482d43098f3f
parent2f7b04061e61df7dcc1029b71fe12ca4dfca5f10 (diff)
downloadsamba-c89eaa20d14c46c70980598345d7aa9394bcd854.tar.gz
samba-c89eaa20d14c46c70980598345d7aa9394bcd854.tar.bz2
samba-c89eaa20d14c46c70980598345d7aa9394bcd854.zip
Making it harder for share_mode_entries to be left with
non-zero op_type fields. Paranoia code really. Jeremy (jallison@whistle.com) (This used to be commit 21ecb46f56ac0f341803d0552c981e517d0322cb)
-rw-r--r--source3/locking/locking.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 834f3e5658..abda5d39d4 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -668,8 +668,7 @@ record due to old locking version %d for file dev %d, inode %d hash bucket %d\n"
while(entry_scanner_p)
{
if( (pid == entry_scanner_p->pid) &&
- (entry_scanner_p->op_port != 0) &&
- (entry_scanner_p->op_type != 0) &&
+ (entry_scanner_p->share_mode == Files[fnum].share_mode) &&
(memcmp(&entry_scanner_p->time,
&Files[fnum].open_time,sizeof(struct timeval)) == 0) )
{
@@ -1463,9 +1462,7 @@ for share file %d\n", num_entries, fname));
if((IVAL(p,SME_SEC_OFFSET) != fs_p->open_time.tv_sec) ||
(IVAL(p,SME_USEC_OFFSET) != fs_p->open_time.tv_usec) ||
(IVAL(p,SME_SHAREMODE_OFFSET) != fs_p->share_mode) ||
- (IVAL(p,SME_PID_OFFSET) != pid) ||
- (SVAL(p,SME_PORT_OFFSET) == 0) ||
- (SVAL(p,SME_OPLOCK_TYPE_OFFSET) == 0))
+ (IVAL(p,SME_PID_OFFSET) != pid))
continue;
DEBUG(5,("remove_share_oplock: clearing oplock on entry number %d (of %d) \