r20257: Hey, change_owner_to_parent is now static :-)
[samba.git] / source3 / smbd / open.c
index 7621ee001dd0b0f719759d5b734b2d3fffeeb8ac..3111f68ef59543c6d9ac84c9b9eece547d336af9 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 
+extern struct generic_mapping file_generic_mapping;
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
 extern uint16 global_smbpid;
@@ -37,24 +38,29 @@ struct deferred_open_record {
  fd support routines - attempt to do a dos_open.
 ****************************************************************************/
 
-static int fd_open(struct connection_struct *conn,
-                       const char *fname, 
-                       int flags,
-                       mode_t mode)
+static BOOL fd_open(struct connection_struct *conn,
+                   const char *fname, 
+                   files_struct *fsp,
+                   int flags,
+                   mode_t mode)
 {
-       int fd;
+       int sav;
+
 #ifdef O_NOFOLLOW
        if (!lp_symlinks(SNUM(conn))) {
                flags |= O_NOFOLLOW;
        }
 #endif
 
-       fd = SMB_VFS_OPEN(conn,fname,flags,mode);
+       fsp->fh->fd = SMB_VFS_OPEN(conn,fname,fsp,flags,mode);
+       sav = errno;
 
-       DEBUG(10,("fd_open: name %s, flags = 0%o mode = 0%o, fd = %d. %s\n", fname,
-               flags, (int)mode, fd, (fd == -1) ? strerror(errno) : "" ));
+       DEBUG(10,("fd_open: name %s, flags = 0%o mode = 0%o, fd = %d. %s\n",
+                   fname, flags, (int)mode, fsp->fh->fd,
+               (fsp->fh->fd == -1) ? strerror(errno) : "" ));
 
-       return fd;
+       errno = sav;
+       return fsp->fh->fd != -1;
 }
 
 /****************************************************************************
@@ -62,7 +68,7 @@ static int fd_open(struct connection_struct *conn,
 ****************************************************************************/
 
 int fd_close(struct connection_struct *conn,
-               files_struct *fsp)
+            files_struct *fsp)
 {
        if (fsp->fh->fd == -1) {
                return 0; /* What we used to call a stat open. */
@@ -73,32 +79,15 @@ int fd_close(struct connection_struct *conn,
        return fd_close_posix(conn, fsp);
 }
 
-
-/****************************************************************************
- Check a filename for the pipe string.
-****************************************************************************/
-
-static void check_for_pipe(const char *fname)
-{
-       /* special case of pipe opens */
-       char s[10];
-       StrnCpy(s,fname,sizeof(s)-1);
-       strlower_m(s);
-       if (strstr(s,"pipe/")) {
-               DEBUG(3,("Rejecting named pipe open for %s\n",fname));
-               set_saved_error_triple(ERRSRV, ERRaccess, NT_STATUS_ACCESS_DENIED);
-       }
-}
-
 /****************************************************************************
  Change the ownership of a file to that of the parent directory.
  Do this by fd if possible.
 ****************************************************************************/
 
-void change_owner_to_parent(connection_struct *conn,
-                               files_struct *fsp,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf)
+static void change_owner_to_parent(connection_struct *conn,
+                                  files_struct *fsp,
+                                  const char *fname,
+                                  SMB_STRUCT_STAT *psbuf)
 {
        const char *parent_path = parent_dirname(fname);
        SMB_STRUCT_STAT parent_st;
@@ -195,13 +184,14 @@ void change_owner_to_parent(connection_struct *conn,
  Open a file.
 ****************************************************************************/
 
-static BOOL open_file(files_struct *fsp,
-                       connection_struct *conn,
-                       const char *fname,
-                       SMB_STRUCT_STAT *psbuf,
-                       int flags,
-                       mode_t unx_mode,
-                       uint32 access_mask)
+static NTSTATUS open_file(files_struct *fsp,
+                         connection_struct *conn,
+                         const char *fname,
+                         SMB_STRUCT_STAT *psbuf,
+                         int flags,
+                         mode_t unx_mode,
+                         uint32 access_mask, /* client requested access mask. */
+                         uint32 open_access_mask) /* what we're actually using in the open. */
 {
        int accmode = (flags & O_ACCMODE);
        int local_flags = flags;
@@ -226,8 +216,7 @@ static BOOL open_file(files_struct *fsp,
                /* It's a read-only share - fail if we wanted to write. */
                if(accmode != O_RDONLY) {
                        DEBUG(3,("Permission denied opening %s\n",fname));
-                       check_for_pipe(fname);
-                       return False;
+                       return NT_STATUS_ACCESS_DENIED;
                } else if(flags & O_CREAT) {
                        /* We don't want to write - but we must make sure that
                           O_CREAT doesn't create the file if we have write
@@ -256,13 +245,13 @@ static BOOL open_file(files_struct *fsp,
                local_flags = (flags & ~O_ACCMODE)|O_RDWR;
        }
 
-       if ((access_mask & (FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_EXECUTE)) ||
-           (local_flags & O_CREAT) ||
+       if ((open_access_mask & (FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_EXECUTE)) ||
+           (!file_existed && (local_flags & O_CREAT)) ||
            ((local_flags & O_TRUNC) == O_TRUNC) ) {
 
                /*
                 * We can't actually truncate here as the file may be locked.
-                * open_file_shared will take care of the truncate later. JRA.
+                * open_file_ntcreate will take care of the truncate later. JRA.
                 */
 
                local_flags &= ~O_TRUNC;
@@ -282,22 +271,21 @@ static BOOL open_file(files_struct *fsp,
                /* Don't create files with Microsoft wildcard characters. */
                if ((local_flags & O_CREAT) && !file_existed &&
                    ms_has_wild(fname))  {
-                       set_saved_ntstatus(NT_STATUS_OBJECT_NAME_INVALID);
-                       return False;
+                       return NT_STATUS_OBJECT_NAME_INVALID;
                }
 
                /* Actually do the open */
-               fsp->fh->fd = fd_open(conn, fname, local_flags, unx_mode);
-               if (fsp->fh->fd == -1)  {
+               if (!fd_open(conn, fname, fsp, local_flags, unx_mode)) {
                        DEBUG(3,("Error opening file %s (%s) (local_flags=%d) "
                                 "(flags=%d)\n",
                                 fname,strerror(errno),local_flags,flags));
-                       check_for_pipe(fname);
-                       return False;
+                       return map_nt_error_from_unix(errno);
                }
 
                /* Inherit the ACL if the file was created. */
-               if ((local_flags & O_CREAT) && !file_existed) {
+               if ((local_flags & O_CREAT)
+                   && !file_existed
+                   && lp_inherit_perms(SNUM(conn))) {
                        inherit_access_acl(conn, fname, unx_mode);
                }
 
@@ -321,8 +309,9 @@ static BOOL open_file(files_struct *fsp,
 
                /* For a non-io open, this stat failing means file not found. JRA */
                if (ret == -1) {
+                       NTSTATUS status = map_nt_error_from_unix(errno);
                        fd_close(conn, fsp);
-                       return False;
+                       return status;
                }
        }
 
@@ -335,7 +324,7 @@ static BOOL open_file(files_struct *fsp,
        if(S_ISDIR(psbuf->st_mode)) {
                fd_close(conn, fsp);
                errno = EISDIR;
-               return False;
+               return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
        fsp->mode = psbuf->st_mode;
@@ -348,7 +337,8 @@ static BOOL open_file(files_struct *fsp,
        if (!CAN_WRITE(conn)) {
                fsp->can_write = False;
        } else {
-               fsp->can_write = (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) ? True : False;
+               fsp->can_write = (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) ?
+                       True : False;
        }
        fsp->print_file = False;
        fsp->modified = False;
@@ -364,12 +354,13 @@ static BOOL open_file(files_struct *fsp,
        fsp->wcp = NULL; /* Write cache pointer. */
 
        DEBUG(2,("%s opened file %s read=%s write=%s (numopen=%d)\n",
-                *current_user_info.smb_name ? current_user_info.smb_name : conn->user,fsp->fsp_name,
+                *current_user_info.smb_name ?
+                current_user_info.smb_name : conn->user,fsp->fsp_name,
                 BOOLSTR(fsp->can_read), BOOLSTR(fsp->can_write),
                 conn->num_files_open + 1));
 
        errno = 0;
-       return True;
+       return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -486,8 +477,8 @@ static void validate_my_share_entries(int num,
        if (is_deferred_open_entry(share_entry) &&
            !open_was_deferred(share_entry->op_mid)) {
                pstring str;
-               DEBUG(0, ("Got a deferred entry without a request: "
-                         "PANIC: %s\n", share_mode_str(num, share_entry)));
+               pstr_sprintf(str, "Got a deferred entry without a request: "
+                            "PANIC: %s\n", share_mode_str(num, share_entry));
                smb_panic(str);
        }
 
@@ -617,7 +608,7 @@ static BOOL is_delete_request(files_struct *fsp) {
 }
 
 /*
- * 1) No files open at all: Grant whatever the client wants.
+ * 1) No files open at all or internal open: Grant whatever the client wants.
  *
  * 2) Exclusive (or batch) oplock around: If the requested access is a delete
  *    request, break if the oplock around is a batch oplock. If it's another
@@ -626,26 +617,24 @@ static BOOL is_delete_request(files_struct *fsp) {
  * 3) Only level2 around: Grant level2 and do nothing else.
  */
 
-static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
+static BOOL delay_for_oplocks(struct share_mode_lock *lck,
+                             files_struct *fsp,
+                             int pass_number,
+                             int oplock_request)
 {
        int i;
        struct share_mode_entry *exclusive = NULL;
+       BOOL valid_entry = False;
        BOOL delay_it = False;
        BOOL have_level2 = False;
+       BOOL ret;
+       char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
 
-       if (is_stat_open(fsp->access_mask)) {
+       if (oplock_request & INTERNAL_OPEN_ONLY) {
                fsp->oplock_type = NO_OPLOCK;
-               return False;
        }
 
-       if (lck->num_share_modes == 0) {
-               /* No files open at all: Directly grant whatever the client
-                * wants. */
-
-               if (fsp->oplock_type == NO_OPLOCK) {
-                       /* Store a level2 oplock, but don't tell the client */
-                       fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
-               }
+       if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
                return False;
        }
 
@@ -655,16 +644,37 @@ static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
                        continue;
                }
 
-               if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
-                       SMB_ASSERT(exclusive == NULL);                  
-                       exclusive = &lck->share_modes[i];
+               /* At least one entry is not an invalid or deferred entry. */
+               valid_entry = True;
+
+               if (pass_number == 1) {
+                       if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+                               SMB_ASSERT(exclusive == NULL);                  
+                               exclusive = &lck->share_modes[i];
+                       }
+               } else {
+                       if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+                               SMB_ASSERT(exclusive == NULL);                  
+                               exclusive = &lck->share_modes[i];
+                       }
                }
 
                if (lck->share_modes[i].op_type == LEVEL_II_OPLOCK) {
+                       SMB_ASSERT(exclusive == NULL);                  
                        have_level2 = True;
                }
        }
 
+       if (!valid_entry) {
+               /* All entries are placeholders or deferred.
+                * Directly grant whatever the client wants. */
+               if (fsp->oplock_type == NO_OPLOCK) {
+                       /* Store a level2 oplock, but don't tell the client */
+                       fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+               }
+               return False;
+       }
+
        if (exclusive != NULL) { /* Found an exclusive oplock */
                SMB_ASSERT(!have_level2);
                delay_it = is_delete_request(fsp) ?
@@ -672,7 +682,8 @@ static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
        }
 
        if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
-               /* We can at most grant level2 */
+               /* We can at most grant level2 as there are other
+                * level2 or NO_OPLOCK entries. */
                fsp->oplock_type = LEVEL_II_OPLOCK;
        }
 
@@ -681,18 +692,36 @@ static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
                fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
        }
 
-       if (delay_it) {
-               DEBUG(10, ("Sending break request to PID %s\n",
-                          procid_str_static(&exclusive->pid)));
-               exclusive->op_mid = get_current_mid();
-               if (!message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST,
-                                     exclusive, sizeof(*exclusive), True)) {
-                       DEBUG(3, ("Could not send oplock break message\n"));
-               }
-               file_free(fsp);
+       if (!delay_it) {
+               return False;
+       }
+
+       /*
+        * Send a break message to the oplock holder and delay the open for
+        * our client.
+        */
+
+       DEBUG(10, ("Sending break request to PID %s\n",
+                  procid_str_static(&exclusive->pid)));
+       exclusive->op_mid = get_current_mid();
+
+       /* Create the message. */
+       share_mode_entry_to_message(msg, exclusive);
+
+       /* Add in the FORCE_OPLOCK_BREAK_TO_NONE bit in the message if set. We
+          don't want this set in the share mode struct pointed to by lck. */
+
+       if (oplock_request & FORCE_OPLOCK_BREAK_TO_NONE) {
+               SSVAL(msg,6,exclusive->op_type | FORCE_OPLOCK_BREAK_TO_NONE);
        }
 
-       return delay_it;
+       ret = message_send_pid(exclusive->pid, MSG_SMB_BREAK_REQUEST,
+                              msg, MSG_SMB_SHARE_MODE_ENTRY_SIZE, True);
+       if (!ret) {
+               DEBUG(3, ("Could not send oplock break message\n"));
+       }
+
+       return True;
 }
 
 static BOOL request_timed_out(struct timeval request_time,
@@ -728,7 +757,7 @@ static void defer_open(struct share_mode_lock *lck,
                if (procid_is_me(&e->pid) && (e->op_mid == mid)) {
                        DEBUG(0, ("Trying to defer an already deferred "
                                  "request: mid=%d, exiting\n", mid));
-                       exit_server("exiting");
+                       exit_server("attempt to defer a deferred request");
                }
        }
 
@@ -742,7 +771,7 @@ static void defer_open(struct share_mode_lock *lck,
 
        if (!push_deferred_smb_message(mid, request_time, timeout,
                                       (char *)state, sizeof(*state))) {
-               exit_server("push_deferred_smb_message failed\n");
+               exit_server("push_deferred_smb_message failed");
        }
        add_deferred_open(lck, mid, request_time, state->dev, state->inode);
 
@@ -756,40 +785,18 @@ static void defer_open(struct share_mode_lock *lck,
        srv_defer_sign_response(mid);
 }
 
-/****************************************************************************
- Set a kernel flock on a file for NFS interoperability.
- This requires a patch to Linux.
-****************************************************************************/
-
-static void kernel_flock(files_struct *fsp, uint32 share_mode)
-{
-#if HAVE_KERNEL_SHARE_MODES
-       int kernel_mode = 0;
-       if (share_mode == FILE_SHARE_WRITE) {
-               kernel_mode = LOCK_MAND|LOCK_WRITE;
-       } else if (share_mode == FILE_SHARE_READ) {
-               kernel_mode = LOCK_MAND|LOCK_READ;
-       } else if (share_mode == FILE_SHARE_NONE) {
-               kernel_mode = LOCK_MAND;
-       }
-       if (kernel_mode) {
-               flock(fsp->fh->fd, kernel_mode);
-       }
-#endif
-       ;
-}
 
 /****************************************************************************
  On overwrite open ensure that the attributes match.
 ****************************************************************************/
 
 static BOOL open_match_attributes(connection_struct *conn,
-                               const char *path,
-                               uint32 old_dos_attr,
-                               uint32 new_dos_attr,
-                               mode_t existing_unx_mode,
-                               mode_t new_unx_mode,
-                               mode_t *returned_unx_mode)
+                                 const char *path,
+                                 uint32 old_dos_attr,
+                                 uint32 new_dos_attr,
+                                 mode_t existing_unx_mode,
+                                 mode_t new_unx_mode,
+                                 mode_t *returned_unx_mode)
 {
        uint32 noarch_old_dos_attr, noarch_new_dos_attr;
 
@@ -881,8 +888,8 @@ static files_struct *fcb_or_dos_open(connection_struct *conn,
        }
 
        /* We need to duplicate this fsp. */
-       dup_fsp = dup_file_fsp(fsp, access_mask, share_access, create_options);
-       if (!dup_fsp) {
+       if (!NT_STATUS_IS_OK(dup_file_fsp(fsp, access_mask, share_access,
+                                         create_options, &dup_fsp))) {
                return NULL;
        }
 
@@ -894,10 +901,10 @@ static files_struct *fcb_or_dos_open(connection_struct *conn,
 ****************************************************************************/
 
 BOOL map_open_params_to_ntcreate(const char *fname, int deny_mode, int open_func,
-                               uint32 *paccess_mask,
-                               uint32 *pshare_mode,
-                               uint32 *pcreate_disposition,
-                               uint32 *pcreate_options)
+                                uint32 *paccess_mask,
+                                uint32 *pshare_mode,
+                                uint32 *pcreate_disposition,
+                                uint32 *pcreate_options)
 {
        uint32 access_mask;
        uint32 share_mode;
@@ -1028,39 +1035,66 @@ BOOL map_open_params_to_ntcreate(const char *fname, int deny_mode, int open_func
 
 }
 
-/* Map generic permissions to file object specific permissions */
-                                                                                                               
-struct generic_mapping file_generic_mapping = {
-       FILE_GENERIC_READ,
-       FILE_GENERIC_WRITE,
-       FILE_GENERIC_EXECUTE,
-       FILE_GENERIC_ALL
-};
+static void schedule_defer_open(struct share_mode_lock *lck, struct timeval request_time)
+{
+       struct deferred_open_record state;
+
+       /* This is a relative time, added to the absolute
+          request_time value to get the absolute timeout time.
+          Note that if this is the second or greater time we enter
+          this codepath for this particular request mid then
+          request_time is left as the absolute time of the *first*
+          time this request mid was processed. This is what allows
+          the request to eventually time out. */
+
+       struct timeval timeout;
+
+       /* Normally the smbd we asked should respond within
+        * OPLOCK_BREAK_TIMEOUT seconds regardless of whether
+        * the client did, give twice the timeout as a safety
+        * measure here in case the other smbd is stuck
+        * somewhere else. */
+
+       timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
+
+       /* Nothing actually uses state.delayed_for_oplocks
+          but it's handy to differentiate in debug messages
+          between a 30 second delay due to oplock break, and
+          a 1 second delay for share mode conflicts. */
+
+       state.delayed_for_oplocks = True;
+       state.dev = lck->dev;
+       state.inode = lck->ino;
+
+       if (!request_timed_out(request_time, timeout)) {
+               defer_open(lck, request_time, timeout, &state);
+       }
+}
 
 /****************************************************************************
  Open a file with a share mode.
 ****************************************************************************/
 
-files_struct *open_file_ntcreate(connection_struct *conn,
-                                const char *fname,
-                                SMB_STRUCT_STAT *psbuf,
-                                uint32 access_mask,            /* access bits (FILE_READ_DATA etc.) */
-                                uint32 share_access,           /* share constants (FILE_SHARE_READ etc). */
-                                uint32 create_disposition,     /* FILE_OPEN_IF etc. */
-                                uint32 create_options,         /* options such as delete on close. */
-                                uint32 new_dos_attributes,     /* attributes used for new file. */
-                                int oplock_request,            /* internal Samba oplock codes. */
-                                                               /* Information (FILE_EXISTS etc.) */
-                                int *pinfo)
+NTSTATUS open_file_ntcreate(connection_struct *conn,
+                           const char *fname,
+                           SMB_STRUCT_STAT *psbuf,
+                           uint32 access_mask,         /* access bits (FILE_READ_DATA etc.) */
+                           uint32 share_access,        /* share constants (FILE_SHARE_READ etc) */
+                           uint32 create_disposition,  /* FILE_OPEN_IF etc. */
+                           uint32 create_options,      /* options such as delete on close. */
+                           uint32 new_dos_attributes,  /* attributes used for new file. */
+                           int oplock_request,         /* internal Samba oplock codes. */
+                                                       /* Information (FILE_EXISTS etc.) */
+                           int *pinfo,
+                           files_struct **result)
 {
        int flags=0;
        int flags2=0;
        BOOL file_existed = VALID_STAT(*psbuf);
        BOOL def_acl = False;
-       BOOL internal_only_open = False;
        SMB_DEV_T dev = 0;
        SMB_INO_T inode = 0;
-       BOOL fsp_open = False;
+       NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
        files_struct *fsp = NULL;
        mode_t new_unx_mode = (mode_t)0;
        mode_t unx_mode = (mode_t)0;
@@ -1068,10 +1102,11 @@ files_struct *open_file_ntcreate(connection_struct *conn,
        uint32 existing_dos_attributes = 0;
        struct pending_message_list *pml = NULL;
        uint16 mid = get_current_mid();
-       BOOL delayed_for_oplocks = False;
        struct timeval request_time = timeval_zero();
        struct share_mode_lock *lck = NULL;
+       uint32 open_access_mask = access_mask;
        NTSTATUS status;
+       int ret_flock;
 
        if (conn->printer) {
                /* 
@@ -1085,7 +1120,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
 
                DEBUG(10, ("open_file_ntcreate: printer open fname=%s\n", fname));
 
-               return print_fsp_open(conn, fname);
+               return print_fsp_open(conn, fname, result);
        }
 
        /* We add aARCH to this as this mode is only used if the file is
@@ -1100,35 +1135,23 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                   create_disposition, create_options, unx_mode,
                   oplock_request));
 
-       if (oplock_request == INTERNAL_OPEN_ONLY) {
-               internal_only_open = True;
-               oplock_request = 0;
-       }
-
        if ((pml = get_open_deferred_message(mid)) != NULL) {
                struct deferred_open_record *state =
                        (struct deferred_open_record *)pml->private_data.data;
 
-               request_time = pml->request_time;
-               delayed_for_oplocks = state->delayed_for_oplocks;
-
-               /* There could be a race condition where the dev/inode pair
-                  has changed since we deferred the message. If so, just
-                  remove the deferred open entry and return sharing
-                  violation. */
+               /* Remember the absolute time of the original
+                  request with this mid. We'll use it later to
+                  see if this has timed out. */
 
-               /* If the timeout value is non-zero, we need to just return
-                  sharing violation. Don't retry the open as we were not
-                  notified of a close and we don't want to trigger another
-                  spurious oplock break. */
+               request_time = pml->request_time;
 
-               /* Now remove the deferred open entry under lock. */
+               /* Remove the deferred open entry under lock. */
                lck = get_share_mode_lock(NULL, state->dev, state->inode, NULL, NULL);
                if (lck == NULL) {
                        DEBUG(0, ("could not get share mode lock\n"));
                } else {
                        del_deferred_open_entry(lck, mid);
-                       talloc_destroy(lck);
+                       TALLOC_FREE(lck);
                }
 
                /* Ensure we don't reprocess this message. */
@@ -1136,7 +1159,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
        }
 
        if (!check_name(fname,conn)) {
-               return NULL;
+               return map_nt_error_from_unix(errno);
        } 
 
        new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
@@ -1147,18 +1170,20 @@ files_struct *open_file_ntcreate(connection_struct *conn,
        /* ignore any oplock requests if oplocks are disabled */
        if (!lp_oplocks(SNUM(conn)) || global_client_failed_oplock_break ||
            IS_VETO_OPLOCK_PATH(conn, fname)) {
-               oplock_request = 0;
+               /* Mask off everything except the private Samba bits. */
+               oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK;
        }
 
        /* this is for OS/2 long file names - say we don't support them */
        if (!lp_posix_pathnames() && strstr(fname,".+,;=[].")) {
                /* OS/2 Workplace shell fix may be main code stream in a later
                 * release. */ 
-               set_saved_error_triple(ERRDOS, ERRcannotopen,
-                                      NT_STATUS_OBJECT_NAME_NOT_FOUND);
                DEBUG(5,("open_file_ntcreate: OS/2 long filenames are not "
                         "supported.\n"));
-               return NULL;
+               if (use_nt_status()) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
+               return NT_STATUS_DOS(ERRDOS, ERRcannotopen);
        }
 
        switch( create_disposition ) {
@@ -1186,9 +1211,8 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                                DEBUG(5,("open_file_ntcreate: FILE_OPEN "
                                         "requested for file %s and file "
                                         "doesn't exist.\n", fname ));
-                               set_saved_ntstatus(NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                errno = ENOENT;
-                               return NULL;
+                               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        }
                        break;
 
@@ -1199,9 +1223,8 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                                DEBUG(5,("open_file_ntcreate: FILE_OVERWRITE "
                                         "requested for file %s and file "
                                         "doesn't exist.\n", fname ));
-                               set_saved_ntstatus(NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                errno = ENOENT;
-                               return NULL;
+                               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        }
                        flags2 |= O_TRUNC;
                        break;
@@ -1218,7 +1241,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                                } else {
                                        errno = EEXIST;
                                }
-                               return NULL;
+                               return map_nt_error_from_unix(errno);
                        }
                        flags2 |= (O_CREAT|O_EXCL);
                        break;
@@ -1230,8 +1253,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                        break;
 
                default:
-                       set_saved_ntstatus(NT_STATUS_INVALID_PARAMETER);
-                       return NULL;
+                       return NT_STATUS_INVALID_PARAMETER;
        }
 
        /* We only care about matching attributes on file exists and
@@ -1250,13 +1272,13 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                                 (unsigned int)psbuf->st_mode,
                                 (unsigned int)unx_mode ));
                        errno = EACCES;
-                       return NULL;
+                       return NT_STATUS_ACCESS_DENIED;
                }
        }
 
        /* This is a nasty hack - must fix... JRA. */
        if (access_mask == MAXIMUM_ALLOWED_ACCESS) {
-               access_mask = FILE_GENERIC_ALL;
+               open_access_mask = access_mask = FILE_GENERIC_ALL;
        }
 
        /*
@@ -1264,6 +1286,11 @@ files_struct *open_file_ntcreate(connection_struct *conn,
         */
 
        se_map_generic(&access_mask, &file_generic_mapping);
+       open_access_mask = access_mask;
+
+       if (flags2 & O_TRUNC) {
+               open_access_mask |= FILE_WRITE_DATA; /* This will cause oplock breaks. */
+       }
 
        DEBUG(10, ("open_file_ntcreate: fname=%s, after mapping "
                   "access_mask=0x%x\n", fname, access_mask ));
@@ -1274,7 +1301,15 @@ files_struct *open_file_ntcreate(connection_struct *conn,
         */
 
        if (access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) {
-               flags = O_RDWR;
+               /* DENY_DOS opens are always underlying read-write on the
+                  file handle, no matter what the requested access mask
+                   says. */
+               if ((create_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) ||
+                       access_mask & (FILE_READ_ATTRIBUTES|FILE_READ_DATA|FILE_READ_EA|FILE_EXECUTE)) {
+                       flags = O_RDWR;
+               } else {
+                       flags = O_WRONLY;
+               }
        } else {
                flags = O_RDONLY;
        }
@@ -1284,7 +1319,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
         */
 
 #if defined(O_SYNC)
-       if (create_options & FILE_WRITE_THROUGH) {
+       if ((create_options & FILE_WRITE_THROUGH) && lp_strict_sync(SNUM(conn))) {
                flags2 |= O_SYNC;
        }
 #endif /* O_SYNC */
@@ -1307,86 +1342,80 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                DEBUG(5,("open_file_ntcreate: write access requested for "
                         "file %s on read only %s\n",
                         fname, !CAN_WRITE(conn) ? "share" : "file" ));
-               set_saved_ntstatus(NT_STATUS_ACCESS_DENIED);
                errno = EACCES;
-               return NULL;
+               return NT_STATUS_ACCESS_DENIED;
        }
 
-       fsp = file_new(conn);
-       if(!fsp) {
-               return NULL;
+       status = file_new(conn, &fsp);
+       if(!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        fsp->dev = psbuf->st_dev;
        fsp->inode = psbuf->st_ino;
        fsp->share_access = share_access;
        fsp->fh->private_options = create_options;
-       fsp->access_mask = access_mask;
-       fsp->oplock_type = oplock_request;
+       fsp->access_mask = open_access_mask; /* We change this to the
+                                             * requested access_mask after
+                                             * the open is done. */
+       /* Ensure no SAMBA_PRIVATE bits can be set. */
+       fsp->oplock_type = (oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK);
 
        if (timeval_is_zero(&request_time)) {
                request_time = fsp->open_time;
        }
 
        if (file_existed) {
-
                dev = psbuf->st_dev;
                inode = psbuf->st_ino;
 
                lck = get_share_mode_lock(NULL, dev, inode,
-                                       conn->connectpath,
-                                       fname);
+                                         conn->connectpath,
+                                         fname);
 
                if (lck == NULL) {
+                       file_free(fsp);
                        DEBUG(0, ("Could not get share mode lock\n"));
-                       set_saved_ntstatus(NT_STATUS_SHARING_VIOLATION);
-                       return NULL;
+                       return NT_STATUS_SHARING_VIOLATION;
                }
 
-               if (delay_for_oplocks(lck, fsp)) {
-                       struct deferred_open_record state;
-                       struct timeval timeout;
-
-                       if (delayed_for_oplocks) {
-                               DEBUG(0, ("Trying to delay for oplocks "
-                                         "twice\n"));
-                               exit_server("exiting");
-                       }
-
-                       timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
-
-                       /* Normally the smbd we asked should respond within
-                        * OPLOCK_BREAK_TIMEOUT seconds regardless of whether
-                        * the client did, give twice the timeout as a safety
-                        * measure here in case the other smbd is stuck
-                        * somewhere else. */
-
-                       state.delayed_for_oplocks = True;
-                       state.dev = dev;
-                       state.inode = inode;
-
-                       if (!request_timed_out(request_time, timeout)) {
-                               defer_open(lck, request_time, timeout,
-                                          &state);
-                       }
-
-                       talloc_free(lck);
-                       return NULL;
+               /* First pass - send break only on batch oplocks. */
+               if (delay_for_oplocks(lck, fsp, 1, oplock_request)) {
+                       schedule_defer_open(lck, request_time);
+                       TALLOC_FREE(lck);
+                       file_free(fsp);
+                       return NT_STATUS_SHARING_VIOLATION;
                }
 
+               /* Use the client requested access mask here, not the one we
+                * open with. */
                status = open_mode_check(conn, fname, lck,
                                         access_mask, share_access,
                                         create_options, &file_existed);
 
+               if (NT_STATUS_IS_OK(status)) {
+                       /* We might be going to allow this open. Check oplock
+                        * status again. */
+                       /* Second pass - send break for both batch or
+                        * exclusive oplocks. */
+                       if (delay_for_oplocks(lck, fsp, 2, oplock_request)) {
+                               schedule_defer_open(lck, request_time);
+                               TALLOC_FREE(lck);
+                               file_free(fsp);
+                               return NT_STATUS_SHARING_VIOLATION;
+                       }
+               }
+
                if (NT_STATUS_EQUAL(status, NT_STATUS_DELETE_PENDING)) {
                        /* DELETE_PENDING is not deferred for a second */
-                       set_saved_ntstatus(status);
-                       talloc_free(lck);
+                       TALLOC_FREE(lck);
                        file_free(fsp);
-                       return NULL;
+                       return status;
                }
 
                if (!NT_STATUS_IS_OK(status)) {
+                       uint32 can_access_mask;
+                       BOOL can_access = True;
 
                        SMB_ASSERT(NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION));
 
@@ -1396,19 +1425,23 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                            (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS|
                             NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) {
                                files_struct *fsp_dup;
+
+                               /* Use the client requested access mask here,
+                                * not the one we open with. */
                                fsp_dup = fcb_or_dos_open(conn, fname, dev,
                                                          inode, access_mask,
                                                          share_access,
                                                          create_options);
 
                                if (fsp_dup) {
-                                       talloc_free(lck);
+                                       TALLOC_FREE(lck);
                                        file_free(fsp);
                                        if (pinfo) {
                                                *pinfo = FILE_WAS_OPENED;
                                        }
                                        conn->num_files_open++;
-                                       return fsp_dup;
+                                       *result = fsp_dup;
+                                       return NT_STATUS_OK;
                                }
                        }
 
@@ -1417,29 +1450,22 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                         * MS-Access. If a file open will fail due to share
                         * permissions and also for security (access) reasons,
                         * we need to return the access failed error, not the
-                        * share error. This means we must attempt to open the
-                        * file anyway in order to get the UNIX access error -
-                        * even if we're going to fail the open for share
-                        * reasons. This is bad, as we're burning another fd
-                        * if there are existing locks but there's nothing
-                        * else we can do. We also ensure we're not going to
-                        * create or tuncate the file as we only want an
-                        * access decision at this stage. JRA.
+                        * share error. We can't open the file due to kernel
+                        * oplock deadlock (it's possible we failed above on
+                        * the open_mode_check()) so use a userspace check.
                         */
-                       errno = 0;
-                       fsp_open = open_file(fsp,conn,fname,psbuf,
-                                            flags|(flags2&~(O_TRUNC|O_CREAT)),
-                                            unx_mode,access_mask);
-
-                       DEBUG(4,("open_file_ntcreate : share_mode deny - "
-                                "calling open_file with flags=0x%X "
-                                "flags2=0x%X mode=0%o returned %d\n",
-                                flags, (flags2&~(O_TRUNC|O_CREAT)),
-                                (unsigned int)unx_mode, (int)fsp_open ));
-
-                       if (!fsp_open && errno) {
-                               /* Default error. */
-                               set_saved_ntstatus(NT_STATUS_ACCESS_DENIED);
+
+                       if (flags & O_RDWR) {
+                               can_access_mask = FILE_READ_DATA|FILE_WRITE_DATA;
+                       } else if (flags & O_WRONLY) {
+                               can_access_mask = FILE_WRITE_DATA;
+                       } else {
+                               can_access_mask = FILE_READ_DATA;
+                       }
+
+                       if (((can_access_mask & FILE_WRITE_DATA) && !CAN_WRITE(conn)) ||
+                           !can_access_file(conn,fname,psbuf,can_access_mask)) {
+                               can_access = False;
                        }
 
                        /* 
@@ -1447,12 +1473,32 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                         * cope with the braindead 1 second delay.
                         */
 
-                       if (!internal_only_open &&
+                       if (!(oplock_request & INTERNAL_OPEN_ONLY) &&
                            lp_defer_sharing_violations()) {
                                struct timeval timeout;
                                struct deferred_open_record state;
+                               int timeout_usecs;
+
+                               /* this is a hack to speed up torture tests
+                                  in 'make test' */
+                               timeout_usecs = lp_parm_int(SNUM(conn),
+                                                           "smbd","sharedelay",
+                                                           SHARING_VIOLATION_USEC_WAIT);
 
-                               timeout = timeval_set(0, SHARING_VIOLATION_USEC_WAIT);
+                               /* This is a relative time, added to the absolute
+                                  request_time value to get the absolute timeout time.
+                                  Note that if this is the second or greater time we enter
+                                  this codepath for this particular request mid then
+                                  request_time is left as the absolute time of the *first*
+                                  time this request mid was processed. This is what allows
+                                  the request to eventually time out. */
+
+                               timeout = timeval_set(0, timeout_usecs);
+
+                               /* Nothing actually uses state.delayed_for_oplocks
+                                  but it's handy to differentiate in debug messages
+                                  between a 30 second delay due to oplock break, and
+                                  a 1 second delay for share mode conflicts. */
 
                                state.delayed_for_oplocks = False;
                                state.dev = dev;
@@ -1465,17 +1511,18 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                                }
                        }
 
-                       talloc_free(lck);
-                       if (fsp_open) {
-                               fd_close(conn, fsp);
+                       TALLOC_FREE(lck);
+                       if (can_access) {
                                /*
                                 * We have detected a sharing violation here
                                 * so return the correct error code
                                 */
-                               set_saved_ntstatus(NT_STATUS_SHARING_VIOLATION);
+                               status = NT_STATUS_SHARING_VIOLATION;
+                       } else {
+                               status = NT_STATUS_ACCESS_DENIED;
                        }
                        file_free(fsp);
-                       return NULL;
+                       return status;
                }
 
                /*
@@ -1495,26 +1542,28 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                unx_mode = 0777;
        }
 
-       DEBUG(4,("calling open_file with flags=0x%X flags2=0x%X mode=0%o\n",
+       DEBUG(4,("calling open_file with flags=0x%X flags2=0x%X mode=0%o, "
+               "access_mask = 0x%x, open_access_mask = 0x%x\n",
                 (unsigned int)flags, (unsigned int)flags2,
-                (unsigned int)unx_mode));
+                (unsigned int)unx_mode, (unsigned int)access_mask,
+                (unsigned int)open_access_mask));
 
        /*
         * open_file strips any O_TRUNC flags itself.
         */
 
        fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,unx_mode,
-                            access_mask);
+                            access_mask, open_access_mask);
 
-       if (!fsp_open) {
+       if (!NT_STATUS_IS_OK(fsp_open)) {
                if (lck != NULL) {
-                       talloc_free(lck);
+                       TALLOC_FREE(lck);
                }
                file_free(fsp);
-               return NULL;
+               return fsp_open;
        }
 
-       if (!file_existed) { 
+       if (!file_existed) {
 
                /*
                 * Deal with the race condition where two smbd's detect the
@@ -1535,15 +1584,15 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                inode = fsp->inode;
 
                lck = get_share_mode_lock(NULL, dev, inode,
-                                       conn->connectpath,
-                                       fname);
+                                         conn->connectpath,
+                                         fname);
 
                if (lck == NULL) {
-                       DEBUG(0, ("open_file_ntcreate: Could not get share mode lock for %s\n", fname));
+                       DEBUG(0, ("open_file_ntcreate: Could not get share "
+                                 "mode lock for %s\n", fname));
                        fd_close(conn, fsp);
                        file_free(fsp);
-                       set_saved_ntstatus(NT_STATUS_SHARING_VIOLATION);
-                       return NULL;
+                       return NT_STATUS_SHARING_VIOLATION;
                }
 
                status = open_mode_check(conn, fname, lck,
@@ -1569,13 +1618,14 @@ files_struct *open_file_ntcreate(connection_struct *conn,
 
                        defer_open(lck, request_time, timeval_zero(),
                                   &state);
-                       talloc_free(lck);
-                       return NULL;
+                       TALLOC_FREE(lck);
+                       return status;
                }
 
                /*
                 * We exit this block with the share entry *locked*.....
                 */
+
        }
 
        SMB_ASSERT(lck != NULL);
@@ -1585,9 +1635,18 @@ files_struct *open_file_ntcreate(connection_struct *conn,
            these only read them. Nobody but Samba can ever set a deny
            mode and we have already checked our more authoritative
            locking database for permission to set this deny mode. If
-           the kernel refuses the operations then the kernel is wrong */
+           the kernel refuses the operations then the kernel is wrong.
+          note that GPFS supports it as well - jmcd */
+
+       ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, fsp->fh->fd, share_access);
+       if(ret_flock == -1 ){
 
-       kernel_flock(fsp, share_access);
+               talloc_free(lck);
+               fd_close(conn, fsp);
+               file_free(fsp);
+               
+               return NT_STATUS_SHARING_VIOLATION;
+       }
 
        /*
         * At this point onwards, we can guarentee that the share entry
@@ -1606,10 +1665,11 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                 */
                if ((SMB_VFS_FTRUNCATE(fsp,fsp->fh->fd,0) == -1) ||
                    (SMB_VFS_FSTAT(fsp,fsp->fh->fd,psbuf)==-1)) {
-                       talloc_free(lck);
+                       status = map_nt_error_from_unix(errno);
+                       TALLOC_FREE(lck);
                        fd_close(conn,fsp);
                        file_free(fsp);
-                       return NULL;
+                       return status;
                }
        }
 
@@ -1619,6 +1679,11 @@ files_struct *open_file_ntcreate(connection_struct *conn,
        fsp->access_mask = access_mask;
 
        if (file_existed) {
+               /* stat opens on existing files don't get oplocks. */
+               if (is_stat_open(open_access_mask)) {
+                       fsp->oplock_type = NO_OPLOCK;
+               }
+
                if (!(flags2 & O_TRUNC)) {
                        info = FILE_WAS_OPENED;
                } else {
@@ -1649,34 +1714,30 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                        fsp->oplock_type = NO_OPLOCK;
                }
        }
-       set_share_mode(lck, fsp, 0, fsp->oplock_type);
-
-       if (create_options & FILE_DELETE_ON_CLOSE) {
-               uint32 dosattr= existing_dos_attributes;
-               NTSTATUS result;
+       set_share_mode(lck, fsp, current_user.ut.uid, 0, fsp->oplock_type);
 
-               if (info == FILE_WAS_OVERWRITTEN || info == FILE_WAS_CREATED ||
-                               info == FILE_WAS_SUPERSEDED) {
-                       dosattr = new_dos_attributes;
-               }
-
-               result = can_set_delete_on_close(fsp, True, dosattr);
-
-               if (!NT_STATUS_IS_OK(result)) {
-                       /* Remember to delete the mode we just added. */
-                       del_share_mode(lck, fsp);
-                       talloc_free(lck);
-                       fd_close(conn,fsp);
-                       file_free(fsp);
-                       set_saved_ntstatus(result);
-                       return NULL;
+       if (info == FILE_WAS_OVERWRITTEN || info == FILE_WAS_CREATED ||
+           info == FILE_WAS_SUPERSEDED) {
+
+               /* Handle strange delete on close create semantics. */
+               if (create_options & FILE_DELETE_ON_CLOSE) {
+                       status = can_set_delete_on_close(fsp, True, new_dos_attributes);
+
+                       if (!NT_STATUS_IS_OK(status)) {
+                               /* Remember to delete the mode we just added. */
+                               del_share_mode(lck, fsp);
+                               TALLOC_FREE(lck);
+                               fd_close(conn,fsp);
+                               file_free(fsp);
+                               return status;
+                       }
+                       /* Note that here we set the *inital* delete on close flag,
+                          not the regular one. */
+                       set_delete_on_close_token(lck, &current_user.ut);
+                       lck->initial_delete_on_close = True;
+                       lck->modified = True;
                }
-               lck->delete_on_close = True;
-               lck->modified = True;
-       }
        
-       if (info == FILE_WAS_OVERWRITTEN || info == FILE_WAS_CREATED ||
-                               info == FILE_WAS_SUPERSEDED) {
                /* Files should be initially set as archive */
                if (lp_map_archive(SNUM(conn)) ||
                    lp_store_dos_attributes(SNUM(conn))) {
@@ -1696,8 +1757,8 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                int saved_errno = errno; /* We might get ENOSYS in the next
                                          * call.. */
 
-               if (SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd, unx_mode) == -1
-                   && errno == ENOSYS) {
+               if (SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd, unx_mode) == -1 &&
+                   errno == ENOSYS) {
                        errno = saved_errno; /* Ignore ENOSYS */
                }
 
@@ -1716,52 +1777,53 @@ files_struct *open_file_ntcreate(connection_struct *conn,
                        if (ret == -1 && errno == ENOSYS) {
                                errno = saved_errno; /* Ignore ENOSYS */
                        } else {
-                               DEBUG(5, ("open_file_shared: reset "
+                               DEBUG(5, ("open_file_ntcreate: reset "
                                          "attributes of file %s to 0%o\n",
-                                       fname, (unsigned int)new_unx_mode));
+                                         fname, (unsigned int)new_unx_mode));
                                ret = 0; /* Don't do the fchmod below. */
                        }
                }
 
                if ((ret == -1) &&
                    (SMB_VFS_FCHMOD(fsp, fsp->fh->fd, new_unx_mode) == -1))
-                       DEBUG(5, ("open_file_shared: failed to reset "
+                       DEBUG(5, ("open_file_ntcreate: failed to reset "
                                  "attributes of file %s to 0%o\n",
-                               fname, (unsigned int)new_unx_mode));
+                                 fname, (unsigned int)new_unx_mode));
        }
 
        /* If this is a successful open, we must remove any deferred open
         * records. */
        del_deferred_open_entry(lck, mid);
-       talloc_free(lck);
+       TALLOC_FREE(lck);
 
        conn->num_files_open++;
 
-       return fsp;
+       *result = fsp;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
  Open a file for for write to ensure that we can fchmod it.
 ****************************************************************************/
 
-files_struct *open_file_fchmod(connection_struct *conn, const char *fname,
-                              SMB_STRUCT_STAT *psbuf)
+NTSTATUS open_file_fchmod(connection_struct *conn, const char *fname,
+                         SMB_STRUCT_STAT *psbuf, files_struct **result)
 {
        files_struct *fsp = NULL;
-       BOOL fsp_open;
+       NTSTATUS status;
 
        if (!VALID_STAT(*psbuf)) {
-               return NULL;
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       fsp = file_new(conn);
-       if(!fsp) {
-               return NULL;
+       status = file_new(conn, &fsp);
+       if(!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        /* note! we must use a non-zero desired access or we don't get
            a real file descriptor. Oh what a twisted web we weave. */
-       fsp_open = open_file(fsp,conn,fname,psbuf,O_WRONLY,0,FILE_WRITE_DATA);
+       status = open_file(fsp,conn,fname,psbuf,O_WRONLY,0,FILE_WRITE_DATA,FILE_WRITE_DATA);
 
        /* 
         * This is not a user visible file open.
@@ -1769,12 +1831,13 @@ files_struct *open_file_fchmod(connection_struct *conn, const char *fname,
         * the conn->num_files_open.
         */
 
-       if (!fsp_open) {
+       if (!NT_STATUS_IS_OK(status)) {
                file_free(fsp);
-               return NULL;
+               return status;
        }
 
-       return fsp;
+       *result = fsp;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -1792,14 +1855,15 @@ int close_file_fchmod(files_struct *fsp)
  Open a directory from an NT SMB call.
 ****************************************************************************/
 
-files_struct *open_directory(connection_struct *conn,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf,
-                               uint32 access_mask,
-                               uint32 share_access,
-                               uint32 create_disposition,
-                               uint32 create_options,
-                               int *pinfo)
+NTSTATUS open_directory(connection_struct *conn,
+                       const char *fname,
+                       SMB_STRUCT_STAT *psbuf,
+                       uint32 access_mask,
+                       uint32 share_access,
+                       uint32 create_disposition,
+                       uint32 create_options,
+                       int *pinfo,
+                       files_struct **result)
 {
        files_struct *fsp = NULL;
        BOOL dir_existed = VALID_STAT(*psbuf) ? True : False;
@@ -1819,14 +1883,7 @@ files_struct *open_directory(connection_struct *conn,
 
        if (is_ntfs_stream_name(fname)) {
                DEBUG(0,("open_directory: %s is a stream name!\n", fname ));
-               set_saved_ntstatus(NT_STATUS_NOT_A_DIRECTORY);
-               return NULL;
-       }
-
-       if (dir_existed && !S_ISDIR(psbuf->st_mode)) {
-               DEBUG(0,("open_directory: %s is not a directory !\n", fname ));
-               set_saved_ntstatus(NT_STATUS_NOT_A_DIRECTORY);
-               return NULL;
+               return NT_STATUS_NOT_A_DIRECTORY;
        }
 
        switch( create_disposition ) {
@@ -1837,8 +1894,7 @@ files_struct *open_directory(connection_struct *conn,
                                DEBUG(5,("open_directory: FILE_OPEN requested "
                                         "for directory %s and it doesn't "
                                         "exist.\n", fname ));
-                               set_saved_ntstatus(NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                               return NULL;
+                               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        }
                        info = FILE_WAS_OPENED;
                        break;
@@ -1850,9 +1906,12 @@ files_struct *open_directory(connection_struct *conn,
                                DEBUG(5,("open_directory: FILE_CREATE "
                                         "requested for directory %s and it "
                                         "already exists.\n", fname ));
-                               set_saved_error_triple(ERRDOS, ERRfilexists,
-                                                      NT_STATUS_OBJECT_NAME_COLLISION);
-                               return NULL;
+                               if (use_nt_status()) {
+                                       return NT_STATUS_OBJECT_NAME_COLLISION;
+                               } else {
+                                       return NT_STATUS_DOS(ERRDOS,
+                                                            ERRfilexists);
+                               }
                        }
                        create_dir = True;
                        info = FILE_WAS_CREATED;
@@ -1876,9 +1935,7 @@ files_struct *open_directory(connection_struct *conn,
                        DEBUG(5,("open_directory: invalid create_disposition "
                                 "0x%x for directory %s\n",
                                 (unsigned int)create_disposition, fname));
-                       file_free(fsp);
-                       set_saved_ntstatus(NT_STATUS_INVALID_PARAMETER);
-                       return NULL;
+                       return NT_STATUS_INVALID_PARAMETER;
        }
 
        if (create_dir) {
@@ -1895,27 +1952,26 @@ files_struct *open_directory(connection_struct *conn,
                                 "Error was %s\n", fname, strerror(errno) ));
                        /* Ensure we return the correct NT status to the
                         * client. */
-                       set_saved_error_triple(0, 0, status);
-                       return NULL;
+                       return status;
                }
 
                /* Ensure we're checking for a symlink here.... */
                /* We don't want to get caught by a symlink racer. */
 
                if(SMB_VFS_LSTAT(conn,fname, psbuf) != 0) {
-                       return NULL;
+                       return map_nt_error_from_unix(errno);
                }
 
                if(!S_ISDIR(psbuf->st_mode)) {
                        DEBUG(0,("open_directory: %s is not a directory !\n",
                                 fname ));
-                       return NULL;
+                       return NT_STATUS_NOT_A_DIRECTORY;
                }
        }
 
-       fsp = file_new(conn);
-       if(!fsp) {
-               return NULL;
+       status = file_new(conn, &fsp);
+       if(!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        /*
@@ -1927,7 +1983,7 @@ files_struct *open_directory(connection_struct *conn,
        fsp->dev = psbuf->st_dev;
        fsp->vuid = current_user.vuid;
        fsp->file_pid = global_smbpid;
-       fsp->can_lock = True;
+       fsp->can_lock = False;
        fsp->can_read = False;
        fsp->can_write = False;
 
@@ -1944,14 +2000,13 @@ files_struct *open_directory(connection_struct *conn,
        string_set(&fsp->fsp_name,fname);
 
        lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode,
-                               conn->connectpath,
-                               fname);
+                                 conn->connectpath,
+                                 fname);
 
        if (lck == NULL) {
                DEBUG(0, ("open_directory: Could not get share mode lock for %s\n", fname));
                file_free(fsp);
-               set_saved_ntstatus(NT_STATUS_SHARING_VIOLATION);
-               return NULL;
+               return NT_STATUS_SHARING_VIOLATION;
        }
 
        status = open_mode_check(conn, fname, lck,
@@ -1959,28 +2014,29 @@ files_struct *open_directory(connection_struct *conn,
                                create_options, &dir_existed);
 
        if (!NT_STATUS_IS_OK(status)) {
-               set_saved_ntstatus(status);
-               talloc_free(lck);
+               TALLOC_FREE(lck);
                file_free(fsp);
-               return NULL;
+               return status;
        }
 
-       set_share_mode(lck, fsp, 0, NO_OPLOCK);
+       set_share_mode(lck, fsp, current_user.ut.uid, 0, NO_OPLOCK);
 
+       /* For directories the delete on close bit at open time seems
+          always to be honored on close... See test 19 in Samba4 BASE-DELETE. */
        if (create_options & FILE_DELETE_ON_CLOSE) {
                status = can_set_delete_on_close(fsp, True, 0);
                if (!NT_STATUS_IS_OK(status)) {
-                       set_saved_ntstatus(status);
-                       talloc_free(lck);
+                       TALLOC_FREE(lck);
                        file_free(fsp);
-                       return NULL;
+                       return status;
                }
 
-               lck->delete_on_close = True;
+               set_delete_on_close_token(lck, &current_user.ut);
+               lck->initial_delete_on_close = True;
                lck->modified = True;
        }
 
-       talloc_free(lck);
+       TALLOC_FREE(lck);
 
        /* Change the owner if required. */
        if ((info == FILE_WAS_CREATED) && lp_inherit_owner(SNUM(conn))) {
@@ -1993,28 +2049,33 @@ files_struct *open_directory(connection_struct *conn,
 
        conn->num_files_open++;
 
-       return fsp;
+       *result = fsp;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
  Open a pseudo-file (no locking checks - a 'stat' open).
 ****************************************************************************/
 
-files_struct *open_file_stat(connection_struct *conn, char *fname,
-                            SMB_STRUCT_STAT *psbuf)
+NTSTATUS open_file_stat(connection_struct *conn, const char *fname,
+                       SMB_STRUCT_STAT *psbuf, files_struct **result)
 {
        files_struct *fsp = NULL;
+       NTSTATUS status;
 
-       if (!VALID_STAT(*psbuf))
-               return NULL;
+       if (!VALID_STAT(*psbuf)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
        /* Can't 'stat' open directories. */
-       if(S_ISDIR(psbuf->st_mode))
-               return NULL;
+       if(S_ISDIR(psbuf->st_mode)) {
+               return NT_STATUS_FILE_IS_A_DIRECTORY;
+       }
 
-       fsp = file_new(conn);
-       if(!fsp)
-               return NULL;
+       status = file_new(conn, &fsp);
+       if(!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        DEBUG(5,("open_file_stat: 'opening' file %s\n", fname));
 
@@ -2040,7 +2101,8 @@ files_struct *open_file_stat(connection_struct *conn, char *fname,
 
        conn->num_files_open++;
 
-       return fsp;
+       *result = fsp;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -2051,25 +2113,30 @@ files_struct *open_file_stat(connection_struct *conn, char *fname,
 void msg_file_was_renamed(int msg_type, struct process_id src, void *buf, size_t len)
 {
        files_struct *fsp;
-       struct file_renamed_message *frm = (struct file_renamed_message *)buf;
+       char *frm = (char *)buf;
+       SMB_DEV_T dev;
+       SMB_INO_T inode;
        const char *sharepath;
        const char *newname;
        size_t sp_len;
 
-       if (buf == NULL || len < sizeof(*frm)) {
+       if (buf == NULL || len < MSG_FILE_RENAMED_MIN_SIZE + 2) {
                 DEBUG(0, ("msg_file_was_renamed: Got invalid msg len %d\n", (int)len));
                 return;
         }
 
-       sharepath = &frm->names[0];
+       /* Unpack the message. */
+       dev = DEV_T_VAL(frm,0);
+       inode = INO_T_VAL(frm,8);
+       sharepath = &frm[16];
        newname = sharepath + strlen(sharepath) + 1;
        sp_len = strlen(sharepath);
 
        DEBUG(10,("msg_file_was_renamed: Got rename message for sharepath %s, new name %s, "
                "dev %x, inode  %.0f\n",
-               sharepath, newname, (unsigned int)frm->dev, (double)frm->inode ));
+               sharepath, newname, (unsigned int)dev, (double)inode ));
 
-       for(fsp = file_find_di_first(frm->dev, frm->inode); fsp; fsp = file_find_di_next(fsp)) {
+       for(fsp = file_find_di_first(dev, inode); fsp; fsp = file_find_di_next(fsp)) {
                if (memcmp(fsp->conn->connectpath, sharepath, sp_len) == 0) {
                        DEBUG(10,("msg_file_was_renamed: renaming file fnum %d from %s -> %s\n",
                                fsp->fnum, fsp->fsp_name, newname ));