r21108: Send sys_notify_watch through the VFS, FAM is next
[ira/wip.git] / source3 / smbd / trans2.c
index 9f22f65e34988ae67c9388eb8bf5347f14bb52e0..60becc95f67aaed49c1b51221cdfd8ff7de11684 100644 (file)
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    SMB transaction2 handling
-   Copyright (C) Jeremy Allison                        1994-2003
+   Copyright (C) Jeremy Allison                        1994-2007
    Copyright (C) Stefan (metze) Metzmacher     2003
    Copyright (C) Volker Lendecke               2005
    Copyright (C) Steve French                  2005
@@ -568,9 +568,9 @@ static struct ea_list *ea_list_union(struct ea_list *name_list, struct ea_list *
 
 int send_trans2_replies(char *outbuf,
                        int bufsize,
-                       char *params, 
+                       const char *params, 
                        int paramsize,
-                       char *pdata,
+                       const char *pdata,
                        int datasize,
                        int max_data_bytes)
 {
@@ -583,8 +583,8 @@ int send_trans2_replies(char *outbuf,
        int data_to_send = datasize;
        int params_to_send = paramsize;
        int useable_space;
-       char *pp = params;
-       char *pd = pdata;
+       const char *pp = params;
+       const char *pd = pdata;
        int params_sent_thistime, data_sent_thistime, total_sent_thistime;
        int alignment_offset = 1; /* JRA. This used to be 3. Set to 1 to make netmon parse ok. */
        int data_alignment_offset = 0;
@@ -751,7 +751,6 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
        SMB_INO_T inode = 0;
        SMB_STRUCT_STAT sbuf;
        int smb_action = 0;
-       BOOL bad_path = False;
        files_struct *fsp;
        struct ea_list *ea_list = NULL;
        uint16 flags = 0;
@@ -790,7 +789,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
                return(ERROR_DOS(ERRSRV,ERRaccess));
        }
 
-       srvstr_get_path(inbuf, fname, pname, sizeof(fname), -1, STR_TERMINATE, &status);
+       srvstr_get_path(inbuf, fname, pname, sizeof(fname), total_params - 28, STR_TERMINATE, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return ERROR_NT(status);
        }
@@ -801,13 +800,18 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
 
        /* XXXX we need to handle passed times, sattr and flags */
 
-       unix_convert(fname,conn,0,&bad_path,&sbuf);
-       if (bad_path) {
-               return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+       status = unix_convert(conn, fname, False, NULL, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
        }
     
-       if (!check_name(fname,conn)) {
-               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
+       status = check_name(conn, fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
+       }
+
+       if (open_ofun == 0) {
+               return ERROR_NT(NT_STATUS_OBJECT_NAME_COLLISION);
        }
 
        if (!map_open_params_to_ntcreate(fname, deny_mode, open_ofun,
@@ -857,7 +861,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
                        /* We have re-scheduled this call. */
                        return -1;
                }
-               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
+               return ERROR_NT(status);
        }
 
        size = get_file_size(sbuf);
@@ -909,7 +913,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
        params = *pparams;
 
        SSVAL(params,0,fsp->fnum);
-       SSVAL(params,2,open_attr);
+       SSVAL(params,2,fattr);
        srv_put_dos_date2(params,4, mtime);
        SIVAL(params,8, (uint32)size);
        SSVAL(params,12,deny_mode);
@@ -1001,12 +1005,24 @@ static uint32 unix_filetype(mode_t mode)
  Map wire perms onto standard UNIX permissions. Obey share restrictions.
 ****************************************************************************/
 
-static mode_t unix_perms_from_wire( connection_struct *conn, SMB_STRUCT_STAT *pst, uint32 perms)
+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,
+                               uint32 perms,
+                               enum perm_type ptype,
+                               mode_t *ret_perms)
 {
        mode_t ret = 0;
 
-       if (perms == SMB_MODE_NO_CHANGE)
-               return pst->st_mode;
+       if (perms == SMB_MODE_NO_CHANGE) {
+               if (!VALID_STAT(*psbuf)) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               } else {
+                       *ret_perms = psbuf->st_mode;
+                       return NT_STATUS_OK;
+               }
+       }
 
        ret |= ((perms & UNIX_X_OTH ) ? S_IXOTH : 0);
        ret |= ((perms & UNIX_W_OTH ) ? S_IWOTH : 0);
@@ -1027,18 +1043,34 @@ static mode_t unix_perms_from_wire( connection_struct *conn, SMB_STRUCT_STAT *ps
        ret |= ((perms & UNIX_SET_UID ) ? S_ISUID : 0);
 #endif
 
-       if (VALID_STAT(*pst) && S_ISDIR(pst->st_mode)) {
+       switch (ptype) {
+       case PERM_NEW_FILE:
+               /* Apply mode mask */
+               ret &= lp_create_mask(SNUM(conn));
+               /* Add in force bits */
+               ret |= lp_force_create_mode(SNUM(conn));
+               break;
+       case PERM_NEW_DIR:
                ret &= lp_dir_mask(SNUM(conn));
                /* Add in force bits */
                ret |= lp_force_dir_mode(SNUM(conn));
-       } else {
+               break;
+       case PERM_EXISTING_FILE:
                /* Apply mode mask */
-               ret &= lp_create_mask(SNUM(conn));
+               ret &= lp_security_mask(SNUM(conn));
                /* Add in force bits */
-               ret |= lp_force_create_mode(SNUM(conn));
+               ret |= lp_force_security_mode(SNUM(conn));
+               break;
+       case PERM_EXISTING_DIR:
+               /* Apply mode mask */
+               ret &= lp_dir_security_mask(SNUM(conn));
+               /* Add in force bits */
+               ret |= lp_force_dir_security_mode(SNUM(conn));
+               break;
        }
 
-       return ret;
+       *ret_perms = ret;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -1640,13 +1672,13 @@ static int call_trans2findfirst(connection_struct *conn, char *inbuf, char *outb
                requested. */
        char *params = *pparams;
        char *pdata = *ppdata;
-       uint32 dirtype = SVAL(params,0);
-       int maxentries = SVAL(params,2);
-       uint16 findfirst_flags = SVAL(params,4);
-       BOOL close_after_first = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE);
-       BOOL close_if_end = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
-       BOOL requires_resume_key = (findfirst_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
-       int info_level = SVAL(params,6);
+       uint32 dirtype;
+       int maxentries;
+       uint16 findfirst_flags;
+       BOOL close_after_first;
+       BOOL close_if_end;
+       BOOL requires_resume_key;
+       int info_level;
        pstring directory;
        pstring mask;
        char *p;
@@ -1658,17 +1690,24 @@ static int call_trans2findfirst(connection_struct *conn, char *inbuf, char *outb
        BOOL dont_descend = False;
        BOOL out_of_space = False;
        int space_remaining;
-       BOOL bad_path = False;
        BOOL mask_contains_wcard = False;
        SMB_STRUCT_STAT sbuf;
        TALLOC_CTX *ea_ctx = NULL;
        struct ea_list *ea_list = NULL;
        NTSTATUS ntstatus = NT_STATUS_OK;
 
-       if (total_params < 12) {
+       if (total_params < 13) {
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
+       dirtype = SVAL(params,0);
+       maxentries = SVAL(params,2);
+       findfirst_flags = SVAL(params,4);
+       close_after_first = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE);
+       close_if_end = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
+       requires_resume_key = (findfirst_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
+       info_level = SVAL(params,6);
+
        *directory = *mask = 0;
 
        DEBUG(3,("call_trans2findfirst: dirtype = %x, maxentries = %d, close_after_first=%d, \
@@ -1701,19 +1740,20 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
                        return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
-       srvstr_get_path_wcard(inbuf, directory, params+12, sizeof(directory), -1, STR_TERMINATE, &ntstatus, &mask_contains_wcard);
+       srvstr_get_path_wcard(inbuf, directory, params+12, sizeof(directory), total_params - 12, STR_TERMINATE, &ntstatus, &mask_contains_wcard);
        if (!NT_STATUS_IS_OK(ntstatus)) {
                return ERROR_NT(ntstatus);
        }
 
        RESOLVE_DFSPATH_WCARD(directory, conn, inbuf, outbuf);
 
-       unix_convert(directory,conn,0,&bad_path,&sbuf);
-       if (bad_path) {
-               return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+       ntstatus = unix_convert(conn, directory, True, NULL, &sbuf);
+       if (!NT_STATUS_IS_OK(ntstatus)) {
+               return ERROR_NT(ntstatus);
        }
-       if(!check_name(directory,conn)) {
-               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+       ntstatus = check_name(conn, directory);
+       if (!NT_STATUS_IS_OK(ntstatus)) {
+               return ERROR_NT(ntstatus);
        }
 
        p = strrchr_m(directory,'/');
@@ -1754,7 +1794,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                if ((ea_ctx = talloc_init("findnext_ea_list")) == NULL) {
                        return ERROR_NT(NT_STATUS_NO_MEMORY);
                }
-                                                                                                                                                        
+
                /* Pull out the list of names. */
                ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
                if (!ea_list) {
@@ -1782,13 +1822,23 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
        /* Save the wildcard match and attribs we are using on this directory - 
                needed as lanman2 assumes these are being saved between calls */
 
-       dptr_num = dptr_create(conn,directory, False, True ,SVAL(inbuf,smb_pid), mask, mask_contains_wcard, dirtype);
-       if (dptr_num < 0) {
+       ntstatus = dptr_create(conn,
+                               directory,
+                               False,
+                               True,
+                               SVAL(inbuf,smb_pid),
+                               mask,
+                               mask_contains_wcard,
+                               dirtype,
+                               &conn->dirptr);
+
+       if (!NT_STATUS_IS_OK(ntstatus)) {
                talloc_destroy(ea_ctx);
-               return(UNIXERROR(ERRDOS,ERRbadfile));
+               return ERROR_NT(ntstatus);
        }
 
-       DEBUG(4,("dptr_num is %d, wcard = %s, attr = %d\n",dptr_num, mask, dirtype));
+       dptr_num = dptr_dnum(conn->dirptr);
+       DEBUG(4,("dptr_num is %d, wcard = %s, attr = %d\n", dptr_num, mask, dirtype));
 
        /* We don't need to check for VOL here as this is returned by 
                a different TRANS2 call. */
@@ -1908,15 +1958,15 @@ static int call_trans2findnext(connection_struct *conn, char *inbuf, char *outbu
                requested. */
        char *params = *pparams;
        char *pdata = *ppdata;
-       int dptr_num = SVAL(params,0);
-       int maxentries = SVAL(params,2);
-       uint16 info_level = SVAL(params,4);
-       uint32 resume_key = IVAL(params,6);
-       uint16 findnext_flags = SVAL(params,10);
-       BOOL close_after_request = (findnext_flags & FLAG_TRANS2_FIND_CLOSE);
-       BOOL close_if_end = (findnext_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
-       BOOL requires_resume_key = (findnext_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
-       BOOL continue_bit = (findnext_flags & FLAG_TRANS2_FIND_CONTINUE);
+       int dptr_num;
+       int maxentries;
+       uint16 info_level;
+       uint32 resume_key;
+       uint16 findnext_flags;
+       BOOL close_after_request;
+       BOOL close_if_end;
+       BOOL requires_resume_key;
+       BOOL continue_bit;
        BOOL mask_contains_wcard = False;
        pstring resume_name;
        pstring mask;
@@ -1933,13 +1983,23 @@ static int call_trans2findnext(connection_struct *conn, char *inbuf, char *outbu
        struct ea_list *ea_list = NULL;
        NTSTATUS ntstatus = NT_STATUS_OK;
 
-       if (total_params < 12) {
+       if (total_params < 13) {
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
+       dptr_num = SVAL(params,0);
+       maxentries = SVAL(params,2);
+       info_level = SVAL(params,4);
+       resume_key = IVAL(params,6);
+       findnext_flags = SVAL(params,10);
+       close_after_request = (findnext_flags & FLAG_TRANS2_FIND_CLOSE);
+       close_if_end = (findnext_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
+       requires_resume_key = (findnext_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
+       continue_bit = (findnext_flags & FLAG_TRANS2_FIND_CONTINUE);
+
        *mask = *directory = *resume_name = 0;
 
-       srvstr_get_path_wcard(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE, &ntstatus, &mask_contains_wcard);
+       srvstr_get_path_wcard(inbuf, resume_name, params+12, sizeof(resume_name), total_params - 12, STR_TERMINATE, &ntstatus, &mask_contains_wcard);
        if (!NT_STATUS_IS_OK(ntstatus)) {
                /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to
                   complain (it thinks we're asking for the directory above the shared
@@ -2174,7 +2234,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
 {
        char *pdata = *ppdata;
        char *params = *pparams;
-       uint16 info_level = SVAL(params,0);
+       uint16 info_level;
        int data_len, len;
        SMB_STRUCT_STAT st;
        char *vname = volume_label(SNUM(conn));
@@ -2182,6 +2242,12 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
        char *fstype = lp_fstype(SNUM(conn));
        int quota_flag = 0;
 
+       if (total_params < 2) {
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
+
+       info_level = SVAL(params,0);
+
        DEBUG(3,("call_trans2qfsinfo: level = %d\n", info_level));
 
        if(SMB_VFS_STAT(conn,".",&st)!=0) {
@@ -2674,25 +2740,6 @@ cap_low = 0x%x, cap_high = 0x%x\n",
        return outsize;
 }
 
-/****************************************************************************
- Utility function to set bad path error.
-****************************************************************************/
-
-int set_bad_path_error(int err, BOOL bad_path, char *outbuf, int def_class, uint32 def_code)
-{
-       DEBUG(10,("set_bad_path_error: err = %d bad_path = %d\n",
-                       err, (int)bad_path ));
-
-       if(err == ENOENT) {
-               if (bad_path) {
-                       return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
-               } else {
-                       return ERROR_NT(NT_STATUS_OBJECT_NAME_NOT_FOUND);
-               }
-       }
-       return UNIXERROR(def_class,def_code);
-}
-
 #if defined(HAVE_POSIX_ACLS)
 /****************************************************************************
  Utility function to count the number of entries in a POSIX acl.
@@ -2835,7 +2882,6 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
        char *base_name;
        char *p;
        SMB_OFF_T pos = 0;
-       BOOL bad_path = False;
        BOOL delete_pending = False;
        int len;
        time_t create_time, mtime, atime;
@@ -2882,11 +2928,11 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                                /* 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)));
-                                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+                                       return UNIXERROR(ERRDOS,ERRbadpath);
                                }
                        } else if (SMB_VFS_STAT(conn,fname,&sbuf)) {
                                DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+                               return UNIXERROR(ERRDOS,ERRbadpath);
                        }
 
                        delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
@@ -2909,7 +2955,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                NTSTATUS status = NT_STATUS_OK;
 
                /* qpathinfo */
-               if (total_params < 6) {
+               if (total_params < 7) {
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
@@ -2917,31 +2963,32 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
 
                DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
-               srvstr_get_path(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE, &status);
+               srvstr_get_path(inbuf, fname, &params[6], sizeof(fname), total_params - 6, STR_TERMINATE, &status);
                if (!NT_STATUS_IS_OK(status)) {
                        return ERROR_NT(status);
                }
 
                RESOLVE_DFSPATH(fname, conn, inbuf, outbuf);
 
-               unix_convert(fname,conn,0,&bad_path,&sbuf);
-               if (bad_path) {
-                       return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+               status = unix_convert(conn, fname, False, NULL, &sbuf);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
                }
-               if (!check_name(fname,conn)) {
-                       DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+               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)));
+                       return ERROR_NT(status);
                }
 
                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)));
-                               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+                               return UNIXERROR(ERRDOS,ERRbadpath);
                        }
                } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) {
                        DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+                       return UNIXERROR(ERRDOS,ERRbadpath);
                }
 
                delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
@@ -3660,10 +3707,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
  code.
 ****************************************************************************/
 
-NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newname)
+NTSTATUS hardlink_internals(connection_struct *conn, pstring oldname, pstring newname)
 {
-       BOOL bad_path_oldname = False;
-       BOOL bad_path_newname = False;
        SMB_STRUCT_STAT sbuf1, sbuf2;
        pstring last_component_oldname;
        pstring last_component_newname;
@@ -3672,21 +3717,9 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam
        ZERO_STRUCT(sbuf1);
        ZERO_STRUCT(sbuf2);
 
-       /* No wildcards. */
-       if (ms_has_wild(newname) || ms_has_wild(oldname)) {
-               return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
-       }
-
-       unix_convert(oldname,conn,last_component_oldname,&bad_path_oldname,&sbuf1);
-       if (bad_path_oldname) {
-               return NT_STATUS_OBJECT_PATH_NOT_FOUND;
-       }
-
-       /* Quick check for "." and ".." */
-       if (last_component_oldname[0] == '.') {
-               if (!last_component_oldname[1] || (last_component_oldname[1] == '.' && !last_component_oldname[2])) {
-                       return NT_STATUS_OBJECT_NAME_INVALID;
-               }
+       status = unix_convert(conn, oldname, False, last_component_oldname, &sbuf1);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        /* source must already exist. */
@@ -3694,20 +3727,14 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       if (!check_name(oldname,conn)) {
+       status = check_name(conn, oldname);
+       if (!NT_STATUS_IS_OK(status)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       unix_convert(newname,conn,last_component_newname,&bad_path_newname,&sbuf2);
-       if (bad_path_newname) {
-               return NT_STATUS_OBJECT_PATH_NOT_FOUND;
-       }
-
-       /* Quick check for "." and ".." */
-       if (last_component_newname[0] == '.') {
-               if (!last_component_newname[1] || (last_component_newname[1] == '.' && !last_component_newname[2])) {
-                       return NT_STATUS_OBJECT_NAME_INVALID;
-               }
+       status = unix_convert(conn, newname, False, last_component_newname, &sbuf2);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        /* Disallow if newname already exists. */
@@ -3715,7 +3742,8 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam
                return NT_STATUS_OBJECT_NAME_COLLISION;
        }
 
-       if (!check_name(newname,conn)) {
+       status = check_name(conn, newname);
+       if (!NT_STATUS_IS_OK(status)) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -3725,8 +3753,10 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam
        }
 
        /* Ensure this is within the share. */
-       if (!reduce_name(conn, oldname) != 0)
-               return NT_STATUS_ACCESS_DENIED;
+       status = reduce_name(conn, oldname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        DEBUG(10,("hardlink_internals: doing hard link %s -> %s\n", newname, oldname ));
 
@@ -3740,1019 +3770,1407 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam
 }
 
 /****************************************************************************
Reply to a TRANS2_SETFILEINFO (set file info by fileid).
Deal with setting the time from any of the setfilepathinfo functions.
 ****************************************************************************/
 
-static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
-                                       unsigned int tran_call,
-                                       char **pparams, int total_params, char **ppdata, int total_data,
-                                       unsigned int max_data_bytes)
+static NTSTATUS smb_set_file_time(connection_struct *conn,
+                               files_struct *fsp,
+                               const char *fname,
+                               const SMB_STRUCT_STAT *psbuf,
+                               struct utimbuf tvs)
 {
-       char *params = *pparams;
-       char *pdata = *ppdata;
-       uint16 info_level;
-       int dosmode=0;
-       SMB_OFF_T size=0;
-       struct utimbuf tvs;
-       SMB_STRUCT_STAT sbuf;
-       pstring fname;
-       int fd = -1;
-       BOOL bad_path = False;
-       files_struct *fsp = NULL;
-       uid_t set_owner = (uid_t)SMB_UID_NO_CHANGE;
-       gid_t set_grp = (uid_t)SMB_GID_NO_CHANGE;
-       mode_t unixmode = 0;
-       NTSTATUS status = NT_STATUS_OK;
-
-       if (!params)
-               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-
-       ZERO_STRUCT(sbuf);
-       ZERO_STRUCT(tvs);
-
-       if (tran_call == TRANSACT2_SETFILEINFO) {
-               if (total_params < 4) {
-                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-               }
-
-               fsp = file_fsp(params,0);
-               info_level = SVAL(params,2);    
+       if (!VALID_STAT(*psbuf)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
 
-               if(fsp && (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.
-                        */
-                       pstrcpy(fname, fsp->fsp_name);
-                       if (SMB_VFS_STAT(conn,fname,&sbuf) != 0) {
-                               DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-                               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
-                       }
-               } else if (fsp && 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;
+       /* get some defaults (no modifications) if any info is zero or -1. */
+       if (null_mtime(tvs.actime)) {
+               tvs.actime = psbuf->st_atime;
+       }
 
-                               DEBUG(3,("call_trans2setfilepathinfo: Cancelling print job (%s)\n", fsp->fsp_name ));
-       
-                               SSVAL(params,0,0);
-                               send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                               return(-1);
-                       } else
-                               return (UNIXERROR(ERRDOS,ERRbadpath));
-           } else {
-                       /*
-                        * Original code - this is an open file.
-                        */
-                       CHECK_FSP(fsp,conn);
+       if (null_mtime(tvs.modtime)) {
+               tvs.modtime = psbuf->st_mtime;
+       }
 
-                       pstrcpy(fname, fsp->fsp_name);
-                       fd = fsp->fh->fd;
+       DEBUG(6,("smb_set_file_time: actime: %s " , ctime(&tvs.actime)));
+       DEBUG(6,("smb_set_file_time: modtime: %s ", ctime(&tvs.modtime)));
 
-                       if (SMB_VFS_FSTAT(fsp,fd,&sbuf) != 0) {
-                               DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
-                               return(UNIXERROR(ERRDOS,ERRbadfid));
-                       }
-               }
-       } else {
-               /* set path info */
-               if (total_params < 6) {
-                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-               }
+       /*
+        * Try and set the times of this file if
+        * they are different from the current values.
+        */
 
-               info_level = SVAL(params,0);    
-               srvstr_get_path(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE, &status);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return ERROR_NT(status);
-               }
-               unix_convert(fname,conn,0,&bad_path,&sbuf);
-               if (bad_path) {
-                       return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
-               }
+       if (psbuf->st_mtime == tvs.modtime && psbuf->st_atime == tvs.actime) {
+               return NT_STATUS_OK;
+       }
 
+       if(fsp != NULL) {
                /*
-                * For CIFS UNIX extensions the target name may not exist.
+                * This was a 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
+                * in smbd/fileio.c it ensures that this timestamp is
+                * kept sticky even after a write. We save the request
+                * away and will set it on file close and after a write. JRA.
                 */
 
-               if(!VALID_STAT(sbuf) && !INFO_LEVEL_IS_UNIX(info_level)) {
-                       DEBUG(3,("call_trans2setfilepathinfo: stat of %s failed (%s)\n", fname, strerror(errno)));
-                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
-               }    
-
-               if(!check_name(fname, conn)) {
-                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+               if (tvs.modtime != (time_t)0 && tvs.modtime != (time_t)-1) {
+                       DEBUG(10,("smb_set_file_time: setting pending modtime to %s\n", ctime(&tvs.modtime) ));
+                       fsp_set_pending_modtime(fsp, tvs.modtime);
                }
 
        }
+       DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
-       if (!CAN_WRITE(conn))
-               return ERROR_DOS(ERRSRV,ERRaccess);
-
-       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+       if(file_utime(conn, fname, &tvs)!=0) {
+               return map_nt_error_from_unix(errno);
        }
+       return NT_STATUS_OK;
+}
 
-       if (VALID_STAT(sbuf))
-               unixmode = sbuf.st_mode;
-
-       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));
+/****************************************************************************
+ Deal with setting the dosmode from any of the setfilepathinfo functions.
+****************************************************************************/
 
-       /* Realloc the parameter size */
-       *pparams = (char *)SMB_REALLOC(*pparams,2);
-       if (*pparams == NULL) {
-               return ERROR_NT(NT_STATUS_NO_MEMORY);
+static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
+                               const char *fname,
+                               SMB_STRUCT_STAT *psbuf,
+                               uint32 dosmode)
+{
+       if (!VALID_STAT(*psbuf)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
-       params = *pparams;
-
-       SSVAL(params,0,0);
 
-       if (fsp && fsp->pending_modtime) {
-               /* the pending modtime overrides the current modtime */
-               sbuf.st_mtime = fsp->pending_modtime;
+       if (dosmode) {
+               if (S_ISDIR(psbuf->st_mode)) {
+                       dosmode |= aDIR;
+               } else {
+                       dosmode &= ~aDIR;
+               }
        }
 
-       size = get_file_size(sbuf);
-       tvs.modtime = sbuf.st_mtime;
-       tvs.actime = sbuf.st_atime;
-       dosmode = dos_mode(conn,fname,&sbuf);
-       unixmode = sbuf.st_mode;
+       DEBUG(6,("smb_set_file_dosmode: dosmode: 0x%x\n", (unsigned int)dosmode));
 
-       set_owner = VALID_STAT(sbuf) ? sbuf.st_uid : (uid_t)SMB_UID_NO_CHANGE;
-       set_grp = VALID_STAT(sbuf) ? sbuf.st_gid : (gid_t)SMB_GID_NO_CHANGE;
+       /* check the mode isn't different, before changing it */
+       if ((dosmode != 0) && (dosmode != dos_mode(conn, fname, psbuf))) {
 
-       switch (info_level) {
-               case SMB_INFO_STANDARD:
-               {
-                       if (total_data < 12) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+               DEBUG(10,("smb_set_file_dosmode: file %s : setting dos mode 0x%x\n",
+                                       fname, (unsigned int)dosmode ));
 
-                       /* access time */
-                       tvs.actime = srv_make_unix_date2(pdata+l1_fdateLastAccess);
-                       /* write time */
-                       tvs.modtime = srv_make_unix_date2(pdata+l1_fdateLastWrite);
-                       break;
+               if(file_set_dosmode(conn, fname, dosmode, psbuf, 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);
                }
+       }
+       return NT_STATUS_OK;
+}
 
-               case SMB_INFO_SET_EA:
-               {
-                       struct ea_list *ea_list = NULL;
-                       TALLOC_CTX *ctx = NULL;
-
-                       if (total_data < 10) {
-
-                               /* OS/2 workplace shell seems to send SET_EA requests of "null"
-                                  length. They seem to have no effect. Bug #3212. JRA */
+/****************************************************************************
+ Deal with setting the size from any of the setfilepathinfo functions.
+****************************************************************************/
 
-                               if ((total_data == 4) && (IVAL(pdata,0) == 4)) {
-                                       /* We're done. We only get EA info in this call. */
-                                       SSVAL(params,0,0);
-                                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                                       return(-1);
-                               }
+static NTSTATUS smb_set_file_size(connection_struct *conn,
+                               files_struct *fsp,
+                               const char *fname,
+                               SMB_STRUCT_STAT *psbuf,
+                               SMB_OFF_T size)
+{
+       NTSTATUS status = NT_STATUS_OK;
+       files_struct *new_fsp = NULL;
 
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+       if (!VALID_STAT(*psbuf)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
 
-                       if (IVAL(pdata,0) > total_data) {
-                               DEBUG(10,("call_trans2setfilepathinfo: bad total data size (%u) > %u\n",
-                                       IVAL(pdata,0), (unsigned int)total_data));
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+       DEBUG(6,("smb_set_file_size: size: %.0f ", (double)size));
 
-                       ctx = talloc_init("SMB_INFO_SET_EA");
-                       if (!ctx) {
-                               return ERROR_NT(NT_STATUS_NO_MEMORY);
-                       }
-                       ea_list = read_ea_list(ctx, pdata + 4, total_data - 4);
-                       if (!ea_list) {
-                               talloc_destroy(ctx);
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-                       status = set_ea(conn, fsp, fname, ea_list);
-                       talloc_destroy(ctx);
+       if (size == get_file_size(*psbuf)) {
+               return NT_STATUS_OK;
+       }
 
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
-                       }
+       DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
+               fname, (double)size ));
 
-                       /* We're done. We only get EA info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+       if (fsp && fsp->fh->fd != -1) {
+               /* Handle based call. */
+               if (vfs_set_filelen(fsp, size) == -1) {
+                       return map_nt_error_from_unix(errno);
                }
+               return NT_STATUS_OK;
+       }
 
-#if 0
-               /* The following 2 info levels are only valid on query, not set. Remove them. JRA. */
-               /* XXXX um, i don't think this is right.
-                       it's also not in the cifs6.txt spec.
-               */
-               case SMB_INFO_QUERY_EAS_FROM_LIST:
-                       if (total_data < 28)
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       status = open_file_ntcreate(conn, fname, psbuf,
+                               FILE_WRITE_DATA,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FORCE_OPLOCK_BREAK_TO_NONE,
+                               NULL, &new_fsp);
+       
+       if (!NT_STATUS_IS_OK(status)) {
+               /* NB. We check for open_was_deferred in the caller. */
+               return status;
+       }
 
-                       tvs.actime = make_unix_date2(pdata+8);
-                       tvs.modtime = make_unix_date2(pdata+12);
-                       size = IVAL(pdata,16);
-                       dosmode = IVAL(pdata,24);
-                       break;
+       if (vfs_set_filelen(new_fsp, size) == -1) {
+               status = map_nt_error_from_unix(errno);
+               close_file(new_fsp,NORMAL_CLOSE);
+               return status;
+       }
 
-               /* XXXX nor this.  not in cifs6.txt, either. */
-               case SMB_INFO_QUERY_ALL_EAS:
-                       if (total_data < 28)
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       close_file(new_fsp,NORMAL_CLOSE);
+       return NT_STATUS_OK;
+}
 
-                       tvs.actime = make_unix_date2(pdata+8);
-                       tvs.modtime = make_unix_date2(pdata+12);
-                       size = IVAL(pdata,16);
-                       dosmode = IVAL(pdata,24);
-                       break;
-#endif
+/****************************************************************************
+ Deal with SMB_INFO_SET_EA.
+****************************************************************************/
 
-               case SMB_SET_FILE_BASIC_INFO:
-               case SMB_FILE_BASIC_INFORMATION:
-               {
-                       /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
-                       time_t write_time;
-                       time_t changed_time;
+static NTSTATUS smb_info_set_ea(connection_struct *conn,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp,
+                               const char *fname)
+{
+       struct ea_list *ea_list = NULL;
+       TALLOC_CTX *ctx = NULL;
+       NTSTATUS status = NT_STATUS_OK;
 
-                       if (total_data < 36) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+       if (total_data < 10) {
 
-                       /* Ignore create time at offset pdata. */
+               /* OS/2 workplace shell seems to send SET_EA requests of "null"
+                  length. They seem to have no effect. Bug #3212. JRA */
 
-                       /* access time */
-                       tvs.actime = convert_timespec_to_time_t(interpret_long_date(pdata+8));
+               if ((total_data == 4) && (IVAL(pdata,0) == 4)) {
+                       /* We're done. We only get EA info in this call. */
+                       return NT_STATUS_OK;
+               }
 
-                       write_time = convert_timespec_to_time_t(interpret_long_date(pdata+16));
-                       changed_time = convert_timespec_to_time_t(interpret_long_date(pdata+24));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       tvs.modtime = MIN(write_time, changed_time);
+       if (IVAL(pdata,0) > total_data) {
+               DEBUG(10,("smb_info_set_ea: bad total data size (%u) > %u\n",
+                       IVAL(pdata,0), (unsigned int)total_data));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       if (write_time > tvs.modtime && write_time != (time_t)-1) {
-                               tvs.modtime = write_time;
-                       }
-                       /* Prefer a defined time to an undefined one. */
-                       if (null_mtime(tvs.modtime)) {
-                               tvs.modtime = null_mtime(write_time) ? changed_time : write_time;
-                       }
+       ctx = talloc_init("SMB_INFO_SET_EA");
+       if (!ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       ea_list = read_ea_list(ctx, pdata + 4, total_data - 4);
+       if (!ea_list) {
+               talloc_destroy(ctx);
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       status = set_ea(conn, fsp, fname, ea_list);
+       talloc_destroy(ctx);
 
-                       /* attributes */
-                       dosmode = IVAL(pdata,32);
-                       break;
-               }
+       return status;
+}
 
-               case SMB_FILE_ALLOCATION_INFORMATION:
-               case SMB_SET_FILE_ALLOCATION_INFO:
-               {
-                       int ret = -1;
-                       SMB_BIG_UINT allocation_size;
+/****************************************************************************
+ Deal with SMB_SET_FILE_DISPOSITION_INFO.
+****************************************************************************/
 
-                       if (total_data < 8) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+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)
+{
+       NTSTATUS status = NT_STATUS_OK;
+       BOOL delete_on_close;
+       uint32 dosmode = 0;
 
-                       allocation_size = (SMB_BIG_UINT)IVAL(pdata,0);
-#ifdef LARGE_SMB_OFF_T
-                       allocation_size |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
-#else /* LARGE_SMB_OFF_T */
-                       if (IVAL(pdata,4) != 0) {
-                               /* more than 32 bits? */
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-#endif /* LARGE_SMB_OFF_T */
-                       DEBUG(10,("call_trans2setfilepathinfo: Set file allocation info for file %s to %.0f\n",
-                                       fname, (double)allocation_size ));
+       if (total_data < 1) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       if (allocation_size) {
-                               allocation_size = smb_roundup(conn, allocation_size);
-                       }
+       if (fsp == NULL) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
 
-                       if(allocation_size != get_file_size(sbuf)) {
-                               SMB_STRUCT_STAT new_sbuf;
-                               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new allocation size to %.0f\n",
-                                       fname, (double)allocation_size ));
-                               if (fd == -1) {
-                                       files_struct *new_fsp = NULL;
-                                       status = open_file_ntcreate(conn, fname, &sbuf,
-                                                                       FILE_WRITE_DATA,
-                                                                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-                                                                       FILE_OPEN,
-                                                                       0,
-                                                                       FILE_ATTRIBUTE_NORMAL,
-                                                                       FORCE_OPLOCK_BREAK_TO_NONE,
-                                                                       NULL, &new_fsp);
+       delete_on_close = (CVAL(pdata,0) ? True : False);
+       dosmode = dos_mode(conn, fname, psbuf);
+
+       status = can_set_delete_on_close(fsp, delete_on_close, dosmode);
  
-                                       if (!NT_STATUS_IS_OK(status)) {
-                                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
-                                                       /* We have re-scheduled this call. */
-                                                       return -1;
-                                               }
-                                               return(UNIXERROR(ERRDOS,ERRnoaccess));
-                                       }
-                                       ret = vfs_allocate_file_space(new_fsp, allocation_size);
-                                       if (SMB_VFS_FSTAT(new_fsp,new_fsp->fh->fd,&new_sbuf) != 0) {
-                                               DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",
-                                                                       new_fsp->fnum, strerror(errno)));
-                                               ret = -1;
-                                       }
-                                       close_file(new_fsp,NORMAL_CLOSE);
-                               } else {
-                                       ret = vfs_allocate_file_space(fsp, allocation_size);
-                                       if (SMB_VFS_FSTAT(fsp,fd,&new_sbuf) != 0) {
-                                               DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",
-                                                                       fsp->fnum, strerror(errno)));
-                                               ret = -1;
-                                       }
-                               }
-                               if (ret == -1)
-                                       return ERROR_NT(NT_STATUS_DISK_FULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-                               /* Allocate can truncate size... */
-                               size = get_file_size(new_sbuf);
-                       }
+       /* The set is across all open files on this dev/inode pair. */
+       if (!set_delete_on_close(fsp, delete_on_close, &current_user.ut)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+       return NT_STATUS_OK;
+}
 
-                       break;
-               }
+/****************************************************************************
+ Deal with SMB_FILE_POSITION_INFORMATION.
+****************************************************************************/
 
-               case SMB_FILE_END_OF_FILE_INFORMATION:
-               case SMB_SET_FILE_END_OF_FILE_INFO:
-               {
-                       if (total_data < 8) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+static NTSTATUS smb_file_position_information(connection_struct *conn,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp)
+{
+       SMB_BIG_UINT position_information;
+
+       if (total_data < 8) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (fsp == NULL) {
+               /* Ignore on pathname based set. */
+               return NT_STATUS_OK;
+       }
 
-                       size = IVAL(pdata,0);
+       position_information = (SMB_BIG_UINT)IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-                       size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+       position_information |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
-                       if (IVAL(pdata,4) != 0) {
-                               /* more than 32 bits? */
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+       if (IVAL(pdata,4) != 0) {
+               /* more than 32 bits? */
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
 #endif /* LARGE_SMB_OFF_T */
-                       DEBUG(10,("call_trans2setfilepathinfo: Set end of file info for file %s to %.0f\n", fname, (double)size ));
-                       break;
-               }
 
-               case SMB_FILE_DISPOSITION_INFORMATION:
-               case SMB_SET_FILE_DISPOSITION_INFO: /* Set delete on close for open file. */
-               {
-                       BOOL delete_on_close;
+       DEBUG(10,("smb_file_position_information: Set file position information for file %s to %.0f\n",
+               fsp->fsp_name, (double)position_information ));
+       fsp->fh->position_information = position_information;
+       return NT_STATUS_OK;
+}
 
-                       if (total_data < 1) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+/****************************************************************************
+ Deal with SMB_FILE_MODE_INFORMATION.
+****************************************************************************/
 
-                       delete_on_close = (CVAL(pdata,0) ? True : False);
+static NTSTATUS smb_file_mode_information(connection_struct *conn,
+                               const char *pdata,
+                               int total_data)
+{
+       uint32 mode;
 
-                       /* Just ignore this set on a path. */
-                       if (tran_call != TRANSACT2_SETFILEINFO)
-                               break;
+       if (total_data < 4) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       mode = IVAL(pdata,0);
+       if (mode != 0 && mode != 2 && mode != 4 && mode != 6) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       return NT_STATUS_OK;
+}
 
-                       if (fsp == NULL)
-                               return(UNIXERROR(ERRDOS,ERRbadfid));
+/****************************************************************************
+ Deal with SMB_SET_FILE_UNIX_LINK (create a UNIX symlink).
+****************************************************************************/
 
-                       status = can_set_delete_on_close(fsp, delete_on_close,
-                                                        dosmode);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
-                       }
+static NTSTATUS smb_set_file_unix_link(connection_struct *conn,
+                               char *inbuf,
+                               const char *pdata,
+                               int total_data,
+                               const char *fname)
+{
+       pstring link_target;
+       const char *newname = fname;
+       NTSTATUS status = NT_STATUS_OK;
 
-                       /* The set is across all open files on this dev/inode pair. */
-                       if (!set_delete_on_close(fsp, delete_on_close, &current_user.ut)) {
-                               return ERROR_NT(NT_STATUS_ACCESS_DENIED);
-                       }
+       /* Set a symbolic link. */
+       /* Don't allow this if follow links is false. */
 
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
-               }
+       if (total_data == 0) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-               case SMB_FILE_POSITION_INFORMATION:
-               {
-                       SMB_BIG_UINT position_information;
+       if (!lp_symlinks(SNUM(conn))) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-                       if (total_data < 8) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+       srvstr_pull(inbuf, link_target, pdata, sizeof(link_target), total_data, STR_TERMINATE);
 
-                       position_information = (SMB_BIG_UINT)IVAL(pdata,0);
-#ifdef LARGE_SMB_OFF_T
-                       position_information |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
-#else /* LARGE_SMB_OFF_T */
-                       if (IVAL(pdata,4) != 0) {
-                               /* more than 32 bits? */
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-#endif /* LARGE_SMB_OFF_T */
-                       DEBUG(10,("call_trans2setfilepathinfo: Set file position information for file %s to %.0f\n",
-                                       fname, (double)position_information ));
-                       if (fsp) {
-                               fsp->fh->position_information = position_information;
-                       }
+       /* !widelinks forces the target path to be within the share. */
+       /* This means we can interpret the target as a pathname. */
+       if (!lp_widelinks(SNUM(conn))) {
+               pstring rel_name;
+               char *last_dirp = NULL;
 
-                       /* We're done. We only get position info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+               unix_format(link_target);
+               if (*link_target == '/') {
+                       /* No absolute paths allowed. */
+                       return NT_STATUS_ACCESS_DENIED;
                }
+               pstrcpy(rel_name, newname);
+               last_dirp = strrchr_m(rel_name, '/');
+               if (last_dirp) {
+                       last_dirp[1] = '\0';
+               } else {
+                       pstrcpy(rel_name, "./");
+               }
+               pstrcat(rel_name, link_target);
 
-               /* From tridge Samba4 : 
-                * MODE_INFORMATION in setfileinfo (I have no
-                * idea what "mode information" on a file is - it takes a value of 0,
-                * 2, 4 or 6. What could it be?).
-                */
+               status = check_name(conn, rel_name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+       }
 
-               case SMB_FILE_MODE_INFORMATION:
-               {
-                       uint32 mode;
+       DEBUG(10,("smb_set_file_unix_link: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n",
+                       newname, link_target ));
 
-                       if (total_data < 4) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-                       mode = IVAL(pdata,0);
-                       if (mode != 0 && mode != 2 && mode != 4 && mode != 6) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       if (SMB_VFS_SYMLINK(conn,link_target,newname) != 0) {
+               return map_nt_error_from_unix(errno);
+       }
+
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_UNIX_HLINK (create a UNIX hard link).
+****************************************************************************/
+
+static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
+                               char *inbuf,
+                               const char *pdata,
+                               int total_data,
+                               pstring fname)
+{
+       pstring oldname;
+       NTSTATUS status = NT_STATUS_OK;
+
+       /* Set a hard link. */
+       if (total_data == 0) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       srvstr_get_path(inbuf, oldname, pdata, sizeof(oldname), total_data, STR_TERMINATE, &status);
+       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(conn, oldname, fname);
+}
+
+/****************************************************************************
+ Deal with SMB_FILE_RENAME_INFORMATION.
+****************************************************************************/
+
+static NTSTATUS smb_file_rename_information(connection_struct *conn,
+                               char *inbuf,
+                               char *outbuf,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp,
+                               pstring fname)
+{
+       BOOL overwrite;
+       /* uint32 root_fid; */  /* Not used */
+       uint32 len;
+       pstring newname;
+       pstring base_name;
+       NTSTATUS status = NT_STATUS_OK;
+       char *p;
+
+       if (total_data < 13) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       overwrite = (CVAL(pdata,0) ? True : False);
+       /* root_fid = IVAL(pdata,4); */
+       len = IVAL(pdata,8);
+
+       if (len > (total_data - 12) || (len == 0)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       srvstr_get_path(inbuf, newname, &pdata[12], sizeof(newname), len, 0, &status);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* Check the new name has no '/' characters. */
+       if (strchr_m(newname, '/')) {
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+
+       RESOLVE_DFSPATH_STATUS(newname, conn, inbuf, outbuf);
+
+       /* Create the base directory. */
+       pstrcpy(base_name, fname);
+       p = strrchr_m(base_name, '/');
+       if (p) {
+               *p = '\0';
+       }
+       /* Append the new name. */
+       pstrcat(base_name, "/");
+       pstrcat(base_name, newname);
+
+       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, 0, overwrite);
+       } else {
+               DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION %s -> %s\n",
+                       fname, newname ));
+               status = rename_internals(conn, fname, base_name, 0, overwrite, False);
+       }
+
+       return status;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_POSIX_ACL.
+****************************************************************************/
+
+#if defined(HAVE_POSIX_ACLS)
+static NTSTATUS smb_set_posix_acl(connection_struct *conn,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp,
+                               const char *fname,
+                               SMB_STRUCT_STAT *psbuf)
+{
+       uint16 posix_acl_version;
+       uint16 num_file_acls;
+       uint16 num_def_acls;
+       BOOL valid_file_acls = True;
+       BOOL valid_def_acls = True;
+
+       if (total_data < SMB_POSIX_ACL_HEADER_SIZE) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+       posix_acl_version = SVAL(pdata,0);
+       num_file_acls = SVAL(pdata,2);
+       num_def_acls = SVAL(pdata,4);
+
+       if (num_file_acls == SMB_POSIX_IGNORE_ACE_ENTRIES) {
+               valid_file_acls = False;
+               num_file_acls = 0;
+       }
+
+       if (num_def_acls == SMB_POSIX_IGNORE_ACE_ENTRIES) {
+               valid_def_acls = False;
+               num_def_acls = 0;
+       }
+
+       if (posix_acl_version != SMB_POSIX_ACL_VERSION) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (total_data < SMB_POSIX_ACL_HEADER_SIZE +
+                       (num_file_acls+num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (valid_file_acls && !set_unix_posix_acl(conn, fsp, fname, num_file_acls,
+                       pdata + SMB_POSIX_ACL_HEADER_SIZE)) {
+               return map_nt_error_from_unix(errno);
+       }
+
+       if (valid_def_acls && !set_unix_posix_default_acl(conn, fname, psbuf, num_def_acls,
+                       pdata + SMB_POSIX_ACL_HEADER_SIZE +
+                       (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE))) {
+               return map_nt_error_from_unix(errno);
+       }
+       return NT_STATUS_OK;
+}
+#endif
+
+/****************************************************************************
+ Deal with SMB_SET_POSIX_LOCK.
+****************************************************************************/
+
+static NTSTATUS smb_set_posix_lock(connection_struct *conn,
+                               char *inbuf,
+                               int length,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp)
+{
+       SMB_BIG_UINT count;
+       SMB_BIG_UINT offset;
+       uint32 lock_pid;
+       BOOL blocking_lock = False;
+       enum brl_type lock_type;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (fsp == NULL || fsp->fh->fd == -1) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (total_data != 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:
+                       /* Return the right POSIX-mappable error code for files opened read-only. */
+                       if (!fsp->can_write) {
+                               return NT_STATUS_INVALID_HANDLE;
                        }
+                       lock_type = WRITE_LOCK;
+                       break;
+               case POSIX_LOCK_TYPE_UNLOCK:
+                       lock_type = UNLOCK_LOCK;
+                       break;
+               default:
+                       return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       /* We're done. We only get mode info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
-               }
+       if (SVAL(pdata,POSIX_LOCK_FLAGS_OFFSET) == POSIX_LOCK_FLAG_NOWAIT) {
+               blocking_lock = False;
+       } else if (SVAL(pdata,POSIX_LOCK_FLAGS_OFFSET) == POSIX_LOCK_FLAG_WAIT) {
+               blocking_lock = True;
+       } else {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-               /*
-                * CIFS UNIX extensions.
-                */
+       if (!lp_blocking_locks(SNUM(conn))) { 
+               blocking_lock = False;
+       }
 
-               case SMB_SET_FILE_UNIX_BASIC:
-               {
-                       uint32 raw_unixmode;
+       lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
+#if defined(HAVE_LONGLONG)
+       offset = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
+                       ((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_START_OFFSET));
+       count = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
+                       ((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
+#else /* HAVE_LONGLONG */
+       offset = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_START_OFFSET);
+       count = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
+#endif /* HAVE_LONGLONG */
 
-                       if (total_data < 100) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       if (lock_type == UNLOCK_LOCK) {
+               status = do_unlock(fsp,
+                               lock_pid,
+                               count,
+                               offset,
+                               POSIX_LOCK);
+       } else {
+               struct byte_range_lock *br_lck = do_lock(fsp,
+                                                       lock_pid,
+                                                       count,
+                                                       offset,
+                                                       lock_type,
+                                                       POSIX_LOCK,
+                                                       blocking_lock,
+                                                       &status);
+
+               if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
+                       /*
+                        * A blocking lock was requested. Package up
+                        * this smb into a queued request and push it
+                        * onto the blocking lock queue.
+                        */
+                       if(push_blocking_lock_request(br_lck,
+                                               inbuf, length,
+                                               fsp,
+                                               -1, /* infinite timeout. */
+                                               0,
+                                               lock_pid,
+                                               lock_type,
+                                               POSIX_LOCK,
+                                               offset,
+                                               count)) {
+                               TALLOC_FREE(br_lck);
+                               return status;
                        }
+               }
+               TALLOC_FREE(br_lck);
+       }
+
+       return status;
+}
+
+/****************************************************************************
+ Deal with SMB_INFO_STANDARD.
+****************************************************************************/
+
+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)
+{
+       struct utimbuf tvs;
+
+       if (total_data < 12) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* access time */
+       tvs.actime = srv_make_unix_date2(pdata+l1_fdateLastAccess);
+       /* write time */
+       tvs.modtime = srv_make_unix_date2(pdata+l1_fdateLastWrite);
+
+       return smb_set_file_time(conn,
+                               fsp,
+                               fname,
+                               psbuf,
+                               tvs);
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_BASIC_INFO.
+****************************************************************************/
+
+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)
+{
+       /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
+       time_t write_time;
+       time_t changed_time;
+       uint32 dosmode = 0;
+       struct utimbuf tvs;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (total_data < 36) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* Set the attributes */
+       dosmode = IVAL(pdata,32);
+       status = smb_set_file_dosmode(conn,
+                                       fname,
+                                       psbuf,
+                                       dosmode);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* Ignore create time at offset pdata. */
+
+       /* access time */
+       tvs.actime = convert_timespec_to_time_t(interpret_long_date(pdata+8));
+
+       write_time = convert_timespec_to_time_t(interpret_long_date(pdata+16));
+       changed_time = convert_timespec_to_time_t(interpret_long_date(pdata+24));
+
+       tvs.modtime = MIN(write_time, changed_time);
+
+       if (write_time > tvs.modtime && write_time != (time_t)-1) {
+               tvs.modtime = write_time;
+       }
+       /* Prefer a defined time to an undefined one. */
+       if (null_mtime(tvs.modtime)) {
+               tvs.modtime = null_mtime(write_time) ? changed_time : write_time;
+       }
+
+       return smb_set_file_time(conn,
+                               fsp,
+                               fname,
+                               psbuf,
+                               tvs);
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_ALLOCATION_INFO.
+****************************************************************************/
+
+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)
+{
+       SMB_BIG_UINT allocation_size = 0;
+       NTSTATUS status = NT_STATUS_OK;
+       files_struct *new_fsp = NULL;
+
+       if (!VALID_STAT(*psbuf)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (total_data < 8) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-                       if(IVAL(pdata, 0) != SMB_SIZE_NO_CHANGE_LO &&
-                          IVAL(pdata, 4) != SMB_SIZE_NO_CHANGE_HI) {
-                               size=IVAL(pdata,0); /* first 8 Bytes are size */
+       allocation_size = (SMB_BIG_UINT)IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-                               size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+       allocation_size |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
-                               if (IVAL(pdata,4) != 0) {
-                                       /* more than 32 bits? */
-                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                               }
+       if (IVAL(pdata,4) != 0) {
+               /* more than 32 bits? */
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 #endif /* LARGE_SMB_OFF_T */
-                       }
-                       pdata+=24;          /* ctime & st_blocks are not changed */
-                       tvs.actime = convert_timespec_to_time_t(interpret_long_date(pdata)); /* access_time */
-                       tvs.modtime = convert_timespec_to_time_t(interpret_long_date(pdata+8)); /* modification_time */
-                       pdata+=16;
-                       set_owner = (uid_t)IVAL(pdata,0);
-                       pdata += 8;
-                       set_grp = (gid_t)IVAL(pdata,0);
-                       pdata += 8;
-                       raw_unixmode = IVAL(pdata,28);
-                       unixmode = unix_perms_from_wire(conn, &sbuf, raw_unixmode);
-                       dosmode = 0; /* Ensure dos mode change doesn't override this. */
 
-                       DEBUG(10,("call_trans2setfilepathinfo: 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_allocation_info: Set file allocation info for file %s to %.0f\n",
+                       fname, (double)allocation_size ));
 
-                       if (!VALID_STAT(sbuf)) {
+       if (allocation_size) {
+               allocation_size = smb_roundup(conn, allocation_size);
+       }
 
-                               /*
-                                * The only valid use of this is to create character and block
-                                * devices, and named pipes. This is deprecated (IMHO) and 
-                                * a new info level should be used for mknod. JRA.
-                                */
+       if(allocation_size == get_file_size(*psbuf)) {
+               return NT_STATUS_OK;
+       }
+       DEBUG(10,("smb_set_file_allocation_info: file %s : setting new allocation size to %.0f\n",
+                       fname, (double)allocation_size ));
+       if (fsp && fsp->fh->fd != -1) {
+               /* Open file handle. */
+               if (vfs_allocate_file_space(fsp, allocation_size) == -1) {
+                       return map_nt_error_from_unix(errno);
+               }
+               return NT_STATUS_OK;
+       }
 
-                               uint32 file_type = IVAL(pdata,0);
-#if defined(HAVE_MAKEDEV)
-                               uint32 dev_major = IVAL(pdata,4);
-                               uint32 dev_minor = IVAL(pdata,12);
-#endif
+       /* Pathname or stat or directory file. */
+
+       status = open_file_ntcreate(conn, fname, psbuf,
+                               FILE_WRITE_DATA,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FORCE_OPLOCK_BREAK_TO_NONE,
+                               NULL, &new_fsp);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* NB. We check for open_was_deferred in the caller. */
+               return status;
+       }
+       if (vfs_allocate_file_space(new_fsp, allocation_size) == -1) {
+               status = map_nt_error_from_unix(errno);
+               close_file(new_fsp,NORMAL_CLOSE);
+               return status;
+       }
 
-                               uid_t myuid = geteuid();
-                               gid_t mygid = getegid();
-                               SMB_DEV_T dev = (SMB_DEV_T)0;
+       close_file(new_fsp,NORMAL_CLOSE);
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_END_OF_FILE_INFO.
+****************************************************************************/
 
-                               if (tran_call == TRANSACT2_SETFILEINFO)
-                                       return(ERROR_DOS(ERRDOS,ERRnoaccess));
+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)
+{
+       SMB_OFF_T size;
 
-                               if (raw_unixmode == SMB_MODE_NO_CHANGE) {
-                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                               }
+       if (total_data < 8) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       size = IVAL(pdata,0);
+#ifdef LARGE_SMB_OFF_T
+       size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+#else /* LARGE_SMB_OFF_T */
+       if (IVAL(pdata,4) != 0) {
+               /* more than 32 bits? */
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+#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 ));
+
+       return smb_set_file_size(conn,
+                               fsp,
+                               fname,
+                               psbuf,
+                               size);
+}
+
+/****************************************************************************
+ Allow a UNIX info mknod.
+****************************************************************************/
 
+static NTSTATUS smb_unix_mknod(connection_struct *conn,
+                                       const char *pdata,
+                                       int total_data,
+                                       const char *fname,
+                                       SMB_STRUCT_STAT *psbuf)
+{
+       uint32 file_type = IVAL(pdata,56);
 #if defined(HAVE_MAKEDEV)
-                               dev = makedev(dev_major, dev_minor);
+       uint32 dev_major = IVAL(pdata,60);
+       uint32 dev_minor = IVAL(pdata,68);
 #endif
+       SMB_DEV_T dev = (SMB_DEV_T)0;
+       uint32 raw_unixmode = IVAL(pdata,84);
+       NTSTATUS status;
+       mode_t unixmode;
 
-                               /* We can only create as the owner/group we are. */
+       if (total_data < 100) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       status = unix_perms_from_wire(conn, psbuf, raw_unixmode, PERM_NEW_FILE, &unixmode);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-                               if ((set_owner != myuid) && (set_owner != (uid_t)SMB_UID_NO_CHANGE))
-                                       return(ERROR_DOS(ERRDOS,ERRnoaccess));
-                               if ((set_grp != mygid) && (set_grp != (gid_t)SMB_GID_NO_CHANGE))
-                                       return(ERROR_DOS(ERRDOS,ERRnoaccess));
+#if defined(HAVE_MAKEDEV)
+       dev = makedev(dev_major, dev_minor);
+#endif
 
-                               switch (file_type) {
+       switch (file_type) {
 #if defined(S_IFIFO)
-                                       case UNIX_TYPE_FIFO:
-                                               unixmode |= S_IFIFO;
-                                               break;
+               case UNIX_TYPE_FIFO:
+                       unixmode |= S_IFIFO;
+                       break;
 #endif
 #if defined(S_IFSOCK)
-                                       case UNIX_TYPE_SOCKET:
-                                               unixmode |= S_IFSOCK;
-                                               break;
+               case UNIX_TYPE_SOCKET:
+                       unixmode |= S_IFSOCK;
+                       break;
 #endif
 #if defined(S_IFCHR)
-                                       case UNIX_TYPE_CHARDEV:
-                                               unixmode |= S_IFCHR;
-                                               break;
+               case UNIX_TYPE_CHARDEV:
+                       unixmode |= S_IFCHR;
+                       break;
 #endif
 #if defined(S_IFBLK)
-                                       case UNIX_TYPE_BLKDEV:
-                                               unixmode |= S_IFBLK;
-                                               break;
+               case UNIX_TYPE_BLKDEV:
+                       unixmode |= S_IFBLK;
+                       break;
 #endif
-                                       default:
-                                               return(ERROR_DOS(ERRDOS,ERRnoaccess));
-                               }
+               default:
+                       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 ));
+
+       /* Ok - do the mknod. */
+       if (SMB_VFS_MKNOD(conn, fname, unixmode, dev) != 0) {
+               return map_nt_error_from_unix(errno);
+       }
+
+       /* If any of the other "set" calls fail we
+        * don't want to end up with a half-constructed mknod.
+        */
+
+       if (lp_inherit_perms(SNUM(conn))) {
+               inherit_access_acl(
+                       conn, parent_dirname(fname),
+                       fname, unixmode);
+       }
+
+       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;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_UNIX_BASIC.
+****************************************************************************/
+
+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)
+{
+       struct utimbuf tvs;
+       uint32 raw_unixmode;
+       mode_t unixmode;
+       SMB_OFF_T size = 0;
+       uid_t set_owner = (uid_t)SMB_UID_NO_CHANGE;
+       gid_t set_grp = (uid_t)SMB_GID_NO_CHANGE;
+       NTSTATUS status = NT_STATUS_OK;
+       BOOL delete_on_fail = False;
+       enum perm_type ptype;
+
+       if (total_data < 100) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if(IVAL(pdata, 0) != SMB_SIZE_NO_CHANGE_LO &&
+          IVAL(pdata, 4) != SMB_SIZE_NO_CHANGE_HI) {
+               size=IVAL(pdata,0); /* first 8 Bytes are size */
+#ifdef LARGE_SMB_OFF_T
+               size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+#else /* LARGE_SMB_OFF_T */
+               if (IVAL(pdata,4) != 0) {
+                       /* more than 32 bits? */
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+#endif /* LARGE_SMB_OFF_T */
+       }
+
+       tvs.actime = convert_timespec_to_time_t(interpret_long_date(pdata+24)); /* access_time */
+       tvs.modtime = convert_timespec_to_time_t(interpret_long_date(pdata+32)); /* modification_time */
+       set_owner = (uid_t)IVAL(pdata,40);
+       set_grp = (gid_t)IVAL(pdata,48);
+       raw_unixmode = IVAL(pdata,84);
+
+       if (VALID_STAT(*psbuf)) {
+               if (S_ISDIR(psbuf->st_mode)) {
+                       ptype = PERM_EXISTING_DIR;
+               } else {
+                       ptype = PERM_EXISTING_FILE;
+               }
+       } else {
+               ptype = PERM_NEW_FILE;
+       }
+
+       status = unix_perms_from_wire(conn, psbuf, 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));
+
+       if (!VALID_STAT(*psbuf)) {
+               /*
+                * The only valid use of this is to create character and block
+                * devices, and named pipes. This is deprecated (IMHO) and 
+                * a new info level should be used for mknod. JRA.
+                */
+
+               status = smb_unix_mknod(conn,
+                                       pdata,
+                                       total_data,
+                                       fname,
+                                       psbuf);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+
+               /* Ensure we don't try and change anything else. */
+               raw_unixmode = SMB_MODE_NO_CHANGE;
+               size = get_file_size(*psbuf);
+               tvs.modtime = psbuf->st_mtime;
+               tvs.actime = psbuf->st_atime;
+               /* 
+                * We continue here as we might want to change the 
+                * owner uid/gid.
+                */
+               delete_on_fail = True;
+       }
+
+       /*
+        * Deal with the UNIX specific mode set.
+        */
+
+       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) {
+                       return map_nt_error_from_unix(errno);
+               }
+       }
+
+       /*
+        * Deal with the UNIX specific uid set.
+        */
+
+       if ((set_owner != (uid_t)SMB_UID_NO_CHANGE) && (psbuf->st_uid != set_owner)) {
+               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC changing owner %u for file %s\n",
+                       (unsigned int)set_owner, fname ));
+               if (SMB_VFS_CHOWN(conn, fname, set_owner, (gid_t)-1) != 0) {
+                       status = map_nt_error_from_unix(errno);
+                       if (delete_on_fail) {
+                               SMB_VFS_UNLINK(conn,fname);
+                       }
+                       return status;
+               }
+       }
+
+       /*
+        * Deal with the UNIX specific gid set.
+        */
+
+       if ((set_grp != (uid_t)SMB_GID_NO_CHANGE) && (psbuf->st_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) {
+                       status = map_nt_error_from_unix(errno);
+                       if (delete_on_fail) {
+                               SMB_VFS_UNLINK(conn,fname);
+                       }
+                       return status;
+               }
+       }
+
+       /* Deal with any size changes. */
+
+       status = smb_set_file_size(conn,
+                               fsp,
+                               fname,
+                               psbuf,
+                               size);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* Deal with any time changes. */
+
+       return smb_set_file_time(conn,
+                               fsp,
+                               fname,
+                               psbuf,
+                               tvs);
+}
+
+/****************************************************************************
+ Reply to a TRANS2_SETFILEINFO (set file info by fileid or pathname).
+****************************************************************************/
+
+static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+                                       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;
+       pstring fname;
+       files_struct *fsp = NULL;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (!params) {
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
+
+       ZERO_STRUCT(sbuf);
+
+       if (tran_call == TRANSACT2_SETFILEINFO) {
+               if (total_params < 4) {
+                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               }
+
+               fsp = file_fsp(params,0);
+               info_level = SVAL(params,2);    
+
+               if(fsp && (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.
+                        */
+                       pstrcpy(fname, fsp->fsp_name);
+                       if (SMB_VFS_STAT(conn,fname,&sbuf) != 0) {
+                               DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
+                               return UNIXERROR(ERRDOS,ERRbadpath);
+                       }
+               } else if (fsp && 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(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
+                               return(-1);
+                       } else
+                               return (UNIXERROR(ERRDOS,ERRbadpath));
+           } else {
+                       /*
+                        * Original code - this is an open file.
+                        */
+                       CHECK_FSP(fsp,conn);
+
+                       pstrcpy(fname, fsp->fsp_name);
+
+                       if (SMB_VFS_FSTAT(fsp, fsp->fh->fd, &sbuf) != 0) {
+                               DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
+                               return(UNIXERROR(ERRDOS,ERRbadfid));
+                       }
+               }
+       } else {
+               /* set path info */
+               if (total_params < 7) {
+                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               }
+
+               info_level = SVAL(params,0);    
+               srvstr_get_path(inbuf, fname, &params[6], sizeof(fname), total_params - 6, STR_TERMINATE, &status);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
+               }
+               status = unix_convert(conn, fname, False, NULL, &sbuf);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
+               }
+
+               /*
+                * For CIFS UNIX extensions the target name may not exist.
+                */
+
+               if(!VALID_STAT(sbuf) && !INFO_LEVEL_IS_UNIX(info_level)) {
+                       DEBUG(3,("call_trans2setfilepathinfo: stat of %s failed (%s)\n", fname, strerror(errno)));
+                       return UNIXERROR(ERRDOS,ERRbadpath);
+               }    
+
+               status = check_name(conn, fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
+               }
+
+       }
+
+       if (!CAN_WRITE(conn)) {
+               return ERROR_DOS(ERRSRV,ERRaccess);
+       }
+
+       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+               return ERROR_NT(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));
+
+       /* Realloc the parameter size */
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if (*pparams == NULL) {
+               return ERROR_NT(NT_STATUS_NO_MEMORY);
+       }
+       params = *pparams;
 
-                               DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_BASIC doing mknod dev %.0f mode \
-0%o for file %s\n", (double)dev, unixmode, fname ));
+       SSVAL(params,0,0);
 
-                               /* Ok - do the mknod. */
-                               if (SMB_VFS_MKNOD(conn,fname, unixmode, dev) != 0)
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+       if (fsp && fsp->pending_modtime) {
+               /* the pending modtime overrides the current modtime */
+               sbuf.st_mtime = fsp->pending_modtime;
+       }
 
-                               if (lp_inherit_perms(SNUM(conn))) {
-                                       inherit_access_acl(
-                                               conn, parent_dirname(fname),
-                                               fname, unixmode);
-                               }
+       switch (info_level) {
 
-                               SSVAL(params,0,0);
-                               send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                               return(-1);
-                       }
+               case SMB_INFO_STANDARD:
+               {
+                       status = smb_set_info_standard(conn,
+                                       pdata,
+                                       total_data,
+                                       fsp,
+                                       fname,
+                                       &sbuf);
+                       break;
+               }
 
-                       /*
-                        * Deal with the UNIX specific mode set.
-                        */
+               case SMB_INFO_SET_EA:
+               {
+                       status = smb_info_set_ea(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               fname);
+                       break;
+               }
 
-                       if (raw_unixmode != SMB_MODE_NO_CHANGE) {
-                               DEBUG(10,("call_trans2setfilepathinfo: 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)
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       }
+               case SMB_SET_FILE_BASIC_INFO:
+               case SMB_FILE_BASIC_INFORMATION:
+               {
+                       status = smb_set_file_basic_info(conn,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname,
+                                                       &sbuf);
+                       break;
+               }
 
-                       /*
-                        * Deal with the UNIX specific uid set.
-                        */
+               case SMB_FILE_ALLOCATION_INFORMATION:
+               case SMB_SET_FILE_ALLOCATION_INFO:
+               {
+                       status = smb_set_file_allocation_info(conn,
+                                                               pdata,
+                                                               total_data,
+                                                               fsp,
+                                                               fname,
+                                                               &sbuf);
+                       break;
+               }
 
-                       if ((set_owner != (uid_t)SMB_UID_NO_CHANGE) && (sbuf.st_uid != set_owner)) {
-                               DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_BASIC changing owner %u for file %s\n",
-                                       (unsigned int)set_owner, fname ));
-                               if (SMB_VFS_CHOWN(conn,fname,set_owner, (gid_t)-1) != 0)
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       }
+               case SMB_FILE_END_OF_FILE_INFORMATION:
+               case SMB_SET_FILE_END_OF_FILE_INFO:
+               {
+                       status = smb_set_file_end_of_file_info(conn,
+                                                               pdata,
+                                                               total_data,
+                                                               fsp,
+                                                               fname,
+                                                               &sbuf);
+                       break;
+               }
 
-                       /*
-                        * Deal with the UNIX specific gid set.
+               case SMB_FILE_DISPOSITION_INFORMATION:
+               case SMB_SET_FILE_DISPOSITION_INFO: /* Set delete on close for open file. */
+               {
+#if 0
+                       /* JRA - We used to just ignore this on a path ? 
+                        * Shouldn't this be invalid level on a pathname
+                        * based call ?
                         */
-
-                       if ((set_grp != (uid_t)SMB_GID_NO_CHANGE) && (sbuf.st_gid != set_grp)) {
-                               DEBUG(10,("call_trans2setfilepathinfo: 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)
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+                       if (tran_call != TRANSACT2_SETFILEINFO) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
+#endif
+                       status = smb_set_file_disposition_info(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               fname,
+                                               &sbuf);
                        break;
                }
 
-               case SMB_SET_FILE_UNIX_LINK:
+               case SMB_FILE_POSITION_INFORMATION:
                {
-                       pstring link_target;
-                       char *newname = fname;
-
-                       /* Set a symbolic link. */
-                       /* Don't allow this if follow links is false. */
-
-                       if (!lp_symlinks(SNUM(conn)))
-                               return(ERROR_DOS(ERRDOS,ERRnoaccess));
+                       status = smb_file_position_information(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp);
+                       break;
+               }
 
-                       srvstr_pull(inbuf, link_target, pdata, sizeof(link_target), -1, STR_TERMINATE);
+               /* From tridge Samba4 : 
+                * MODE_INFORMATION in setfileinfo (I have no
+                * idea what "mode information" on a file is - it takes a value of 0,
+                * 2, 4 or 6. What could it be?).
+                */
 
-                       /* !widelinks forces the target path to be within the share. */
-                       /* This means we can interpret the target as a pathname. */
-                       if (!lp_widelinks(SNUM(conn))) {
-                               pstring rel_name;
-                               char *last_dirp = NULL;
+               case SMB_FILE_MODE_INFORMATION:
+               {
+                       status = smb_file_mode_information(conn,
+                                               pdata,
+                                               total_data);
+                       break;
+               }
 
-                               unix_format(link_target);
-                               if (*link_target == '/') {
-                                       /* No absolute paths allowed. */
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-                               }
-                               pstrcpy(rel_name, newname);
-                               last_dirp = strrchr_m(rel_name, '/');
-                               if (last_dirp) {
-                                       last_dirp[1] = '\0';
-                               } else {
-                                       pstrcpy(rel_name, "./");
-                               }
-                               pstrcat(rel_name, link_target);
+               /*
+                * CIFS UNIX extensions.
+                */
 
-                               if (!check_name(rel_name, conn)) {
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-                               }
+               case SMB_SET_FILE_UNIX_BASIC:
+               {
+                       if (tran_call == TRANSACT2_SETFILEINFO) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
 
-                       DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n",
-                               fname, link_target ));
-
-                       if (SMB_VFS_SYMLINK(conn,link_target,newname) != 0)
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+                       status = smb_set_file_unix_basic(conn,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname,
+                                                       &sbuf);
+                       break;
                }
 
-               case SMB_SET_FILE_UNIX_HLINK:
+               case SMB_SET_FILE_UNIX_LINK:
                {
-                       pstring oldname;
-                       char *newname = fname;
-
-                       /* Set a hard link. */
-                       srvstr_get_path(inbuf, oldname, pdata, sizeof(oldname), -1, STR_TERMINATE, &status);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
+                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                               /* We must have a pathname for this. */
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
+                       status = smb_set_file_unix_link(conn,
+                                               inbuf,
+                                               pdata,
+                                               total_data,
+                                               fname);
+                       break;
+               }
 
-                       DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_LINK doing hard link %s -> %s\n",
-                               fname, oldname));
-
-                       status = hardlink_internals(conn, oldname, newname);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
+               case SMB_SET_FILE_UNIX_HLINK:
+               {
+                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                               /* We must have a pathname for this. */
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+                       status = smb_set_file_unix_hlink(conn,
+                                               inbuf,
+                                               pdata,
+                                               total_data,
+                                               fname);
+                       break;
                }
 
                case SMB_FILE_RENAME_INFORMATION:
                {
-                       BOOL overwrite;
-                       /* uint32 root_fid; */  /* Not used */
-                       uint32 len;
-                       pstring newname;
-                       pstring base_name;
-                       char *p;
-
-                       if (total_data < 12) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       overwrite = (CVAL(pdata,0) ? True : False);
-                       /* root_fid = IVAL(pdata,4); */
-                       len = IVAL(pdata,8);
-                       srvstr_get_path(inbuf, newname, &pdata[12], sizeof(newname), len, 0, &status);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
-                       }
-
-                       /* Check the new name has no '/' characters. */
-                       if (strchr_m(newname, '/'))
-                               return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
-
-                       RESOLVE_DFSPATH(newname, conn, inbuf, outbuf);
-
-                       /* Create the base directory. */
-                       pstrcpy(base_name, fname);
-                       p = strrchr_m(base_name, '/');
-                       if (p)
-                               *p = '\0';
-                       /* Append the new name. */
-                       pstrcat(base_name, "/");
-                       pstrcat(base_name, newname);
-
-                       if (fsp) {
-                               DEBUG(10,("call_trans2setfilepathinfo: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
-                                       fsp->fnum, fsp->fsp_name, base_name ));
-                               status = rename_internals_fsp(conn, fsp, base_name, 0, overwrite);
-                       } else {
-                               DEBUG(10,("call_trans2setfilepathinfo: SMB_FILE_RENAME_INFORMATION %s -> %s\n",
-                                       fname, newname ));
-                               status = rename_internals(conn, fname, base_name, 0, overwrite, False);
-                       }
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
-                       }
-                       process_pending_change_notify_queue((time_t)0);
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+                       status = smb_file_rename_information(conn,
+                                                       inbuf,
+                                                       outbuf,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname);
+                       break;
                }
 
 #if defined(HAVE_POSIX_ACLS)
                case SMB_SET_POSIX_ACL:
                {
-                       uint16 posix_acl_version;
-                       uint16 num_file_acls;
-                       uint16 num_def_acls;
-                       BOOL valid_file_acls = True;
-                       BOOL valid_def_acls = True;
-
-                       if (total_data < SMB_POSIX_ACL_HEADER_SIZE) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-                       posix_acl_version = SVAL(pdata,0);
-                       num_file_acls = SVAL(pdata,2);
-                       num_def_acls = SVAL(pdata,4);
-
-                       if (num_file_acls == SMB_POSIX_IGNORE_ACE_ENTRIES) {
-                               valid_file_acls = False;
-                               num_file_acls = 0;
-                       }
-
-                       if (num_def_acls == SMB_POSIX_IGNORE_ACE_ENTRIES) {
-                               valid_def_acls = False;
-                               num_def_acls = 0;
-                       }
-
-                       if (posix_acl_version != SMB_POSIX_ACL_VERSION) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       if (total_data < SMB_POSIX_ACL_HEADER_SIZE +
-                                       (num_file_acls+num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       if (valid_file_acls && !set_unix_posix_acl(conn, fsp, fname, num_file_acls,
-                                       pdata + SMB_POSIX_ACL_HEADER_SIZE)) {
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       }
-
-                       if (valid_def_acls && !set_unix_posix_default_acl(conn, fname, &sbuf, num_def_acls,
-                                       pdata + SMB_POSIX_ACL_HEADER_SIZE +
-                                       (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE))) {
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+                       status = smb_set_posix_acl(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               fname,
+                                               &sbuf);
+                       break;
                }
 #endif
 
                case SMB_SET_POSIX_LOCK:
                {
-                       SMB_BIG_UINT count;
-                       SMB_BIG_UINT offset;
-                       uint32 lock_pid;
-                       BOOL blocking_lock = False;
-                       enum brl_type lock_type;
-
-                       if (fsp == NULL || fsp->fh->fd == -1) {
-                               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
-                       }
-
-                       if (total_data != POSIX_LOCK_DATA_SIZE) {
-                               return ERROR_NT(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:
-                                       /* Return the right POSIX-mappable error code for files opened read-only. */
-                                       if (!fsp->can_write) {
-                                               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
-                                       }
-                                       lock_type = WRITE_LOCK;
-                                       break;
-                               case POSIX_LOCK_TYPE_UNLOCK:
-                                       lock_type = UNLOCK_LOCK;
-                                       break;
-                               default:
-                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       if (SVAL(pdata,POSIX_LOCK_FLAGS_OFFSET) == POSIX_LOCK_FLAG_NOWAIT) {
-                               blocking_lock = False;
-                       } else if (SVAL(pdata,POSIX_LOCK_FLAGS_OFFSET) == POSIX_LOCK_FLAG_WAIT) {
-                               blocking_lock = True;
-                       } else {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       if (!lp_blocking_locks(SNUM(conn))) { 
-                               blocking_lock = False;
-                       }
-
-                       lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
-#if defined(HAVE_LONGLONG)
-                       offset = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
-                                       ((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_START_OFFSET));
-                       count = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
-                                       ((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
-#else /* HAVE_LONGLONG */
-                       offset = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_START_OFFSET);
-                       count = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
-#endif /* HAVE_LONGLONG */
-
-                       if (lock_type == UNLOCK_LOCK) {
-                               status = do_unlock(fsp,
-                                               lock_pid,
-                                               count,
-                                               offset,
-                                               POSIX_LOCK);
-                       } else {
-                               struct byte_range_lock *br_lck = do_lock(fsp,
-                                                                       lock_pid,
-                                                                       count,
-                                                                       offset,
-                                                                       lock_type,
-                                                                       POSIX_LOCK,
-                                                                       blocking_lock,
-                                                                       &status);
-
-                               if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
-                                       /*
-                                        * A blocking lock was requested. Package up
-                                        * this smb into a queued request and push it
-                                        * onto the blocking lock queue.
-                                        */
-                                       if(push_blocking_lock_request(br_lck,
-                                                               inbuf, length,
-                                                               fsp,
-                                                               -1, /* infinite timeout. */
-                                                               0,
-                                                               lock_pid,
-                                                               lock_type,
-                                                               POSIX_LOCK,
-                                                               offset,
-                                                               count)) {
-                                               TALLOC_FREE(br_lck);
-                                               return -1;
-                                       }
-                               }
-                               TALLOC_FREE(br_lck);
-                       }
-
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
-                       }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
-                       return(-1);
+                       status = smb_set_posix_lock(conn,
+                                               inbuf,
+                                               length,
+                                               pdata,
+                                               total_data,
+                                               fsp);
+                       break;
                }
 
                default:
                        return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
-       /* get some defaults (no modifications) if any info is zero or -1. */
-       if (null_mtime(tvs.actime)) {
-               tvs.actime = sbuf.st_atime;
-       }
-
-       if (null_mtime(tvs.modtime)) {
-               tvs.modtime = sbuf.st_mtime;
-       }
-
-       DEBUG(6,("actime: %s " , ctime(&tvs.actime)));
-       DEBUG(6,("modtime: %s ", ctime(&tvs.modtime)));
-       DEBUG(6,("size: %.0f ", (double)size));
-
-       if (dosmode) {
-               if (S_ISDIR(sbuf.st_mode))
-                       dosmode |= aDIR;
-               else
-                       dosmode &= ~aDIR;
-       }
-
-       DEBUG(6,("dosmode: %x\n"  , dosmode));
-
-       if(!((info_level == SMB_SET_FILE_END_OF_FILE_INFO) ||
-               (info_level == SMB_SET_FILE_ALLOCATION_INFO) ||
-               (info_level == SMB_FILE_ALLOCATION_INFORMATION) ||
-               (info_level == SMB_FILE_END_OF_FILE_INFORMATION))) {
-
-               /*
-                * Only do this test if we are not explicitly
-                * changing the size of a file.
-                */
-               if (!size)
-                       size = get_file_size(sbuf);
-       }
-
-       /*
-        * Try and set the times, size and mode of this file -
-        * if they are different from the current values
-        */
-
-       /* check the mode isn't different, before changing it */
-       if ((dosmode != 0) && (dosmode != dos_mode(conn, fname, &sbuf))) {
-
-               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting dos mode %x\n", fname, dosmode ));
-
-               if(file_set_dosmode(conn, fname, dosmode, &sbuf, False)) {
-                       DEBUG(2,("file_set_dosmode of %s failed (%s)\n", fname, strerror(errno)));
-                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-               }
-       }
-
-       /* Now the size. */
-       if (size != get_file_size(sbuf)) {
-
-               int ret;
-
-               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
-                       fname, (double)size ));
-
-               if (fd == -1) {
-                       files_struct *new_fsp = NULL;
-
-                       status = open_file_ntcreate(conn, fname, &sbuf,
-                                               FILE_WRITE_DATA,
-                                               FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-                                               FILE_OPEN,
-                                               0,
-                                               FILE_ATTRIBUTE_NORMAL,
-                                               FORCE_OPLOCK_BREAK_TO_NONE,
-                                               NULL, &new_fsp);
        
-                       if (!NT_STATUS_IS_OK(status)) {
-                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
-                                       /* We have re-scheduled this call. */
-                                       return -1;
-                               }
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
-                       }
-                       ret = vfs_set_filelen(new_fsp, size);
-                       close_file(new_fsp,NORMAL_CLOSE);
-               } else {
-                       ret = vfs_set_filelen(fsp, size);
-               }
-
-               if (ret == -1) {
-                       return (UNIXERROR(ERRHRD,ERRdiskfull));
+       if (!NT_STATUS_IS_OK(status)) {
+               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                       /* We have re-scheduled this call. */
+                       return -1;
                }
-       }
-
-       /*
-        * Finally the times.
-        */
-       if (sbuf.st_mtime != tvs.modtime || sbuf.st_atime != tvs.actime) {
-               if(fsp != NULL) {
-                       /*
-                        * This was a 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
-                        * in smbd/fileio.c it ensures that this timestamp is
-                        * kept sticky even after a write. We save the request
-                        * away and will set it on file close and after a write. JRA.
-                        */
-
-                       if (tvs.modtime != (time_t)0 && tvs.modtime != (time_t)-1) {
-                               DEBUG(10,("call_trans2setfilepathinfo: setting pending modtime to %s\n", ctime(&tvs.modtime) ));
-                               fsp_set_pending_modtime(fsp, tvs.modtime);
-                       }
-
+               if (blocking_lock_was_deferred(SVAL(inbuf,smb_mid))) {
+                       /* We have re-scheduled this call. */
+                       return -1;
                }
-               DEBUG(10,("call_trans2setfilepathinfo: setting utimes to modified values.\n"));
-
-               if(file_utime(conn, fname, &tvs)!=0) {
-                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV, ERRbadpath);
                }
+               return ERROR_NT(status);
        }
 
        SSVAL(params,0,0);
        send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
   
-       return(-1);
+       return -1;
 }
 
 /****************************************************************************
@@ -4767,28 +5185,26 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
        char *pdata = *ppdata;
        pstring directory;
        SMB_STRUCT_STAT sbuf;
-       BOOL bad_path = False;
        NTSTATUS status = NT_STATUS_OK;
        struct ea_list *ea_list = NULL;
-       files_struct *fsp;
 
        if (!CAN_WRITE(conn))
                return ERROR_DOS(ERRSRV,ERRaccess);
 
-       if (total_params < 4) {
+       if (total_params < 5) {
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
-       srvstr_get_path(inbuf, directory, &params[4], sizeof(directory), -1, STR_TERMINATE, &status);
+       srvstr_get_path(inbuf, directory, &params[4], sizeof(directory), total_params - 4, STR_TERMINATE, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return ERROR_NT(status);
        }
 
        DEBUG(3,("call_trans2mkdir : name = %s\n", directory));
 
-       unix_convert(directory,conn,0,&bad_path,&sbuf);
-       if (bad_path) {
-               return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+       status = unix_convert(conn, directory, False, NULL, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
        }
 
        /* Any data in this call is an EA list. */
@@ -4822,21 +5238,17 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
-       if (!check_name(directory,conn)) {
-               DEBUG(5,("call_trans2mkdir error (%s)\n", strerror(errno)));
-               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,
-                                         ERRnoaccess);
+       status = check_name(conn, directory);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(5,("call_trans2mkdir error (%s)\n", nt_errstr(status)));
+               return ERROR_NT(status);
        }
 
-       status = open_directory(conn, directory, &sbuf, 
-                               FILE_READ_ATTRIBUTES, /* A stat open */
-                               FILE_SHARE_NONE, /* Ignored  */
-                               FILE_CREATE, 0, NULL, &fsp);
+       status = create_directory(conn, directory);
 
        if (!NT_STATUS_IS_OK(status)) {
                return ERROR_NT(status);
        }
-       close_file(fsp, NORMAL_CLOSE);
   
        /* Try and set any given EA. */
        if (ea_list) {
@@ -4952,7 +5364,7 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf, char*
 
        DEBUG(10,("call_trans2getdfsreferral\n"));
 
-       if (total_params < 2) {
+       if (total_params < 3) {
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
@@ -4961,7 +5373,7 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf, char*
        if(!lp_host_msdfs())
                return ERROR_DOS(ERRDOS,ERRbadfunc);
 
-       srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE);
+       srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), total_params - 2, STR_TERMINATE);
        if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata)) < 0)
                return UNIXERROR(ERRDOS,ERRbadfile);
     
@@ -5076,147 +5488,147 @@ int handle_trans2(connection_struct *conn,
        switch(state->call)  {
        case TRANSACT2_OPEN:
        {
-               START_PROFILE_NESTED(Trans2_open);
+               START_PROFILE(Trans2_open);
                outsize = call_trans2open(
                        conn, inbuf, outbuf, bufsize, 
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_open);
+               END_PROFILE(Trans2_open);
                break;
        }
 
        case TRANSACT2_FINDFIRST:
        {
-               START_PROFILE_NESTED(Trans2_findfirst);
+               START_PROFILE(Trans2_findfirst);
                outsize = call_trans2findfirst(
                        conn, inbuf, outbuf, bufsize,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_findfirst);
+               END_PROFILE(Trans2_findfirst);
                break;
        }
 
        case TRANSACT2_FINDNEXT:
        {
-               START_PROFILE_NESTED(Trans2_findnext);
+               START_PROFILE(Trans2_findnext);
                outsize = call_trans2findnext(
                        conn, inbuf, outbuf, size, bufsize, 
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_findnext);
+               END_PROFILE(Trans2_findnext);
                break;
        }
 
        case TRANSACT2_QFSINFO:
        {
-               START_PROFILE_NESTED(Trans2_qfsinfo);
+               START_PROFILE(Trans2_qfsinfo);
                outsize = call_trans2qfsinfo(
                        conn, inbuf, outbuf, size, bufsize,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_qfsinfo);
+               END_PROFILE(Trans2_qfsinfo);
            break;
        }
 
        case TRANSACT2_SETFSINFO:
        {
-               START_PROFILE_NESTED(Trans2_setfsinfo);
+               START_PROFILE(Trans2_setfsinfo);
                outsize = call_trans2setfsinfo(
                        conn, inbuf, outbuf, size, bufsize, 
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_setfsinfo);
+               END_PROFILE(Trans2_setfsinfo);
                break;
        }
 
        case TRANSACT2_QPATHINFO:
        case TRANSACT2_QFILEINFO:
        {
-               START_PROFILE_NESTED(Trans2_qpathinfo);
+               START_PROFILE(Trans2_qpathinfo);
                outsize = call_trans2qfilepathinfo(
                        conn, inbuf, outbuf, size, bufsize, state->call,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_qpathinfo);
+               END_PROFILE(Trans2_qpathinfo);
                break;
        }
 
        case TRANSACT2_SETPATHINFO:
        case TRANSACT2_SETFILEINFO:
        {
-               START_PROFILE_NESTED(Trans2_setpathinfo);
+               START_PROFILE(Trans2_setpathinfo);
                outsize = call_trans2setfilepathinfo(
                        conn, inbuf, outbuf, size, bufsize, state->call,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_setpathinfo);
+               END_PROFILE(Trans2_setpathinfo);
                break;
        }
 
        case TRANSACT2_FINDNOTIFYFIRST:
        {
-               START_PROFILE_NESTED(Trans2_findnotifyfirst);
+               START_PROFILE(Trans2_findnotifyfirst);
                outsize = call_trans2findnotifyfirst(
                        conn, inbuf, outbuf, size, bufsize, 
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_findnotifyfirst);
+               END_PROFILE(Trans2_findnotifyfirst);
                break;
        }
 
        case TRANSACT2_FINDNOTIFYNEXT:
        {
-               START_PROFILE_NESTED(Trans2_findnotifynext);
+               START_PROFILE(Trans2_findnotifynext);
                outsize = call_trans2findnotifynext(
                        conn, inbuf, outbuf, size, bufsize, 
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_findnotifynext);
+               END_PROFILE(Trans2_findnotifynext);
                break;
        }
 
        case TRANSACT2_MKDIR:
        {
-               START_PROFILE_NESTED(Trans2_mkdir);
+               START_PROFILE(Trans2_mkdir);
                outsize = call_trans2mkdir(
                        conn, inbuf, outbuf, size, bufsize,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_mkdir);
+               END_PROFILE(Trans2_mkdir);
                break;
        }
 
        case TRANSACT2_GET_DFS_REFERRAL:
        {
-               START_PROFILE_NESTED(Trans2_get_dfs_referral);
+               START_PROFILE(Trans2_get_dfs_referral);
                outsize = call_trans2getdfsreferral(
                        conn, inbuf, outbuf, size, bufsize,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_get_dfs_referral);
+               END_PROFILE(Trans2_get_dfs_referral);
                break;
        }
 
        case TRANSACT2_IOCTL:
        {
-               START_PROFILE_NESTED(Trans2_ioctl);
+               START_PROFILE(Trans2_ioctl);
                outsize = call_trans2ioctl(
                        conn, inbuf, outbuf, size, bufsize,
                        &state->param, state->total_param,
                        &state->data, state->total_data,
                        state->max_data_return);
-               END_PROFILE_NESTED(Trans2_ioctl);
+               END_PROFILE(Trans2_ioctl);
                break;
        }