s3: Check for serverid_exists in find_oplock_types

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8a5273ef14e9f2b6c5c575c0fbaf8e9beb1af894..774b5fc93806b06b1836b1d0ff9dd36988256ab6 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1128,6 +1128,10 @@ 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, ("Found stale batch oplock\n"));
+                               continue;
+                       }
                        if (*pp_ex_or_batch || *pp_batch || *got_level2 || *got_no_oplock) {
                                smb_panic("Bad batch oplock entry.");
                        }
@@ -1135,6 +1139,10 @@ 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, ("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.");
@@ -1144,6 +1152,11 @@ 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, ("Found stale LevelII "
+                                                  "oplock\n"));
+                                       continue;
+                               }
                                smb_panic("Bad levelII oplock entry.");
                        }
                        *got_level2 = true;
@@ -1151,6 +1164,11 @@ 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, ("Found stale NO_OPLOCK "
+                                                  "entry\n"));
+                                       continue;
+                               }
                                smb_panic("Bad no oplock entry.");
                        }
                        *got_no_oplock = true;