diff options
| author | Jeremy Allison <jra@samba.org> | 2001-09-05 23:16:15 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-09-05 23:16:15 +0000 |
| commit | 60713712dfdebb7bf9e0de89888e3b79e52dc420 (patch) | |
| tree | bba3c5bcaae7a57f5c4ea7f0dfe567c8a04fc54a | |
| parent | 49a21ad5ea39d77ba07b6a1ff778177bf10df4ea (diff) | |
| download | samba-60713712dfdebb7bf9e0de89888e3b79e52dc420.tar.gz samba-60713712dfdebb7bf9e0de89888e3b79e52dc420.tar.xz samba-60713712dfdebb7bf9e0de89888e3b79e52dc420.zip | |
Merge Andrew's delete on close fix - don't check for delete on close
flag when we're comparing share modes.
Jeremy.
| -rw-r--r-- | source/locking/locking.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/locking/locking.c b/source/locking/locking.c index 81b2e92f684..5d0a19c1a67 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -473,15 +473,15 @@ static void fill_share_mode(char *p, files_struct *fsp, uint16 port, uint16 op_t /******************************************************************* Check if two share mode entries are identical, ignoring oplock - and port info. + and port info and also ignoring the delete on close setting. ********************************************************************/ BOOL share_modes_identical( share_mode_entry *e1, share_mode_entry *e2) { return (e1->pid == e2->pid && - e1->share_mode == e2->share_mode && - e1->time.tv_sec == e2->time.tv_sec && - e1->time.tv_usec == e2->time.tv_usec ); + (e1->share_mode & ~DELETE_ON_CLOSE_FLAG) == (e2->share_mode & ~DELETE_ON_CLOSE_FLAG) && + e1->time.tv_sec == e2->time.tv_sec && + e1->time.tv_usec == e2->time.tv_usec ); } /******************************************************************* |