Fix coverity CID 931. This check is redundent as smb_fname can
[ira/wip.git] / source3 / smbd / trans2.c
index 1d95c207bafc9c8c6a4b488457841c69bf4e6a50..561c18a29d5ed63659c984f561041dc8b27ff6ff 100644 (file)
@@ -367,6 +367,69 @@ static unsigned int fill_ea_buffer(TALLOC_CTX *mem_ctx, char *pdata, unsigned in
        return ret_data_size;
 }
 
+static NTSTATUS fill_ea_chained_buffer(TALLOC_CTX *mem_ctx,
+                                      char *pdata,
+                                      unsigned int total_data_size,
+                                      unsigned int *ret_data_size,
+                                      connection_struct *conn,
+                                      struct ea_list *ea_list)
+{
+       uint8_t *p = (uint8_t *)pdata;
+       uint8_t *last_start = NULL;
+
+       *ret_data_size = 0;
+
+       if (!lp_ea_support(SNUM(conn))) {
+               return NT_STATUS_NO_EAS_ON_FILE;
+       }
+
+       for (; ea_list; ea_list = ea_list->next) {
+               size_t dos_namelen;
+               fstring dos_ea_name;
+               size_t this_size;
+
+               if (last_start) {
+                       SIVAL(last_start, 0, PTR_DIFF(p, last_start));
+               }
+               last_start = p;
+
+               push_ascii_fstring(dos_ea_name, ea_list->ea.name);
+               dos_namelen = strlen(dos_ea_name);
+               if (dos_namelen > 255 || dos_namelen == 0) {
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+               if (ea_list->ea.value.length > 65535) {
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+
+               this_size = 0x08 + dos_namelen + 1 + ea_list->ea.value.length;
+
+               if (ea_list->next) {
+                       size_t pad = 4 - (this_size % 4);
+                       this_size += pad;
+               }
+
+               if (this_size > total_data_size) {
+                       return NT_STATUS_INFO_LENGTH_MISMATCH;
+               }
+
+               /* We know we have room. */
+               SIVAL(p, 0x00, 0); /* next offset */
+               SCVAL(p, 0x04, ea_list->ea.flags);
+               SCVAL(p, 0x05, dos_namelen);
+               SSVAL(p, 0x06, ea_list->ea.value.length);
+               fstrcpy((char *)(p+0x08), dos_ea_name);
+               memcpy(p + 0x08 + dos_namelen + 1, ea_list->ea.value.data, ea_list->ea.value.length);
+
+               total_data_size -= this_size;
+               p += this_size;
+       }
+
+       *ret_data_size = PTR_DIFF(p, pdata);
+       DEBUG(10,("fill_ea_chained_buffer: data_size = %u\n", *ret_data_size));
+       return NT_STATUS_OK;
+}
+
 static unsigned int estimate_ea_size(connection_struct *conn, files_struct *fsp, const char *fname)
 {
        size_t total_ea_len = 0;
@@ -404,12 +467,22 @@ static void canonicalize_ea_name(connection_struct *conn, files_struct *fsp, con
  Set or delete an extended attribute.
 ****************************************************************************/
 
-NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, struct ea_list *ea_list)
+NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
+               const struct smb_filename *smb_fname, struct ea_list *ea_list)
 {
+       char *fname = NULL;
+       NTSTATUS status;
+
        if (!lp_ea_support(SNUM(conn))) {
                return NT_STATUS_EAS_NOT_SUPPORTED;
        }
 
+       status = get_full_smb_filename(talloc_tos(), smb_fname,
+                                      &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        for (;ea_list; ea_list = ea_list->next) {
                int ret;
                fstring unix_ea_name;
@@ -682,6 +755,8 @@ void send_trans2_replies(connection_struct *conn,
        int alignment_offset = 1; /* JRA. This used to be 3. Set to 1 to make netmon parse ok. */
        int data_alignment_offset = 0;
        bool overflow = False;
+       struct smbd_server_connection *sconn = smbd_server_conn;
+       int max_send = sconn->smb1.sessions.max_send;
 
        /* Modify the data_to_send and datasize and set the error if
           we're trying to send more than max_data_bytes. We still send
@@ -700,6 +775,14 @@ void send_trans2_replies(connection_struct *conn,
        if(params_to_send == 0 && data_to_send == 0) {
                reply_outbuf(req, 10, 0);
                show_msg((char *)req->outbuf);
+               if (!srv_send_smb(smbd_server_fd(),
+                               (char *)req->outbuf,
+                               true, req->seqnum+1,
+                               IS_CONN_ENCRYPTED(conn),
+                               &req->pcd)) {
+                       exit_server_cleanly("send_trans2_replies: srv_send_smb failed.");
+               }
+               TALLOC_FREE(req->outbuf);
                return;
        }
 
@@ -867,6 +950,7 @@ static void call_trans2open(connection_struct *conn,
                            char **ppdata, int total_data,
                            unsigned int max_data_bytes)
 {
+       struct smb_filename *smb_fname = NULL;
        char *params = *pparams;
        char *pdata = *ppdata;
        int deny_mode;
@@ -884,7 +968,6 @@ static void call_trans2open(connection_struct *conn,
        SMB_OFF_T size=0;
        int fattr=0,mtime=0;
        SMB_INO_T inode = 0;
-       SMB_STRUCT_STAT sbuf;
        int smb_action = 0;
        files_struct *fsp;
        struct ea_list *ea_list = NULL;
@@ -896,15 +979,13 @@ static void call_trans2open(connection_struct *conn,
        uint32 create_options = 0;
        TALLOC_CTX *ctx = talloc_tos();
 
-       SET_STAT_INVALID(sbuf);
-
        /*
         * Ensure we have enough parameters to perform the operation.
         */
 
        if (total_params < 29) {
                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return;
+               goto out;
        }
 
        flags = SVAL(params, 0);
@@ -926,7 +1007,7 @@ static void call_trans2open(connection_struct *conn,
 
        if (IS_IPC(conn)) {
                reply_doserror(req, ERRSRV, ERRaccess);
-               return;
+               goto out;
        }
 
        srvstr_get_path(ctx, params, req->flags2, &fname, pname,
@@ -934,63 +1015,80 @@ static void call_trans2open(connection_struct *conn,
                        &status);
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);
-               return;
+               goto out;
        }
 
        DEBUG(3,("call_trans2open %s deny_mode=0x%x attr=%d ofun=0x%x size=%d\n",
                fname, (unsigned int)deny_mode, (unsigned int)open_attr,
                (unsigned int)open_ofun, open_size));
 
+       status = filename_convert(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &smb_fname,
+                               NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                               NT_STATUS_PATH_NOT_COVERED,
+                               ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;
+       }
+
        if (open_ofun == 0) {
                reply_nterror(req, NT_STATUS_OBJECT_NAME_COLLISION);
-               return;
+               goto out;
        }
 
-       if (!map_open_params_to_ntcreate(fname, deny_mode, open_ofun,
+       if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+                               open_ofun,
                                &access_mask,
                                &share_mode,
                                &create_disposition,
                                &create_options)) {
                reply_doserror(req, ERRDOS, ERRbadaccess);
-               return;
+               goto out;
        }
 
        /* Any data in this call is an EA list. */
        if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
                reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
-               return;
+               goto out;
        }
 
        if (total_data != 4) {
                if (total_data < 10) {
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
 
                if (IVAL(pdata,0) > total_data) {
                        DEBUG(10,("call_trans2open: bad total data size (%u) > %u\n",
                                IVAL(pdata,0), (unsigned int)total_data));
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
 
                ea_list = read_ea_list(talloc_tos(), pdata + 4,
                                       total_data - 4);
                if (!ea_list) {
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
        } else if (IVAL(pdata,0) != 4) {
                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return;
+               goto out;
        }
 
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               CFF_DOS_PATH,                           /* create_file_flags */
+               smb_fname,                              /* fname */
                access_mask,                            /* access_mask */
                share_mode,                             /* share_access */
                create_disposition,                     /* create_disposition*/
@@ -1001,33 +1099,32 @@ static void call_trans2open(connection_struct *conn,
                NULL,                                   /* sd */
                ea_list,                                /* ea_list */
                &fsp,                                   /* result */
-               &smb_action,                            /* pinfo */
-               &sbuf);                                 /* psbuf */
+               &smb_action);                           /* psbuf */
 
        if (!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(req->mid)) {
                        /* We have re-scheduled this call. */
-                       return;
+                       goto out;
                }
                reply_openerror(req, status);
-               return;
+               goto out;
        }
 
-       size = get_file_size_stat(&sbuf);
-       fattr = dos_mode(conn,fsp->fsp_name,&sbuf);
-       mtime = convert_timespec_to_time_t(sbuf.st_ex_mtime);
-       inode = sbuf.st_ex_ino;
+       size = get_file_size_stat(&smb_fname->st);
+       fattr = dos_mode(conn, smb_fname);
+       mtime = convert_timespec_to_time_t(smb_fname->st.st_ex_mtime);
+       inode = smb_fname->st.st_ex_ino;
        if (fattr & aDIR) {
                close_file(req, fsp, ERROR_CLOSE);
                reply_doserror(req, ERRDOS,ERRnoaccess);
-               return;
+               goto out;
        }
 
        /* Realloc the size of parameters and data we will return */
        *pparams = (char *)SMB_REALLOC(*pparams, 30);
        if(*pparams == NULL ) {
                reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
+               goto out;
        }
        params = *pparams;
 
@@ -1059,6 +1156,8 @@ static void call_trans2open(connection_struct *conn,
 
        /* Send the required number of replies */
        send_trans2_replies(conn, req, params, 30, *ppdata, 0, max_data_bytes);
+ out:
+       TALLOC_FREE(smb_fname);
 }
 
 /*********************************************************
@@ -1125,7 +1224,7 @@ static uint32 unix_filetype(mode_t mode)
 enum perm_type { PERM_NEW_FILE, PERM_NEW_DIR, PERM_EXISTING_FILE, PERM_EXISTING_DIR};
 
 static NTSTATUS unix_perms_from_wire( connection_struct *conn,
-                               SMB_STRUCT_STAT *psbuf,
+                               const SMB_STRUCT_STAT *psbuf,
                                uint32 perms,
                                enum perm_type ptype,
                                mode_t *ret_perms)
@@ -1353,6 +1452,8 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
 
                if (got_match) {
                        bool isdots = (ISDOT(dname) || ISDOTDOT(dname));
+                       struct smb_filename *smb_fname = NULL;
+                       NTSTATUS status;
 
                        if (dont_descend && !isdots) {
                                TALLOC_FREE(fname);
@@ -1377,22 +1478,41 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                                return False;
                        }
 
+                       /* A dirent from dptr_ReadDirName isn't a stream. */
+                       status = create_synthetic_smb_fname(ctx, pathreal,
+                                                           NULL, &sbuf,
+                                                           &smb_fname);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               TALLOC_FREE(fname);
+                               return false;
+                       }
+
                        if (INFO_LEVEL_IS_UNIX(info_level)) {
-                               if (SMB_VFS_LSTAT(conn,pathreal,&sbuf) != 0) {
-                                       DEBUG(5,("get_lanman2_dir_entry:Couldn't lstat [%s] (%s)\n",
-                                               pathreal,strerror(errno)));
+                               if (SMB_VFS_LSTAT(conn, smb_fname) != 0) {
+                                       DEBUG(5,("get_lanman2_dir_entry: "
+                                                "Couldn't lstat [%s] (%s)\n",
+                                                smb_fname_str_dbg(smb_fname),
+                                                strerror(errno)));
+                                       TALLOC_FREE(smb_fname);
                                        TALLOC_FREE(pathreal);
                                        TALLOC_FREE(fname);
                                        continue;
                                }
-                       } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,pathreal,&sbuf) != 0) {
+                       } else if (!VALID_STAT(smb_fname->st) &&
+                                  SMB_VFS_STAT(conn, smb_fname) != 0) {
                                /* Needed to show the msdfs symlinks as
                                 * directories */
 
-                               ms_dfs_link = check_msdfs_link(conn, pathreal, &sbuf);
+                               ms_dfs_link =
+                                   check_msdfs_link(conn,
+                                                    smb_fname->base_name,
+                                                    &smb_fname->st);
                                if (!ms_dfs_link) {
-                                       DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",
-                                               pathreal,strerror(errno)));
+                                       DEBUG(5,("get_lanman2_dir_entry: "
+                                                "Couldn't stat [%s] (%s)\n",
+                                                smb_fname_str_dbg(smb_fname),
+                                                strerror(errno)));
+                                       TALLOC_FREE(smb_fname);
                                        TALLOC_FREE(pathreal);
                                        TALLOC_FREE(fname);
                                        continue;
@@ -1400,38 +1520,43 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        }
 
                        if (ms_dfs_link) {
-                               mode = dos_mode_msdfs(conn,pathreal,&sbuf);
+                               mode = dos_mode_msdfs(conn, smb_fname);
                        } else {
-                               mode = dos_mode(conn,pathreal,&sbuf);
+                               mode = dos_mode(conn, smb_fname);
                        }
 
                        if (!dir_check_ftype(conn,mode,dirtype)) {
                                DEBUG(5,("get_lanman2_dir_entry: [%s] attribs didn't match %x\n",fname,dirtype));
+                               TALLOC_FREE(smb_fname);
                                TALLOC_FREE(pathreal);
                                TALLOC_FREE(fname);
                                continue;
                        }
 
                        if (!(mode & aDIR)) {
-                               file_size = get_file_size_stat(&sbuf);
+                               file_size = get_file_size_stat(&smb_fname->st);
                        }
-                       allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn,NULL,&sbuf);
-
-                       mdate_ts = sbuf.st_ex_mtime;
-                       adate_ts = sbuf.st_ex_atime;
-                       create_date_ts = sbuf.st_ex_btime;
+                       allocation_size =
+                           SMB_VFS_GET_ALLOC_SIZE(conn, NULL, &smb_fname->st);
 
                        if (ask_sharemode) {
                                struct timespec write_time_ts;
                                struct file_id fileid;
 
-                               fileid = vfs_file_id_from_sbuf(conn, &sbuf);
+                               ZERO_STRUCT(write_time_ts);
+                               fileid = vfs_file_id_from_sbuf(conn,
+                                                              &smb_fname->st);
                                get_file_infos(fileid, NULL, &write_time_ts);
                                if (!null_timespec(write_time_ts)) {
-                                       mdate_ts = write_time_ts;
+                                       update_stat_ex_mtime(&smb_fname->st,
+                                                            write_time_ts);
                                }
                        }
 
+                       mdate_ts = smb_fname->st.st_ex_mtime;
+                       adate_ts = smb_fname->st.st_ex_atime;
+                       create_date_ts = smb_fname->st.st_ex_btime;
+
                        if (lp_dos_filetime_resolution(SNUM(conn))) {
                                dos_filetime_timespec(&create_date_ts);
                                dos_filetime_timespec(&mdate_ts);
@@ -1443,11 +1568,14 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
                        adate = convert_timespec_to_time_t(adate_ts);
 
                        DEBUG(5,("get_lanman2_dir_entry: found %s fname=%s\n",
-                               pathreal,fname));
+                                smb_fname_str_dbg(smb_fname), fname));
 
                        found = True;
 
                        dptr_DirCacheAdd(conn->dirptr, dname, curr_dirpos);
+                       sbuf = smb_fname->st;
+
+                       TALLOC_FREE(smb_fname);
                }
 
                if (!found)
@@ -2559,67 +2687,37 @@ static void samba_extended_info_version(struct smb_extended_info *extended_info)
                  "%s", samba_version_string());
 }
 
-/****************************************************************************
- Reply to a TRANS2_QFSINFO (query filesystem info).
-****************************************************************************/
-
-static void call_trans2qfsinfo(connection_struct *conn,
-                              struct smb_request *req,
-                              char **pparams, int total_params,
-                              char **ppdata, int total_data,
-                              unsigned int max_data_bytes)
+NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
+                        TALLOC_CTX *mem_ctx,
+                        uint16_t info_level,
+                        SMB_STRUCT_STAT st,
+                        uint16_t flags2,
+                        unsigned int max_data_bytes,
+                        char **ppdata,
+                        int *ret_data_len)
 {
        char *pdata, *end_data;
-       char *params = *pparams;
-       uint16 info_level;
-       int data_len, len;
-       SMB_STRUCT_STAT st;
+       int data_len = 0, len;
        const char *vname = volume_label(SNUM(conn));
        int snum = SNUM(conn);
        char *fstype = lp_fstype(SNUM(conn));
        uint32 additional_flags = 0;
 
-       if (total_params < 2) {
-               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return;
-       }
-
-       info_level = SVAL(params,0);
-
        if (IS_IPC(conn)) {
                if (info_level != SMB_QUERY_CIFS_UNIX_INFO) {
-                       DEBUG(0,("call_trans2qfsinfo: not an allowed "
+                       DEBUG(0,("smbd_do_qfsinfo: not an allowed "
                                "info level (0x%x) on IPC$.\n",
                                (unsigned int)info_level));
-                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
-                       return;
-               }
-       }
-
-       if (ENCRYPTION_REQUIRED(conn) && !req->encrypted) {
-               if (info_level != SMB_QUERY_CIFS_UNIX_INFO) {
-                       DEBUG(0,("call_trans2qfsinfo: encryption required "
-                               "and info level 0x%x sent.\n",
-                               (unsigned int)info_level));
-                       exit_server_cleanly("encryption required "
-                               "on connection");
-                       return;
+                       return NT_STATUS_ACCESS_DENIED;
                }
        }
 
-       DEBUG(3,("call_trans2qfsinfo: level = %d\n", info_level));
-
-       if(SMB_VFS_STAT(conn,".",&st)!=0) {
-               DEBUG(2,("call_trans2qfsinfo: stat of . failed (%s)\n", strerror(errno)));
-               reply_doserror(req, ERRSRV, ERRinvdevice);
-               return;
-       }
+       DEBUG(3,("smbd_do_qfsinfo: level = %d\n", info_level));
 
        *ppdata = (char *)SMB_REALLOC(
                *ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
-       if (*ppdata == NULL ) {
-               reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
+       if (*ppdata == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        pdata = *ppdata;
@@ -2632,8 +2730,7 @@ static void call_trans2qfsinfo(connection_struct *conn,
                        uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 18;
                        if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
-                               reply_unixerror(req, ERRHRD, ERRgeneral);
-                               return;
+                               return map_nt_error_from_unix(errno);
                        }
 
                        block_size = lp_block_size(snum);
@@ -2652,7 +2749,7 @@ static void call_trans2qfsinfo(connection_struct *conn,
                        bytes_per_sector = 512;
                        sectors_per_unit = bsize/bytes_per_sector;
 
-                       DEBUG(5,("call_trans2qfsinfo : SMB_INFO_ALLOCATION id=%x, bsize=%u, cSectorUnit=%u, \
+                       DEBUG(5,("smbd_do_qfsinfo : SMB_INFO_ALLOCATION id=%x, bsize=%u, cSectorUnit=%u, \
 cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (unsigned int)bsize, (unsigned int)sectors_per_unit,
                                (unsigned int)bytes_per_sector, (unsigned int)dsize, (unsigned int)dfree));
 
@@ -2678,13 +2775,13 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
                         * the pushed string. The change here was adding the STR_TERMINATE. JRA.
                         */
                        len = srvstr_push(
-                               pdata, req->flags2,
+                               pdata, flags2,
                                pdata+l2_vol_szVolLabel, vname,
                                PTR_DIFF(end_data, pdata+l2_vol_szVolLabel),
                                STR_NOALIGN|STR_TERMINATE);
                        SCVAL(pdata,l2_vol_cch,len);
                        data_len = l2_vol_szVolLabel + len;
-                       DEBUG(5,("call_trans2qfsinfo : time = %x, namelen = %d, name = %s\n",
+                       DEBUG(5,("smbd_do_qfsinfo : time = %x, namelen = %d, name = %s\n",
                                 (unsigned)convert_timespec_to_time_t(st.st_ex_ctime),
                                 len, vname));
                        break;
@@ -2711,7 +2808,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
                        SIVAL(pdata,4,255); /* Max filename component length */
                        /* NOTE! the fstype must *not* be null terminated or win98 won't recognise it
                                and will think we can't do long filenames */
-                       len = srvstr_push(pdata, req->flags2, pdata+12, fstype,
+                       len = srvstr_push(pdata, flags2, pdata+12, fstype,
                                          PTR_DIFF(end_data, pdata+12),
                                          STR_UNICODE);
                        SIVAL(pdata,8,len);
@@ -2720,7 +2817,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
 
                case SMB_QUERY_FS_LABEL_INFO:
                case SMB_FS_LABEL_INFORMATION:
-                       len = srvstr_push(pdata, req->flags2, pdata+4, vname,
+                       len = srvstr_push(pdata, flags2, pdata+4, vname,
                                          PTR_DIFF(end_data, pdata+4), 0);
                        data_len = 4 + len;
                        SIVAL(pdata,0,len);
@@ -2737,13 +2834,13 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
                                (str_checksum(get_local_machine_name())<<16));
 
                        /* Max label len is 32 characters. */
-                       len = srvstr_push(pdata, req->flags2, pdata+18, vname,
+                       len = srvstr_push(pdata, flags2, pdata+18, vname,
                                          PTR_DIFF(end_data, pdata+18),
                                          STR_UNICODE);
                        SIVAL(pdata,12,len);
                        data_len = 18+len;
 
-                       DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n", 
+                       DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n",
                                (int)strlen(vname),vname, lp_servicename(snum)));
                        break;
 
@@ -2753,8 +2850,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
                        uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 24;
                        if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
-                               reply_unixerror(req, ERRHRD, ERRgeneral);
-                               return;
+                               return map_nt_error_from_unix(errno);
                        }
                        block_size = lp_block_size(snum);
                        if (bsize < block_size) {
@@ -2771,7 +2867,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
                        }
                        bytes_per_sector = 512;
                        sectors_per_unit = bsize/bytes_per_sector;
-                       DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_SIZE_INFO bsize=%u, cSectorUnit=%u, \
+                       DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_FS_SIZE_INFO bsize=%u, cSectorUnit=%u, \
 cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned int)sectors_per_unit,
                                (unsigned int)bytes_per_sector, (unsigned int)dsize, (unsigned int)dfree));
                        SBIG_UINT(pdata,0,dsize);
@@ -2786,8 +2882,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 32;
                        if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
-                               reply_unixerror(req, ERRHRD, ERRgeneral);
-                               return;
+                               return map_nt_error_from_unix(errno);
                        }
                        block_size = lp_block_size(snum);
                        if (bsize < block_size) {
@@ -2804,7 +2899,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        }
                        bytes_per_sector = 512;
                        sectors_per_unit = bsize/bytes_per_sector;
-                       DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_FULL_SIZE_INFO bsize=%u, cSectorUnit=%u, \
+                       DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_FS_FULL_SIZE_INFO bsize=%u, cSectorUnit=%u, \
 cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned int)sectors_per_unit,
                                (unsigned int)bytes_per_sector, (unsigned int)dsize, (unsigned int)dfree));
                        SBIG_UINT(pdata,0,dsize); /* Total Allocation units. */
@@ -2857,24 +2952,23 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        fsp.fnum = -1;
 
                        /* access check */
-                       if (conn->server_info->utok.uid != 0) {
+                       if (conn->server_info->utok.uid != sec_initial_uid()) {
                                DEBUG(0,("set_user_quota: access_denied "
                                         "service [%s] user [%s]\n",
                                         lp_servicename(SNUM(conn)),
                                         conn->server_info->unix_name));
-                               reply_doserror(req, ERRDOS, ERRnoaccess);
-                               return;
+                               return NT_STATUS_ACCESS_DENIED;
                        }
 
                        if (vfs_get_ntquota(&fsp, SMB_USER_FS_QUOTA_TYPE, NULL, &quotas)!=0) {
                                DEBUG(0,("vfs_get_ntquota() failed for service [%s]\n",lp_servicename(SNUM(conn))));
-                               reply_doserror(req, ERRSRV, ERRerror);
-                               return;
+                               return map_nt_error_from_unix(errno);
                        }
 
                        data_len = 48;
 
-                       DEBUG(10,("SMB_FS_QUOTA_INFORMATION: for service [%s]\n",lp_servicename(SNUM(conn))));          
+                       DEBUG(10,("SMB_FS_QUOTA_INFORMATION: for service [%s]\n",
+                                 lp_servicename(SNUM(conn))));
 
                        /* Unknown1 24 NULL bytes*/
                        SBIG_UINT(pdata,0,(uint64_t)0);
@@ -2925,8 +3019,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        int encrypt_caps = 0;
 
                        if (!lp_unix_extensions()) {
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
 
                        switch (conn->encrypt_level) {
@@ -2971,8 +3064,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        vfs_statvfs_struct svfs;
 
                        if (!lp_unix_extensions()) {
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
 
                        rc = SMB_VFS_STATVFS(conn, ".", &svfs);
@@ -2987,16 +3079,14 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                                SBIG_UINT(pdata,32,svfs.TotalFileNodes);
                                SBIG_UINT(pdata,40,svfs.FreeFileNodes);
                                SBIG_UINT(pdata,48,svfs.FsIdentifier);
-                               DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_POSIX_FS_INFO succsessful\n"));
+                               DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_POSIX_FS_INFO succsessful\n"));
 #ifdef EOPNOTSUPP
                        } else if (rc == EOPNOTSUPP) {
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
 #endif /* EOPNOTSUPP */
                        } else {
                                DEBUG(0,("vfs_statvfs() failed for service [%s]\n",lp_servicename(SNUM(conn))));
-                               reply_doserror(req, ERRSRV, ERRerror);
-                               return;
+                               return NT_STATUS_DOS(ERRSRV, ERRerror);
                        }
                        break;
                }
@@ -3008,13 +3098,11 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        int i;
 
                        if (!lp_unix_extensions()) {
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
 
                        if (max_data_bytes < 40) {
-                               reply_nterror(req, NT_STATUS_BUFFER_TOO_SMALL);
-                               return;
+                               return NT_STATUS_BUFFER_TOO_SMALL;
                        }
 
                        /* We ARE guest if global_sid_Builtin_Guests is
@@ -3128,12 +3216,66 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        }
                        /* drop through */
                default:
-                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                       return NT_STATUS_INVALID_LEVEL;
+       }
+
+       *ret_data_len = data_len;
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Reply to a TRANS2_QFSINFO (query filesystem info).
+****************************************************************************/
+
+static void call_trans2qfsinfo(connection_struct *conn,
+                              struct smb_request *req,
+                              char **pparams, int total_params,
+                              char **ppdata, int total_data,
+                              unsigned int max_data_bytes)
+{
+       char *params = *pparams;
+       uint16_t info_level;
+       int data_len = 0;
+       SMB_STRUCT_STAT st;
+       NTSTATUS status;
+
+       if (total_params < 2) {
+               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
+       }
+
+       info_level = SVAL(params,0);
+
+       if (ENCRYPTION_REQUIRED(conn) && !req->encrypted) {
+               if (info_level != SMB_QUERY_CIFS_UNIX_INFO) {
+                       DEBUG(0,("call_trans2qfsinfo: encryption required "
+                               "and info level 0x%x sent.\n",
+                               (unsigned int)info_level));
+                       exit_server_cleanly("encryption required "
+                               "on connection");
                        return;
+               }
+       }
+
+       DEBUG(3,("call_trans2qfsinfo: level = %d\n", info_level));
+
+       if(vfs_stat_smb_fname(conn,".",&st)!=0) {
+               DEBUG(2,("call_trans2qfsinfo: stat of . failed (%s)\n", strerror(errno)));
+               reply_doserror(req, ERRSRV, ERRinvdevice);
+               return;
        }
 
+       status = smbd_do_qfsinfo(conn, req,
+                                info_level, st,
+                                req->flags2,
+                                max_data_bytes,
+                                ppdata, &data_len);
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
+               return;
+       }
 
-       send_trans2_replies(conn, req, params, 0, pdata, data_len,
+       send_trans2_replies(conn, req, params, 0, *ppdata, data_len,
                            max_data_bytes);
 
        DEBUG( 4, ( "%s info_level = %d\n",
@@ -3304,12 +3446,12 @@ cap_low = 0x%x, cap_high = 0x%x\n",
                                ZERO_STRUCT(quotas);
 
                                /* access check */
-                               if ((conn->server_info->utok.uid != 0)
+                               if ((conn->server_info->utok.uid != sec_initial_uid())
                                    ||!CAN_WRITE(conn)) {
                                        DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
                                                 lp_servicename(SNUM(conn)),
                                                 conn->server_info->unix_name));
-                                       reply_doserror(req, ERRSRV, ERRaccess);
+                                       reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                                        return;
                                }
 
@@ -3378,7 +3520,7 @@ cap_low = 0x%x, cap_high = 0x%x\n",
                                /* now set the quotas */
                                if (vfs_set_ntquota(fsp, SMB_USER_FS_QUOTA_TYPE, NULL, &quotas)!=0) {
                                        DEBUG(0,("vfs_set_ntquota() failed for service [%s]\n",lp_servicename(SNUM(conn))));
-                                       reply_doserror(req, ERRSRV, ERRerror);
+                                       reply_nterror(req, map_nt_error_from_unix(errno));
                                        return;
                                }
 
@@ -3813,515 +3955,270 @@ static void call_trans2qpipeinfo(connection_struct *conn,
        return;
 }
 
-/****************************************************************************
- Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
- file name or file id).
-****************************************************************************/
-
-static void call_trans2qfilepathinfo(connection_struct *conn,
-                                    struct smb_request *req,
-                                    unsigned int tran_call,
-                                    char **pparams, int total_params,
-                                    char **ppdata, int total_data,
-                                    unsigned int max_data_bytes)
+NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
+                              TALLOC_CTX *mem_ctx,
+                              uint16_t info_level,
+                              files_struct *fsp,
+                              const struct smb_filename *smb_fname,
+                              bool delete_pending,
+                              struct timespec write_time_ts,
+                              bool ms_dfs_link,
+                              struct ea_list *ea_list,
+                              int lock_data_count,
+                              char *lock_data,
+                              uint16_t flags2,
+                              unsigned int max_data_bytes,
+                              char **ppdata,
+                              unsigned int *pdata_size)
 {
-       char *params = *pparams;
        char *pdata = *ppdata;
        char *dstart, *dend;
-       uint16 info_level;
-       int mode=0;
-       int nlink;
-       SMB_OFF_T file_size=0;
-       uint64_t allocation_size=0;
-       unsigned int data_size = 0;
-       unsigned int param_size = 2;
+       unsigned int data_size;
+       struct timespec create_time_ts, mtime_ts, atime_ts;
+       time_t create_time, mtime, atime;
        SMB_STRUCT_STAT sbuf;
-       char *dos_fname = NULL;
-       char *fname = NULL;
-       struct smb_filename *smb_fname = NULL;
-       char *fullpathname;
-       char *base_name;
        char *p;
-       SMB_OFF_T pos = 0;
-       bool delete_pending = False;
-       int len;
-       time_t create_time, mtime, atime;
-       struct timespec create_time_ts, mtime_ts, atime_ts;
-       struct timespec write_time_ts;
-       files_struct *fsp = NULL;
-       struct file_id fileid;
-       struct ea_list *ea_list = NULL;
-       char *lock_data = NULL;
-       bool ms_dfs_link = false;
-       TALLOC_CTX *ctx = talloc_tos();
+       char *fname;
+       char *base_name;
+       char *dos_fname;
+       int mode;
+       int nlink;
+       NTSTATUS status;
+       uint64_t file_size = 0;
+       uint64_t pos = 0;
+       uint64_t allocation_size = 0;
+       uint64_t file_index = 0;
+       uint32_t access_mask = 0;
 
-       if (!params) {
-               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return;
+       sbuf = smb_fname->st;
+
+       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+               return NT_STATUS_INVALID_LEVEL;
        }
 
-       ZERO_STRUCT(sbuf);
-       ZERO_STRUCT(write_time_ts);
+       status = get_full_smb_filename(mem_ctx, smb_fname, &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       if (tran_call == TRANSACT2_QFILEINFO) {
-               if (total_params < 4) {
-                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
-               }
+       DEBUG(5,("smbd_do_qfilepathinfo: %s (fnum = %d) level=%d max_data=%u\n",
+               fname, fsp ? fsp->fnum : -1, info_level, max_data_bytes));
 
-               if (IS_IPC(conn)) {
-                       call_trans2qpipeinfo(conn, req, tran_call,
-                                            pparams, total_params,
-                                            ppdata, total_data,
-                                            max_data_bytes);
-                       return;
-               }
-
-               fsp = file_fsp(req, SVAL(params,0));
-               info_level = SVAL(params,2);
+       if (ms_dfs_link) {
+               mode = dos_mode_msdfs(conn, smb_fname);
+       } else {
+               mode = dos_mode(conn, smb_fname);
+       }
+       if (!mode)
+               mode = FILE_ATTRIBUTE_NORMAL;
 
-               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
+       nlink = sbuf.st_ex_nlink;
 
-               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                       return;
-               }
+       if (nlink && (mode&aDIR)) {
+               nlink = 1;
+       }
 
-               /* Initial check for valid fsp ptr. */
-               if (!check_fsp_open(conn, req, fsp)) {
-                       return;
-               }
+       if ((nlink > 0) && delete_pending) {
+               nlink -= 1;
+       }
 
-               fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
-               if (!fname) {
-                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                       return;
-               }
+       data_size = max_data_bytes + DIR_ENTRY_SAFETY_MARGIN;
+       *ppdata = (char *)SMB_REALLOC(*ppdata, data_size); 
+       if (*ppdata == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       pdata = *ppdata;
+       dstart = pdata;
+       dend = dstart + data_size - 1;
 
-               if(fsp->fake_file_handle) {
-                       /*
-                        * This is actually for the QUOTA_FAKE_FILE --metze
-                        */
+       if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
+               update_stat_ex_mtime(&sbuf, write_time_ts);
+       }
 
-                       /* We know this name is ok, it's already passed the checks. */
+       create_time_ts = sbuf.st_ex_btime;
+       mtime_ts = sbuf.st_ex_mtime;
+       atime_ts = sbuf.st_ex_atime;
 
-               } else if(fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
-                       /*
-                        * This is actually a QFILEINFO on a directory
-                        * handle (returned from an NT SMB). NT5.0 seems
-                        * to do this call. JRA.
-                        */
+       if (lp_dos_filetime_resolution(SNUM(conn))) {
+               dos_filetime_timespec(&create_time_ts);
+               dos_filetime_timespec(&mtime_ts);
+               dos_filetime_timespec(&atime_ts);
+       }
 
-                       if (INFO_LEVEL_IS_UNIX(info_level)) {
-                               /* Always do lstat for UNIX calls. */
-                               if (SMB_VFS_LSTAT(conn,fname,&sbuf)) {
-                                       DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno)));
-                                       reply_unixerror(req,ERRDOS,ERRbadpath);
-                                       return;
-                               }
-                       } else if (SMB_VFS_STAT(conn,fname,&sbuf)) {
-                               DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                               reply_unixerror(req, ERRDOS, ERRbadpath);
-                               return;
-                       }
+       create_time = convert_timespec_to_time_t(create_time_ts);
+       mtime = convert_timespec_to_time_t(mtime_ts);
+       atime = convert_timespec_to_time_t(atime_ts);
 
-                       fileid = vfs_file_id_from_sbuf(conn, &sbuf);
-                       get_file_infos(fileid, &delete_pending, &write_time_ts);
-               } else {
-                       /*
-                        * Original code - this is an open file.
-                        */
-                       if (!check_fsp(conn, req, fsp)) {
-                               return;
-                       }
+       p = strrchr_m(smb_fname->base_name,'/');
+       if (!p)
+               base_name = smb_fname->base_name;
+       else
+               base_name = p+1;
 
-                       if (SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
-                               DEBUG(3,("fstat of fnum %d failed (%s)\n", fsp->fnum, strerror(errno)));
-                               reply_unixerror(req, ERRDOS, ERRbadfid);
-                               return;
-                       }
-                       pos = fsp->fh->position_information;
-                       fileid = vfs_file_id_from_sbuf(conn, &sbuf);
-                       get_file_infos(fileid, &delete_pending, &write_time_ts);
+       /* NT expects the name to be in an exact form of the *full*
+          filename. See the trans2 torture test */
+       if (ISDOT(base_name)) {
+               dos_fname = talloc_strdup(mem_ctx, "\\");
+               if (!dos_fname) {
+                       return NT_STATUS_NO_MEMORY;
                }
-
        } else {
-               NTSTATUS status = NT_STATUS_OK;
+               dos_fname = talloc_asprintf(mem_ctx,
+                               "\\%s",
+                               fname);
+               if (!dos_fname) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               string_replace(dos_fname, '/', '\\');
+       }
 
-               /* qpathinfo */
-               if (total_params < 7) {
-                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+       allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp, &sbuf);
+
+       if (!fsp) {
+               /* Do we have this path open ? */
+               files_struct *fsp1;
+               struct file_id fileid = vfs_file_id_from_sbuf(conn, &sbuf);
+               fsp1 = file_find_di_first(fileid);
+               if (fsp1 && fsp1->initial_allocation_size) {
+                       allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp1, &sbuf);
                }
+       }
 
-               info_level = SVAL(params,0);
+       if (!(mode & aDIR)) {
+               file_size = get_file_size_stat(&sbuf);
+       }
 
-               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
+       if (fsp && fsp->fh) {
+               pos = fsp->fh->position_information;
+       }
 
-               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                       return;
-               }
+       if (fsp) {
+               access_mask = fsp->access_mask;
+       } else {
+               /* GENERIC_EXECUTE mapping from Windows */
+               access_mask = 0x12019F;
+       }
 
-               srvstr_get_path(ctx, params, req->flags2, &fname, &params[6],
-                               total_params - 6,
-                               STR_TERMINATE, &status);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
-               }
+       /* This should be an index number - looks like
+          dev/ino to me :-)
 
-               status = resolve_dfspath(ctx,
-                                       conn,
-                                       req->flags2 & FLAGS2_DFS_PATHNAMES,
-                                       fname,
-                                       &fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
-                               reply_botherror(req,
-                                               NT_STATUS_PATH_NOT_COVERED,
-                                               ERRSRV, ERRbadpath);
-                       }
-                       reply_nterror(req, status);
-                       return;
-               }
+          I think this causes us to fail the IFSKIT
+          BasicFileInformationTest. -tpot */
+       file_index =  ((sbuf.st_ex_ino) & UINT32_MAX); /* FileIndexLow */
+       file_index |= ((uint64_t)((sbuf.st_ex_dev) & UINT32_MAX)) << 32; /* FileIndexHigh */
 
-               status = unix_convert(ctx, conn, fname, &smb_fname, 0);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
-               }
-               sbuf = smb_fname->st;
+       switch (info_level) {
+               case SMB_INFO_STANDARD:
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_STANDARD\n"));
+                       data_size = 22;
+                       srv_put_dos_date2(pdata,l1_fdateCreation,create_time);
+                       srv_put_dos_date2(pdata,l1_fdateLastAccess,atime);
+                       srv_put_dos_date2(pdata,l1_fdateLastWrite,mtime); /* write time */
+                       SIVAL(pdata,l1_cbFile,(uint32)file_size);
+                       SIVAL(pdata,l1_cbFileAlloc,(uint32)allocation_size);
+                       SSVAL(pdata,l1_attrFile,mode);
+                       break;
 
-               status = get_full_smb_filename(ctx, smb_fname, &fname);
-               TALLOC_FREE(smb_fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
+               case SMB_INFO_QUERY_EA_SIZE:
+               {
+                       unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_EA_SIZE\n"));
+                       data_size = 26;
+                       srv_put_dos_date2(pdata,0,create_time);
+                       srv_put_dos_date2(pdata,4,atime);
+                       srv_put_dos_date2(pdata,8,mtime); /* write time */
+                       SIVAL(pdata,12,(uint32)file_size);
+                       SIVAL(pdata,16,(uint32)allocation_size);
+                       SSVAL(pdata,20,mode);
+                       SIVAL(pdata,22,ea_size);
+                       break;
                }
 
-               status = check_name(conn, fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,nt_errstr(status)));
-                       reply_nterror(req, status);
-                       return;
-               }
+               case SMB_INFO_IS_NAME_VALID:
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_IS_NAME_VALID\n"));
+                       if (fsp) {
+                               /* os/2 needs this ? really ?*/
+                               return NT_STATUS_DOS(ERRDOS, ERRbadfunc);
+                       }
+                       /* This is only reached for qpathinfo */
+                       data_size = 0;
+                       break;
 
-               if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
-                   && is_ntfs_stream_name(fname)) {
-                       char *base;
-                       SMB_STRUCT_STAT bsbuf;
+               case SMB_INFO_QUERY_EAS_FROM_LIST:
+               {
+                       size_t total_ea_len = 0;
+                       struct ea_list *ea_file_list = NULL;
 
-                       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)));
-                               reply_nterror(req, status);
-                               return;
-                       }
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n"));
 
-                       SMB_ASSERT(!is_ntfs_stream_name(base)); /* paranoia.. */
+                       ea_file_list = get_ea_list_from_file(mem_ctx, conn, fsp, fname, &total_ea_len);
+                       ea_list = ea_list_union(ea_list, ea_file_list, &total_ea_len);
 
-                       if (INFO_LEVEL_IS_UNIX(info_level)) {
-                               /* Always do lstat for UNIX calls. */
-                               if (SMB_VFS_LSTAT(conn,base,&bsbuf)) {
-                                       DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",base,strerror(errno)));
-                                       reply_unixerror(req,ERRDOS,ERRbadpath);
-                                       return;
-                               }
-                       } else {
-                               if (SMB_VFS_STAT(conn,base,&bsbuf) != 0) {
-                                       DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",base,strerror(errno)));
-                                       reply_unixerror(req,ERRDOS,ERRbadpath);
-                                       return;
-                               }
+                       if (!ea_list || (total_ea_len > data_size)) {
+                               data_size = 4;
+                               SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
+                               break;
                        }
 
-                       fileid = vfs_file_id_from_sbuf(conn, &bsbuf);
-                       get_file_infos(fileid, &delete_pending, NULL);
-                       if (delete_pending) {
-                               reply_nterror(req, NT_STATUS_DELETE_PENDING);
-                               return;
-                       }
+                       data_size = fill_ea_buffer(mem_ctx, pdata, data_size, conn, ea_list);
+                       break;
                }
 
-               if (INFO_LEVEL_IS_UNIX(info_level)) {
-                       /* Always do lstat for UNIX calls. */
-                       if (SMB_VFS_LSTAT(conn,fname,&sbuf)) {
-                               DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno)));
-                               reply_unixerror(req, ERRDOS, ERRbadpath);
-                               return;
-                       }
+               case SMB_INFO_QUERY_ALL_EAS:
+               {
+                       /* We have data_size bytes to put EA's into. */
+                       size_t total_ea_len = 0;
 
-               } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) {
-                       ms_dfs_link = check_msdfs_link(conn,fname,&sbuf);
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_ALL_EAS\n"));
 
-                       if (!ms_dfs_link) {
-                               DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                               reply_unixerror(req, ERRDOS, ERRbadpath);
-                               return;
+                       ea_list = get_ea_list_from_file(mem_ctx, conn, fsp, fname, &total_ea_len);
+                       if (!ea_list || (total_ea_len > data_size)) {
+                               data_size = 4;
+                               SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
+                               break;
                        }
-               }
 
-               fileid = vfs_file_id_from_sbuf(conn, &sbuf);
-               get_file_infos(fileid, &delete_pending, &write_time_ts);
-               if (delete_pending) {
-                       reply_nterror(req, NT_STATUS_DELETE_PENDING);
-                       return;
+                       data_size = fill_ea_buffer(mem_ctx, pdata, data_size, conn, ea_list);
+                       break;
                }
-       }
 
-       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-               return;
-       }
+               case 0xFF0F:/*SMB2_INFO_QUERY_ALL_EAS*/
+               {
+                       /* We have data_size bytes to put EA's into. */
+                       size_t total_ea_len = 0;
+                       struct ea_list *ea_file_list = NULL;
 
-       DEBUG(3,("call_trans2qfilepathinfo %s (fnum = %d) level=%d call=%d total_data=%d\n",
-               fname,fsp ? fsp->fnum : -1, info_level,tran_call,total_data));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB2_INFO_QUERY_ALL_EAS\n"));
 
-       p = strrchr_m(fname,'/');
-       if (!p)
-               base_name = fname;
-       else
-               base_name = p+1;
+                       /*TODO: add filtering and index handling */
 
-       if (ms_dfs_link) {
-               mode = dos_mode_msdfs(conn,fname,&sbuf);
-       } else {
-               mode = dos_mode(conn,fname,&sbuf);
-       }
-       if (!mode)
-               mode = FILE_ATTRIBUTE_NORMAL;
+                       ea_file_list = get_ea_list_from_file(mem_ctx,
+                                                            conn, fsp,
+                                                            fname,
+                                                            &total_ea_len);
+                       if (!ea_file_list) {
+                               return NT_STATUS_NO_EAS_ON_FILE;
+                       }
 
-       nlink = sbuf.st_ex_nlink;
-
-       if (nlink && (mode&aDIR)) {
-               nlink = 1;
-       }
-
-       if ((nlink > 0) && delete_pending) {
-               nlink -= 1;
-       }
-
-       fullpathname = fname;
-       if (!(mode & aDIR))
-               file_size = get_file_size_stat(&sbuf);
-
-       /* Pull out any data sent here before we realloc. */
-       switch (info_level) {
-               case SMB_INFO_QUERY_EAS_FROM_LIST:
-               {
-                       /* Pull any EA list from the data portion. */
-                       uint32 ea_size;
-
-                       if (total_data < 4) {
-                               reply_nterror(
-                                       req, NT_STATUS_INVALID_PARAMETER);
-                               return;
-                       }
-                       ea_size = IVAL(pdata,0);
-
-                       if (total_data > 0 && ea_size != total_data) {
-                               DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
-total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pdata,0) ));
-                               reply_nterror(
-                                       req, NT_STATUS_INVALID_PARAMETER);
-                               return;
-                       }
-
-                       if (!lp_ea_support(SNUM(conn))) {
-                               reply_doserror(req, ERRDOS,
-                                              ERReasnotsupported);
-                               return;
-                       }
-
-                       /* Pull out the list of names. */
-                       ea_list = read_ea_name_list(ctx, pdata + 4, ea_size - 4);
-                       if (!ea_list) {
-                               reply_nterror(
-                                       req, NT_STATUS_INVALID_PARAMETER);
-                               return;
-                       }
-                       break;
-               }
-
-               case SMB_QUERY_POSIX_LOCK:
-               {
-                       if (fsp == NULL || fsp->fh->fd == -1) {
-                               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
-                               return;
-                       }
-
-                       if (total_data != POSIX_LOCK_DATA_SIZE) {
-                               reply_nterror(
-                                       req, NT_STATUS_INVALID_PARAMETER);
-                               return;
-                       }
-
-                       /* Copy the lock range data. */
-                       lock_data = (char *)TALLOC_MEMDUP(
-                               ctx, pdata, total_data);
-                       if (!lock_data) {
-                               reply_nterror(req, NT_STATUS_NO_MEMORY);
-                               return;
-                       }
-               }
-               default:
-                       break;
-       }
-
-       *pparams = (char *)SMB_REALLOC(*pparams,2);
-       if (*pparams == NULL) {
-               reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
-       }
-       params = *pparams;
-       SSVAL(params,0,0);
-       data_size = max_data_bytes + DIR_ENTRY_SAFETY_MARGIN;
-       *ppdata = (char *)SMB_REALLOC(*ppdata, data_size); 
-       if (*ppdata == NULL ) {
-               reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
-       }
-       pdata = *ppdata;
-       dstart = pdata;
-       dend = dstart + data_size - 1;
-
-       create_time_ts = sbuf.st_ex_btime;
-       mtime_ts = sbuf.st_ex_mtime;
-       atime_ts = sbuf.st_ex_atime;
-
-       allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn,fsp,&sbuf);
-
-       if (!fsp) {
-               /* Do we have this path open ? */
-               files_struct *fsp1;
-               fileid = vfs_file_id_from_sbuf(conn, &sbuf);
-               fsp1 = file_find_di_first(fileid);
-               if (fsp1 && fsp1->initial_allocation_size) {
-                       allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp1, &sbuf);
-               }
-       }
-
-       if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
-               mtime_ts = write_time_ts;
-       }
-
-       if (lp_dos_filetime_resolution(SNUM(conn))) {
-               dos_filetime_timespec(&create_time_ts);
-               dos_filetime_timespec(&mtime_ts);
-               dos_filetime_timespec(&atime_ts);
-       }
-
-       create_time = convert_timespec_to_time_t(create_time_ts);
-       mtime = convert_timespec_to_time_t(mtime_ts);
-       atime = convert_timespec_to_time_t(atime_ts);
-
-       /* NT expects the name to be in an exact form of the *full*
-          filename. See the trans2 torture test */
-       if (ISDOT(base_name)) {
-               dos_fname = talloc_strdup(ctx, "\\");
-               if (!dos_fname) {
-                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                       return;
-               }
-       } else {
-               dos_fname = talloc_asprintf(ctx,
-                               "\\%s",
-                               fname);
-               if (!dos_fname) {
-                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                       return;
-               }
-               string_replace(dos_fname, '/', '\\');
-       }
-
-       switch (info_level) {
-               case SMB_INFO_STANDARD:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_STANDARD\n"));
-                       data_size = 22;
-                       srv_put_dos_date2(pdata,l1_fdateCreation,create_time);
-                       srv_put_dos_date2(pdata,l1_fdateLastAccess,atime);
-                       srv_put_dos_date2(pdata,l1_fdateLastWrite,mtime); /* write time */
-                       SIVAL(pdata,l1_cbFile,(uint32)file_size);
-                       SIVAL(pdata,l1_cbFileAlloc,(uint32)allocation_size);
-                       SSVAL(pdata,l1_attrFile,mode);
-                       break;
-
-               case SMB_INFO_QUERY_EA_SIZE:
-               {
-                       unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EA_SIZE\n"));
-                       data_size = 26;
-                       srv_put_dos_date2(pdata,0,create_time);
-                       srv_put_dos_date2(pdata,4,atime);
-                       srv_put_dos_date2(pdata,8,mtime); /* write time */
-                       SIVAL(pdata,12,(uint32)file_size);
-                       SIVAL(pdata,16,(uint32)allocation_size);
-                       SSVAL(pdata,20,mode);
-                       SIVAL(pdata,22,ea_size);
-                       break;
-               }
-
-               case SMB_INFO_IS_NAME_VALID:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_IS_NAME_VALID\n"));
-                       if (tran_call == TRANSACT2_QFILEINFO) {
-                               /* os/2 needs this ? really ?*/
-                               reply_doserror(req, ERRDOS, ERRbadfunc);
-                               return;
-                       }
-                       data_size = 0;
-                       param_size = 0;
-                       break;
-
-               case SMB_INFO_QUERY_EAS_FROM_LIST:
-               {
-                       size_t total_ea_len = 0;
-                       struct ea_list *ea_file_list = NULL;
-
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n"));
-
-                       ea_file_list = get_ea_list_from_file(ctx, conn, fsp, fname, &total_ea_len);
-                       ea_list = ea_list_union(ea_list, ea_file_list, &total_ea_len);
-
-                       if (!ea_list || (total_ea_len > data_size)) {
-                               data_size = 4;
-                               SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
-                               break;
-                       }
-
-                       data_size = fill_ea_buffer(ctx, pdata, data_size, conn, ea_list);
-                       break;
-               }
-
-               case SMB_INFO_QUERY_ALL_EAS:
-               {
-                       /* We have data_size bytes to put EA's into. */
-                       size_t total_ea_len = 0;
-
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_ALL_EAS\n"));
-
-                       ea_list = get_ea_list_from_file(ctx, conn, fsp, fname, &total_ea_len);
-                       if (!ea_list || (total_ea_len > data_size)) {
-                               data_size = 4;
-                               SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
-                               break;
-                       }
-
-                       data_size = fill_ea_buffer(ctx, pdata, data_size, conn, ea_list);
-                       break;
-               }
+                       status = fill_ea_chained_buffer(mem_ctx,
+                                                       pdata,
+                                                       data_size,
+                                                       &data_size,
+                                                       conn, ea_file_list);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return status;
+                       }
+                       break;
+               }
 
                case SMB_FILE_BASIC_INFORMATION:
                case SMB_QUERY_FILE_BASIC_INFO:
 
                        if (info_level == SMB_QUERY_FILE_BASIC_INFO) {
-                               DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_BASIC_INFO\n"));
+                               DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_BASIC_INFO\n"));
                                data_size = 36; /* w95 returns 40 bytes not 36 - why ?. */
                        } else {
-                               DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_BASIC_INFORMATION\n"));
+                               DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_BASIC_INFORMATION\n"));
                                data_size = 40;
                                SIVAL(pdata,36,0);
                        }
@@ -4342,7 +4239,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_FILE_STANDARD_INFORMATION:
                case SMB_QUERY_FILE_STANDARD_INFO:
 
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_STANDARD_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_STANDARD_INFORMATION\n"));
                        data_size = 24;
                        SOFF_T(pdata,0,allocation_size);
                        SOFF_T(pdata,8,file_size);
@@ -4356,7 +4253,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_QUERY_FILE_EA_INFO:
                {
                        unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_EA_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_EA_INFORMATION\n"));
                        data_size = 4;
                        SIVAL(pdata,0,ea_size);
                        break;
@@ -4366,15 +4263,14 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_QUERY_FILE_ALT_NAME_INFO:
                case SMB_FILE_ALTERNATE_NAME_INFORMATION:
                {
+                       int len;
                        char mangled_name[13];
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALTERNATE_NAME_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALTERNATE_NAME_INFORMATION\n"));
                        if (!name_to_8_3(base_name,mangled_name,
                                                True,conn->params)) {
-                               reply_nterror(
-                                       req,
-                                       NT_STATUS_NO_MEMORY);
+                               return NT_STATUS_NO_MEMORY;
                        }
-                       len = srvstr_push(dstart, req->flags2,
+                       len = srvstr_push(dstart, flags2,
                                          pdata+4, mangled_name,
                                          PTR_DIFF(dend, pdata+4),
                                          STR_UNICODE);
@@ -4384,28 +4280,31 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                }
 
                case SMB_QUERY_FILE_NAME_INFO:
+               {
+                       int len;
                        /*
                          this must be *exactly* right for ACLs on mapped drives to work
                         */
-                       len = srvstr_push(dstart, req->flags2,
+                       len = srvstr_push(dstart, flags2,
                                          pdata+4, dos_fname,
                                          PTR_DIFF(dend, pdata+4),
                                          STR_UNICODE);
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_NAME_INFO\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_NAME_INFO\n"));
                        data_size = 4 + len;
                        SIVAL(pdata,0,len);
                        break;
+               }
 
                case SMB_FILE_ALLOCATION_INFORMATION:
                case SMB_QUERY_FILE_ALLOCATION_INFO:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALLOCATION_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALLOCATION_INFORMATION\n"));
                        data_size = 8;
                        SOFF_T(pdata,0,allocation_size);
                        break;
 
                case SMB_FILE_END_OF_FILE_INFORMATION:
                case SMB_QUERY_FILE_END_OF_FILEINFO:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_END_OF_FILE_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_END_OF_FILE_INFORMATION\n"));
                        data_size = 8;
                        SOFF_T(pdata,0,file_size);
                        break;
@@ -4413,8 +4312,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_QUERY_FILE_ALL_INFO:
                case SMB_FILE_ALL_INFORMATION:
                {
+                       int len;
                        unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALL_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALL_INFORMATION\n"));
                        put_long_date_timespec(pdata,create_time_ts);
                        put_long_date_timespec(pdata+8,atime_ts);
                        put_long_date_timespec(pdata+16,mtime_ts); /* write time */
@@ -4431,7 +4331,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        pdata += 24;
                        SIVAL(pdata,0,ea_size);
                        pdata += 4; /* EA info */
-                       len = srvstr_push(dstart, req->flags2,
+                       len = srvstr_push(dstart, flags2,
                                          pdata+4, dos_fname,
                                          PTR_DIFF(dend, pdata+4),
                                          STR_UNICODE);
@@ -4440,27 +4340,52 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        data_size = PTR_DIFF(pdata,(*ppdata));
                        break;
                }
-               case SMB_FILE_INTERNAL_INFORMATION:
-                       /* This should be an index number - looks like
-                          dev/ino to me :-) 
 
-                          I think this causes us to fail the IFSKIT
-                          BasicFileInformationTest. -tpot */
+               case 0xFF12:/*SMB2_FILE_ALL_INFORMATION*/
+               {
+                       int len;
+                       unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB2_FILE_ALL_INFORMATION\n"));
+                       put_long_date_timespec(pdata+0x00,create_time_ts);
+                       put_long_date_timespec(pdata+0x08,atime_ts);
+                       put_long_date_timespec(pdata+0x10,mtime_ts); /* write time */
+                       put_long_date_timespec(pdata+0x18,mtime_ts); /* change time */
+                       SIVAL(pdata,    0x20, mode);
+                       SIVAL(pdata,    0x24, 0); /* padding. */
+                       SBVAL(pdata,    0x28, allocation_size);
+                       SBVAL(pdata,    0x30, file_size);
+                       SIVAL(pdata,    0x38, nlink);
+                       SCVAL(pdata,    0x3C, delete_pending);
+                       SCVAL(pdata,    0x3D, (mode&aDIR)?1:0);
+                       SSVAL(pdata,    0x3E, 0); /* padding */
+                       SBVAL(pdata,    0x40, file_index);
+                       SIVAL(pdata,    0x48, ea_size);
+                       SIVAL(pdata,    0x4C, access_mask);
+                       SBVAL(pdata,    0x50, pos);
+                       SIVAL(pdata,    0x58, mode); /*TODO: mode != mode fix this!!! */
+                       SIVAL(pdata,    0x5C, 0); /* No alignment needed. */
+
+                       pdata += 0x60;
+
+                       len = srvstr_push(dstart, flags2,
+                                         pdata+4, dos_fname,
+                                         PTR_DIFF(dend, pdata+4),
+                                         STR_UNICODE);
+                       SIVAL(pdata,0,len);
+                       pdata += 4 + len;
+                       data_size = PTR_DIFF(pdata,(*ppdata));
+                       break;
+               }
+               case SMB_FILE_INTERNAL_INFORMATION:
 
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
-                       SIVAL(pdata,0,sbuf.st_ex_ino); /* FileIndexLow */
-                       SIVAL(pdata,4,sbuf.st_ex_dev); /* FileIndexHigh */
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
+                       SBVAL(pdata, 0, file_index);
                        data_size = 8;
                        break;
 
                case SMB_FILE_ACCESS_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
-                       if (fsp) {
-                               SIVAL(pdata,0,fsp->access_mask);
-                       } else {
-                               /* GENERIC_EXECUTE mapping from Windows */
-                               SIVAL(pdata,0,0x12019F);
-                       }
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
+                       SIVAL(pdata, 0, access_mask);
                        data_size = 4;
                        break;
 
@@ -4469,32 +4394,32 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        {
                                size_t byte_len;
                                byte_len = dos_PutUniCode(pdata+4,dos_fname,(size_t)max_data_bytes,False);
-                               DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NAME_INFORMATION\n"));
+                               DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_NAME_INFORMATION\n"));
                                SIVAL(pdata,0,byte_len);
                                data_size = 4 + byte_len;
                                break;
                        }
 
                case SMB_FILE_DISPOSITION_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_DISPOSITION_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_DISPOSITION_INFORMATION\n"));
                        data_size = 1;
                        SCVAL(pdata,0,delete_pending);
                        break;
 
                case SMB_FILE_POSITION_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_POSITION_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_POSITION_INFORMATION\n"));
                        data_size = 8;
                        SOFF_T(pdata,0,pos);
                        break;
 
                case SMB_FILE_MODE_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_MODE_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_MODE_INFORMATION\n"));
                        SIVAL(pdata,0,mode);
                        data_size = 4;
                        break;
 
                case SMB_FILE_ALIGNMENT_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALIGNMENT_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALIGNMENT_INFORMATION\n"));
                        SIVAL(pdata,0,0); /* No alignment needed. */
                        data_size = 4;
                        break;
@@ -4511,9 +4436,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_FILE_STREAM_INFORMATION: {
                        unsigned int num_streams;
                        struct stream_struct *streams;
-                       NTSTATUS status;
 
-                       DEBUG(10,("call_trans2qfilepathinfo: "
+                       DEBUG(10,("smbd_do_qfilepathinfo: "
                                  "SMB_FILE_STREAM_INFORMATION\n"));
 
                        status = SMB_VFS_STREAMINFO(
@@ -4523,8 +4447,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        if (!NT_STATUS_IS_OK(status)) {
                                DEBUG(10, ("could not get stream info: %s\n",
                                           nt_errstr(status)));
-                               reply_nterror(req, status);
-                               return;
+                               return status;
                        }
 
                        status = marshall_stream_info(num_streams, streams,
@@ -4534,8 +4457,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        if (!NT_STATUS_IS_OK(status)) {
                                DEBUG(10, ("marshall_stream_info failed: %s\n",
                                           nt_errstr(status)));
-                               reply_nterror(req, status);
-                               return;
+                               return status;
                        }
 
                        TALLOC_FREE(streams);
@@ -4544,7 +4466,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                }
                case SMB_QUERY_COMPRESSION_INFO:
                case SMB_FILE_COMPRESSION_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_COMPRESSION_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_COMPRESSION_INFORMATION\n"));
                        SOFF_T(pdata,0,file_size);
                        SIVAL(pdata,8,0); /* ??? */
                        SIVAL(pdata,12,0); /* ??? */
@@ -4552,7 +4474,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        break;
 
                case SMB_FILE_NETWORK_OPEN_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n"));
                        put_long_date_timespec(pdata,create_time_ts);
                        put_long_date_timespec(pdata+8,atime_ts);
                        put_long_date_timespec(pdata+16,mtime_ts); /* write time */
@@ -4565,7 +4487,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        break;
 
                case SMB_FILE_ATTRIBUTE_TAG_INFORMATION:
-                       DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ATTRIBUTE_TAG_INFORMATION\n"));
+                       DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ATTRIBUTE_TAG_INFORMATION\n"));
                        SIVAL(pdata,0,mode);
                        SIVAL(pdata,4,0);
                        data_size = 8;
@@ -4582,7 +4504,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        {
                                int i;
-                               DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
+                               DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
 
                                for (i=0; i<100; i++)
                                        DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
@@ -4598,7 +4520,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        {
                                int i;
-                               DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
+                               DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
 
                                for (i=0; i<100; i++)
                                        DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
@@ -4609,33 +4531,28 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                case SMB_QUERY_FILE_UNIX_LINK:
                        {
-                               char *buffer = TALLOC_ARRAY(ctx, char, PATH_MAX+1);
+                               int len;
+                               char *buffer = TALLOC_ARRAY(mem_ctx, char, PATH_MAX+1);
 
                                if (!buffer) {
-                                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                                       return;
+                                       return NT_STATUS_NO_MEMORY;
                                }
 
-                               DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_LINK\n"));
+                               DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_LINK\n"));
 #ifdef S_ISLNK
                                if(!S_ISLNK(sbuf.st_ex_mode)) {
-                                       reply_unixerror(req, ERRSRV,
-                                                       ERRbadlink);
-                                       return;
+                                       return NT_STATUS_DOS(ERRSRV, ERRbadlink);
                                }
 #else
-                               reply_unixerror(req, ERRDOS, ERRbadlink);
-                               return;
+                               return NT_STATUS_DOS(ERRDOS, ERRbadlink);
 #endif
-                               len = SMB_VFS_READLINK(conn,fullpathname,
+                               len = SMB_VFS_READLINK(conn,fname,
                                                buffer, PATH_MAX);
                                if (len == -1) {
-                                       reply_unixerror(req, ERRDOS,
-                                                       ERRnoaccess);
-                                       return;
+                                       return map_nt_error_from_unix(errno);
                                }
                                buffer[len] = 0;
-                               len = srvstr_push(dstart, req->flags2,
+                               len = srvstr_push(dstart, flags2,
                                                  pdata, buffer,
                                                  PTR_DIFF(dend, pdata),
                                                  STR_TERMINATE);
@@ -4660,12 +4577,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                }
 
                                if (file_acl == NULL && no_acl_syscall_error(errno)) {
-                                       DEBUG(5,("call_trans2qfilepathinfo: ACLs not implemented on filesystem containing %s\n",
+                                       DEBUG(5,("smbd_do_qfilepathinfo: ACLs not implemented on filesystem containing %s\n",
                                                fname ));
-                                       reply_nterror(
-                                               req,
-                                               NT_STATUS_NOT_IMPLEMENTED);
-                                       return;
+                                       return NT_STATUS_NOT_IMPLEMENTED;
                                }
 
                                if (S_ISDIR(sbuf.st_ex_mode)) {
@@ -4681,7 +4595,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                num_def_acls = count_acl_entries(conn, def_acl);
 
                                if ( data_size < (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE) {
-                                       DEBUG(5,("call_trans2qfilepathinfo: data_size too small (%u) need %u\n",
+                                       DEBUG(5,("smbd_do_qfilepathinfo: data_size too small (%u) need %u\n",
                                                data_size,
                                                (unsigned int)((num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE +
                                                        SMB_POSIX_ACL_HEADER_SIZE) ));
@@ -4691,132 +4605,500 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                        if (def_acl) {
                                                SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
                                        }
-                                       reply_nterror(
-                                               req,
-                                               NT_STATUS_BUFFER_TOO_SMALL);
+                                       return NT_STATUS_BUFFER_TOO_SMALL;
+                               }
+
+                               SSVAL(pdata,0,SMB_POSIX_ACL_VERSION);
+                               SSVAL(pdata,2,num_file_acls);
+                               SSVAL(pdata,4,num_def_acls);
+                               if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE, &sbuf, file_acl)) {
+                                       if (file_acl) {
+                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+                                       }
+                                       if (def_acl) {
+                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+                                       }
+                                       return NT_STATUS_INTERNAL_ERROR;
+                               }
+                               if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE + (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE), &sbuf, def_acl)) {
+                                       if (file_acl) {
+                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+                                       }
+                                       if (def_acl) {
+                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+                                       }
+                                       return NT_STATUS_INTERNAL_ERROR;
+                               }
+
+                               if (file_acl) {
+                                       SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+                               }
+                               if (def_acl) {
+                                       SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+                               }
+                               data_size = (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE;
+                               break;
+                       }
+#endif
+
+
+               case SMB_QUERY_POSIX_LOCK:
+               {
+                       uint64_t count;
+                       uint64_t offset;
+                       uint32 lock_pid;
+                       enum brl_type lock_type;
+
+                       if (lock_data_count != POSIX_LOCK_DATA_SIZE) {
+                               return NT_STATUS_INVALID_PARAMETER;
+                       }
+
+                       switch (SVAL(pdata, POSIX_LOCK_TYPE_OFFSET)) {
+                               case POSIX_LOCK_TYPE_READ:
+                                       lock_type = READ_LOCK;
+                                       break;
+                               case POSIX_LOCK_TYPE_WRITE:
+                                       lock_type = WRITE_LOCK;
+                                       break;
+                               case POSIX_LOCK_TYPE_UNLOCK:
+                               default:
+                                       /* There's no point in asking for an unlock... */
+                                       return NT_STATUS_INVALID_PARAMETER;
+                       }
+
+                       lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
+#if defined(HAVE_LONGLONG)
+                       offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
+                                       ((uint64_t) IVAL(pdata,POSIX_LOCK_START_OFFSET));
+                       count = (((uint64_t) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
+                                       ((uint64_t) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
+#else /* HAVE_LONGLONG */
+                       offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET);
+                       count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
+#endif /* HAVE_LONGLONG */
+
+                       status = query_lock(fsp,
+                                       &lock_pid,
+                                       &count,
+                                       &offset,
+                                       &lock_type,
+                                       POSIX_LOCK);
+
+                       if (ERROR_WAS_LOCK_DENIED(status)) {
+                               /* Here we need to report who has it locked... */
+                               data_size = POSIX_LOCK_DATA_SIZE;
+
+                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, lock_type);
+                               SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0);
+                               SIVAL(pdata, POSIX_LOCK_PID_OFFSET, lock_pid);
+#if defined(HAVE_LONGLONG)
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, (uint32)(offset & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET + 4, (uint32)((offset >> 32) & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, (uint32)(count & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET + 4, (uint32)((count >> 32) & 0xFFFFFFFF));
+#else /* HAVE_LONGLONG */
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, offset);
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, count);
+#endif /* HAVE_LONGLONG */
+
+                       } else if (NT_STATUS_IS_OK(status)) {
+                               /* For success we just return a copy of what we sent
+                                  with the lock type set to POSIX_LOCK_TYPE_UNLOCK. */
+                               data_size = POSIX_LOCK_DATA_SIZE;
+                               memcpy(pdata, lock_data, POSIX_LOCK_DATA_SIZE);
+                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, POSIX_LOCK_TYPE_UNLOCK);
+                       } else {
+                               return status;
+                       }
+                       break;
+               }
+
+               default:
+                       return NT_STATUS_INVALID_LEVEL;
+       }
+
+       *pdata_size = data_size;
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
+ file name or file id).
+****************************************************************************/
+
+static void call_trans2qfilepathinfo(connection_struct *conn,
+                                    struct smb_request *req,
+                                    unsigned int tran_call,
+                                    char **pparams, int total_params,
+                                    char **ppdata, int total_data,
+                                    unsigned int max_data_bytes)
+{
+       char *params = *pparams;
+       char *pdata = *ppdata;
+       uint16 info_level;
+       unsigned int data_size = 0;
+       unsigned int param_size = 2;
+       char *fname = NULL;
+       struct smb_filename *smb_fname = NULL;
+       bool delete_pending = False;
+       struct timespec write_time_ts;
+       files_struct *fsp = NULL;
+       struct file_id fileid;
+       struct ea_list *ea_list = NULL;
+       int lock_data_count = 0;
+       char *lock_data = NULL;
+       bool ms_dfs_link = false;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (!params) {
+               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
+       }
+
+       ZERO_STRUCT(write_time_ts);
+
+       if (tran_call == TRANSACT2_QFILEINFO) {
+               if (total_params < 4) {
+                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+
+               if (IS_IPC(conn)) {
+                       call_trans2qpipeinfo(conn, req, tran_call,
+                                            pparams, total_params,
+                                            ppdata, total_data,
+                                            max_data_bytes);
+                       return;
+               }
+
+               fsp = file_fsp(req, SVAL(params,0));
+               info_level = SVAL(params,2);
+
+               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
+
+               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                       return;
+               }
+
+               /* Initial check for valid fsp ptr. */
+               if (!check_fsp_open(conn, req, fsp)) {
+                       return;
+               }
+
+               fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
+               if (!fname) {
+                       reply_nterror(req, NT_STATUS_NO_MEMORY);
+                       return;
+               }
+
+               status = create_synthetic_smb_fname_split(talloc_tos(), fname,
+                                                         NULL, &smb_fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       reply_nterror(req, status);
+                       return;
+               }
+
+               if(fsp->fake_file_handle) {
+                       /*
+                        * This is actually for the QUOTA_FAKE_FILE --metze
+                        */
+
+                       /* We know this name is ok, it's already passed the checks. */
+
+               } else if(fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
+                       /*
+                        * This is actually a QFILEINFO on a directory
+                        * handle (returned from an NT SMB). NT5.0 seems
+                        * to do this call. JRA.
+                        */
+
+                       if (INFO_LEVEL_IS_UNIX(info_level)) {
+                               /* Always do lstat for UNIX calls. */
+                               if (SMB_VFS_LSTAT(conn, smb_fname)) {
+                                       DEBUG(3,("call_trans2qfilepathinfo: "
+                                                "SMB_VFS_LSTAT of %s failed "
+                                                "(%s)\n",
+                                                smb_fname_str_dbg(smb_fname),
+                                                strerror(errno)));
+                                       reply_nterror(req,
+                                               map_nt_error_from_unix(errno));
                                        return;
                                }
+                       } else if (SMB_VFS_STAT(conn, smb_fname)) {
+                               DEBUG(3,("call_trans2qfilepathinfo: "
+                                        "SMB_VFS_STAT of %s failed (%s)\n",
+                                        smb_fname_str_dbg(smb_fname),
+                                        strerror(errno)));
+                               reply_nterror(req,
+                                       map_nt_error_from_unix(errno));
+                               return;
+                       }
+
+                       fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+                       get_file_infos(fileid, &delete_pending, &write_time_ts);
+               } else {
+                       /*
+                        * Original code - this is an open file.
+                        */
+                       if (!check_fsp(conn, req, fsp)) {
+                               return;
+                       }
+
+                       if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
+                               DEBUG(3, ("fstat of fnum %d failed (%s)\n",
+                                         fsp->fnum, strerror(errno)));
+                               reply_nterror(req,
+                                       map_nt_error_from_unix(errno));
+                               return;
+                       }
+                       fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+                       get_file_infos(fileid, &delete_pending, &write_time_ts);
+               }
+
+       } else {
+               /* qpathinfo */
+               if (total_params < 7) {
+                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+
+               info_level = SVAL(params,0);
+
+               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
+
+               if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                       return;
+               }
+
+               srvstr_get_path(req, params, req->flags2, &fname, &params[6],
+                               total_params - 6,
+                               STR_TERMINATE, &status);
+               if (!NT_STATUS_IS_OK(status)) {
+                       reply_nterror(req, status);
+                       return;
+               }
+
+               status = filename_convert(req,
+                                       conn,
+                                       req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                       fname,
+                                       &smb_fname,
+                                       &fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                               reply_botherror(req,
+                                               NT_STATUS_PATH_NOT_COVERED,
+                                               ERRSRV, ERRbadpath);
+                               return;
+                       }
+                       reply_nterror(req, status);
+                       return;
+               }
 
-                               SSVAL(pdata,0,SMB_POSIX_ACL_VERSION);
-                               SSVAL(pdata,2,num_file_acls);
-                               SSVAL(pdata,4,num_def_acls);
-                               if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE, &sbuf, file_acl)) {
-                                       if (file_acl) {
-                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
-                                       }
-                                       if (def_acl) {
-                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
-                                       }
-                                       reply_nterror(
-                                               req, NT_STATUS_INTERNAL_ERROR);
+               /* If this is a stream, check if there is a delete_pending. */
+               if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
+                   && is_ntfs_stream_smb_fname(smb_fname)) {
+                       struct smb_filename *smb_fname_base = NULL;
+
+                       /* 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)) {
+                               reply_nterror(req, status);
+                               return;
+                       }
+
+                       if (INFO_LEVEL_IS_UNIX(info_level)) {
+                               /* Always do lstat for UNIX calls. */
+                               if (SMB_VFS_LSTAT(conn, smb_fname_base) != 0) {
+                                       DEBUG(3,("call_trans2qfilepathinfo: "
+                                                "SMB_VFS_LSTAT of %s failed "
+                                                "(%s)\n",
+                                                smb_fname_str_dbg(smb_fname_base),
+                                                strerror(errno)));
+                                       TALLOC_FREE(smb_fname_base);
+                                       reply_nterror(req,
+                                               map_nt_error_from_unix(errno));
                                        return;
                                }
-                               if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE + (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE), &sbuf, def_acl)) {
-                                       if (file_acl) {
-                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
-                                       }
-                                       if (def_acl) {
-                                               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
-                                       }
-                                       reply_nterror(
-                                               req,
-                                               NT_STATUS_INTERNAL_ERROR);
+                       } else {
+                               if (SMB_VFS_STAT(conn, smb_fname_base) != 0) {
+                                       DEBUG(3,("call_trans2qfilepathinfo: "
+                                                "fileinfo of %s failed "
+                                                "(%s)\n",
+                                                smb_fname_str_dbg(smb_fname_base),
+                                                strerror(errno)));
+                                       TALLOC_FREE(smb_fname_base);
+                                       reply_nterror(req,
+                                               map_nt_error_from_unix(errno));
                                        return;
                                }
+                       }
 
-                               if (file_acl) {
-                                       SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
-                               }
-                               if (def_acl) {
-                                       SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
-                               }
-                               data_size = (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE;
-                               break;
+                       fileid = vfs_file_id_from_sbuf(conn,
+                                                      &smb_fname_base->st);
+                       TALLOC_FREE(smb_fname_base);
+                       get_file_infos(fileid, &delete_pending, NULL);
+                       if (delete_pending) {
+                               reply_nterror(req, NT_STATUS_DELETE_PENDING);
+                               return;
+                       }
+               }
+
+               if (INFO_LEVEL_IS_UNIX(info_level)) {
+                       /* Always do lstat for UNIX calls. */
+                       if (SMB_VFS_LSTAT(conn, smb_fname)) {
+                               DEBUG(3,("call_trans2qfilepathinfo: "
+                                        "SMB_VFS_LSTAT of %s failed (%s)\n",
+                                        smb_fname_str_dbg(smb_fname),
+                                        strerror(errno)));
+                               reply_nterror(req,
+                                       map_nt_error_from_unix(errno));
+                               return;
                        }
-#endif
 
+               } else if (!VALID_STAT(smb_fname->st) &&
+                          SMB_VFS_STAT(conn, smb_fname) &&
+                          (info_level != SMB_INFO_IS_NAME_VALID)) {
+                       ms_dfs_link = check_msdfs_link(conn, fname,
+                                                      &smb_fname->st);
 
-               case SMB_QUERY_POSIX_LOCK:
+                       if (!ms_dfs_link) {
+                               DEBUG(3,("call_trans2qfilepathinfo: "
+                                        "SMB_VFS_STAT of %s failed (%s)\n",
+                                        smb_fname_str_dbg(smb_fname),
+                                        strerror(errno)));
+                               reply_nterror(req,
+                                       map_nt_error_from_unix(errno));
+                               return;
+                       }
+               }
+
+               fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+               get_file_infos(fileid, &delete_pending, &write_time_ts);
+               if (delete_pending) {
+                       reply_nterror(req, NT_STATUS_DELETE_PENDING);
+                       return;
+               }
+       }
+
+       DEBUG(3,("call_trans2qfilepathinfo %s (fnum = %d) level=%d call=%d total_data=%d\n",
+               fname,fsp ? fsp->fnum : -1, info_level,tran_call,total_data));
+
+       /* Pull out any data sent here before we realloc. */
+       switch (info_level) {
+               case SMB_INFO_QUERY_EAS_FROM_LIST:
                {
-                       NTSTATUS status = NT_STATUS_INVALID_LEVEL;
-                       uint64_t count;
-                       uint64_t offset;
-                       uint32 lock_pid;
-                       enum brl_type lock_type;
+                       /* Pull any EA list from the data portion. */
+                       uint32 ea_size;
 
-                       if (total_data != POSIX_LOCK_DATA_SIZE) {
+                       if (total_data < 4) {
                                reply_nterror(
                                        req, NT_STATUS_INVALID_PARAMETER);
                                return;
                        }
+                       ea_size = IVAL(pdata,0);
 
-                       switch (SVAL(pdata, POSIX_LOCK_TYPE_OFFSET)) {
-                               case POSIX_LOCK_TYPE_READ:
-                                       lock_type = READ_LOCK;
-                                       break;
-                               case POSIX_LOCK_TYPE_WRITE:
-                                       lock_type = WRITE_LOCK;
-                                       break;
-                               case POSIX_LOCK_TYPE_UNLOCK:
-                               default:
-                                       /* There's no point in asking for an unlock... */
-                                       reply_nterror(
-                                               req,
-                                               NT_STATUS_INVALID_PARAMETER);
-                                       return;
+                       if (total_data > 0 && ea_size != total_data) {
+                               DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
+total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pdata,0) ));
+                               reply_nterror(
+                                       req, NT_STATUS_INVALID_PARAMETER);
+                               return;
                        }
 
-                       lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
-#if defined(HAVE_LONGLONG)
-                       offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
-                                       ((uint64_t) IVAL(pdata,POSIX_LOCK_START_OFFSET));
-                       count = (((uint64_t) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
-                                       ((uint64_t) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
-#else /* HAVE_LONGLONG */
-                       offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET);
-                       count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
-#endif /* HAVE_LONGLONG */
+                       if (!lp_ea_support(SNUM(conn))) {
+                               reply_doserror(req, ERRDOS,
+                                              ERReasnotsupported);
+                               return;
+                       }
 
-                       status = query_lock(fsp,
-                                       &lock_pid,
-                                       &count,
-                                       &offset,
-                                       &lock_type,
-                                       POSIX_LOCK);
+                       /* Pull out the list of names. */
+                       ea_list = read_ea_name_list(req, pdata + 4, ea_size - 4);
+                       if (!ea_list) {
+                               reply_nterror(
+                                       req, NT_STATUS_INVALID_PARAMETER);
+                               return;
+                       }
+                       break;
+               }
 
-                       if (ERROR_WAS_LOCK_DENIED(status)) {
-                               /* Here we need to report who has it locked... */
-                               data_size = POSIX_LOCK_DATA_SIZE;
+               case SMB_QUERY_POSIX_LOCK:
+               {
+                       if (fsp == NULL || fsp->fh->fd == -1) {
+                               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
+                               return;
+                       }
 
-                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, lock_type);
-                               SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0);
-                               SIVAL(pdata, POSIX_LOCK_PID_OFFSET, lock_pid);
-#if defined(HAVE_LONGLONG)
-                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, (uint32)(offset & 0xFFFFFFFF));
-                               SIVAL(pdata, POSIX_LOCK_START_OFFSET + 4, (uint32)((offset >> 32) & 0xFFFFFFFF));
-                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, (uint32)(count & 0xFFFFFFFF));
-                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET + 4, (uint32)((count >> 32) & 0xFFFFFFFF));
-#else /* HAVE_LONGLONG */
-                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, offset);
-                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, count);
-#endif /* HAVE_LONGLONG */
+                       if (total_data != POSIX_LOCK_DATA_SIZE) {
+                               reply_nterror(
+                                       req, NT_STATUS_INVALID_PARAMETER);
+                               return;
+                       }
 
-                       } else if (NT_STATUS_IS_OK(status)) {
-                               /* For success we just return a copy of what we sent
-                                  with the lock type set to POSIX_LOCK_TYPE_UNLOCK. */
-                               data_size = POSIX_LOCK_DATA_SIZE;
-                               memcpy(pdata, lock_data, POSIX_LOCK_DATA_SIZE);
-                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, POSIX_LOCK_TYPE_UNLOCK);
-                       } else {
-                               reply_nterror(req, status);
+                       /* Copy the lock range data. */
+                       lock_data = (char *)TALLOC_MEMDUP(
+                               req, pdata, total_data);
+                       if (!lock_data) {
+                               reply_nterror(req, NT_STATUS_NO_MEMORY);
                                return;
                        }
-                       break;
+                       lock_data_count = total_data;
                }
-
                default:
-                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                       return;
+                       break;
+       }
+
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if (*pparams == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
+       }
+       params = *pparams;
+       SSVAL(params,0,0);
+
+       /*
+        * draft-leach-cifs-v1-spec-02.txt
+        * 4.2.14 TRANS2_QUERY_PATH_INFORMATION: Get File Attributes given Path
+        * says:
+        *
+        *  The requested information is placed in the Data portion of the
+        *  transaction response. For the information levels greater than 0x100,
+        *  the transaction response has 1 parameter word which should be
+        *  ignored by the client.
+        *
+        * However Windows only follows this rule for the IS_NAME_VALID call.
+        */
+       switch (info_level) {
+       case SMB_INFO_IS_NAME_VALID:
+               param_size = 0;
+               break;
+       }
+
+       if ((info_level & 0xFF00) == 0xFF00) {
+               /*
+                * We use levels that start with 0xFF00
+                * internally to represent SMB2 specific levels
+                */
+               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+               return;
+       }
+
+       status = smbd_do_qfilepathinfo(conn, req, info_level,
+                                      fsp, smb_fname,
+                                      delete_pending, write_time_ts,
+                                      ms_dfs_link, ea_list,
+                                      lock_data_count, lock_data,
+                                      req->flags2, max_data_bytes,
+                                      ppdata, &data_size);
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
+               return;
        }
 
        send_trans2_replies(conn, req, params, param_size, *ppdata, data_size,
@@ -4832,65 +5114,33 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
 NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
                connection_struct *conn,
-               const char *oldname_in,
-               const char *newname_in)
+               const struct smb_filename *smb_fname_old,
+               const struct smb_filename *smb_fname_new)
 {
-       struct smb_filename *smb_fname = NULL;
-       struct smb_filename *smb_fname_new = NULL;
        char *oldname = NULL;
        char *newname = NULL;
        NTSTATUS status = NT_STATUS_OK;
 
-       status = unix_convert(ctx, conn, oldname_in, &smb_fname, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
-       }
-
-       status = get_full_smb_filename(ctx, smb_fname, &oldname);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
-       }
-
-       status = check_name(conn, oldname);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
-       }
-
        /* source must already exist. */
-       if (!VALID_STAT(smb_fname->st)) {
-               status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-               goto out;
-       }
-
-       status = unix_convert(ctx, conn, newname_in, &smb_fname_new, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
-       }
-
-       status = get_full_smb_filename(ctx, smb_fname_new, &newname);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
-       }
-
-       status = check_name(conn, newname);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto out;
+       if (!VALID_STAT(smb_fname_old->st)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
        /* Disallow if newname already exists. */
        if (VALID_STAT(smb_fname_new->st)) {
-               status = NT_STATUS_OBJECT_NAME_COLLISION;
-               goto out;
+               return NT_STATUS_OBJECT_NAME_COLLISION;
        }
 
        /* No links from a directory. */
-       if (S_ISDIR(smb_fname->st.st_ex_mode)) {
-               status = NT_STATUS_FILE_IS_A_DIRECTORY;
-               goto out;
+       if (S_ISDIR(smb_fname_old->st.st_ex_mode)) {
+               return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
-       /* Ensure this is within the share. */
-       status = check_reduced_name(conn, oldname);
+       status = get_full_smb_filename(ctx, smb_fname_new, &newname);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto out;
+       }
+       status = get_full_smb_filename(ctx, smb_fname_old, &oldname);
        if (!NT_STATUS_IS_OK(status)) {
                goto out;
        }
@@ -4903,8 +5153,8 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
                                 nt_errstr(status), newname, oldname));
        }
  out:
-       TALLOC_FREE(smb_fname);
-       TALLOC_FREE(smb_fname_new);
+       TALLOC_FREE(newname);
+       TALLOC_FREE(oldname);
        return status;
 }
 
@@ -4914,27 +5164,28 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
 
 NTSTATUS smb_set_file_time(connection_struct *conn,
                           files_struct *fsp,
-                          const char *fname,
-                          const SMB_STRUCT_STAT *psbuf,
+                          const struct smb_filename *smb_fname,
                           struct smb_file_time *ft,
                           bool setting_write_time)
 {
+       struct smb_filename *smb_fname_base = NULL;
        uint32 action =
                FILE_NOTIFY_CHANGE_LAST_ACCESS
                |FILE_NOTIFY_CHANGE_LAST_WRITE;
+       NTSTATUS status;
 
-       if (!VALID_STAT(*psbuf)) {
+       if (!VALID_STAT(smb_fname->st)) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
        /* get some defaults (no modifications) if any info is zero or -1. */
        if (null_timespec(ft->atime)) {
-               ft->atime= psbuf->st_ex_atime;
+               ft->atime= smb_fname->st.st_ex_atime;
                action &= ~FILE_NOTIFY_CHANGE_LAST_ACCESS;
        }
 
        if (null_timespec(ft->mtime)) {
-               ft->mtime = psbuf->st_ex_mtime;
+               ft->mtime = smb_fname->st.st_ex_mtime;
                action &= ~FILE_NOTIFY_CHANGE_LAST_WRITE;
        }
 
@@ -4958,8 +5209,8 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
         */
 
        {
-               struct timespec mts = psbuf->st_ex_mtime;
-               struct timespec ats = psbuf->st_ex_atime;
+               struct timespec mts = smb_fname->st.st_ex_mtime;
+               struct timespec ats = smb_fname->st.st_ex_atime;
                if ((timespec_compare(&ft->atime, &ats) == 0) &&
                    (timespec_compare(&ft->mtime, &mts) == 0)) {
                        return NT_STATUS_OK;
@@ -4968,7 +5219,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
 
        if (setting_write_time) {
                /*
-                * This was a setfileinfo on an open file.
+                * This was a Windows setfileinfo on an open file.
                 * NT does this a lot. We also need to 
                 * set the time here, as it can be read by 
                 * FindFirst/FindNext and with the patch for bug #2045
@@ -4988,23 +5239,30 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
                                set_sticky_write_time_fsp(fsp, ft->mtime);
                        }
                } else {
-                       set_sticky_write_time_path(conn, fname,
-                                           vfs_file_id_from_sbuf(conn, psbuf),
-                                           ft->mtime);
+                       set_sticky_write_time_path(
+                               vfs_file_id_from_sbuf(conn, &smb_fname->st),
+                               ft->mtime);
                }
        }
 
        DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
-       if (fsp && fsp->base_fsp) {
-               fname = fsp->base_fsp->fsp_name;
+       /* Always call ntimes on the base, even if a stream was passed in. */
+       status = create_synthetic_smb_fname(talloc_tos(), smb_fname->base_name,
+                                           NULL, &smb_fname->st,
+                                           &smb_fname_base);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       if(file_ntimes(conn, fname, ft)!=0) {
+       if(file_ntimes(conn, smb_fname_base, ft)!=0) {
+               TALLOC_FREE(smb_fname_base);
                return map_nt_error_from_unix(errno);
        }
-       notify_fname(conn, NOTIFY_ACTION_MODIFIED, action, fname);
+       TALLOC_FREE(smb_fname_base);
 
+       notify_fname(conn, NOTIFY_ACTION_MODIFIED, action,
+                    smb_fname->base_name);
        return NT_STATUS_OK;
 }
 
@@ -5013,25 +5271,26 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
 ****************************************************************************/
 
 static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
-                               files_struct *fsp,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf,
-                               uint32 dosmode)
+                                    const struct smb_filename *smb_fname,
+                                    uint32 dosmode)
 {
-       if (!VALID_STAT(*psbuf)) {
+       struct smb_filename *smb_fname_base = NULL;
+       NTSTATUS status;
+
+       if (!VALID_STAT(smb_fname->st)) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       if (fsp) {
-               if (fsp->base_fsp) {
-                       fname = fsp->base_fsp->fsp_name;
-               } else {
-                       fname = fsp->fsp_name;
-               }
+       /* Always operate on the base_name, even if a stream was passed in. */
+       status = create_synthetic_smb_fname(talloc_tos(), smb_fname->base_name,
+                                           NULL, &smb_fname->st,
+                                           &smb_fname_base);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        if (dosmode) {
-               if (S_ISDIR(psbuf->st_ex_mode)) {
+               if (S_ISDIR(smb_fname_base->st.st_ex_mode)) {
                        dosmode |= aDIR;
                } else {
                        dosmode &= ~aDIR;
@@ -5041,18 +5300,25 @@ static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
        DEBUG(6,("smb_set_file_dosmode: dosmode: 0x%x\n", (unsigned int)dosmode));
 
        /* check the mode isn't different, before changing it */
-       if ((dosmode != 0) && (dosmode != dos_mode(conn, fname, psbuf))) {
-
-               DEBUG(10,("smb_set_file_dosmode: file %s : setting dos mode 0x%x\n",
-                                       fname, (unsigned int)dosmode ));
-
-               if(file_set_dosmode(conn, fname, dosmode, psbuf, NULL, false)) {
-                       DEBUG(2,("smb_set_file_dosmode: file_set_dosmode of %s failed (%s)\n",
-                                               fname, strerror(errno)));
-                       return map_nt_error_from_unix(errno);
+       if ((dosmode != 0) && (dosmode != dos_mode(conn, smb_fname_base))) {
+               DEBUG(10,("smb_set_file_dosmode: file %s : setting dos mode "
+                         "0x%x\n", smb_fname_str_dbg(smb_fname_base),
+                         (unsigned int)dosmode));
+
+               if(file_set_dosmode(conn, smb_fname_base, dosmode, NULL,
+                                   false)) {
+                       DEBUG(2,("smb_set_file_dosmode: file_set_dosmode of "
+                                "%s failed (%s)\n",
+                                smb_fname_str_dbg(smb_fname_base),
+                                strerror(errno)));
+                       status = map_nt_error_from_unix(errno);
+                       goto out;
                }
        }
-       return NT_STATUS_OK;
+       status = NT_STATUS_OK;
+ out:
+       TALLOC_FREE(smb_fname_base);
+       return status;
 }
 
 /****************************************************************************
@@ -5061,12 +5327,13 @@ static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
 
 static NTSTATUS smb_set_file_size(connection_struct *conn,
                                  struct smb_request *req,
-                               files_struct *fsp,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf,
-                               SMB_OFF_T size)
+                                 files_struct *fsp,
+                                 const struct smb_filename *smb_fname,
+                                 const SMB_STRUCT_STAT *psbuf,
+                                 SMB_OFF_T size)
 {
        NTSTATUS status = NT_STATUS_OK;
+       struct smb_filename *smb_fname_tmp = NULL;
        files_struct *new_fsp = NULL;
 
        if (!VALID_STAT(*psbuf)) {
@@ -5080,7 +5347,7 @@ static NTSTATUS smb_set_file_size(connection_struct *conn,
        }
 
        DEBUG(10,("smb_set_file_size: file %s : setting new size to %.0f\n",
-               fname, (double)size ));
+                 smb_fname_str_dbg(smb_fname), (double)size));
 
        if (fsp && fsp->fh->fd != -1) {
                /* Handle based call. */
@@ -5091,12 +5358,18 @@ static NTSTATUS smb_set_file_size(connection_struct *conn,
                return NT_STATUS_OK;
        }
 
+       status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       smb_fname_tmp->st = *psbuf;
+
         status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               0,                                      /* create_file_flags */
+               smb_fname_tmp,                          /* fname */
                FILE_WRITE_ATTRIBUTES,                  /* access_mask */
                (FILE_SHARE_READ | FILE_SHARE_WRITE |   /* share_access */
                    FILE_SHARE_DELETE),
@@ -5108,8 +5381,9 @@ static NTSTATUS smb_set_file_size(connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &new_fsp,                               /* result */
-               NULL,                                   /* pinfo */
-               psbuf);                                 /* psbuf */
+               NULL);                                  /* pinfo */
+
+       TALLOC_FREE(smb_fname_tmp);
 
        if (!NT_STATUS_IS_OK(status)) {
                /* NB. We check for open_was_deferred in the caller. */
@@ -5135,7 +5409,7 @@ static NTSTATUS smb_info_set_ea(connection_struct *conn,
                                const char *pdata,
                                int total_data,
                                files_struct *fsp,
-                               const char *fname)
+                               const struct smb_filename *smb_fname)
 {
        struct ea_list *ea_list = NULL;
        TALLOC_CTX *ctx = NULL;
@@ -5165,7 +5439,7 @@ static NTSTATUS smb_info_set_ea(connection_struct *conn,
        if (!ea_list) {
                return NT_STATUS_INVALID_PARAMETER;
        }
-       status = set_ea(conn, fsp, fname, ea_list);
+       status = set_ea(conn, fsp, smb_fname, ea_list);
 
        return status;
 }
@@ -5178,8 +5452,7 @@ static NTSTATUS smb_set_file_disposition_info(connection_struct *conn,
                                const char *pdata,
                                int total_data,
                                files_struct *fsp,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf)
+                               const struct smb_filename *smb_fname)
 {
        NTSTATUS status = NT_STATUS_OK;
        bool delete_on_close;
@@ -5194,11 +5467,11 @@ static NTSTATUS smb_set_file_disposition_info(connection_struct *conn,
        }
 
        delete_on_close = (CVAL(pdata,0) ? True : False);
-       dosmode = dos_mode(conn, fname, psbuf);
+       dosmode = dos_mode(conn, smb_fname);
 
        DEBUG(10,("smb_set_file_disposition_info: file %s, dosmode = %u, "
                "delete_on_close = %u\n",
-               fsp->fsp_name,
+               smb_fname_str_dbg(smb_fname),
                (unsigned int)dosmode,
                (unsigned int)delete_on_close ));
 
@@ -5358,9 +5631,10 @@ static NTSTATUS smb_set_file_unix_link(connection_struct *conn,
 static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
                                        struct smb_request *req,
                                        const char *pdata, int total_data,
-                                       const char *fname)
+                                       const struct smb_filename *smb_fname_new)
 {
        char *oldname = NULL;
+       struct smb_filename *smb_fname_old = NULL;
        TALLOC_CTX *ctx = talloc_tos();
        NTSTATUS status = NT_STATUS_OK;
 
@@ -5375,18 +5649,20 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
                return status;
        }
 
-       status = resolve_dfspath(ctx, conn,
+       DEBUG(10,("smb_set_file_unix_hlink: SMB_SET_FILE_UNIX_LINK doing hard link %s -> %s\n",
+               smb_fname_str_dbg(smb_fname_new), oldname));
+
+       status = filename_convert(ctx,
+                               conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                oldname,
-                               &oldname);
+                               &smb_fname_old,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       DEBUG(10,("smb_set_file_unix_hlink: SMB_SET_FILE_UNIX_LINK doing hard link %s -> %s\n",
-               fname, oldname));
-
-       return hardlink_internals(ctx, conn, oldname, fname);
+       return hardlink_internals(ctx, conn, smb_fname_old, smb_fname_new);
 }
 
 /****************************************************************************
@@ -5452,15 +5728,36 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                if (newname[0] != ':') {
                        return NT_STATUS_NOT_SUPPORTED;
                }
+
+               /* Create an smb_fname to call rename_internals_fsp() with. */
+               status = create_synthetic_smb_fname(talloc_tos(),
+                                                   fsp->base_fsp->fsp_name,
+                                                   newname, NULL, &smb_fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto out;
+               }
+
+               /*
+                * Set the original last component, since
+                * rename_internals_fsp() requires it.
+                */
+               smb_fname->original_lcomp = talloc_strdup(smb_fname, newname);
+               if (smb_fname->original_lcomp == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto out;
+               }
+
+               /* Create a char * to call rename_internals() with. */
                base_name = talloc_asprintf(ctx, "%s%s",
                                           fsp->base_fsp->fsp_name,
                                           newname);
                if (!base_name) {
-                       return NT_STATUS_NO_MEMORY;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto out;
                }
        } else {
                /* newname must *not* be a stream name. */
-               if (is_ntfs_stream_name(newname)) {
+               if (newname[0] == ':') {
                        return NT_STATUS_NOT_SUPPORTED;
                }
 
@@ -5486,26 +5783,33 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                        return NT_STATUS_NO_MEMORY;
                }
 
-               status = unix_convert(ctx, conn, newname, &smb_fname,
+               status = unix_convert(ctx, conn, base_name, &smb_fname,
                                      UCF_SAVE_LCOMP);
 
                /* If an error we expect this to be
                 * NT_STATUS_OBJECT_PATH_NOT_FOUND */
 
-               if (!NT_STATUS_IS_OK(status)
-                   && !NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND,
-                                       status)) {
-                       goto out;
+               if (!NT_STATUS_IS_OK(status)) {
+                       if(!NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND,
+                                           status)) {
+                               goto out;
+                       }
+                       /* Create an smb_fname to call rename_internals_fsp() */
+                       status = create_synthetic_smb_fname(talloc_tos(),
+                                                           base_name, NULL,
+                                                           NULL, &smb_fname);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               goto out;
+                       }
                }
+
        }
 
        if (fsp) {
                DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
                        fsp->fnum, fsp->fsp_name, base_name ));
-               status = rename_internals_fsp(conn, fsp, base_name,
-                                             smb_fname ?
-                                             smb_fname->original_lcomp : NULL,
-                                             0, overwrite);
+               status = rename_internals_fsp(conn, fsp, smb_fname, 0,
+                                             overwrite);
        } else {
                DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION %s -> %s\n",
                        fname, base_name ));
@@ -5713,8 +6017,7 @@ static NTSTATUS smb_set_info_standard(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       const SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        struct smb_file_time ft;
        ZERO_STRUCT(ft);
@@ -5733,14 +6036,9 @@ static NTSTATUS smb_set_info_standard(connection_struct *conn,
        ft.mtime = interpret_long_date(pdata + 16);
 
        DEBUG(10,("smb_set_info_standard: file %s\n",
-               fname ? fname : fsp->fsp_name ));
+                 smb_fname_str_dbg(smb_fname)));
 
-       return smb_set_file_time(conn,
-                               fsp,
-                               fname,
-                               psbuf,
-                               &ft,
-                               true);
+       return smb_set_file_time(conn, fsp, smb_fname, &ft, true);
 }
 
 /****************************************************************************
@@ -5751,8 +6049,7 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
        struct timespec write_time;
@@ -5770,7 +6067,7 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
 
        /* Set the attributes */
        dosmode = IVAL(pdata,32);
-       status = smb_set_file_dosmode(conn, fsp, fname, psbuf, dosmode);
+       status = smb_set_file_dosmode(conn, smb_fname, dosmode);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -5802,15 +6099,11 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
                }
        }
 
-       DEBUG(10,("smb_set_file_basic_info: file %s\n",
-               fname ? fname : fsp->fsp_name ));
+       DEBUG(10, ("smb_set_file_basic_info: file %s\n",
+                  smb_fname_str_dbg(smb_fname)));
 
-       return smb_set_file_time(conn,
-                               fsp,
-                               fname,
-                               psbuf,
-                               &ft,
-                               setting_write_time);
+       return smb_set_file_time(conn, fsp, smb_fname, &ft,
+                                setting_write_time);
 }
 
 /****************************************************************************
@@ -5822,14 +6115,13 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       struct smb_filename *smb_fname)
 {
        uint64_t allocation_size = 0;
        NTSTATUS status = NT_STATUS_OK;
        files_struct *new_fsp = NULL;
 
-       if (!VALID_STAT(*psbuf)) {
+       if (!VALID_STAT(smb_fname->st)) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
@@ -5847,20 +6139,22 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
        }
 #endif /* LARGE_SMB_OFF_T */
 
-       DEBUG(10,("smb_set_file_allocation_info: Set file allocation info for file %s to %.0f\n",
-                       fname, (double)allocation_size ));
+       DEBUG(10,("smb_set_file_allocation_info: Set file allocation info for "
+                 "file %s to %.0f\n", smb_fname_str_dbg(smb_fname),
+                 (double)allocation_size));
 
        if (allocation_size) {
                allocation_size = smb_roundup(conn, allocation_size);
        }
 
-       DEBUG(10,("smb_set_file_allocation_info: file %s : setting new allocation size to %.0f\n",
-                       fname, (double)allocation_size ));
+       DEBUG(10,("smb_set_file_allocation_info: file %s : setting new "
+                 "allocation size to %.0f\n", smb_fname_str_dbg(smb_fname),
+                 (double)allocation_size));
 
        if (fsp && fsp->fh->fd != -1) {
                /* Open file handle. */
                /* Only change if needed. */
-               if (allocation_size != get_file_size_stat(psbuf)) {
+               if (allocation_size != get_file_size_stat(&smb_fname->st)) {
                        if (vfs_allocate_file_space(fsp, allocation_size) == -1) {
                                return map_nt_error_from_unix(errno);
                        }
@@ -5875,13 +6169,11 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
        }
 
        /* Pathname or stat or directory file. */
-
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* 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),
@@ -5893,8 +6185,7 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &new_fsp,                               /* result */
-               NULL,                                   /* pinfo */
-               psbuf);                                 /* psbuf */
+               NULL);                                  /* pinfo */
 
        if (!NT_STATUS_IS_OK(status)) {
                /* NB. We check for open_was_deferred in the caller. */
@@ -5902,7 +6193,7 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
        }
 
        /* Only change if needed. */
-       if (allocation_size != get_file_size_stat(psbuf)) {
+       if (allocation_size != get_file_size_stat(&smb_fname->st)) {
                if (vfs_allocate_file_space(new_fsp, allocation_size) == -1) {
                        status = map_nt_error_from_unix(errno);
                        close_file(req, new_fsp, NORMAL_CLOSE);
@@ -5930,8 +6221,7 @@ static NTSTATUS smb_set_file_end_of_file_info(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        SMB_OFF_T size;
 
@@ -5949,12 +6239,13 @@ static NTSTATUS smb_set_file_end_of_file_info(connection_struct *conn,
        }
 #endif /* LARGE_SMB_OFF_T */
        DEBUG(10,("smb_set_file_end_of_file_info: Set end of file info for "
-               "file %s to %.0f\n", fname, (double)size ));
+                 "file %s to %.0f\n", smb_fname_str_dbg(smb_fname),
+                 (double)size));
 
        return smb_set_file_size(conn, req,
                                fsp,
-                               fname,
-                               psbuf,
+                               smb_fname,
+                               &smb_fname->st,
                                size);
 }
 
@@ -5965,8 +6256,7 @@ static NTSTATUS smb_set_file_end_of_file_info(connection_struct *conn,
 static NTSTATUS smb_unix_mknod(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        uint32 file_type = IVAL(pdata,56);
 #if defined(HAVE_MAKEDEV)
@@ -5982,7 +6272,8 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = unix_perms_from_wire(conn, psbuf, raw_unixmode, PERM_NEW_FILE, &unixmode);
+       status = unix_perms_from_wire(conn, &smb_fname->st, raw_unixmode,
+                                     PERM_NEW_FILE, &unixmode);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -6016,11 +6307,12 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
                        return NT_STATUS_INVALID_PARAMETER;
        }
 
-       DEBUG(10,("smb_unix_mknod: SMB_SET_FILE_UNIX_BASIC doing mknod dev %.0f mode \
-0%o for file %s\n", (double)dev, (unsigned int)unixmode, fname ));
+       DEBUG(10,("smb_unix_mknod: SMB_SET_FILE_UNIX_BASIC doing mknod dev "
+                 "%.0f mode 0%o for file %s\n", (double)dev,
+                 (unsigned int)unixmode, smb_fname_str_dbg(smb_fname)));
 
        /* Ok - do the mknod. */
-       if (SMB_VFS_MKNOD(conn, fname, unixmode, dev) != 0) {
+       if (SMB_VFS_MKNOD(conn, smb_fname->base_name, unixmode, dev) != 0) {
                return map_nt_error_from_unix(errno);
        }
 
@@ -6030,18 +6322,15 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
 
        if (lp_inherit_perms(SNUM(conn))) {
                char *parent;
-               if (!parent_dirname(talloc_tos(), fname, &parent, NULL)) {
+               if (!parent_dirname(talloc_tos(), smb_fname->base_name,
+                                   &parent, NULL)) {
                        return NT_STATUS_NO_MEMORY;
                }
-               inherit_access_posix_acl(conn, parent, fname, unixmode);
+               inherit_access_posix_acl(conn, parent, smb_fname->base_name,
+                                        unixmode);
                TALLOC_FREE(parent);
        }
 
-       if (SMB_VFS_STAT(conn, fname, psbuf) != 0) {
-               status = map_nt_error_from_unix(errno);
-               SMB_VFS_UNLINK(conn,fname);
-               return status;
-       }
        return NT_STATUS_OK;
 }
 
@@ -6054,8 +6343,7 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        struct smb_file_time ft;
        uint32 raw_unixmode;
@@ -6066,6 +6354,10 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
        NTSTATUS status = NT_STATUS_OK;
        bool delete_on_fail = False;
        enum perm_type ptype;
+       files_struct *all_fsps = NULL;
+       bool modify_mtime = true;
+       struct file_id id;
+       SMB_STRUCT_STAT sbuf;
 
        ZERO_STRUCT(ft);
 
@@ -6092,8 +6384,8 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
        set_grp = (gid_t)IVAL(pdata,48);
        raw_unixmode = IVAL(pdata,84);
 
-       if (VALID_STAT(*psbuf)) {
-               if (S_ISDIR(psbuf->st_ex_mode)) {
+       if (VALID_STAT(smb_fname->st)) {
+               if (S_ISDIR(smb_fname->st.st_ex_mode)) {
                        ptype = PERM_EXISTING_DIR;
                } else {
                        ptype = PERM_EXISTING_FILE;
@@ -6102,16 +6394,22 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
                ptype = PERM_NEW_FILE;
        }
 
-       status = unix_perms_from_wire(conn, psbuf, raw_unixmode, ptype, &unixmode);
+       status = unix_perms_from_wire(conn, &smb_fname->st, raw_unixmode,
+                                     ptype, &unixmode);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC: name = %s \
-size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
-               fname, (double)size, (unsigned int)set_owner, (unsigned int)set_grp, (int)raw_unixmode));
+       DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC: name = "
+                 "%s size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
+                 smb_fname_str_dbg(smb_fname), (double)size,
+                 (unsigned int)set_owner, (unsigned int)set_grp,
+                 (int)raw_unixmode));
 
-       if (!VALID_STAT(*psbuf)) {
+       sbuf = smb_fname->st;
+
+       if (!VALID_STAT(sbuf)) {
+               struct smb_filename *smb_fname_tmp = NULL;
                /*
                 * The only valid use of this is to create character and block
                 * devices, and named pipes. This is deprecated (IMHO) and 
@@ -6121,17 +6419,32 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                status = smb_unix_mknod(conn,
                                        pdata,
                                        total_data,
-                                       fname,
-                                       psbuf);
+                                       smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
 
+               status = copy_smb_filename(talloc_tos(), smb_fname,
+                                          &smb_fname_tmp);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               if (SMB_VFS_STAT(conn, smb_fname_tmp) != 0) {
+                       status = map_nt_error_from_unix(errno);
+                       TALLOC_FREE(smb_fname_tmp);
+                       SMB_VFS_UNLINK(conn, smb_fname);
+                       return status;
+               }
+
+               sbuf = smb_fname_tmp->st;
+               TALLOC_FREE(smb_fname_tmp);
+
                /* Ensure we don't try and change anything else. */
                raw_unixmode = SMB_MODE_NO_CHANGE;
-               size = get_file_size_stat(psbuf);
-               ft.atime = psbuf->st_ex_atime;
-               ft.mtime = psbuf->st_ex_mtime;
+               size = get_file_size_stat(&sbuf);
+               ft.atime = sbuf.st_ex_atime;
+               ft.mtime = sbuf.st_ex_mtime;
                /* 
                 * We continue here as we might want to change the 
                 * owner uid/gid.
@@ -6145,7 +6458,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
         * */
 
        if (!size) {
-               size = get_file_size_stat(psbuf);
+               size = get_file_size_stat(&sbuf);
        }
 #endif
 
@@ -6154,9 +6467,11 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
         */
 
        if (raw_unixmode != SMB_MODE_NO_CHANGE) {
-               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC setting mode 0%o for file %s\n",
-                       (unsigned int)unixmode, fname ));
-               if (SMB_VFS_CHMOD(conn, fname, unixmode) != 0) {
+               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC "
+                         "setting mode 0%o for file %s\n",
+                         (unsigned int)unixmode,
+                         smb_fname_str_dbg(smb_fname)));
+               if (SMB_VFS_CHMOD(conn, smb_fname->base_name, unixmode) != 0) {
                        return map_nt_error_from_unix(errno);
                }
        }
@@ -6165,22 +6480,27 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
         * Deal with the UNIX specific uid set.
         */
 
-       if ((set_owner != (uid_t)SMB_UID_NO_CHANGE) && (psbuf->st_ex_uid != set_owner)) {
+       if ((set_owner != (uid_t)SMB_UID_NO_CHANGE) &&
+           (sbuf.st_ex_uid != set_owner)) {
                int ret;
 
-               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC changing owner %u for path %s\n",
-                       (unsigned int)set_owner, fname ));
+               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC "
+                         "changing owner %u for path %s\n",
+                         (unsigned int)set_owner,
+                         smb_fname_str_dbg(smb_fname)));
 
-               if (S_ISLNK(psbuf->st_ex_mode)) {
-                       ret = SMB_VFS_LCHOWN(conn, fname, set_owner, (gid_t)-1);
+               if (S_ISLNK(sbuf.st_ex_mode)) {
+                       ret = SMB_VFS_LCHOWN(conn, smb_fname->base_name,
+                                            set_owner, (gid_t)-1);
                } else {
-                       ret = SMB_VFS_CHOWN(conn, fname, set_owner, (gid_t)-1);
+                       ret = SMB_VFS_CHOWN(conn, smb_fname->base_name,
+                                           set_owner, (gid_t)-1);
                }
 
                if (ret != 0) {
                        status = map_nt_error_from_unix(errno);
                        if (delete_on_fail) {
-                               SMB_VFS_UNLINK(conn,fname);
+                               SMB_VFS_UNLINK(conn, smb_fname);
                        }
                        return status;
                }
@@ -6190,13 +6510,17 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
         * Deal with the UNIX specific gid set.
         */
 
-       if ((set_grp != (uid_t)SMB_GID_NO_CHANGE) && (psbuf->st_ex_gid != set_grp)) {
-               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC changing group %u for file %s\n",
-                       (unsigned int)set_owner, fname ));
-               if (SMB_VFS_CHOWN(conn, fname, (uid_t)-1, set_grp) != 0) {
+       if ((set_grp != (uid_t)SMB_GID_NO_CHANGE) &&
+           (sbuf.st_ex_gid != set_grp)) {
+               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC "
+                         "changing group %u for file %s\n",
+                         (unsigned int)set_owner,
+                         smb_fname_str_dbg(smb_fname)));
+               if (SMB_VFS_CHOWN(conn, smb_fname->base_name, (uid_t)-1,
+                                 set_grp) != 0) {
                        status = map_nt_error_from_unix(errno);
                        if (delete_on_fail) {
-                               SMB_VFS_UNLINK(conn,fname);
+                               SMB_VFS_UNLINK(conn, smb_fname);
                        }
                        return status;
                }
@@ -6205,22 +6529,51 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
        /* Deal with any size changes. */
 
        status = smb_set_file_size(conn, req,
-                               fsp,
-                               fname,
-                               psbuf,
-                               size);
+                                  fsp,
+                                  smb_fname,
+                                  &sbuf,
+                                  size);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
        /* Deal with any time changes. */
+       if (null_timespec(ft.mtime) && null_timespec(ft.atime)) {
+               /* No change, don't cancel anything. */
+               return status;
+       }
+
+       id = vfs_file_id_from_sbuf(conn, &sbuf);
+       for(all_fsps = file_find_di_first(id); all_fsps;
+                       all_fsps = file_find_di_next(all_fsps)) {
+               /*
+                * We're setting the time explicitly for UNIX.
+                * Cancel any pending changes over all handles.
+                */
+               all_fsps->update_write_time_on_close = false;
+               TALLOC_FREE(all_fsps->update_write_time_event);
+       }
+
+       /*
+        * Override the "setting_write_time"
+        * parameter here as it almost does what
+        * we need. Just remember if we modified
+        * mtime and send the notify ourselves.
+        */
+       if (null_timespec(ft.mtime)) {
+               modify_mtime = false;
+       }
 
-       return smb_set_file_time(conn,
+       status = smb_set_file_time(conn,
                                fsp,
-                               fname,
-                               psbuf,
+                               smb_fname,
                                &ft,
-                               true);
+                               false);
+       if (modify_mtime) {
+               notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+                       FILE_NOTIFY_CHANGE_LAST_WRITE, smb_fname->base_name);
+       }
+       return status;
 }
 
 /****************************************************************************
@@ -6232,8 +6585,7 @@ static NTSTATUS smb_set_file_unix_info2(connection_struct *conn,
                                        const char *pdata,
                                        int total_data,
                                        files_struct *fsp,
-                                       const char *fname,
-                                       SMB_STRUCT_STAT *psbuf)
+                                       const struct smb_filename *smb_fname)
 {
        NTSTATUS status;
        uint32 smb_fflags;
@@ -6247,7 +6599,7 @@ static NTSTATUS smb_set_file_unix_info2(connection_struct *conn,
         * and UNIX_INFO2.
         */
        status = smb_set_file_unix_basic(conn, req, pdata, total_data,
-                               fsp, fname, psbuf);
+                                        fsp, smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -6261,8 +6613,8 @@ static NTSTATUS smb_set_file_unix_info2(connection_struct *conn,
        if (smb_fmask != 0) {
                int stat_fflags = 0;
 
-               if (!map_info2_flags_to_sbuf(psbuf, smb_fflags, smb_fmask,
-                           &stat_fflags)) {
+               if (!map_info2_flags_to_sbuf(&smb_fname->st, smb_fflags,
+                                            smb_fmask, &stat_fflags)) {
                        /* Client asked to alter a flag we don't understand. */
                        return NT_STATUS_INVALID_PARAMETER;
                }
@@ -6271,7 +6623,8 @@ static NTSTATUS smb_set_file_unix_info2(connection_struct *conn,
                        /* XXX: we should be  using SMB_VFS_FCHFLAGS here. */
                        return NT_STATUS_NOT_SUPPORTED;
                } else {
-                       if (SMB_VFS_CHFLAGS(conn, fname, stat_fflags) != 0) {
+                       if (SMB_VFS_CHFLAGS(conn, smb_fname->base_name,
+                                           stat_fflags) != 0) {
                                return map_nt_error_from_unix(errno);
                        }
                }
@@ -6297,6 +6650,7 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
                                SMB_STRUCT_STAT *psbuf,
                                int *pdata_return_size)
 {
+       struct smb_filename *smb_fname;
        NTSTATUS status = NT_STATUS_OK;
        uint32 raw_unixmode = 0;
        uint32 mod_unixmode = 0;
@@ -6323,12 +6677,17 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
        DEBUG(10,("smb_posix_mkdir: file %s, mode 0%o\n",
                fname, (unsigned int)unixmode ));
 
-       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 */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               0,                                      /* create_file_flags */
+               smb_fname,                              /* fname */
                FILE_READ_ATTRIBUTES,                   /* access_mask */
                FILE_SHARE_NONE,                        /* share_access */
                FILE_CREATE,                            /* create_disposition*/
@@ -6339,8 +6698,10 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &fsp,                                   /* result */
-               &info,                                  /* pinfo */
-               psbuf);                                 /* psbuf */
+               &info);                                 /* pinfo */
+
+       *psbuf = smb_fname->st;
+       TALLOC_FREE(smb_fname);
 
         if (NT_STATUS_IS_OK(status)) {
                 close_file(req, fsp, NORMAL_CLOSE);
@@ -6400,6 +6761,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
                                SMB_STRUCT_STAT *psbuf,
                                int *pdata_return_size)
 {
+       struct smb_filename *smb_fname = NULL;
        bool extended_oplock_granted = False;
        char *pdata = *ppdata;
        uint32 flags = 0;
@@ -6499,12 +6861,17 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
                (unsigned int)wire_open_mode,
                (unsigned int)unixmode ));
 
+       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 */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               0,                                      /* create_file_flags */
+               smb_fname,                              /* fname */
                access_mask,                            /* access_mask */
                (FILE_SHARE_READ | FILE_SHARE_WRITE |   /* share_access */
                    FILE_SHARE_DELETE),
@@ -6516,8 +6883,10 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &fsp,                                   /* result */
-               &info,                                  /* pinfo */
-               psbuf);                                 /* psbuf */
+               &info);                                 /* pinfo */
+
+       *psbuf = smb_fname->st;
+       TALLOC_FREE(smb_fname);
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -6594,8 +6963,7 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
                                 struct smb_request *req,
                                const char *pdata,
                                int total_data,
-                               const char *fname,
-                               SMB_STRUCT_STAT *psbuf)
+                               struct smb_filename *smb_fname)
 {
        NTSTATUS status = NT_STATUS_OK;
        files_struct *fsp = NULL;
@@ -6612,20 +6980,20 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
 
        flags = SVAL(pdata,0);
 
-       if (!VALID_STAT(*psbuf)) {
+       if (!VALID_STAT(smb_fname->st)) {
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
        if ((flags == SMB_POSIX_UNLINK_DIRECTORY_TARGET) &&
-                       !VALID_STAT_OF_DIR(*psbuf)) {
+                       !VALID_STAT_OF_DIR(smb_fname->st)) {
                return NT_STATUS_NOT_A_DIRECTORY;
        }
 
        DEBUG(10,("smb_posix_unlink: %s %s\n",
                (flags == SMB_POSIX_UNLINK_DIRECTORY_TARGET) ? "directory" : "file",
-               fname));
+               smb_fname_str_dbg(smb_fname)));
 
-       if (VALID_STAT_OF_DIR(*psbuf)) {
+       if (VALID_STAT_OF_DIR(smb_fname->st)) {
                create_options |= FILE_DIRECTORY_FILE;
        }
 
@@ -6633,8 +7001,7 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
                conn,                                   /* conn */
                req,                                    /* req */
                0,                                      /* root_dir_fid */
-               fname,                                  /* fname */
-               0,                                      /* create_file_flags */
+               smb_fname,                              /* fname */
                DELETE_ACCESS,                          /* access_mask */
                (FILE_SHARE_READ | FILE_SHARE_WRITE |   /* share_access */
                    FILE_SHARE_DELETE),
@@ -6646,8 +7013,7 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
                NULL,                                   /* sd */
                NULL,                                   /* ea_list */
                &fsp,                                   /* result */
-               &info,                                  /* pinfo */
-               psbuf);                                 /* psbuf */
+               &info);                                 /* pinfo */
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -6681,217 +7047,67 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
                        /* Fail with sharing violation. */
                        close_file(req, fsp, NORMAL_CLOSE);
                        TALLOC_FREE(lck);
-                       return NT_STATUS_SHARING_VIOLATION;
-               }
-       }
-
-       /*
-        * Set the delete on close.
-        */
-       status = smb_set_file_disposition_info(conn,
-                                               &del,
-                                               1,
-                                               fsp,
-                                               fname,
-                                               psbuf);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               close_file(req, fsp, NORMAL_CLOSE);
-               TALLOC_FREE(lck);
-               return status;
-       }
-       TALLOC_FREE(lck);
-       return close_file(req, fsp, NORMAL_CLOSE);
-}
-
-/****************************************************************************
- Reply to a TRANS2_SETFILEINFO (set file info by fileid or pathname).
-****************************************************************************/
-
-static void call_trans2setfilepathinfo(connection_struct *conn,
-                                      struct smb_request *req,
-                                      unsigned int tran_call,
-                                      char **pparams, int total_params,
-                                      char **ppdata, int total_data,
-                                      unsigned int max_data_bytes)
-{
-       char *params = *pparams;
-       char *pdata = *ppdata;
-       uint16 info_level;
-       SMB_STRUCT_STAT sbuf;
-       char *fname = NULL;
-       struct smb_filename *smb_fname = NULL;
-       files_struct *fsp = NULL;
-       NTSTATUS status = NT_STATUS_OK;
-       int data_return_size = 0;
-       TALLOC_CTX *ctx = talloc_tos();
-
-       if (!params) {
-               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return;
-       }
-
-       ZERO_STRUCT(sbuf);
-
-       if (tran_call == TRANSACT2_SETFILEINFO) {
-               if (total_params < 4) {
-                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
-               }
-
-               fsp = file_fsp(req, SVAL(params,0));
-               /* Basic check for non-null fsp. */
-               if (!check_fsp_open(conn, req, fsp)) {
-                       return;
-               }
-               info_level = SVAL(params,2);
-
-               fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
-               if (!fname) {
-                       reply_nterror(req, NT_STATUS_NO_MEMORY);
-                       return;
-               }
-
-               if(fsp->is_directory || fsp->fh->fd == -1) {
-                       /*
-                        * This is actually a SETFILEINFO on a directory
-                        * handle (returned from an NT SMB). NT5.0 seems
-                        * to do this call. JRA.
-                        */
-                       if (INFO_LEVEL_IS_UNIX(info_level)) {
-                               /* Always do lstat for UNIX calls. */
-                               if (SMB_VFS_LSTAT(conn,fname,&sbuf)) {
-                                       DEBUG(3,("call_trans2setfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno)));
-                                       reply_unixerror(req,ERRDOS,ERRbadpath);
-                                       return;
-                               }
-                       } else {
-                               if (SMB_VFS_STAT(conn,fname,&sbuf) != 0) {
-                                       DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-                                       reply_unixerror(req,ERRDOS,ERRbadpath);
-                                       return;
-                               }
-                       }
-               } else if (fsp->print_file) {
-                       /*
-                        * Doing a DELETE_ON_CLOSE should cancel a print job.
-                        */
-                       if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) {
-                               fsp->fh->private_options |= FILE_DELETE_ON_CLOSE;
-
-                               DEBUG(3,("call_trans2setfilepathinfo: Cancelling print job (%s)\n", fsp->fsp_name ));
-
-                               SSVAL(params,0,0);
-                               send_trans2_replies(conn, req, params, 2,
-                                                   *ppdata, 0,
-                                                   max_data_bytes);
-                               return;
-                       } else {
-                               reply_unixerror(req, ERRDOS, ERRbadpath);
-                               return;
-                       }
-               } else {
-                       /*
-                        * Original code - this is an open file.
-                        */
-                       if (!check_fsp(conn, req, fsp)) {
-                               return;
-                       }
-
-                       if (SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
-                               DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
-                               reply_unixerror(req, ERRDOS, ERRbadfid);
-                               return;
-                       }
-               }
-       } else {
-               /* set path info */
-               if (total_params < 7) {
-                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
-               }
-
-               info_level = SVAL(params,0);
-               srvstr_get_path(ctx, params, req->flags2, &fname, &params[6],
-                               total_params - 6, STR_TERMINATE,
-                               &status);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
-               }
-
-               status = resolve_dfspath(ctx, conn,
-                                        req->flags2 & FLAGS2_DFS_PATHNAMES,
-                                        fname,
-                                        &fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
-                               reply_botherror(req,
-                                               NT_STATUS_PATH_NOT_COVERED,
-                                               ERRSRV, ERRbadpath);
-                               return;
-                       }
-                       reply_nterror(req, status);
-                       return;
-               }
-
-               status = unix_convert(ctx, conn, fname, &smb_fname, 0);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
-               }
-               sbuf = smb_fname->st;
-
-               status = get_full_smb_filename(ctx, smb_fname, &fname);
-               TALLOC_FREE(smb_fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
-               }
-
-               status = check_name(conn, fname);
-               if (!NT_STATUS_IS_OK(status)) {
-                       reply_nterror(req, status);
-                       return;
+                       return NT_STATUS_SHARING_VIOLATION;
                }
+       }
 
-               if (INFO_LEVEL_IS_UNIX(info_level)) {
-                       /*
-                        * For CIFS UNIX extensions the target name may not exist.
-                        */
-
-                       /* Always do lstat for UNIX calls. */
-                       SMB_VFS_LSTAT(conn,fname,&sbuf);
+       /*
+        * Set the delete on close.
+        */
+       status = smb_set_file_disposition_info(conn,
+                                               &del,
+                                               1,
+                                               fsp,
+                                               smb_fname);
 
-               } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf)) {
-                       DEBUG(3,("call_trans2setfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                       reply_unixerror(req, ERRDOS, ERRbadpath);
-                       return;
-               }
+       if (!NT_STATUS_IS_OK(status)) {
+               close_file(req, fsp, NORMAL_CLOSE);
+               TALLOC_FREE(lck);
+               return status;
        }
+       TALLOC_FREE(lck);
+       return close_file(req, fsp, NORMAL_CLOSE);
+}
 
-       if (!CAN_WRITE(conn)) {
-               reply_doserror(req, ERRSRV, ERRaccess);
-               return;
-       }
+NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
+                               struct smb_request *req,
+                               TALLOC_CTX *mem_ctx,
+                               uint16_t info_level,
+                               files_struct *fsp,
+                               struct smb_filename *smb_fname,
+                               char **ppdata, int total_data,
+                               int *ret_data_size)
+{
+       char *pdata = *ppdata;
+       SMB_STRUCT_STAT sbuf;
+       char *fname = NULL;
+       NTSTATUS status = NT_STATUS_OK;
+       int data_return_size = 0;
+
+       *ret_data_size = 0;
+
+       /* Set sbuf for use below. */
+       sbuf = smb_fname->st;
 
        if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-               return;
+               return NT_STATUS_INVALID_LEVEL;
        }
 
-       DEBUG(3,("call_trans2setfilepathinfo(%d) %s (fnum %d) info_level=%d totdata=%d\n",
-               tran_call,fname, fsp ? fsp->fnum : -1, info_level,total_data));
+       if (!CAN_WRITE(conn)) {
+               /* Allow POSIX opens. The open path will deny
+                * any non-readonly opens. */
+               if (info_level != SMB_POSIX_PATH_OPEN) {
+                       return NT_STATUS_DOS(ERRSRV, ERRaccess);
+               }
+       }
 
-       /* Realloc the parameter size */
-       *pparams = (char *)SMB_REALLOC(*pparams,2);
-       if (*pparams == NULL) {
-               reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
+       status = get_full_smb_filename(mem_ctx, smb_fname, &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
-       params = *pparams;
 
-       SSVAL(params,0,0);
+       DEBUG(3,("smbd_do_setfilepathinfo: %s (fnum %d) info_level=%d totdata=%d\n",
+               fname, fsp ? fsp->fnum : -1, info_level, total_data));
 
        switch (info_level) {
 
@@ -6901,8 +7117,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                        pdata,
                                        total_data,
                                        fsp,
-                                       fname,
-                                       &sbuf);
+                                       smb_fname);
                        break;
                }
 
@@ -6912,7 +7127,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                pdata,
                                                total_data,
                                                fsp,
-                                               fname);
+                                               smb_fname);
                        break;
                }
 
@@ -6923,8 +7138,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                        pdata,
                                                        total_data,
                                                        fsp,
-                                                       fname,
-                                                       &sbuf);
+                                                       smb_fname);
                        break;
                }
 
@@ -6935,8 +7149,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                                pdata,
                                                                total_data,
                                                                fsp,
-                                                               fname,
-                                                               &sbuf);
+                                                               smb_fname);
                        break;
                }
 
@@ -6947,8 +7160,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                                pdata,
                                                                total_data,
                                                                fsp,
-                                                               fname,
-                                                               &sbuf);
+                                                               smb_fname);
                        break;
                }
 
@@ -6968,8 +7180,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                pdata,
                                                total_data,
                                                fsp,
-                                               fname,
-                                               &sbuf);
+                                               smb_fname);
                        break;
                }
 
@@ -7006,8 +7217,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                        pdata,
                                                        total_data,
                                                        fsp,
-                                                       fname,
-                                                       &sbuf);
+                                                       smb_fname);
                        break;
                }
 
@@ -7017,17 +7227,15 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                                                        pdata,
                                                        total_data,
                                                        fsp,
-                                                       fname,
-                                                       &sbuf);
+                                                       smb_fname);
                        break;
                }
 
                case SMB_SET_FILE_UNIX_LINK:
                {
-                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                       if (fsp) {
                                /* We must have a pathname for this. */
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
                        status = smb_set_file_unix_link(conn, req, pdata,
                                                        total_data, fname);
@@ -7036,14 +7244,13 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 
                case SMB_SET_FILE_UNIX_HLINK:
                {
-                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                       if (fsp) {
                                /* We must have a pathname for this. */
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
                        status = smb_set_file_unix_hlink(conn, req,
                                                         pdata, total_data,
-                                                        fname);
+                                                        smb_fname);
                        break;
                }
 
@@ -7070,9 +7277,8 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 
                case SMB_SET_POSIX_LOCK:
                {
-                       if (tran_call != TRANSACT2_SETFILEINFO) {
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                       if (!fsp) {
+                               return NT_STATUS_INVALID_LEVEL;
                        }
                        status = smb_set_posix_lock(conn, req,
                                                    pdata, total_data, fsp);
@@ -7081,10 +7287,9 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 
                case SMB_POSIX_PATH_OPEN:
                {
-                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                       if (fsp) {
                                /* We must have a pathname for this. */
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
 
                        status = smb_posix_open(conn, req,
@@ -7098,25 +7303,212 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 
                case SMB_POSIX_PATH_UNLINK:
                {
-                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                       if (fsp) {
                                /* We must have a pathname for this. */
-                               reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                               return;
+                               return NT_STATUS_INVALID_LEVEL;
                        }
 
                        status = smb_posix_unlink(conn, req,
                                                pdata,
                                                total_data,
-                                               fname,
-                                               &sbuf);
+                                               smb_fname);
                        break;
                }
 
                default:
-                       reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                       return NT_STATUS_INVALID_LEVEL;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       *ret_data_size = data_return_size;
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Reply to a TRANS2_SETFILEINFO (set file info by fileid or pathname).
+****************************************************************************/
+
+static void call_trans2setfilepathinfo(connection_struct *conn,
+                                      struct smb_request *req,
+                                      unsigned int tran_call,
+                                      char **pparams, int total_params,
+                                      char **ppdata, int total_data,
+                                      unsigned int max_data_bytes)
+{
+       char *params = *pparams;
+       char *pdata = *ppdata;
+       uint16 info_level;
+       char *fname = NULL;
+       struct smb_filename *smb_fname = NULL;
+       files_struct *fsp = NULL;
+       NTSTATUS status = NT_STATUS_OK;
+       int data_return_size = 0;
+
+       if (!params) {
+               reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return;
+       }
+
+       if (tran_call == TRANSACT2_SETFILEINFO) {
+               if (total_params < 4) {
+                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+
+               fsp = file_fsp(req, SVAL(params,0));
+               /* Basic check for non-null fsp. */
+               if (!check_fsp_open(conn, req, fsp)) {
+                       return;
+               }
+               info_level = SVAL(params,2);
+
+               fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
+               if (!fname) {
+                       reply_nterror(req, NT_STATUS_NO_MEMORY);
+                       return;
+               }
+
+               status = create_synthetic_smb_fname_split(talloc_tos(), fname,
+                                                         NULL, &smb_fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       reply_nterror(req, status);
+                       return;
+               }
+
+               if(fsp->is_directory || fsp->fh->fd == -1) {
+                       /*
+                        * This is actually a SETFILEINFO on a directory
+                        * handle (returned from an NT SMB). NT5.0 seems
+                        * to do this call. JRA.
+                        */
+                       if (INFO_LEVEL_IS_UNIX(info_level)) {
+                               /* Always do lstat for UNIX calls. */
+                               if (SMB_VFS_LSTAT(conn, smb_fname)) {
+                                       DEBUG(3,("call_trans2setfilepathinfo: "
+                                                "SMB_VFS_LSTAT of %s failed "
+                                                "(%s)\n",
+                                                smb_fname_str_dbg(smb_fname),
+                                                strerror(errno)));
+                                       reply_nterror(req, map_nt_error_from_unix(errno));
+                                       return;
+                               }
+                       } else {
+                               if (SMB_VFS_STAT(conn, smb_fname) != 0) {
+                                       DEBUG(3,("call_trans2setfilepathinfo: "
+                                                "fileinfo of %s failed (%s)\n",
+                                                smb_fname_str_dbg(smb_fname),
+                                                strerror(errno)));
+                                       reply_nterror(req, map_nt_error_from_unix(errno));
+                                       return;
+                               }
+                       }
+               } else if (fsp->print_file) {
+                       /*
+                        * Doing a DELETE_ON_CLOSE should cancel a print job.
+                        */
+                       if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) {
+                               fsp->fh->private_options |= FILE_DELETE_ON_CLOSE;
+
+                               DEBUG(3,("call_trans2setfilepathinfo: Cancelling print job (%s)\n", fsp->fsp_name ));
+
+                               SSVAL(params,0,0);
+                               send_trans2_replies(conn, req, params, 2,
+                                                   *ppdata, 0,
+                                                   max_data_bytes);
+                               return;
+                       } else {
+                               reply_doserror(req, ERRDOS, ERRbadpath);
+                               return;
+                       }
+               } else {
+                       /*
+                        * Original code - this is an open file.
+                        */
+                       if (!check_fsp(conn, req, fsp)) {
+                               return;
+                       }
+
+                       if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
+                               DEBUG(3,("call_trans2setfilepathinfo: fstat "
+                                        "of fnum %d failed (%s)\n", fsp->fnum,
+                                        strerror(errno)));
+                               reply_nterror(req, map_nt_error_from_unix(errno));
+                               return;
+                       }
+               }
+       } else {
+               /* set path info */
+               if (total_params < 7) {
+                       reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+
+               info_level = SVAL(params,0);
+               srvstr_get_path(req, params, req->flags2, &fname, &params[6],
+                               total_params - 6, STR_TERMINATE,
+                               &status);
+               if (!NT_STATUS_IS_OK(status)) {
+                       reply_nterror(req, status);
+                       return;
+               }
+
+               status = filename_convert(req, conn,
+                                        req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                        fname,
+                                        &smb_fname,
+                                        &fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                               reply_botherror(req,
+                                               NT_STATUS_PATH_NOT_COVERED,
+                                               ERRSRV, ERRbadpath);
+                               return;
+                       }
+                       reply_nterror(req, status);
+                       return;
+               }
+
+               if (INFO_LEVEL_IS_UNIX(info_level)) {
+                       /*
+                        * For CIFS UNIX extensions the target name may not exist.
+                        */
+
+                       /* Always do lstat for UNIX calls. */
+                       SMB_VFS_LSTAT(conn, smb_fname);
+
+               } else if (!VALID_STAT(smb_fname->st) &&
+                          SMB_VFS_STAT(conn, smb_fname)) {
+                       DEBUG(3,("call_trans2setfilepathinfo: SMB_VFS_STAT of "
+                                "%s failed (%s)\n",
+                                smb_fname_str_dbg(smb_fname),
+                                strerror(errno)));
+                       reply_nterror(req, map_nt_error_from_unix(errno));
                        return;
+               }
+       }
+
+       DEBUG(3,("call_trans2setfilepathinfo(%d) %s (fnum %d) info_level=%d totdata=%d\n",
+               tran_call, fname, fsp ? fsp->fnum : -1, info_level,total_data));
+
+       /* Realloc the parameter size */
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if (*pparams == NULL) {
+               reply_nterror(req, NT_STATUS_NO_MEMORY);
+               return;
        }
+       params = *pparams;
+
+       SSVAL(params,0,0);
 
+       status = smbd_do_setfilepathinfo(conn, req, req,
+                                        info_level,
+                                        fsp,
+                                        smb_fname,
+                                        ppdata, total_data,
+                                        &data_return_size);
        if (!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(req->mid)) {
                        /* We have re-scheduled this call. */
@@ -7140,7 +7532,6 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                return;
        }
 
-       SSVAL(params,0,0);
        send_trans2_replies(conn, req, params, 2, *ppdata, data_return_size,
                            max_data_bytes);
 
@@ -7184,29 +7575,28 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
 
        DEBUG(3,("call_trans2mkdir : name = %s\n", directory));
 
-       status = unix_convert(ctx, conn, directory, &smb_dname, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               reply_nterror(req, status);
-               return;
-       }
-
-       status = get_full_smb_filename(ctx, smb_dname, &directory);
-       if (!NT_STATUS_IS_OK(status)) {
-               reply_nterror(req, status);
-               return;
-       }
+       status = filename_convert(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               directory,
+                               &smb_dname,
+                               NULL);
 
-       status = check_name(conn, directory);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(5,("call_trans2mkdir error (%s)\n", nt_errstr(status)));
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                               NT_STATUS_PATH_NOT_COVERED,
+                               ERRSRV, ERRbadpath);
+                       return;
+               }
                reply_nterror(req, status);
                return;
-       }
+        }
 
        /* Any data in this call is an EA list. */
        if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
                reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
-               return;
+               goto out;
        }
 
        /*
@@ -7218,21 +7608,21 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
        if (total_data != 4) {
                if (total_data < 10) {
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
 
                if (IVAL(pdata,0) > total_data) {
                        DEBUG(10,("call_trans2mkdir: bad total data size (%u) > %u\n",
                                IVAL(pdata,0), (unsigned int)total_data));
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
 
                ea_list = read_ea_list(talloc_tos(), pdata + 4,
                                       total_data - 4);
                if (!ea_list) {
                        reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return;
+                       goto out;
                }
        }
        /* If total_data == 4 Windows doesn't care what values
@@ -7240,19 +7630,19 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
         * The System i QNTC IBM SMB client puts bad values here,
         * so ignore them. */
 
-       status = create_directory(conn, req, directory);
+       status = create_directory(conn, req, smb_dname);
 
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);
-               return;
+               goto out;
        }
 
        /* Try and set any given EA. */
        if (ea_list) {
-               status = set_ea(conn, NULL, directory, ea_list);
+               status = set_ea(conn, NULL, smb_dname, ea_list);
                if (!NT_STATUS_IS_OK(status)) {
                        reply_nterror(req, status);
-                       return;
+                       goto out;
                }
        }
 
@@ -7260,7 +7650,7 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
        *pparams = (char *)SMB_REALLOC(*pparams,2);
        if(*pparams == NULL) {
                reply_nterror(req, NT_STATUS_NO_MEMORY);
-               return;
+               goto out;
        }
        params = *pparams;
 
@@ -7268,6 +7658,8 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
 
        send_trans2_replies(conn, req, params, 2, *ppdata, 0, max_data_bytes);
 
+ out:
+       TALLOC_FREE(smb_dname);
        return;
 }