s3: Plumb smb_filename around SMB_VFS_CHFLAGS
[samba.git] / source3 / smbd / open.c
index 8fe20f9cca8aff027f068a7e4f9e1e179602d63a..926c0ecaa7350fd07ba1ee2c46b36bf314106c08 100644 (file)
@@ -20,9 +20,9 @@
 */
 
 #include "includes.h"
+#include "smbd/globals.h"
 
 extern const struct generic_mapping file_generic_mapping;
-extern bool global_client_failed_oplock_break;
 
 struct deferred_open_record {
        bool delayed_for_oplocks;
@@ -31,7 +31,7 @@ struct deferred_open_record {
 
 static NTSTATUS create_file_unixpath(connection_struct *conn,
                                     struct smb_request *req,
-                                    const char *fname,
+                                    struct smb_filename *smb_fname,
                                     uint32_t access_mask,
                                     uint32_t share_access,
                                     uint32_t create_disposition,
@@ -43,8 +43,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                                     struct ea_list *ea_list,
 
                                     files_struct **result,
-                                    int *pinfo,
-                                    SMB_STRUCT_STAT *psbuf);
+                                    int *pinfo);
 
 /****************************************************************************
  SMB1 file varient of se_access_check. Never test FILE_READ_ATTRIBUTES.
@@ -67,13 +66,24 @@ NTSTATUS smb1_file_se_access_check(const struct security_descriptor *sd,
 
 static NTSTATUS check_open_rights(struct connection_struct *conn,
                                const char *fname,
-                               uint32_t access_mask)
+                               uint32_t access_mask,
+                               uint32_t *access_granted)
 {
        /* Check if we have rights to open. */
        NTSTATUS status;
-       uint32_t access_granted = 0;
        struct security_descriptor *sd;
 
+       *access_granted = 0;
+
+       if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+               /* I'm sorry sir, I didn't know you were root... */
+               *access_granted = access_mask;
+               if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+                       *access_granted |= FILE_GENERIC_ALL;
+               }
+               return NT_STATUS_OK;
+       }
+
        status = SMB_VFS_GET_NT_ACL(conn, fname,
                        (OWNER_SECURITY_INFORMATION |
                        GROUP_SECURITY_INFORMATION |
@@ -90,9 +100,17 @@ static NTSTATUS check_open_rights(struct connection_struct *conn,
        status = smb1_file_se_access_check(sd,
                                conn->server_info->ptok,
                                access_mask,
-                               &access_granted);
+                               access_granted);
 
        TALLOC_FREE(sd);
+
+       DEBUG(10,("check_open_rights: file %s requesting "
+               "0x%x returning 0x%x (%s)\n",
+               fname,
+               (unsigned int)access_mask,
+               (unsigned int)*access_granted,
+               nt_errstr(status) ));
+
        return status;
 }
 
@@ -101,7 +119,7 @@ static NTSTATUS check_open_rights(struct connection_struct *conn,
 ****************************************************************************/
 
 static NTSTATUS fd_open(struct connection_struct *conn,
-                   const char *fname, 
+                   struct smb_filename *smb_fname,
                    files_struct *fsp,
                    int flags,
                    mode_t mode)
@@ -119,13 +137,25 @@ static NTSTATUS fd_open(struct connection_struct *conn,
        }
 #endif
 
-       fsp->fh->fd = SMB_VFS_OPEN(conn,fname,fsp,flags,mode);
+       fsp->fh->fd = SMB_VFS_OPEN(conn, smb_fname, fsp, flags, mode);
        if (fsp->fh->fd == -1) {
                status = map_nt_error_from_unix(errno);
+               if (errno == EMFILE) {
+                       static time_t last_warned = 0L;
+
+                       if (time((time_t *) NULL) > last_warned) {
+                               DEBUG(0,("Too many open files, unable "
+                                       "to open more!  smbd's max "
+                                       "open files = %d\n",
+                                       lp_max_open_files()));
+                               last_warned = time((time_t *) NULL);
+                       }
+               }
+
        }
 
        DEBUG(10,("fd_open: name %s, flags = 0%o mode = 0%o, fd = %d. %s\n",
-                   fname, flags, (int)mode, fsp->fh->fd,
+                 smb_fname_str_dbg(smb_fname), flags, (int)mode, fsp->fh->fd,
                (fsp->fh->fd == -1) ? strerror(errno) : "" ));
 
        return status;
@@ -163,31 +193,41 @@ void change_file_owner_to_parent(connection_struct *conn,
                                        const char *inherit_from_dir,
                                        files_struct *fsp)
 {
-       SMB_STRUCT_STAT parent_st;
+       struct smb_filename *smb_fname_parent = NULL;
+       NTSTATUS status;
        int ret;
 
-       ret = SMB_VFS_STAT(conn, inherit_from_dir, &parent_st);
+       status = create_synthetic_smb_fname(talloc_tos(), inherit_from_dir,
+                                           NULL, NULL, &smb_fname_parent);
+       if (!NT_STATUS_IS_OK(status)) {
+               return;
+       }
+
+       ret = SMB_VFS_STAT(conn, smb_fname_parent);
        if (ret == -1) {
                DEBUG(0,("change_file_owner_to_parent: failed to stat parent "
                         "directory %s. Error was %s\n",
-                        inherit_from_dir, strerror(errno) ));
+                        smb_fname_str_dbg(smb_fname_parent),
+                        strerror(errno)));
                return;
        }
 
        become_root();
-       ret = SMB_VFS_FCHOWN(fsp, parent_st.st_uid, (gid_t)-1);
+       ret = SMB_VFS_FCHOWN(fsp, smb_fname_parent->st.st_ex_uid, (gid_t)-1);
        unbecome_root();
        if (ret == -1) {
                DEBUG(0,("change_file_owner_to_parent: failed to fchown "
                         "file %s to parent directory uid %u. Error "
                         "was %s\n", fsp->fsp_name,
-                        (unsigned int)parent_st.st_uid,
+                        (unsigned int)smb_fname_parent->st.st_ex_uid,
                         strerror(errno) ));
        }
 
        DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
                  "parent directory uid %u.\n", fsp->fsp_name,
-                 (unsigned int)parent_st.st_uid ));
+                 (unsigned int)smb_fname_parent->st.st_ex_uid));
+
+       TALLOC_FREE(smb_fname_parent);
 }
 
 NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
@@ -195,20 +235,27 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
                                       const char *fname,
                                       SMB_STRUCT_STAT *psbuf)
 {
+       struct smb_filename *smb_fname_parent = NULL;
+       struct smb_filename *smb_fname_cwd = NULL;
        char *saved_dir = NULL;
-       SMB_STRUCT_STAT sbuf;
-       SMB_STRUCT_STAT parent_st;
        TALLOC_CTX *ctx = talloc_tos();
        NTSTATUS status = NT_STATUS_OK;
        int ret;
 
-       ret = SMB_VFS_STAT(conn, inherit_from_dir, &parent_st);
+       status = create_synthetic_smb_fname(ctx, inherit_from_dir, NULL, NULL,
+                                           &smb_fname_parent);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       ret = SMB_VFS_STAT(conn, smb_fname_parent);
        if (ret == -1) {
                status = map_nt_error_from_unix(errno);
                DEBUG(0,("change_dir_owner_to_parent: failed to stat parent "
                         "directory %s. Error was %s\n",
-                        inherit_from_dir, strerror(errno) ));
-               return status;
+                        smb_fname_str_dbg(smb_fname_parent),
+                        strerror(errno)));
+               goto out;
        }
 
        /* We've already done an lstat into psbuf, and we know it's a
@@ -224,7 +271,7 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
                DEBUG(0,("change_dir_owner_to_parent: failed to get "
                         "current working directory. Error was %s\n",
                         strerror(errno)));
-               return status;
+               goto out;
        }
 
        /* Chdir into the new path. */
@@ -233,47 +280,58 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
                DEBUG(0,("change_dir_owner_to_parent: failed to change "
                         "current working directory to %s. Error "
                         "was %s\n", fname, strerror(errno) ));
-               goto out;
+               goto chdir;
        }
 
-       if (SMB_VFS_STAT(conn,".",&sbuf) == -1) {
+       status = create_synthetic_smb_fname(ctx, ".", NULL, NULL,
+                                           &smb_fname_cwd);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       ret = SMB_VFS_STAT(conn, smb_fname_cwd);
+       if (ret == -1) {
                status = map_nt_error_from_unix(errno);
                DEBUG(0,("change_dir_owner_to_parent: failed to stat "
                         "directory '.' (%s) Error was %s\n",
                         fname, strerror(errno)));
-               goto out;
+               goto chdir;
        }
 
        /* Ensure we're pointing at the same place. */
-       if (sbuf.st_dev != psbuf->st_dev ||
-           sbuf.st_ino != psbuf->st_ino ||
-           sbuf.st_mode != psbuf->st_mode ) {
+       if (smb_fname_cwd->st.st_ex_dev != psbuf->st_ex_dev ||
+           smb_fname_cwd->st.st_ex_ino != psbuf->st_ex_ino ||
+           smb_fname_cwd->st.st_ex_mode != psbuf->st_ex_mode ) {
                DEBUG(0,("change_dir_owner_to_parent: "
                         "device/inode/mode on directory %s changed. "
                         "Refusing to chown !\n", fname ));
                status = NT_STATUS_ACCESS_DENIED;
-               goto out;
+               goto chdir;
        }
 
        become_root();
-       ret = SMB_VFS_CHOWN(conn, ".", parent_st.st_uid, (gid_t)-1);
+       ret = SMB_VFS_CHOWN(conn, ".", smb_fname_parent->st.st_ex_uid,
+                           (gid_t)-1);
        unbecome_root();
        if (ret == -1) {
                status = map_nt_error_from_unix(errno);
                DEBUG(10,("change_dir_owner_to_parent: failed to chown "
                          "directory %s to parent directory uid %u. "
                          "Error was %s\n", fname,
-                         (unsigned int)parent_st.st_uid, strerror(errno) ));
-               goto out;
+                         (unsigned int)smb_fname_parent->st.st_ex_uid,
+                         strerror(errno) ));
+               goto chdir;
        }
 
        DEBUG(10,("change_dir_owner_to_parent: changed ownership of new "
                  "directory %s to parent directory uid %u.\n",
-                 fname, (unsigned int)parent_st.st_uid ));
-
- out:
+                 fname, (unsigned int)smb_fname_parent->st.st_ex_uid ));
 
+ chdir:
        vfs_ChDir(conn,saved_dir);
+ out:
+       TALLOC_FREE(smb_fname_parent);
+       TALLOC_FREE(smb_fname_cwd);
        return status;
 }
 
@@ -285,22 +343,27 @@ static NTSTATUS open_file(files_struct *fsp,
                          connection_struct *conn,
                          struct smb_request *req,
                          const char *parent_dir,
-                         const char *name,
-                         const char *path,
-                         SMB_STRUCT_STAT *psbuf,
+                         struct smb_filename *smb_fname,
                          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. */
 {
+       char *path = NULL;
        NTSTATUS status = NT_STATUS_OK;
        int accmode = (flags & O_ACCMODE);
        int local_flags = flags;
-       bool file_existed = VALID_STAT(*psbuf);
+       bool file_existed = VALID_STAT(smb_fname->st);
 
        fsp->fh->fd = -1;
        errno = EPERM;
 
+       status = get_full_smb_filename(talloc_tos(), smb_fname,
+                                      &path);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        /* Check permissions */
 
        /*
@@ -315,16 +378,17 @@ static NTSTATUS open_file(files_struct *fsp,
 
        if (!CAN_WRITE(conn)) {
                /* It's a read-only share - fail if we wanted to write. */
-               if(accmode != O_RDONLY) {
-                       DEBUG(3,("Permission denied opening %s\n", path));
+               if(accmode != O_RDONLY || (flags & O_TRUNC) || (flags & O_APPEND)) {
+                       DEBUG(3,("Permission denied opening %s\n",
+                                smb_fname_str_dbg(smb_fname)));
                        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
                           access into the directory.
                        */
-                       flags &= ~O_CREAT;
-                       local_flags &= ~O_CREAT;
+                       flags &= ~(O_CREAT|O_EXCL);
+                       local_flags &= ~(O_CREAT|O_EXCL);
                }
        }
 
@@ -342,7 +406,7 @@ static NTSTATUS open_file(files_struct *fsp,
 
        if ((accmode == O_RDONLY) && ((flags & O_TRUNC) == O_TRUNC)) {
                DEBUG(10,("open_file: truncate requested on read-only open "
-                         "for file %s\n", path));
+                         "for file %s\n", smb_fname_str_dbg(smb_fname)));
                local_flags = (flags & ~O_ACCMODE)|O_RDWR;
        }
 
@@ -365,7 +429,7 @@ static NTSTATUS open_file(files_struct *fsp,
                 * open flags. JRA.
                 */
 
-               if (file_existed && S_ISFIFO(psbuf->st_mode)) {
+               if (file_existed && S_ISFIFO(smb_fname->st.st_ex_mode)) {
                        local_flags |= O_NONBLOCK;
                }
 #endif
@@ -386,11 +450,11 @@ static NTSTATUS open_file(files_struct *fsp,
                }
 
                /* Actually do the open */
-               status = fd_open(conn, path, fsp, local_flags, unx_mode);
+               status = fd_open(conn, smb_fname, fsp, local_flags, unx_mode);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(3,("Error opening file %s (%s) (local_flags=%d) "
-                                "(flags=%d)\n",
-                                path,nt_errstr(status),local_flags,flags));
+                                "(flags=%d)\n", smb_fname_str_dbg(smb_fname),
+                                nt_errstr(status),local_flags,flags));
                        return status;
                }
 
@@ -415,14 +479,84 @@ static NTSTATUS open_file(files_struct *fsp,
        } else {
                fsp->fh->fd = -1; /* What we used to call a stat open. */
                if (file_existed) {
+                       uint32_t access_granted = 0;
+
                        status = check_open_rights(conn,
                                        path,
-                                       access_mask);
+                                       access_mask,
+                                       &access_granted);
                        if (!NT_STATUS_IS_OK(status)) {
-                               DEBUG(10, ("open_file: Access denied on "
-                                       "file %s\n",
-                                       path));
-                               return status;
+                               if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+                                       /*
+                                        * On NT_STATUS_ACCESS_DENIED, access_granted
+                                        * contains the denied bits.
+                                        */
+
+                                       if ((access_mask & FILE_WRITE_ATTRIBUTES) &&
+                                                       (access_granted & FILE_WRITE_ATTRIBUTES) &&
+                                                       (lp_map_readonly(SNUM(conn)) ||
+                                                        lp_map_archive(SNUM(conn)) ||
+                                                        lp_map_hidden(SNUM(conn)) ||
+                                                        lp_map_system(SNUM(conn)))) {
+                                               access_granted &= ~FILE_WRITE_ATTRIBUTES;
+
+                                               DEBUG(10,("open_file: "
+                                                         "overrode "
+                                                         "FILE_WRITE_"
+                                                         "ATTRIBUTES "
+                                                         "on file %s\n",
+                                                         smb_fname_str_dbg(
+                                                                 smb_fname)));
+                                       }
+
+                                       if ((access_mask & DELETE_ACCESS) &&
+                                           (access_granted & DELETE_ACCESS) &&
+                                           can_delete_file_in_directory(conn,
+                                               smb_fname)) {
+                                               /* Were we trying to do a stat open
+                                                * for delete and didn't get DELETE
+                                                * access (only) ? Check if the
+                                                * directory allows DELETE_CHILD.
+                                                * See here:
+                                                * http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
+                                                * for details. */
+
+                                               access_granted &= ~DELETE_ACCESS;
+
+                                               DEBUG(10,("open_file: "
+                                                         "overrode "
+                                                         "DELETE_ACCESS on "
+                                                         "file %s\n",
+                                                         smb_fname_str_dbg(
+                                                                 smb_fname)));
+                                       }
+
+                                       if (access_granted != 0) {
+                                               DEBUG(10,("open_file: Access "
+                                                         "denied on file "
+                                                         "%s\n",
+                                                         smb_fname_str_dbg(
+                                                                 smb_fname)));
+                                               return status;
+                                       }
+                               } else if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) &&
+                                   fsp->posix_open &&
+                                   S_ISLNK(smb_fname->st.st_ex_mode)) {
+                                       /* This is a POSIX stat open for delete
+                                        * or rename on a symlink that points
+                                        * nowhere. Allow. */
+                                       DEBUG(10,("open_file: allowing POSIX "
+                                                 "open on bad symlink %s\n",
+                                                 smb_fname_str_dbg(
+                                                         smb_fname)));
+                               } else {
+                                       DEBUG(10,("open_file: "
+                                                 "check_open_rights on file "
+                                                 "%s returned %s\n",
+                                                 smb_fname_str_dbg(smb_fname),
+                                                 nt_errstr(status) ));
+                                       return status;
+                               }
                        }
                }
        }
@@ -431,13 +565,15 @@ static NTSTATUS open_file(files_struct *fsp,
                int ret;
 
                if (fsp->fh->fd == -1) {
-                       ret = SMB_VFS_STAT(conn, path, psbuf);
+                       ret = SMB_VFS_STAT(conn, smb_fname);
                } else {
-                       ret = SMB_VFS_FSTAT(fsp, psbuf);
+                       ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
                        /* If we have an fd, this stat should succeed. */
                        if (ret == -1) {
                                DEBUG(0,("Error doing fstat on open file %s "
-                                        "(%s)\n", path,strerror(errno) ));
+                                        "(%s)\n",
+                                        smb_fname_str_dbg(smb_fname),
+                                        strerror(errno) ));
                        }
                }
 
@@ -455,14 +591,14 @@ static NTSTATUS open_file(files_struct *fsp,
         * so catch a directory open and return an EISDIR. JRA.
         */
 
-       if(S_ISDIR(psbuf->st_mode)) {
+       if(S_ISDIR(smb_fname->st.st_ex_mode)) {
                fd_close(fsp);
                errno = EISDIR;
                return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
-       fsp->mode = psbuf->st_mode;
-       fsp->file_id = vfs_file_id_from_sbuf(conn, psbuf);
+       fsp->mode = smb_fname->st.st_ex_mode;
+       fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
        fsp->vuid = req ? req->vuid : UID_FIELD_INVALID;
        fsp->file_pid = req ? req->smbpid : 0;
        fsp->can_lock = True;
@@ -478,7 +614,8 @@ static NTSTATUS open_file(files_struct *fsp,
        fsp->sent_oplock_break = NO_BREAK_SENT;
        fsp->is_directory = False;
        if (conn->aio_write_behind_list &&
-           is_in_path(path, conn->aio_write_behind_list, conn->case_sensitive)) {
+           is_in_path(smb_fname->base_name, conn->aio_write_behind_list,
+                      conn->case_sensitive)) {
                fsp->aio_write_behind = True;
        }
 
@@ -677,7 +814,6 @@ bool is_stat_open(uint32 access_mask)
 ****************************************************************************/
 
 static NTSTATUS open_mode_check(connection_struct *conn,
-                               const char *fname,
                                struct share_mode_lock *lck,
                                uint32 access_mask,
                                uint32 share_access,
@@ -796,7 +932,6 @@ static bool delay_for_oplocks(struct share_mode_lock *lck,
                              int pass_number,
                              int oplock_request)
 {
-       extern uint32 global_client_caps;
        int i;
        struct share_mode_entry *exclusive = NULL;
        bool valid_entry = false;
@@ -946,15 +1081,6 @@ static void defer_open(struct share_mode_lock *lck,
                exit_server("push_deferred_smb_message failed");
        }
        add_deferred_open(lck, req->mid, request_time, state->id);
-
-       /*
-        * Push the MID of this packet on the signing queue.
-        * We only do this once, the first time we push the packet
-        * onto the deferred open queue, as this has a side effect
-        * of incrementing the response sequence number.
-        */
-
-       srv_defer_sign_response(req->mid);
 }
 
 
@@ -963,7 +1089,6 @@ static void defer_open(struct share_mode_lock *lck,
 ****************************************************************************/
 
 bool open_match_attributes(connection_struct *conn,
-                          const char *path,
                           uint32 old_dos_attr,
                           uint32 new_dos_attr,
                           mode_t existing_unx_mode,
@@ -982,10 +1107,9 @@ bool open_match_attributes(connection_struct *conn,
                *returned_unx_mode = (mode_t)0;
        }
 
-       DEBUG(10,("open_match_attributes: file %s old_dos_attr = 0x%x, "
+       DEBUG(10,("open_match_attributes: old_dos_attr = 0x%x, "
                  "existing_unx_mode = 0%o, new_dos_attr = 0x%x "
                  "returned_unx_mode = 0%o\n",
-                 path,
                  (unsigned int)old_dos_attr,
                  (unsigned int)existing_unx_mode,
                  (unsigned int)new_dos_attr,
@@ -1313,8 +1437,7 @@ static NTSTATUS calculate_access_mask(connection_struct *conn,
 
 static NTSTATUS open_file_ntcreate(connection_struct *conn,
                            struct smb_request *req,
-                           const char *fname,
-                           SMB_STRUCT_STAT *psbuf,
+                           struct smb_filename *smb_fname,
                            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. */
@@ -1327,10 +1450,11 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 {
        int flags=0;
        int flags2=0;
-       bool file_existed = VALID_STAT(*psbuf);
+       bool file_existed = VALID_STAT(smb_fname->st);
        bool def_acl = False;
        bool posix_open = False;
        bool new_file_created = False;
+       bool clear_ads = false;
        struct file_id id;
        NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
        mode_t new_unx_mode = (mode_t)0;
@@ -1343,11 +1467,17 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        uint32 open_access_mask = access_mask;
        NTSTATUS status;
        int ret_flock;
+       char *fname = NULL;
        char *parent_dir;
-       const char *newname;
 
        ZERO_STRUCT(id);
 
+       status = get_full_smb_filename(talloc_tos(), smb_fname,
+                                      &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        if (conn->printer) {
                /*
                 * Printers are handled completely differently.
@@ -1358,13 +1488,21 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        *pinfo = FILE_WAS_CREATED;
                }
 
-               DEBUG(10, ("open_file_ntcreate: printer open fname=%s\n", fname));
+               DEBUG(10, ("open_file_ntcreate: printer open fname=%s\n",
+                          smb_fname_str_dbg(smb_fname)));
 
-               return print_fsp_open(req, conn, fname, req->vuid, fsp, psbuf);
+               if (!req) {
+                       DEBUG(0,("open_file_ntcreate: printer open without "
+                               "an SMB request!\n"));
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               return print_fsp_open(req, conn, fname, req->vuid, fsp,
+                                     &smb_fname->st);
        }
 
-       if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir,
-                                  &newname)) {
+       if (!parent_dirname(talloc_tos(), smb_fname->base_name, &parent_dir,
+                           NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1383,9 +1521,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                   "access_mask=0x%x share_access=0x%x "
                   "create_disposition = 0x%x create_options=0x%x "
                   "unix mode=0%o oplock_request=%d\n",
-                  fname, new_dos_attributes, access_mask, share_access,
-                  create_disposition, create_options, unx_mode,
-                  oplock_request));
+                  smb_fname_str_dbg(smb_fname), new_dos_attributes,
+                  access_mask, share_access, create_disposition,
+                  create_options, (unsigned int)unx_mode, oplock_request));
 
        if ((req == NULL) && ((oplock_request & INTERNAL_OPEN_ONLY) == 0)) {
                DEBUG(0, ("No smb request but not an internal only open!\n"));
@@ -1421,7 +1559,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                remove_deferred_open_smb_message(req->mid);
        }
 
-       status = check_name(conn, fname);
+       status = check_name(conn, smb_fname->base_name);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -1429,19 +1567,20 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        if (!posix_open) {
                new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
                if (file_existed) {
-                       existing_dos_attributes = dos_mode(conn, fname, psbuf);
+                       existing_dos_attributes = dos_mode(conn, fname,
+                                                          &smb_fname->st);
                }
        }
 
        /* ignore any oplock requests if oplocks are disabled */
        if (!lp_oplocks(SNUM(conn)) || global_client_failed_oplock_break ||
-           IS_VETO_OPLOCK_PATH(conn, fname)) {
+           IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) {
                /* 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,".+,;=[].")) {
+       if (!lp_posix_pathnames() && strstr(smb_fname->base_name,".+,;=[].")) {
                /* OS/2 Workplace shell fix may be main code stream in a later
                 * release. */
                DEBUG(5,("open_file_ntcreate: OS/2 long filenames are not "
@@ -1463,12 +1602,14 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        /* If file exists replace/overwrite. If file doesn't
                         * exist create. */
                        flags2 |= (O_CREAT | O_TRUNC);
+                       clear_ads = true;
                        break;
 
                case FILE_OVERWRITE_IF:
                        /* If file exists replace/overwrite. If file doesn't
                         * exist create. */
                        flags2 |= (O_CREAT | O_TRUNC);
+                       clear_ads = true;
                        break;
 
                case FILE_OPEN:
@@ -1476,7 +1617,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        if (!file_existed) {
                                DEBUG(5,("open_file_ntcreate: FILE_OPEN "
                                         "requested for file %s and file "
-                                        "doesn't exist.\n", fname ));
+                                        "doesn't exist.\n",
+                                        smb_fname_str_dbg(smb_fname)));
                                errno = ENOENT;
                                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        }
@@ -1488,11 +1630,13 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        if (!file_existed) {
                                DEBUG(5,("open_file_ntcreate: FILE_OVERWRITE "
                                         "requested for file %s and file "
-                                        "doesn't exist.\n", fname ));
+                                        "doesn't exist.\n",
+                                        smb_fname_str_dbg(smb_fname) ));
                                errno = ENOENT;
                                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        }
                        flags2 |= O_TRUNC;
+                       clear_ads = true;
                        break;
 
                case FILE_CREATE:
@@ -1501,8 +1645,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        if (file_existed) {
                                DEBUG(5,("open_file_ntcreate: FILE_CREATE "
                                         "requested for file %s and file "
-                                        "already exists.\n", fname ));
-                               if (S_ISDIR(psbuf->st_mode)) {
+                                        "already exists.\n",
+                                        smb_fname_str_dbg(smb_fname)));
+                               if (S_ISDIR(smb_fname->st.st_ex_mode)) {
                                        errno = EISDIR;
                                } else {
                                        errno = EEXIST;
@@ -1527,15 +1672,16 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
        if (!posix_open && file_existed && ((create_disposition == FILE_OVERWRITE) ||
                             (create_disposition == FILE_OVERWRITE_IF))) {
-               if (!open_match_attributes(conn, fname,
-                                          existing_dos_attributes,
-                                          new_dos_attributes, psbuf->st_mode,
+               if (!open_match_attributes(conn, existing_dos_attributes,
+                                          new_dos_attributes,
+                                          smb_fname->st.st_ex_mode,
                                           unx_mode, &new_unx_mode)) {
                        DEBUG(5,("open_file_ntcreate: attributes missmatch "
                                 "for file %s (%x %x) (0%o, 0%o)\n",
-                                fname, existing_dos_attributes,
+                                smb_fname_str_dbg(smb_fname),
+                                existing_dos_attributes,
                                 new_dos_attributes,
-                                (unsigned int)psbuf->st_mode,
+                                (unsigned int)smb_fname->st.st_ex_mode,
                                 (unsigned int)unx_mode ));
                        errno = EACCES;
                        return NT_STATUS_ACCESS_DENIED;
@@ -1548,8 +1694,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("open_file_ntcreate: calculate_access_mask "
                        "on file %s returned %s\n",
-                       fname,
-                       nt_errstr(status)));
+                       smb_fname_str_dbg(smb_fname), nt_errstr(status)));
                return status;
        }
 
@@ -1560,7 +1705,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        }
 
        DEBUG(10, ("open_file_ntcreate: fname=%s, after mapping "
-                  "access_mask=0x%x\n", fname, access_mask ));
+                  "access_mask=0x%x\n", smb_fname_str_dbg(smb_fname),
+                   access_mask));
 
        /*
         * Note that we ignore the append flag as append does not
@@ -1613,12 +1759,13 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
            (!CAN_WRITE(conn) || IS_DOS_READONLY(existing_dos_attributes))) {
                DEBUG(5,("open_file_ntcreate: write access requested for "
                         "file %s on read only %s\n",
-                        fname, !CAN_WRITE(conn) ? "share" : "file" ));
+                        smb_fname_str_dbg(smb_fname),
+                        !CAN_WRITE(conn) ? "share" : "file" ));
                errno = EACCES;
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       fsp->file_id = vfs_file_id_from_sbuf(conn, psbuf);
+       fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
        fsp->share_access = share_access;
        fsp->fh->private_options = create_options;
        fsp->access_mask = open_access_mask; /* We change this to the
@@ -1634,8 +1781,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        }
 
        if (file_existed) {
-               struct timespec old_write_time = get_mtimespec(psbuf);
-               id = vfs_file_id_from_sbuf(conn, psbuf);
+               struct timespec old_write_time = smb_fname->st.st_ex_mtime;
+               id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
 
                lck = get_share_mode_lock(talloc_tos(), id,
                                          conn->connectpath,
@@ -1657,8 +1804,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
                /* Use the client requested access mask here, not the one we
                 * open with. */
-               status = open_mode_check(conn, fname, lck,
-                                        access_mask, share_access,
+               status = open_mode_check(conn, lck, access_mask, share_access,
                                         create_options, &file_existed);
 
                if (NT_STATUS_IS_OK(status)) {
@@ -1739,8 +1885,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                                can_access_mask = FILE_READ_DATA;
                        }
 
-                       if (((can_access_mask & FILE_WRITE_DATA) && !CAN_WRITE(conn)) ||
-                           !can_access_file_data(conn,fname,psbuf,can_access_mask)) {
+                       if (((can_access_mask & FILE_WRITE_DATA) &&
+                               !CAN_WRITE(conn)) ||
+                           !can_access_file_data(conn, smb_fname,
+                                                 can_access_mask)) {
                                can_access = False;
                        }
 
@@ -1826,7 +1974,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
         * open_file strips any O_TRUNC flags itself.
         */
 
-       fsp_open = open_file(fsp, conn, req, parent_dir, newname, fname, psbuf,
+       fsp_open = open_file(fsp, conn, req, parent_dir, smb_fname,
                             flags|flags2, unx_mode, access_mask,
                             open_access_mask);
 
@@ -1838,7 +1986,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        }
 
        if (!file_existed) {
-               struct timespec old_write_time = get_mtimespec(psbuf);
+               struct timespec old_write_time = smb_fname->st.st_ex_mtime;
                /*
                 * Deal with the race condition where two smbd's detect the
                 * file doesn't exist and do the create at the same time. One
@@ -1862,7 +2010,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
                if (lck == NULL) {
                        DEBUG(0, ("open_file_ntcreate: Could not get share "
-                                 "mode lock for %s\n", fname));
+                                 "mode lock for %s\n",
+                                 smb_fname_str_dbg(smb_fname)));
                        fd_close(fsp);
                        return NT_STATUS_SHARING_VIOLATION;
                }
@@ -1877,8 +2026,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        return NT_STATUS_SHARING_VIOLATION;
                }
 
-               status = open_mode_check(conn, fname, lck,
-                                        access_mask, share_access,
+               status = open_mode_check(conn, lck, access_mask, share_access,
                                         create_options, &file_existed);
 
                if (NT_STATUS_IS_OK(status)) {
@@ -1927,6 +2075,17 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
        SMB_ASSERT(lck != NULL);
 
+       /* Delete streams if create_disposition requires it */
+       if (file_existed && clear_ads &&
+           !is_ntfs_stream_smb_fname(smb_fname)) {
+               status = delete_all_streams(conn, smb_fname->base_name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(lck);
+                       fd_close(fsp);
+                       return status;
+               }
+       }
+
        /* note that we ignore failure for the following. It is
            basically a hack for NFS, and NFS will never set one of
            these only read them. Nobody but Samba can ever set a deny
@@ -1962,7 +2121,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                 * struct..
                 */
                if ((SMB_VFS_FTRUNCATE(fsp, 0) == -1) ||
-                   (SMB_VFS_FSTAT(fsp, psbuf)==-1)) {
+                   (SMB_VFS_FSTAT(fsp, &smb_fname->st)==-1)) {
                        status = map_nt_error_from_unix(errno);
                        TALLOC_FREE(lck);
                        fd_close(fsp);
@@ -2036,14 +2195,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                if (lp_map_archive(SNUM(conn)) ||
                    lp_store_dos_attributes(SNUM(conn))) {
                        if (!posix_open) {
-                               SMB_STRUCT_STAT tmp_sbuf;
-                               SET_STAT_INVALID(tmp_sbuf);
-                               if (file_set_dosmode(
-                                           conn, fname,
+                               if (file_set_dosmode(conn, smb_fname,
                                            new_dos_attributes | aARCH,
-                                           &tmp_sbuf, parent_dir,
-                                           true) == 0) {
-                                       unx_mode = tmp_sbuf.st_mode;
+                                           parent_dir, true) == 0) {
+                                       unx_mode = smb_fname->st.st_ex_mode;
                                }
                        }
                }
@@ -2080,7 +2235,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        } else {
                                DEBUG(5, ("open_file_ntcreate: reset "
                                          "attributes of file %s to 0%o\n",
-                                         fname, (unsigned int)new_unx_mode));
+                                         smb_fname_str_dbg(smb_fname),
+                                         (unsigned int)new_unx_mode));
                                ret = 0; /* Don't do the fchmod below. */
                        }
                }
@@ -2089,7 +2245,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                    (SMB_VFS_FCHMOD(fsp, new_unx_mode) == -1))
                        DEBUG(5, ("open_file_ntcreate: failed to reset "
                                  "attributes of file %s to 0%o\n",
-                                 fname, (unsigned int)new_unx_mode));
+                                 smb_fname_str_dbg(smb_fname),
+                                 (unsigned int)new_unx_mode));
        }
 
        /* If this is a successful open, we must remove any deferred open
@@ -2111,6 +2268,7 @@ NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn,
                          const char *fname,
                          SMB_STRUCT_STAT *psbuf, files_struct **result)
 {
+       struct smb_filename *smb_fname = NULL;
        files_struct *fsp = NULL;
        NTSTATUS status;
 
@@ -2123,12 +2281,17 @@ NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn,
                return status;
        }
 
-       status = SMB_VFS_CREATE_FILE(
+       status = create_synthetic_smb_fname_split(talloc_tos(), fname, psbuf,
+                                                 &smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                NULL,                                   /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               0,                                      /* create_file_flags */
+               smb_fname,                              /* fname */
                FILE_WRITE_DATA,                        /* access_mask */
                (FILE_SHARE_READ | FILE_SHARE_WRITE |   /* share_access */
                    FILE_SHARE_DELETE),
@@ -2140,8 +2303,10 @@ NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &fsp,                                   /* result */
-               NULL,                                   /* pinfo */
-               psbuf);                                 /* psbuf */
+               NULL);                                  /* psbuf */
+
+       *psbuf = smb_fname->st;
+       TALLOC_FREE(smb_fname);
 
        /*
         * This is not a user visible file open.
@@ -2169,13 +2334,11 @@ NTSTATUS close_file_fchmod(struct smb_request *req, files_struct *fsp)
 }
 
 static NTSTATUS mkdir_internal(connection_struct *conn,
-                               const char *name,
-                               uint32 file_attributes,
-                               SMB_STRUCT_STAT *psbuf)
+                              struct smb_filename *smb_dname,
+                              uint32 file_attributes)
 {
        mode_t mode;
        char *parent_dir;
-       const char *dirname;
        NTSTATUS status;
        bool posix_open = false;
 
@@ -2185,13 +2348,13 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       status = check_name(conn, name);
+       status = check_name(conn, smb_dname->base_name);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       if (!parent_dirname_talloc(talloc_tos(), name, &parent_dir,
-                                  &dirname)) {
+       if (!parent_dirname(talloc_tos(), smb_dname->base_name, &parent_dir,
+                           NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -2199,39 +2362,39 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
                posix_open = true;
                mode = (mode_t)(file_attributes & ~FILE_FLAG_POSIX_SEMANTICS);
        } else {
-               mode = unix_mode(conn, aDIR, name, parent_dir);
+               mode = unix_mode(conn, aDIR, smb_dname->base_name, parent_dir);
        }
 
-       if (SMB_VFS_MKDIR(conn, name, mode) != 0) {
+       if (SMB_VFS_MKDIR(conn, smb_dname->base_name, mode) != 0) {
                return map_nt_error_from_unix(errno);
        }
 
        /* Ensure we're checking for a symlink here.... */
        /* We don't want to get caught by a symlink racer. */
 
-       if (SMB_VFS_LSTAT(conn, name, psbuf) == -1) {
+       if (SMB_VFS_LSTAT(conn, smb_dname) == -1) {
                DEBUG(2, ("Could not stat directory '%s' just created: %s\n",
-                         name, strerror(errno)));
+                         smb_fname_str_dbg(smb_dname), strerror(errno)));
                return map_nt_error_from_unix(errno);
        }
 
-       if (!S_ISDIR(psbuf->st_mode)) {
+       if (!S_ISDIR(smb_dname->st.st_ex_mode)) {
                DEBUG(0, ("Directory just '%s' created is not a directory\n",
-                         name));
+                         smb_fname_str_dbg(smb_dname)));
                return NT_STATUS_ACCESS_DENIED;
        }
 
        if (lp_store_dos_attributes(SNUM(conn))) {
                if (!posix_open) {
-                       file_set_dosmode(conn, name,
-                                file_attributes | aDIR, NULL,
-                                parent_dir,
-                                true);
+                       file_set_dosmode(conn, smb_dname,
+                                        file_attributes | aDIR,
+                                        parent_dir, true);
                }
        }
 
        if (lp_inherit_perms(SNUM(conn))) {
-               inherit_access_posix_acl(conn, parent_dir, name, mode);
+               inherit_access_posix_acl(conn, parent_dir,
+                                        smb_dname->base_name, mode);
        }
 
        if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS)) {
@@ -2241,19 +2404,23 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
                 * Consider bits automagically set by UNIX, i.e. SGID bit from parent
                 * dir.
                 */
-               if (mode & ~(S_IRWXU|S_IRWXG|S_IRWXO) && (mode & ~psbuf->st_mode)) {
-                       SMB_VFS_CHMOD(conn, name,
-                                     psbuf->st_mode | (mode & ~psbuf->st_mode));
+               if ((mode & ~(S_IRWXU|S_IRWXG|S_IRWXO)) &&
+                   (mode & ~smb_dname->st.st_ex_mode)) {
+                       SMB_VFS_CHMOD(conn, smb_dname->base_name,
+                                     (smb_dname->st.st_ex_mode |
+                                         (mode & ~smb_dname->st.st_ex_mode)));
                }
        }
 
        /* Change the owner if required. */
        if (lp_inherit_owner(SNUM(conn))) {
-               change_dir_owner_to_parent(conn, parent_dir, name, psbuf);
+               change_dir_owner_to_parent(conn, parent_dir,
+                                          smb_dname->base_name,
+                                          &smb_dname->st);
        }
 
        notify_fname(conn, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_DIR_NAME,
-                    name);
+                    smb_dname->base_name);
 
        return NT_STATUS_OK;
 }
@@ -2264,8 +2431,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
 
 static NTSTATUS open_directory(connection_struct *conn,
                               struct smb_request *req,
-                              const char *fname,
-                              SMB_STRUCT_STAT *psbuf,
+                              struct smb_filename *smb_dname,
                               uint32 access_mask,
                               uint32 share_access,
                               uint32 create_disposition,
@@ -2275,7 +2441,7 @@ static NTSTATUS open_directory(connection_struct *conn,
                               files_struct **result)
 {
        files_struct *fsp = NULL;
-       bool dir_existed = VALID_STAT(*psbuf) ? True : False;
+       bool dir_existed = VALID_STAT(smb_dname->st) ? True : False;
        struct share_mode_lock *lck = NULL;
        NTSTATUS status;
        struct timespec mtimespec;
@@ -2284,7 +2450,7 @@ static NTSTATUS open_directory(connection_struct *conn,
        DEBUG(5,("open_directory: opening directory %s, access_mask = 0x%x, "
                 "share_access = 0x%x create_options = 0x%x, "
                 "create_disposition = 0x%x, file_attributes = 0x%x\n",
-                fname,
+                smb_fname_str_dbg(smb_dname),
                 (unsigned int)access_mask,
                 (unsigned int)share_access,
                 (unsigned int)create_options,
@@ -2293,22 +2459,30 @@ static NTSTATUS open_directory(connection_struct *conn,
 
        if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS) &&
                        (conn->fs_capabilities & FILE_NAMED_STREAMS) &&
-                       is_ntfs_stream_name(fname)) {
-               DEBUG(2, ("open_directory: %s is a stream name!\n", fname));
+                       is_ntfs_stream_smb_fname(smb_dname)) {
+               DEBUG(2, ("open_directory: %s is a stream name!\n",
+                         smb_fname_str_dbg(smb_dname)));
                return NT_STATUS_NOT_A_DIRECTORY;
        }
 
-       status = calculate_access_mask(conn, fname, dir_existed,
-                                       access_mask,
-                                       &access_mask); 
+       status = calculate_access_mask(conn, smb_dname->base_name, dir_existed,
+                                      access_mask, &access_mask);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("open_directory: calculate_access_mask "
                        "on file %s returned %s\n",
-                       fname,
+                       smb_fname_str_dbg(smb_dname),
                        nt_errstr(status)));
                return status;
        }
 
+       /* We need to support SeSecurityPrivilege for this. */
+       if (access_mask & SEC_FLAG_SYSTEM_SECURITY) {
+               DEBUG(10, ("open_directory: open on %s "
+                       "failed - SEC_FLAG_SYSTEM_SECURITY denied.\n",
+                       smb_fname_str_dbg(smb_dname)));
+               return NT_STATUS_PRIVILEGE_NOT_HELD;
+       }
+
        switch( create_disposition ) {
                case FILE_OPEN:
 
@@ -2318,7 +2492,7 @@ static NTSTATUS open_directory(connection_struct *conn,
                         * We want to follow symlinks here.
                         */
 
-                       if (SMB_VFS_STAT(conn, fname, psbuf) != 0) {
+                       if (SMB_VFS_STAT(conn, smb_dname) != 0) {
                                return map_nt_error_from_unix(errno);
                        }
                                
@@ -2329,14 +2503,13 @@ static NTSTATUS open_directory(connection_struct *conn,
                        /* If directory exists error. If directory doesn't
                         * exist create. */
 
-                       status = mkdir_internal(conn,
-                                               fname,
-                                               file_attributes,
-                                               psbuf);
+                       status = mkdir_internal(conn, smb_dname,
+                                               file_attributes);
 
                        if (!NT_STATUS_IS_OK(status)) {
                                DEBUG(2, ("open_directory: unable to create "
-                                         "%s. Error was %s\n", fname,
+                                         "%s. Error was %s\n",
+                                         smb_fname_str_dbg(smb_dname),
                                          nt_errstr(status)));
                                return status;
                        }
@@ -2350,10 +2523,8 @@ static NTSTATUS open_directory(connection_struct *conn,
                         * exist create.
                         */
 
-                       status = mkdir_internal(conn,
-                                               fname,
-                                               file_attributes,
-                                               psbuf);
+                       status = mkdir_internal(conn, smb_dname,
+                                               file_attributes);
 
                        if (NT_STATUS_IS_OK(status)) {
                                info = FILE_WAS_CREATED;
@@ -2373,24 +2544,44 @@ static NTSTATUS open_directory(connection_struct *conn,
                default:
                        DEBUG(5,("open_directory: invalid create_disposition "
                                 "0x%x for directory %s\n",
-                                (unsigned int)create_disposition, fname));
+                                (unsigned int)create_disposition,
+                                smb_fname_str_dbg(smb_dname)));
                        return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if(!S_ISDIR(psbuf->st_mode)) {
+       if(!S_ISDIR(smb_dname->st.st_ex_mode)) {
                DEBUG(5,("open_directory: %s is not a directory !\n",
-                        fname ));
+                        smb_fname_str_dbg(smb_dname)));
                return NT_STATUS_NOT_A_DIRECTORY;
        }
 
        if (info == FILE_WAS_OPENED) {
-               status = check_open_rights(conn,
-                                       fname,
-                                       access_mask);
+               uint32_t access_granted = 0;
+               status = check_open_rights(conn, smb_dname->base_name,
+                                          access_mask, &access_granted);
+
+               /* Were we trying to do a directory open
+                * for delete and didn't get DELETE
+                * access (only) ? Check if the
+                * directory allows DELETE_CHILD.
+                * See here:
+                * http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
+                * for details. */
+
+               if ((NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
+                       (access_mask & DELETE_ACCESS) &&
+                       (access_granted == DELETE_ACCESS) &&
+                       can_delete_file_in_directory(conn, smb_dname))) {
+                       DEBUG(10,("open_directory: overrode ACCESS_DENIED "
+                               "on directory %s\n",
+                               smb_fname_str_dbg(smb_dname)));
+                       status = NT_STATUS_OK;
+               }
+
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10, ("open_directory: check_open_rights on "
                                "file %s failed with %s\n",
-                               fname,
+                               smb_fname_str_dbg(smb_dname),
                                nt_errstr(status)));
                        return status;
                }
@@ -2405,8 +2596,8 @@ static NTSTATUS open_directory(connection_struct *conn,
         * Setup the files_struct for it.
         */
        
-       fsp->mode = psbuf->st_mode;
-       fsp->file_id = vfs_file_id_from_sbuf(conn, psbuf);
+       fsp->mode = smb_dname->st.st_ex_mode;
+       fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_dname->st);
        fsp->vuid = req ? req->vuid : UID_FIELD_INVALID;
        fsp->file_pid = req ? req->smbpid : 0;
        fsp->can_lock = False;
@@ -2426,23 +2617,23 @@ static NTSTATUS open_directory(connection_struct *conn,
        fsp->is_directory = True;
        fsp->posix_open = (file_attributes & FILE_FLAG_POSIX_SEMANTICS) ? True : False;
 
-       string_set(&fsp->fsp_name,fname);
+       string_set(&fsp->fsp_name, smb_dname->base_name);
 
-       mtimespec = get_mtimespec(psbuf);
+       mtimespec = smb_dname->st.st_ex_mtime;
 
        lck = get_share_mode_lock(talloc_tos(), fsp->file_id,
-                                 conn->connectpath,
-                                 fname, &mtimespec);
+                                 conn->connectpath, smb_dname->base_name,
+                                 &mtimespec);
 
        if (lck == NULL) {
-               DEBUG(0, ("open_directory: Could not get share mode lock for %s\n", fname));
+               DEBUG(0, ("open_directory: Could not get share mode lock for "
+                         "%s\n", smb_fname_str_dbg(smb_dname)));
                file_free(req, fsp);
                return NT_STATUS_SHARING_VIOLATION;
        }
 
-       status = open_mode_check(conn, fname, lck,
-                               access_mask, share_access,
-                               create_options, &dir_existed);
+       status = open_mode_check(conn, lck, access_mask, share_access,
+                                create_options, &dir_existed);
 
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(lck);
@@ -2479,20 +2670,17 @@ static NTSTATUS open_directory(connection_struct *conn,
        return NT_STATUS_OK;
 }
 
-NTSTATUS create_directory(connection_struct *conn, struct smb_request *req, const char *directory)
+NTSTATUS create_directory(connection_struct *conn, struct smb_request *req,
+                         struct smb_filename *smb_dname)
 {
        NTSTATUS status;
-       SMB_STRUCT_STAT sbuf;
        files_struct *fsp;
 
-       SET_STAT_INVALID(sbuf);
-       
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               directory,                              /* fname */
-               0,                                      /* create_file_flags */
+               smb_dname,                              /* fname */
                FILE_READ_ATTRIBUTES,                   /* access_mask */
                FILE_SHARE_NONE,                        /* share_access */
                FILE_CREATE,                            /* create_disposition*/
@@ -2503,8 +2691,7 @@ NTSTATUS create_directory(connection_struct *conn, struct smb_request *req, cons
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &fsp,                                   /* result */
-               NULL,                                   /* pinfo */
-               &sbuf);                                 /* psbuf */
+               NULL);                                  /* pinfo */
 
        if (NT_STATUS_IS_OK(status)) {
                close_file(req, fsp, NORMAL_CLOSE);
@@ -2539,8 +2726,8 @@ void msg_file_was_renamed(struct messaging_context *msg,
         }
 
        /* Unpack the message. */
-       pull_file_id_16(frm, &id);
-       sharepath = &frm[16];
+       pull_file_id_24(frm, &id);
+       sharepath = &frm[24];
        newname = sharepath + strlen(sharepath) + 1;
        sp_len = strlen(sharepath);
 
@@ -2621,7 +2808,7 @@ struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX *mem_ctx,
  * If that works, delete them all by setting the delete on close and close.
  */
 
-static NTSTATUS open_streams_for_delete(connection_struct *conn,
+NTSTATUS open_streams_for_delete(connection_struct *conn,
                                        const char *fname)
 {
        struct stream_struct *stream_info;
@@ -2663,29 +2850,33 @@ static NTSTATUS open_streams_for_delete(connection_struct *conn,
        }
 
        for (i=0; i<num_streams; i++) {
-               char *streamname;
+               struct smb_filename *smb_fname = NULL;
 
                if (strequal(stream_info[i].name, "::$DATA")) {
                        streams[i] = NULL;
                        continue;
                }
 
-               streamname = talloc_asprintf(talloc_tos(), "%s%s", fname,
-                                            stream_info[i].name);
-
-               if (streamname == NULL) {
-                       DEBUG(0, ("talloc_aprintf failed\n"));
-                       status = NT_STATUS_NO_MEMORY;
+               status = create_synthetic_smb_fname(talloc_tos(), fname,
+                                                   stream_info[i].name,
+                                                   NULL, &smb_fname);
+               if (!NT_STATUS_IS_OK(status)) {
                        goto fail;
                }
 
-               status = create_file_unixpath
-                       (conn,                  /* conn */
+               if (SMB_VFS_STAT(conn, smb_fname) == -1) {
+                       DEBUG(10, ("Unable to stat stream: %s\n",
+                                  smb_fname_str_dbg(smb_fname)));
+               }
+
+               status = SMB_VFS_CREATE_FILE(
+                        conn,                  /* conn */
                         NULL,                  /* req */
-                        streamname,            /* fname */
+                        0,                     /* root_dir_fid */
+                        smb_fname,             /* fname */
                         DELETE_ACCESS,         /* access_mask */
-                        FILE_SHARE_READ | FILE_SHARE_WRITE
-                        | FILE_SHARE_DELETE,   /* share_access */
+                        (FILE_SHARE_READ |     /* share_access */
+                            FILE_SHARE_WRITE | FILE_SHARE_DELETE),
                         FILE_OPEN,             /* create_disposition*/
                         NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE, /* create_options */
                         FILE_ATTRIBUTE_NORMAL, /* file_attributes */
@@ -2694,16 +2885,17 @@ static NTSTATUS open_streams_for_delete(connection_struct *conn,
                         NULL,                  /* sd */
                         NULL,                  /* ea_list */
                         &streams[i],           /* result */
-                        NULL,                  /* pinfo */
-                        NULL);                 /* psbuf */
-
-               TALLOC_FREE(streamname);
+                        NULL);                 /* pinfo */
 
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10, ("Could not open stream %s: %s\n",
-                                  streamname, nt_errstr(status)));
+                                  smb_fname_str_dbg(smb_fname),
+                                  nt_errstr(status)));
+
+                       TALLOC_FREE(smb_fname);
                        break;
                }
+               TALLOC_FREE(smb_fname);
        }
 
        /*
@@ -2731,7 +2923,7 @@ static NTSTATUS open_streams_for_delete(connection_struct *conn,
 
 static NTSTATUS create_file_unixpath(connection_struct *conn,
                                     struct smb_request *req,
-                                    const char *fname,
+                                    struct smb_filename *smb_fname,
                                     uint32_t access_mask,
                                     uint32_t share_access,
                                     uint32_t create_disposition,
@@ -2743,10 +2935,8 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                                     struct ea_list *ea_list,
 
                                     files_struct **result,
-                                    int *pinfo,
-                                    SMB_STRUCT_STAT *psbuf)
+                                    int *pinfo)
 {
-       SMB_STRUCT_STAT sbuf;
        int info = FILE_WAS_OPENED;
        files_struct *base_fsp = NULL;
        files_struct *fsp = NULL;
@@ -2763,7 +2953,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                  (unsigned int)create_disposition,
                  (unsigned int)create_options,
                  (unsigned int)oplock_request,
-                 ea_list, sd, fname));
+                 ea_list, sd, smb_fname_str_dbg(smb_fname)));
 
        if (create_options & FILE_OPEN_BY_FILE_ID) {
                status = NT_STATUS_NOT_SUPPORTED;
@@ -2779,23 +2969,14 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                oplock_request |= INTERNAL_OPEN_ONLY;
        }
 
-       if (psbuf != NULL) {
-               sbuf = *psbuf;
-       }
-       else {
-               if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
-                       SET_STAT_INVALID(sbuf);
-               }
-       }
-
        if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
            && (access_mask & DELETE_ACCESS)
-           && !is_ntfs_stream_name(fname)) {
+           && !is_ntfs_stream_smb_fname(smb_fname)) {
                /*
                 * We can't open a file with DELETE access if any of the
                 * streams is open without FILE_SHARE_DELETE
                 */
-               status = open_streams_for_delete(conn, fname);
+               status = open_streams_for_delete(conn, smb_fname->base_name);
 
                if (!NT_STATUS_IS_OK(status)) {
                        goto fail;
@@ -2815,43 +2996,50 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
            && (create_disposition != FILE_CREATE)
            && (share_access & FILE_SHARE_DELETE)
            && (access_mask & DELETE_ACCESS)
-           && (!can_delete_file_in_directory(conn, fname))) {
+           && (!(can_delete_file_in_directory(conn, smb_fname) ||
+                can_access_file_acl(conn, smb_fname, DELETE_ACCESS)))) {
                status = NT_STATUS_ACCESS_DENIED;
+               DEBUG(10,("create_file_unixpath: open file %s "
+                         "for delete ACCESS_DENIED\n",
+                         smb_fname_str_dbg(smb_fname)));
                goto fail;
        }
 
 #if 0
        /* We need to support SeSecurityPrivilege for this. */
-       if ((access_mask & SEC_RIGHT_SYSTEM_SECURITY) &&
+       if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) &&
            !user_has_privileges(current_user.nt_user_token,
                                 &se_security)) {
                status = NT_STATUS_PRIVILEGE_NOT_HELD;
                goto fail;
        }
+#else
+       /* We need to support SeSecurityPrivilege for this. */
+       if (access_mask & SEC_FLAG_SYSTEM_SECURITY) {
+               status = NT_STATUS_PRIVILEGE_NOT_HELD;
+               goto fail;
+       }
+       /* Don't allow a SACL set from an NTtrans create until we
+        * support SeSecurityPrivilege. */
+       if (!VALID_STAT(smb_fname->st) &&
+                       lp_nt_acl_support(SNUM(conn)) &&
+                       sd && (sd->sacl != NULL)) {
+               status = NT_STATUS_PRIVILEGE_NOT_HELD;
+               goto fail;
+       }
 #endif
 
        if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
-           && is_ntfs_stream_name(fname)
+           && is_ntfs_stream_smb_fname(smb_fname)
            && (!(create_options & NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE))) {
-               char *base;
                uint32 base_create_disposition;
+               struct smb_filename *smb_fname_base = NULL;
 
                if (create_options & FILE_DIRECTORY_FILE) {
                        status = NT_STATUS_NOT_A_DIRECTORY;
                        goto fail;
                }
 
-               status = split_ntfs_stream_name(talloc_tos(), fname,
-                                               &base, NULL);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10, ("create_file_unixpath: "
-                               "split_ntfs_stream_name failed: %s\n",
-                               nt_errstr(status)));
-                       goto fail;
-               }
-
-               SMB_ASSERT(!is_ntfs_stream_name(base)); /* paranoia.. */
-
                switch (create_disposition) {
                case FILE_OPEN:
                        base_create_disposition = FILE_OPEN;
@@ -2861,16 +3049,34 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                        break;
                }
 
-               status = create_file_unixpath(conn, NULL, base, 0,
+               /* Create an smb_filename with stream_name == NULL. */
+               status = create_synthetic_smb_fname(talloc_tos(),
+                                                   smb_fname->base_name,
+                                                   NULL, NULL,
+                                                   &smb_fname_base);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto fail;
+               }
+
+               if (SMB_VFS_STAT(conn, smb_fname_base) == -1) {
+                       DEBUG(10, ("Unable to stat stream: %s\n",
+                                  smb_fname_str_dbg(smb_fname_base)));
+               }
+
+               /* Open the base file. */
+               status = create_file_unixpath(conn, NULL, smb_fname_base, 0,
                                              FILE_SHARE_READ
                                              | FILE_SHARE_WRITE
                                              | FILE_SHARE_DELETE,
                                              base_create_disposition,
                                              0, 0, 0, 0, NULL, NULL,
-                                             &base_fsp, NULL, NULL);
+                                             &base_fsp, NULL);
+               TALLOC_FREE(smb_fname_base);
+
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10, ("create_file_unixpath for base %s failed: "
-                                  "%s\n", base, nt_errstr(status)));
+                                  "%s\n", smb_fname->base_name,
+                                  nt_errstr(status)));
                        goto fail;
                }
                /* we don't need to low level fd */
@@ -2903,7 +3109,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 
                oplock_request = 0;
                status = open_directory(
-                       conn, req, fname, &sbuf, access_mask, share_access,
+                       conn, req, smb_fname, access_mask, share_access,
                        create_disposition, create_options, file_attributes,
                        &info, &fsp);
        } else {
@@ -2927,8 +3133,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 
                status = open_file_ntcreate(conn,
                                            req,
-                                           fname,
-                                           &sbuf,
+                                           smb_fname,
                                            access_mask,
                                            share_access,
                                            create_disposition,
@@ -2964,7 +3169,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 
                        oplock_request = 0;
                        status = open_directory(
-                               conn, req, fname, &sbuf, access_mask,
+                               conn, req, smb_fname, access_mask,
                                share_access, create_disposition,
                                create_options, file_attributes,
                                &info, &fsp);
@@ -3016,14 +3221,15 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                }
        }
 
-       if ((ea_list != NULL) && (info == FILE_WAS_CREATED)) {
-               status = set_ea(conn, fsp, fname, ea_list);
+       if ((ea_list != NULL) &&
+           ((info == FILE_WAS_CREATED) || (info == FILE_WAS_OVERWRITTEN))) {
+               status = set_ea(conn, fsp, smb_fname, ea_list);
                if (!NT_STATUS_IS_OK(status)) {
                        goto fail;
                }
        }
 
-       if (!fsp->is_directory && S_ISDIR(sbuf.st_mode)) {
+       if (!fsp->is_directory && S_ISDIR(smb_fname->st.st_ex_mode)) {
                status = NT_STATUS_ACCESS_DENIED;
                goto fail;
        }
@@ -3031,7 +3237,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
        /* Save the requested allocation size. */
        if ((info == FILE_WAS_CREATED) || (info == FILE_WAS_OVERWRITTEN)) {
                if (allocation_size
-                   && (allocation_size > sbuf.st_size)) {
+                   && (allocation_size > smb_fname->st.st_ex_size)) {
                        fsp->initial_allocation_size = smb_roundup(
                                fsp->conn, allocation_size);
                        if (fsp->is_directory) {
@@ -3046,7 +3252,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
                        }
                } else {
                        fsp->initial_allocation_size = smb_roundup(
-                               fsp->conn, (uint64_t)sbuf.st_size);
+                               fsp->conn, (uint64_t)smb_fname->st.st_ex_size);
                }
        }
 
@@ -3056,13 +3262,8 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
        if (pinfo != NULL) {
                *pinfo = info;
        }
-       if (psbuf != NULL) {
-               if ((fsp->fh == NULL) || (fsp->fh->fd == -1)) {
-                       *psbuf = sbuf;
-               }
-               else {
-                       SMB_VFS_FSTAT(fsp, psbuf);
-               }
+       if ((fsp->fh != NULL) && (fsp->fh->fd != -1)) {
+               SMB_VFS_FSTAT(fsp, &smb_fname->st);
        }
        return NT_STATUS_OK;
 
@@ -3093,19 +3294,23 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
 NTSTATUS get_relative_fid_filename(connection_struct *conn,
                                   struct smb_request *req,
                                   uint16_t root_dir_fid,
-                                  const char *fname, char **new_fname)
+                                  struct smb_filename *smb_fname)
 {
        files_struct *dir_fsp;
        char *parent_fname = NULL;
+       char *new_base_name = NULL;
+       NTSTATUS status;
 
-       if (root_dir_fid == 0 || !fname || !new_fname) {
-               return NT_STATUS_INTERNAL_ERROR;
+       if (root_dir_fid == 0 || !smb_fname) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto out;
        }
 
        dir_fsp = file_fsp(req, root_dir_fid);
 
        if (dir_fsp == NULL) {
-               return NT_STATUS_INVALID_HANDLE;
+               status = NT_STATUS_INVALID_HANDLE;
+               goto out;
        }
 
        if (!dir_fsp->is_directory) {
@@ -3115,8 +3320,9 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
                 */
 
                if ((conn->fs_capabilities & FILE_NAMED_STREAMS) &&
-                   is_ntfs_stream_name(fname)) {
-                       return NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                   is_ntfs_stream_smb_fname(smb_fname)) {
+                       status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                       goto out;
                }
 
                /*
@@ -3126,7 +3332,8 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
                  (hint from demyn plantenberg)
                */
 
-               return NT_STATUS_INVALID_HANDLE;
+               status = NT_STATUS_INVALID_HANDLE;
+               goto out;
        }
 
        if (ISDOT(dir_fsp->fsp_name)) {
@@ -3138,7 +3345,8 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
                 */
                parent_fname = talloc_strdup(talloc_tos(), "");
                if (parent_fname == NULL) {
-                       return NT_STATUS_NO_MEMORY;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto out;
                }
        } else {
                size_t dir_name_len = strlen(dir_fsp->fsp_name);
@@ -3150,7 +3358,8 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
                parent_fname = TALLOC_ARRAY(talloc_tos(), char,
                    dir_name_len+2);
                if (parent_fname == NULL) {
-                       return NT_STATUS_NO_MEMORY;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto out;
                }
                memcpy(parent_fname, dir_fsp->fsp_name,
                    dir_name_len+1);
@@ -3168,20 +3377,26 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
                }
        }
 
-       *new_fname = talloc_asprintf(talloc_tos(), "%s%s", parent_fname,
-           fname);
-       if (*new_fname == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       new_base_name = talloc_asprintf(smb_fname, "%s%s", parent_fname,
+                                       smb_fname->base_name);
+       if (new_base_name == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto out;
        }
 
-       return NT_STATUS_OK;
+       TALLOC_FREE(smb_fname->base_name);
+       smb_fname->base_name = new_base_name;
+       status = NT_STATUS_OK;
+
+ out:
+       TALLOC_FREE(parent_fname);
+       return status;
 }
 
 NTSTATUS create_file_default(connection_struct *conn,
                             struct smb_request *req,
                             uint16_t root_dir_fid,
-                            const char *fname,
-                            uint32_t create_file_flags,
+                            struct smb_filename *smb_fname,
                             uint32_t access_mask,
                             uint32_t share_access,
                             uint32_t create_disposition,
@@ -3191,13 +3406,9 @@ NTSTATUS create_file_default(connection_struct *conn,
                             uint64_t allocation_size,
                             struct security_descriptor *sd,
                             struct ea_list *ea_list,
-
                             files_struct **result,
-                            int *pinfo,
-                            SMB_STRUCT_STAT *psbuf)
+                            int *pinfo)
 {
-       struct case_semantics_state *case_state = NULL;
-       SMB_STRUCT_STAT sbuf;
        int info = FILE_WAS_OPENED;
        files_struct *fsp = NULL;
        NTSTATUS status;
@@ -3207,7 +3418,7 @@ NTSTATUS create_file_default(connection_struct *conn,
                  "create_disposition = 0x%x create_options = 0x%x "
                  "oplock_request = 0x%x "
                  "root_dir_fid = 0x%x, ea_list = 0x%p, sd = 0x%p, "
-                 "create_file_flags = 0x%x, fname = %s\n",
+                 "fname = %s\n",
                  (unsigned int)access_mask,
                  (unsigned int)file_attributes,
                  (unsigned int)share_access,
@@ -3215,31 +3426,34 @@ NTSTATUS create_file_default(connection_struct *conn,
                  (unsigned int)create_options,
                  (unsigned int)oplock_request,
                  (unsigned int)root_dir_fid,
-                 ea_list, sd, create_file_flags, fname));
+                 ea_list, sd, smb_fname_str_dbg(smb_fname)));
 
        /*
         * Calculate the filename from the root_dir_if if necessary.
         */
 
        if (root_dir_fid != 0) {
-               char *new_fname;
-
                status = get_relative_fid_filename(conn, req, root_dir_fid,
-                                                  fname, &new_fname);
+                                                  smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        goto fail;
                }
-
-               fname = new_fname;
        }
 
        /*
         * Check to see if this is a mac fork of some kind.
         */
 
-       if (is_ntfs_stream_name(fname)) {
+       if (is_ntfs_stream_smb_fname(smb_fname)) {
+               char *fname = NULL;
                enum FAKE_FILE_TYPE fake_file_type;
 
+               status = get_full_smb_filename(talloc_tos(), smb_fname,
+                                              &fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto fail;
+               }
+
                fake_file_type = is_fake_file(fname);
 
                if (fake_file_type != FAKE_FILE_TYPE_NONE) {
@@ -3258,82 +3472,34 @@ NTSTATUS create_file_default(connection_struct *conn,
                        status = open_fake_file(req, conn, req->vuid,
                                                fake_file_type, fname,
                                                access_mask, &fsp);
+                       TALLOC_FREE(fname);
                        if (!NT_STATUS_IS_OK(status)) {
                                goto fail;
                        }
 
-                       ZERO_STRUCT(sbuf);
+                       ZERO_STRUCT(smb_fname->st);
                        goto done;
                }
+               TALLOC_FREE(fname);
 
                if (!(conn->fs_capabilities & FILE_NAMED_STREAMS)) {
-                       status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                       status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
                        goto fail;
                }
        }
 
-       if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
-               char *resolved_fname;
-
-               status = resolve_dfspath(talloc_tos(), conn, true, fname,
-                                        &resolved_fname);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       /*
-                        * For PATH_NOT_COVERED we had
-                        * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
-                        *                 ERRSRV, ERRbadpath);
-                        * Need to fix in callers
-                        */
-                       goto fail;
-               }
-               fname = resolved_fname;
-       }
-
-       /*
-        * Check if POSIX semantics are wanted.
-        */
-
-       if (file_attributes & FILE_FLAG_POSIX_SEMANTICS) {
-               case_state = set_posix_case_semantics(talloc_tos(), conn);
-       }
-
-       if (create_file_flags & CFF_DOS_PATH) {
-               char *converted_fname;
-
-               SET_STAT_INVALID(sbuf);
-
-               status = unix_convert(talloc_tos(), conn, fname, False,
-                                     &converted_fname, NULL, &sbuf);
-               if (!NT_STATUS_IS_OK(status)) {
-                       goto fail;
-               }
-               fname = converted_fname;
-       } else {
-               if (psbuf != NULL) {
-                       sbuf = *psbuf;
-               } else {
-                       if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
-                               SET_STAT_INVALID(sbuf);
-                       }
-               }
-
-       }
-
-       TALLOC_FREE(case_state);
-
        /* All file access must go through check_name() */
 
-       status = check_name(conn, fname);
+       status = check_name(conn, smb_fname->base_name);
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
        status = create_file_unixpath(
-               conn, req, fname, access_mask, share_access,
+               conn, req, smb_fname, access_mask, share_access,
                create_disposition, create_options, file_attributes,
                oplock_request, allocation_size, sd, ea_list,
-               &fsp, &info, &sbuf);
+               &fsp, &info);
 
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
@@ -3346,9 +3512,6 @@ NTSTATUS create_file_default(connection_struct *conn,
        if (pinfo != NULL) {
                *pinfo = info;
        }
-       if (psbuf != NULL) {
-               *psbuf = sbuf;
-       }
        return NT_STATUS_OK;
 
  fail: