diff options
author | Volker Lendecke <vl@samba.org> | 2012-05-18 09:10:02 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2012-05-18 13:12:14 +0200 |
commit | f5ca3f11e47e48d195616f813b5b2c9e8255c6cd (patch) | |
tree | 85456771e595ecdb101a1b521a188baff231ed26 /source3/smbd/open.c | |
parent | 45082a88c7aaaa928ca36003ade071aafe4de54d (diff) | |
download | samba-f5ca3f11e47e48d195616f813b5b2c9e8255c6cd.tar.gz samba-f5ca3f11e47e48d195616f813b5b2c9e8255c6cd.tar.bz2 samba-f5ca3f11e47e48d195616f813b5b2c9e8255c6cd.zip |
s3: Revert the serverid changes, they need more work
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Fri May 18 13:12:14 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/open.c')
-rw-r--r-- | source3/smbd/open.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index f0e523dc77..543a6619e9 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1024,11 +1024,6 @@ static NTSTATUS open_mode_check(connection_struct *conn, * too */ if (share_conflict(&lck->data->share_modes[i], access_mask, share_access)) { - - if (share_mode_stale_pid(lck->data, i)) { - continue; - } - return NT_STATUS_SHARING_VIOLATION; } } @@ -1128,11 +1123,6 @@ static void find_oplock_types(files_struct *fsp, if (BATCH_OPLOCK_TYPE(lck->data->share_modes[i].op_type)) { /* batch - can only be one. */ - if (share_mode_stale_pid(lck->data, i)) { - DEBUG(10, ("find_oplock_types: Found stale " - "batch oplock\n")); - continue; - } if (*pp_ex_or_batch || *pp_batch || *got_level2 || *got_no_oplock) { smb_panic("Bad batch oplock entry."); } @@ -1140,11 +1130,6 @@ static void find_oplock_types(files_struct *fsp, } if (EXCLUSIVE_OPLOCK_TYPE(lck->data->share_modes[i].op_type)) { - if (share_mode_stale_pid(lck->data, i)) { - DEBUG(10, ("find_oplock_types: Found stale " - "duplicate oplock\n")); - continue; - } /* Exclusive or batch - can only be one. */ if (*pp_ex_or_batch || *got_level2 || *got_no_oplock) { smb_panic("Bad exclusive or batch oplock entry."); @@ -1154,11 +1139,6 @@ static void find_oplock_types(files_struct *fsp, if (LEVEL_II_OPLOCK_TYPE(lck->data->share_modes[i].op_type)) { if (*pp_batch || *pp_ex_or_batch) { - if (share_mode_stale_pid(lck->data, i)) { - DEBUG(10, ("find_oplock_types: Found " - "stale LevelII oplock\n")); - continue; - } smb_panic("Bad levelII oplock entry."); } *got_level2 = true; @@ -1166,11 +1146,6 @@ static void find_oplock_types(files_struct *fsp, if (lck->data->share_modes[i].op_type == NO_OPLOCK) { if (*pp_batch || *pp_ex_or_batch) { - if (share_mode_stale_pid(lck->data, i)) { - DEBUG(10, ("find_oplock_types: Found " - "stale NO_OPLOCK entry\n")); - continue; - } smb_panic("Bad no oplock entry."); } *got_no_oplock = true; |