Changeset 738 for branches/samba-3.5.x/source3/smbd/blocking.c

Timestamp:

Nov 12, 2012, 7:10:02 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.18

File:

• branches/samba-3.5.x/source3/smbd/blocking.c (modified) (3 diffs)

branches/samba-3.5.x/source3/smbd/blocking.c

@@ -300 +300 @@
 *****************************************************************************/
 
-static void reply_lockingX_error(struct blocking_lock_record *blr, NTSTATUS status)
+static void undo_locks_obtained(struct blocking_lock_record *blr)
 {
         files_struct *fsp = blr->fsp;
@@ -344 +344 @@
                         WINDOWS_LOCK);
         }
-
-        generic_blocking_lock_error(blr, status);
 }
 
@@ -358 +356 @@
         switch(blr->req->cmd) {
         case SMBlockingX:
-                reply_lockingX_error(blr, status);
-                break;
+                /*
+                 * This code can be called during the rundown of a
+                 * file after it was already closed. In that case,
+                 * blr->fsp==NULL and we do not need to undo any
+                 * locks, they are already gone.
+                 */
+                if (blr->fsp != NULL) {
+                        undo_locks_obtained(blr);
+                }
+                generic_blocking_lock_error(blr, status);
+                break;
         case SMBtrans2:
         case SMBtranss2: