r21063: All case statements are now NTSTATUS returning
[samba.git] / source3 / smbd / trans2.c
index cfe9a2fbdd97994e52827eef23502a991dae68ea..826ccd3f927c2fedc19062fa7be5a4e0aa8ca8e7 100644 (file)
@@ -1,8 +1,10 @@
 /* 
    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
 
    Extensively modified by Andrew Tridgell, 1995
 
@@ -26,7 +28,6 @@
 extern int max_send;
 extern enum protocol_types Protocol;
 extern int smb_read_error;
-extern int global_oplock_break;
 extern uint32 global_client_caps;
 extern struct current_user current_user;
 
@@ -119,8 +120,8 @@ static BOOL get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn, files_str
                return False;
        }
 
-       if (fsp && fsp->fd != -1) {
-               sizeret = SMB_VFS_FGETXATTR(fsp, fsp->fd, ea_name, val, attr_size);
+       if (fsp && fsp->fh->fd != -1) {
+               sizeret = SMB_VFS_FGETXATTR(fsp, fsp->fh->fd, ea_name, val, attr_size);
        } else {
                sizeret = SMB_VFS_GETXATTR(conn, fname, ea_name, val, attr_size);
        }
@@ -134,7 +135,7 @@ static BOOL get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn, files_str
                return False;
        }
 
-       DEBUG(10,("get_ea_value: EA %s is of length %d: ", ea_name, sizeret));
+       DEBUG(10,("get_ea_value: EA %s is of length %u: ", ea_name, (unsigned int)sizeret));
        dump_data(10, val, sizeret);
 
        pea->flags = 0;
@@ -169,10 +170,15 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
                return NULL;
        }
 
-       for (i = 0, ea_namelist = TALLOC(mem_ctx, ea_namelist_size); i < 6;
-                       ea_namelist = TALLOC_REALLOC_ARRAY(mem_ctx, ea_namelist, char, ea_namelist_size), i++) {
-               if (fsp && fsp->fd != -1) {
-                       sizeret = SMB_VFS_FLISTXATTR(fsp, fsp->fd, ea_namelist, ea_namelist_size);
+       for (i = 0, ea_namelist = TALLOC_ARRAY(mem_ctx, char, ea_namelist_size); i < 6;
+            ea_namelist = TALLOC_REALLOC_ARRAY(mem_ctx, ea_namelist, char, ea_namelist_size), i++) {
+
+               if (!ea_namelist) {
+                       return NULL;
+               }
+
+               if (fsp && fsp->fh->fd != -1) {
+                       sizeret = SMB_VFS_FLISTXATTR(fsp, fsp->fh->fd, ea_namelist, ea_namelist_size);
                } else {
                        sizeret = SMB_VFS_LISTXATTR(conn, fname, ea_namelist, ea_namelist_size);
                }
@@ -187,11 +193,11 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
        if (sizeret == -1)
                return NULL;
 
-       DEBUG(10,("get_ea_list_from_file: ea_namelist size = %d\n", sizeret ));
+       DEBUG(10,("get_ea_list_from_file: ea_namelist size = %u\n", (unsigned int)sizeret ));
 
        if (sizeret) {
                for (p = ea_namelist; p - ea_namelist < sizeret; p += strlen(p) + 1) {
-                       struct ea_list *listp, *tmp;
+                       struct ea_list *listp;
 
                        if (strnequal(p, "system.", 7) || samba_private_attr_name(p))
                                continue;
@@ -209,10 +215,10 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
                                push_ascii_fstring(dos_ea_name, listp->ea.name);
                                *pea_total_len += 4 + strlen(dos_ea_name) + 1 + listp->ea.value.length;
                                DEBUG(10,("get_ea_list_from_file: total_len = %u, %s, val len = %u\n",
-                                       *pea_total_len, dos_ea_name,
+                                       (unsigned int)*pea_total_len, dos_ea_name,
                                        (unsigned int)listp->ea.value.length ));
                        }
-                       DLIST_ADD_END(ea_list_head, listp, tmp);
+                       DLIST_ADD_END(ea_list_head, listp, struct ea_list *);
                }
                /* Add on 4 for total length. */
                if (*pea_total_len) {
@@ -220,7 +226,7 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
                }
        }
 
-       DEBUG(10,("get_ea_list_from_file: total_len = %u\n", *pea_total_len));
+       DEBUG(10,("get_ea_list_from_file: total_len = %u\n", (unsigned int)*pea_total_len));
        return ea_list_head;
 }
 
@@ -328,7 +334,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s
 
                canonicalize_ea_name(conn, fsp, fname, unix_ea_name);
 
-               DEBUG(10,("set_ea: ea_name %s ealen = %u\n", unix_ea_name, ea_list->ea.value.length));
+               DEBUG(10,("set_ea: ea_name %s ealen = %u\n", unix_ea_name, (unsigned int)ea_list->ea.value.length));
 
                if (samba_private_attr_name(unix_ea_name)) {
                        DEBUG(10,("set_ea: ea name %s is a private Samba name.\n", unix_ea_name));
@@ -337,10 +343,10 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s
 
                if (ea_list->ea.value.length == 0) {
                        /* Remove the attribute. */
-                       if (fsp && (fsp->fd != -1)) {
+                       if (fsp && (fsp->fh->fd != -1)) {
                                DEBUG(10,("set_ea: deleting ea name %s on file %s by file descriptor.\n",
                                        unix_ea_name, fsp->fsp_name));
-                               ret = SMB_VFS_FREMOVEXATTR(fsp, fsp->fd, unix_ea_name);
+                               ret = SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, unix_ea_name);
                        } else {
                                DEBUG(10,("set_ea: deleting ea name %s on file %s.\n",
                                        unix_ea_name, fname));
@@ -355,10 +361,10 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s
                        }
 #endif
                } else {
-                       if (fsp && (fsp->fd != -1)) {
+                       if (fsp && (fsp->fh->fd != -1)) {
                                DEBUG(10,("set_ea: setting ea name %s on file %s by file descriptor.\n",
                                        unix_ea_name, fsp->fsp_name));
-                               ret = SMB_VFS_FSETXATTR(fsp, fsp->fd, unix_ea_name,
+                               ret = SMB_VFS_FSETXATTR(fsp, fsp->fh->fd, unix_ea_name,
                                                        ea_list->ea.value.data, ea_list->ea.value.length, 0);
                        } else {
                                DEBUG(10,("set_ea: setting ea name %s on file %s.\n",
@@ -390,7 +396,6 @@ static struct ea_list *read_ea_name_list(TALLOC_CTX *ctx, const char *pdata, siz
        size_t offset = 0;
 
        while (offset + 2 < data_size) {
-               struct ea_list *tmp;
                struct ea_list *eal = TALLOC_ZERO_P(ctx, struct ea_list);
                unsigned int namelen = CVAL(pdata,offset);
 
@@ -412,7 +417,7 @@ static struct ea_list *read_ea_name_list(TALLOC_CTX *ctx, const char *pdata, siz
                }
 
                offset += (namelen + 1); /* Go past the name + terminating zero. */
-               DLIST_ADD_END(ea_list_head, eal, tmp);
+               DLIST_ADD_END(ea_list_head, eal, struct ea_list *);
                DEBUG(10,("read_ea_name_list: read ea name %s\n", eal->ea.name));
        }
 
@@ -454,7 +459,7 @@ struct ea_list *read_ea_list_entry(TALLOC_CTX *ctx, const char *pdata, size_t da
                return NULL;
        }
 
-       eal->ea.value = data_blob(NULL, (size_t)val_len + 1);
+       eal->ea.value = data_blob_talloc(eal, NULL, (size_t)val_len + 1);
        if (!eal->ea.value.data) {
                return NULL;
        }
@@ -471,7 +476,7 @@ struct ea_list *read_ea_list_entry(TALLOC_CTX *ctx, const char *pdata, size_t da
        }
 
        DEBUG(10,("read_ea_list_entry: read ea name %s\n", eal->ea.name));
-       dump_data(10, eal->ea.value.data, eal->ea.value.length);
+       dump_data(10, (const char *)eal->ea.value.data, eal->ea.value.length);
 
        return eal;
 }
@@ -487,14 +492,13 @@ static struct ea_list *read_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t d
        size_t bytes_used = 0;
 
        while (offset < data_size) {
-               struct ea_list *tmp;
                struct ea_list *eal = read_ea_list_entry(ctx, pdata + offset, data_size - offset, &bytes_used);
 
                if (!eal) {
                        return NULL;
                }
 
-               DLIST_ADD_END(ea_list_head, eal, tmp);
+               DLIST_ADD_END(ea_list_head, eal, struct ea_list *);
                offset += bytes_used;
        }
 
@@ -562,12 +566,13 @@ static struct ea_list *ea_list_union(struct ea_list *name_list, struct ea_list *
   HACK ! Always assumes smb_setup field is zero.
 ****************************************************************************/
 
-static int send_trans2_replies(char *outbuf,
+int send_trans2_replies(char *outbuf,
                        int bufsize,
-                       char *params, 
+                       const char *params, 
                        int paramsize,
-                       char *pdata,
-                       int datasize)
+                       const char *pdata,
+                       int datasize,
+                       int max_data_bytes)
 {
        /* As we are using a protocol > LANMAN1 then the max_send
         variable must have been set in the sessetupX call.
@@ -578,8 +583,8 @@ static 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;
@@ -588,11 +593,24 @@ static int send_trans2_replies(char *outbuf,
        
        set_message(outbuf,10,0,True);
 
+       /* Modify the data_to_send and datasize and set the error if
+          we're trying to send more than max_data_bytes. We still send
+          the part of the packet(s) that fit. Strange, but needed
+          for OS/2. */
+
+       if (max_data_bytes > 0 && datasize > max_data_bytes) {
+               DEBUG(5,("send_trans2_replies: max_data_bytes %d exceeded by data %d\n",
+                       max_data_bytes, datasize ));
+               datasize = data_to_send = max_data_bytes;
+               error_packet_set(outbuf,ERRDOS,ERRbufferoverflow,STATUS_BUFFER_OVERFLOW,__LINE__,__FILE__);
+       }
+
        /* If there genuinely are no parameters or data to send just send the empty packet */
 
        if(params_to_send == 0 && data_to_send == 0) {
+               show_msg(outbuf);
                if (!send_smb(smbd_server_fd(),outbuf))
-                       exit_server("send_trans2_replies: send_smb failed.");
+                       exit_server_cleanly("send_trans2_replies: send_smb failed.");
                return 0;
        }
 
@@ -685,8 +703,9 @@ static int send_trans2_replies(char *outbuf,
                        params_to_send, data_to_send, paramsize, datasize));
 
                /* Send the packet */
+               show_msg(outbuf);
                if (!send_smb(smbd_server_fd(),outbuf))
-                       exit_server("send_trans2_replies: send_smb failed.");
+                       exit_server_cleanly("send_trans2_replies: send_smb failed.");
 
                pp += params_sent_thistime;
                pd += data_sent_thistime;
@@ -715,29 +734,31 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
 {
        char *params = *pparams;
        char *pdata = *ppdata;
-       int16 open_mode;
-       int16 open_attr;
+       int deny_mode;
+       int32 open_attr;
        BOOL oplock_request;
 #if 0
        BOOL return_additional_info;
        int16 open_sattr;
        time_t open_time;
 #endif
-       int16 open_ofun;
-       int32 open_size;
+       int open_ofun;
+       uint32 open_size;
        char *pname;
        pstring fname;
        SMB_OFF_T size=0;
-       int fmode=0,mtime=0,rmode;
+       int fattr=0,mtime=0;
        SMB_INO_T inode = 0;
        SMB_STRUCT_STAT sbuf;
        int smb_action = 0;
-       BOOL bad_path = False;
        files_struct *fsp;
-       TALLOC_CTX *ctx = NULL;
        struct ea_list *ea_list = NULL;
        uint16 flags = 0;
        NTSTATUS status;
+       uint32 access_mask;
+       uint32 share_mode;
+       uint32 create_disposition;
+       uint32 create_options = 0;
 
        /*
         * Ensure we have enough parameters to perform the operation.
@@ -748,7 +769,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
        }
 
        flags = SVAL(params, 0);
-       open_mode = SVAL(params, 2);
+       deny_mode = SVAL(params, 2);
        open_attr = SVAL(params,6);
         oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
         if (oplock_request) {
@@ -764,41 +785,49 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
        open_size = IVAL(params,14);
        pname = &params[28];
 
-       if (IS_IPC(conn))
+       if (IS_IPC(conn)) {
                return(ERROR_DOS(ERRSRV,ERRaccess));
+       }
 
-       srvstr_get_path(inbuf, fname, pname, sizeof(fname), -1, STR_TERMINATE, &status, False);
+       srvstr_get_path(inbuf, fname, pname, sizeof(fname), total_params - 28, STR_TERMINATE, &status);
        if (!NT_STATUS_IS_OK(status)) {
                return ERROR_NT(status);
        }
 
-       DEBUG(3,("call_trans2open %s mode=%d attr=%d ofun=%d size=%d\n",
-               fname,open_mode, open_attr, open_ofun, open_size));
+       DEBUG(3,("call_trans2open %s deny_mode=0x%x attr=%d ofun=0x%x size=%d\n",
+               fname, (unsigned int)deny_mode, (unsigned int)open_attr,
+               (unsigned int)open_ofun, open_size));
 
        /* 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);
        }
 
-       /* Strange open mode mapping. */
        if (open_ofun == 0) {
-               if (GET_OPEN_MODE(open_mode) == DOS_OPEN_EXEC) {
-                       open_ofun = FILE_EXISTS_FAIL | FILE_CREATE_IF_NOT_EXIST;
-               }
+               return ERROR_NT(NT_STATUS_OBJECT_NAME_COLLISION);
+       }
+
+       if (!map_open_params_to_ntcreate(fname, deny_mode, open_ofun,
+                               &access_mask,
+                               &share_mode,
+                               &create_disposition,
+                               &create_options)) {
+               return ERROR_DOS(ERRDOS, ERRbadaccess);
        }
 
        /* Any data in this call is an EA list. */
-       if (total_data && !lp_ea_support(SNUM(conn))) {
+       if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
                return ERROR_NT(NT_STATUS_EAS_NOT_SUPPORTED);
        }
 
-       if (total_data) {
+       if (total_data != 4) {
                if (total_data < 10) {
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
@@ -809,61 +838,87 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
-               ctx = talloc_init("TRANS2_OPEN_SET_EA");
-               if (!ctx) {
-                       return ERROR_NT(NT_STATUS_NO_MEMORY);
-               }
-               ea_list = read_ea_list(ctx, pdata + 4, total_data - 4);
+               ea_list = read_ea_list(tmp_talloc_ctx(), pdata + 4,
+                                      total_data - 4);
                if (!ea_list) {
-                       talloc_destroy(ctx);
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
+       } else if (IVAL(pdata,0) != 4) {
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
-       fsp = open_file_shared(conn,fname,&sbuf,open_mode,open_ofun,(uint32)open_attr,
-               oplock_request, &rmode,&smb_action);
+       status = open_file_ntcreate(conn,fname,&sbuf,
+               access_mask,
+               share_mode,
+               create_disposition,
+               create_options,
+               open_attr,
+               oplock_request,
+               &smb_action, &fsp);
       
-       if (!fsp) {
-               talloc_destroy(ctx);
+       if (!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(SVAL(inbuf,smb_mid))) {
                        /* 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);
-       fmode = dos_mode(conn,fname,&sbuf);
+       fattr = dos_mode(conn,fname,&sbuf);
        mtime = sbuf.st_mtime;
        inode = sbuf.st_ino;
-       if (fmode & aDIR) {
-               talloc_destroy(ctx);
-               close_file(fsp,False);
+       if (fattr & aDIR) {
+               close_file(fsp,ERROR_CLOSE);
                return(ERROR_DOS(ERRDOS,ERRnoaccess));
        }
 
-       if (total_data && smb_action == FILE_WAS_CREATED) {
+       /* Save the requested allocation size. */
+       /* Allocate space for the file if a size hint is supplied */
+       if ((smb_action == FILE_WAS_CREATED) || (smb_action == FILE_WAS_OVERWRITTEN)) {
+               SMB_BIG_UINT allocation_size = (SMB_BIG_UINT)open_size;
+               if (allocation_size && (allocation_size > (SMB_BIG_UINT)size)) {
+                        fsp->initial_allocation_size = smb_roundup(fsp->conn, allocation_size);
+                        if (fsp->is_directory) {
+                                close_file(fsp,ERROR_CLOSE);
+                                /* Can't set allocation size on a directory. */
+                                return ERROR_NT(NT_STATUS_ACCESS_DENIED);
+                        }
+                        if (vfs_allocate_file_space(fsp, fsp->initial_allocation_size) == -1) {
+                                close_file(fsp,ERROR_CLOSE);
+                                return ERROR_NT(NT_STATUS_DISK_FULL);
+                        }
+
+                       /* Adjust size here to return the right size in the reply.
+                          Windows does it this way. */
+                       size = fsp->initial_allocation_size;
+                } else {
+                        fsp->initial_allocation_size = smb_roundup(fsp->conn,(SMB_BIG_UINT)size);
+                }
+       }
+
+       if (ea_list && smb_action == FILE_WAS_CREATED) {
                status = set_ea(conn, fsp, fname, ea_list);
-               talloc_destroy(ctx);
                if (!NT_STATUS_IS_OK(status)) {
-                       close_file(fsp,False);
+                       close_file(fsp,ERROR_CLOSE);
                        return ERROR_NT(status);
                }
        }
 
        /* Realloc the size of parameters and data we will return */
-       params = SMB_REALLOC(*pparams, 30);
-       if( params == NULL ) {
+       *pparams = (char *)SMB_REALLOC(*pparams, 30);
+       if(*pparams == NULL ) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
 
        SSVAL(params,0,fsp->fnum);
-       SSVAL(params,2,fmode);
-       put_dos_date2(params,4, mtime);
+       SSVAL(params,2,fattr);
+       srv_put_dos_date2(params,4, mtime);
        SIVAL(params,8, (uint32)size);
-       SSVAL(params,12,rmode);
-       SSVAL(params,16,0); /* Padding. */
+       SSVAL(params,12,deny_mode);
+       SSVAL(params,14,0); /* open_type - file or directory. */
+       SSVAL(params,16,0); /* open_state - only valid for IPC device. */
 
        if (oplock_request && lp_fake_oplocks(SNUM(conn))) {
                smb_action |= EXTENDED_OPLOCK_GRANTED;
@@ -884,7 +939,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
        }
 
        /* Send the required number of replies */
-       send_trans2_replies(outbuf, bufsize, params, 30, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 30, *ppdata, 0, max_data_bytes);
 
        return -1;
 }
@@ -896,16 +951,16 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
  Case can be significant or not.
 **********************************************************/
 
-static BOOL exact_match(char *str,char *mask, BOOL case_sig) 
+static BOOL exact_match(connection_struct *conn, char *str, char *mask)
 {
        if (mask[0] == '.' && mask[1] == 0)
                return False;
-       if (case_sig)   
+       if (conn->case_sensitive)
                return strcmp(str,mask)==0;
        if (StrCaseCmp(str,mask) != 0) {
                return False;
        }
-       if (ms_has_wild(str)) {
+       if (dptr_has_wild(conn->dirptr)) {
                return False;
        }
        return True;
@@ -995,8 +1050,8 @@ static mode_t unix_perms_from_wire( connection_struct *conn, SMB_STRUCT_STAT *ps
 ****************************************************************************/
 
 static BOOL get_lanman2_dir_entry(connection_struct *conn,
-                                 void *inbuf, void *outbuf,
-                                char *path_mask,int dirtype,int info_level,
+                                 void *inbuf, char *outbuf,
+                                char *path_mask,uint32 dirtype,int info_level,
                                 int requires_resume_key,
                                 BOOL dont_descend,char **ppdata, 
                                 char *base_data, int space_remaining, 
@@ -1012,22 +1067,27 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
        char *p, *q, *pdata = *ppdata;
        uint32 reskey=0;
        long prev_dirpos=0;
-       int mode=0;
+       uint32 mode=0;
        SMB_OFF_T file_size = 0;
        SMB_BIG_UINT allocation_size = 0;
        uint32 len;
-       time_t mdate=0, adate=0, cdate=0;
+       struct timespec mdate_ts, adate_ts, create_date_ts;
+       time_t mdate = (time_t)0, adate = (time_t)0, create_date = (time_t)0;
        char *nameptr;
        char *last_entry_ptr;
        BOOL was_8_3;
-       int nt_extmode; /* Used for NT connections instead of mode */
+       uint32 nt_extmode; /* Used for NT connections instead of mode */
        BOOL needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
-       BOOL check_mangled_names = lp_manglednames(SNUM(conn));
+       BOOL check_mangled_names = lp_manglednames(conn->params);
 
        *fname = 0;
        *out_of_space = False;
        *got_exact_match = False;
 
+       ZERO_STRUCT(mdate_ts);
+       ZERO_STRUCT(adate_ts);
+       ZERO_STRUCT(create_date_ts);
+
        if (!conn->dirptr)
                return(False);
 
@@ -1043,6 +1103,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
        while (!found) {
                BOOL got_match;
+               BOOL ms_dfs_link = False;
+
                /* Needed if we run out of space */
                long curr_dirpos = prev_dirpos = dptr_TellDir(conn->dirptr);
                dname = dptr_ReadDirName(conn->dirptr,&curr_dirpos,&sbuf);
@@ -1064,10 +1126,11 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
                pstrcpy(fname,dname);      
 
-               if(!(got_match = *got_exact_match = exact_match(fname, mask, conn->case_sensitive)))
+               if(!(got_match = *got_exact_match = exact_match(conn, fname, mask)))
                        got_match = mask_match(fname, mask, conn->case_sensitive);
 
-               if(!got_match && check_mangled_names && !mangle_is_8_3(fname, False, SNUM(conn))) {
+               if(!got_match && check_mangled_names &&
+                  !mangle_is_8_3(fname, False, conn->params)) {
 
                        /*
                         * It turns out that NT matches wildcards against
@@ -1078,8 +1141,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
                        pstring newname;
                        pstrcpy( newname, fname);
-                       mangle_map( newname, True, False, SNUM(conn));
-                       if(!(got_match = *got_exact_match = exact_match(newname, mask, conn->case_sensitive)))
+                       mangle_map( newname, True, False, conn->params);
+                       if(!(got_match = *got_exact_match = exact_match(conn, newname, mask)))
                                got_match = mask_match(newname, mask, conn->case_sensitive);
                }
 
@@ -1106,8 +1169,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
                                if(lp_host_msdfs() && 
                                   lp_msdfs_root(SNUM(conn)) &&
-                                  is_msdfs_link(conn, pathreal, NULL, NULL,
-                                                &sbuf)) {
+                                  ((ms_dfs_link = is_msdfs_link(NULL,conn, pathreal, NULL, NULL, &sbuf)) == True)) {
 
                                        DEBUG(5,("get_lanman2_dir_entry: Masquerading msdfs link %s as a directory\n", pathreal));
                                        sbuf.st_mode = (sbuf.st_mode & 0xFFF) | S_IFDIR;
@@ -1120,40 +1182,44 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                }
                        }
 
-                       mode = dos_mode(conn,pathreal,&sbuf);
+                       if (ms_dfs_link) {
+                               mode = dos_mode_msdfs(conn,pathreal,&sbuf);
+                       } else {
+                               mode = dos_mode(conn,pathreal,&sbuf);
+                       }
 
                        if (!dir_check_ftype(conn,mode,dirtype)) {
                                DEBUG(5,("[%s] attribs didn't match %x\n",fname,dirtype));
                                continue;
                        }
 
-                       file_size = get_file_size(sbuf);
+                       if (!(mode & aDIR))
+                               file_size = get_file_size(sbuf);
                        allocation_size = get_allocation_size(conn,NULL,&sbuf);
-                       mdate = sbuf.st_mtime;
-                       adate = sbuf.st_atime;
-                       cdate = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
 
-                       if (lp_dos_filetime_resolution(SNUM(conn))) {
-                               cdate &= ~1;
-                               mdate &= ~1;
-                               adate &= ~1;
-                       }
+                       mdate_ts = get_mtimespec(&sbuf);
+                       adate_ts = get_atimespec(&sbuf);
+                       create_date_ts = get_create_timespec(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
 
-                       if(mode & aDIR) {
-                               /* This is necessary, as otherwise the
-                                * desktop.ini file in this folder is
-                                * ignored */
-                               mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-                               file_size = 0;
+                       if (lp_dos_filetime_resolution(SNUM(conn))) {
+                               dos_filetime_timespec(&create_date_ts);
+                               dos_filetime_timespec(&mdate_ts);
+                               dos_filetime_timespec(&adate_ts);
                        }
 
+                       create_date = convert_timespec_to_time_t(create_date_ts);
+                       mdate = convert_timespec_to_time_t(mdate_ts);
+                       adate = convert_timespec_to_time_t(adate_ts);
+                       
                        DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
          
                        found = True;
+
+                       dptr_DirCacheAdd(conn->dirptr, dname, curr_dirpos);
                }
        }
 
-       mangle_map(fname,False,True,SNUM(conn));
+       mangle_map(fname,False,True,conn->params);
 
        p = pdata;
        last_entry_ptr = p;
@@ -1167,9 +1233,9 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                SIVAL(p,0,reskey);
                                p += 4;
                        }
-                       put_dos_date2(p,0,cdate);
-                       put_dos_date2(p,4,adate);
-                       put_dos_date2(p,8,mdate);
+                       srv_put_dos_date2(p,0,create_date);
+                       srv_put_dos_date2(p,4,adate);
+                       srv_put_dos_date2(p,8,mdate);
                        SIVAL(p,12,(uint32)file_size);
                        SIVAL(p,16,(uint32)allocation_size);
                        SSVAL(p,20,mode);
@@ -1199,9 +1265,9 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                SIVAL(p,0,reskey);
                                p += 4;
                        }
-                       put_dos_date2(p,0,cdate);
-                       put_dos_date2(p,4,adate);
-                       put_dos_date2(p,8,mdate);
+                       srv_put_dos_date2(p,0,create_date);
+                       srv_put_dos_date2(p,4,adate);
+                       srv_put_dos_date2(p,8,mdate);
                        SIVAL(p,12,(uint32)file_size);
                        SIVAL(p,16,(uint32)allocation_size);
                        SSVAL(p,20,mode);
@@ -1243,9 +1309,9 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                SIVAL(p,0,reskey);
                                p += 4;
                        }
-                       put_dos_date2(p,0,cdate);
-                       put_dos_date2(p,4,adate);
-                       put_dos_date2(p,8,mdate);
+                       srv_put_dos_date2(p,0,create_date);
+                       srv_put_dos_date2(p,4,adate);
+                       srv_put_dos_date2(p,8,mdate);
                        SIVAL(p,12,(uint32)file_size);
                        SIVAL(p,16,(uint32)allocation_size);
                        SSVAL(p,20,mode);
@@ -1289,13 +1355,13 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
                case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_BOTH_DIRECTORY_INFO\n"));
-                       was_8_3 = mangle_is_8_3(fname, True, SNUM(conn));
+                       was_8_3 = mangle_is_8_3(fname, True, conn->params);
                        p += 4;
                        SIVAL(p,0,reskey); p += 4;
-                       put_long_date(p,cdate); p += 8;
-                       put_long_date(p,adate); p += 8;
-                       put_long_date(p,mdate); p += 8;
-                       put_long_date(p,mdate); p += 8;
+                       put_long_date_timespec(p,create_date_ts); p += 8;
+                       put_long_date_timespec(p,adate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
                        SIVAL(p,0,nt_extmode); p += 4;
@@ -1312,7 +1378,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        if (!was_8_3 && check_mangled_names) {
                                pstring mangled_name;
                                pstrcpy(mangled_name, fname);
-                               mangle_map(mangled_name,True,True,SNUM(conn));
+                               mangle_map(mangled_name,True,True,
+                                          conn->params);
                                mangled_name[12] = 0;
                                len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER|STR_UNICODE);
                                if (len < 24) {
@@ -1337,10 +1404,10 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_DIRECTORY_INFO\n"));
                        p += 4;
                        SIVAL(p,0,reskey); p += 4;
-                       put_long_date(p,cdate); p += 8;
-                       put_long_date(p,adate); p += 8;
-                       put_long_date(p,mdate); p += 8;
-                       put_long_date(p,mdate); p += 8;
+                       put_long_date_timespec(p,create_date_ts); p += 8;
+                       put_long_date_timespec(p,adate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
                        SIVAL(p,0,nt_extmode); p += 4;
@@ -1358,10 +1425,10 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_FULL_DIRECTORY_INFO\n"));
                        p += 4;
                        SIVAL(p,0,reskey); p += 4;
-                       put_long_date(p,cdate); p += 8;
-                       put_long_date(p,adate); p += 8;
-                       put_long_date(p,mdate); p += 8;
-                       put_long_date(p,mdate); p += 8;
+                       put_long_date_timespec(p,create_date_ts); p += 8;
+                       put_long_date_timespec(p,adate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
                        SIVAL(p,0,nt_extmode); p += 4;
@@ -1403,10 +1470,10 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_ID_FULL_DIRECTORY_INFO\n"));
                        p += 4;
                        SIVAL(p,0,reskey); p += 4;
-                       put_long_date(p,cdate); p += 8;
-                       put_long_date(p,adate); p += 8;
-                       put_long_date(p,mdate); p += 8;
-                       put_long_date(p,mdate); p += 8;
+                       put_long_date_timespec(p,create_date_ts); p += 8;
+                       put_long_date_timespec(p,adate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
                        SIVAL(p,0,nt_extmode); p += 4;
@@ -1417,8 +1484,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                p +=4;
                        }
                        SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */
-                       SIVAL(p,0,sbuf.st_dev); p += 4;
-                       SIVAL(p,0,sbuf.st_ino); p += 4;
+                       SIVAL(p,0,sbuf.st_ino); p += 4; /* FileIndexLow */
+                       SIVAL(p,0,sbuf.st_dev); p += 4; /* FileIndexHigh */
                        len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE_ASCII);
                        SIVAL(q, 0, len);
                        p += len; 
@@ -1431,13 +1498,13 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
 
                case SMB_FIND_ID_BOTH_DIRECTORY_INFO:
                        DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_ID_BOTH_DIRECTORY_INFO\n"));
-                       was_8_3 = mangle_is_8_3(fname, True, SNUM(conn));
+                       was_8_3 = mangle_is_8_3(fname, True, conn->params);
                        p += 4;
                        SIVAL(p,0,reskey); p += 4;
-                       put_long_date(p,cdate); p += 8;
-                       put_long_date(p,adate); p += 8;
-                       put_long_date(p,mdate); p += 8;
-                       put_long_date(p,mdate); p += 8;
+                       put_long_date_timespec(p,create_date_ts); p += 8;
+                       put_long_date_timespec(p,adate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
+                       put_long_date_timespec(p,mdate_ts); p += 8;
                        SOFF_T(p,0,file_size); p += 8;
                        SOFF_T(p,0,allocation_size); p += 8;
                        SIVAL(p,0,nt_extmode); p += 4;
@@ -1454,7 +1521,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        if (!was_8_3 && check_mangled_names) {
                                pstring mangled_name;
                                pstrcpy(mangled_name, fname);
-                               mangle_map(mangled_name,True,True,SNUM(conn));
+                               mangle_map(mangled_name,True,True,
+                                          conn->params);
                                mangled_name[12] = 0;
                                len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER|STR_UNICODE);
                                SSVAL(p, 0, len);
@@ -1467,8 +1535,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        }
                        p += 26;
                        SSVAL(p,0,0); p += 2; /* Reserved ? */
-                       SIVAL(p,0,sbuf.st_dev); p += 4;
-                       SIVAL(p,0,sbuf.st_ino); p += 4;
+                       SIVAL(p,0,sbuf.st_ino); p += 4; /* FileIndexLow */
+                       SIVAL(p,0,sbuf.st_dev); p += 4; /* FileIndexHigh */
                        len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE_ASCII);
                        SIVAL(q,0,len);
                        p += len;
@@ -1493,9 +1561,9 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        SOFF_T(p,0,get_allocation_size(conn,NULL,&sbuf)); /* Number of bytes used on disk - 64 Bit */
                        p+= 8;
 
-                       put_long_date(p,sbuf.st_ctime);       /* Inode change Time 64 Bit */
-                       put_long_date(p+8,sbuf.st_atime);     /* Last access time 64 Bit */
-                       put_long_date(p+16,sbuf.st_mtime);    /* Last modification time 64 Bit */
+                       put_long_date_timespec(p,get_ctimespec(&sbuf));       /* Inode change Time 64 Bit */
+                       put_long_date_timespec(p+8,get_atimespec(&sbuf));     /* Last access time 64 Bit */
+                       put_long_date_timespec(p+16,get_mtimespec(&sbuf));    /* Last modification time 64 Bit */
                        p+= 24;
 
                        SIVAL(p,0,sbuf.st_uid);               /* user id for the owner */
@@ -1517,7 +1585,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        SIVAL(p,4,0);
                        p+= 8;
 
-                       SINO_T(p,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
+                       SINO_T_VAL(p,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
                        p+= 8;
 
                        SIVAL(p,0, unix_perms_to_wire(sbuf.st_mode));     /* Standard UNIX file permissions */
@@ -1576,13 +1644,13 @@ static int call_trans2findfirst(connection_struct *conn, char *inbuf, char *outb
                requested. */
        char *params = *pparams;
        char *pdata = *ppdata;
-       int 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;
@@ -1594,21 +1662,29 @@ 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 = %d, maxentries = %d, close_after_first=%d, \
+       DEBUG(3,("call_trans2findfirst: dirtype = %x, maxentries = %d, close_after_first=%d, \
 close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
-               dirtype, maxentries, close_after_first, close_if_end, requires_resume_key,
+               (unsigned int)dirtype, maxentries, close_after_first, close_if_end, requires_resume_key,
                info_level, max_data_bytes));
 
        if (!maxentries) {
@@ -1628,35 +1704,39 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
                case SMB_FIND_ID_BOTH_DIRECTORY_INFO:
                        break;
                case SMB_FIND_FILE_UNIX:
-                       if (!lp_unix_extensions())
-                               return(ERROR_DOS(ERRDOS,ERRunknownlevel));
+                       if (!lp_unix_extensions()) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+                       }
                        break;
                default:
-                       return(ERROR_DOS(ERRDOS,ERRunknownlevel));
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
-       srvstr_get_path(inbuf, directory, params+12, sizeof(directory), -1, STR_TERMINATE, &ntstatus, True);
+       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,'/');
        if(p == NULL) {
                /* Windows and OS/2 systems treat search on the root '\' as if it were '\*' */
-               if((directory[0] == '.') && (directory[1] == '\0'))
+               if((directory[0] == '.') && (directory[1] == '\0')) {
                        pstrcpy(mask,"*");
-               else
+                       mask_contains_wcard = True;
+               } else {
                        pstrcpy(mask,directory);
+               }
                pstrcpy(directory,"./");
        } else {
                pstrcpy(mask,p+1);
@@ -1686,7 +1766,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) {
@@ -1695,38 +1775,42 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                }
        }
 
-       pdata = SMB_REALLOC(*ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
-       if( pdata == NULL ) {
+       *ppdata = (char *)SMB_REALLOC(
+               *ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
+       if(*ppdata == NULL ) {
                talloc_destroy(ea_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-
-       *ppdata = pdata;
+       pdata = *ppdata;
 
        /* Realloc the params space */
-       params = SMB_REALLOC(*pparams, 10);
-       if (params == NULL) {
+       *pparams = (char *)SMB_REALLOC(*pparams, 10);
+       if (*pparams == NULL) {
                talloc_destroy(ea_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
-
-       dptr_num = dptr_create(conn,directory, False, True ,SVAL(inbuf,smb_pid));
-       if (dptr_num < 0) {
-               talloc_destroy(ea_ctx);
-               return(UNIXERROR(ERRDOS,ERRbadfile));
-       }
+       params = *pparams;
 
        /* Save the wildcard match and attribs we are using on this directory - 
                needed as lanman2 assumes these are being saved between calls */
 
-       if (!dptr_set_wcard_and_attributes(dptr_num, mask, dirtype)) {
-               dptr_close(&dptr_num);
+       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 ERROR_NT(NT_STATUS_NO_MEMORY);
+               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. */
@@ -1808,7 +1892,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
        SSVAL(params,6,0); /* Never an EA error */
        SSVAL(params,8,last_entry_off);
 
-       send_trans2_replies( outbuf, bufsize, params, 10, pdata, PTR_DIFF(p,pdata));
+       send_trans2_replies( outbuf, bufsize, params, 10, pdata, PTR_DIFF(p,pdata), max_data_bytes);
 
        if ((! *directory) && dptr_path(dptr_num))
                slprintf(directory,sizeof(directory)-1, "(%s)",dptr_path(dptr_num));
@@ -1825,8 +1909,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
         * (see PR#13758). JRA.
         */
 
-       if(!mangle_is_8_3_wildcards( mask, False, SNUM(conn)))
-               mangle_map(mask, True, True, SNUM(conn));
+       if(!mangle_is_8_3_wildcards( mask, False, conn->params))
+               mangle_map(mask, True, True, conn->params);
 
        return(-1);
 }
@@ -1846,15 +1930,16 @@ 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;
        pstring directory;
@@ -1870,13 +1955,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(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE, &ntstatus, True);
+       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
@@ -1910,13 +2005,16 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
                case SMB_FIND_FILE_FULL_DIRECTORY_INFO:
                case SMB_FIND_FILE_NAMES_INFO:
                case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
+               case SMB_FIND_ID_FULL_DIRECTORY_INFO:
+               case SMB_FIND_ID_BOTH_DIRECTORY_INFO:
                        break;
                case SMB_FIND_FILE_UNIX:
-                       if (!lp_unix_extensions())
-                               return(ERROR_DOS(ERRDOS,ERRunknownlevel));
+                       if (!lp_unix_extensions()) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+                       }
                        break;
                default:
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
        if (info_level == SMB_FIND_EA_LIST) {
@@ -1949,22 +2047,23 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                }
        }
 
-       pdata = SMB_REALLOC( *ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
-       if(pdata == NULL) {
+       *ppdata = (char *)SMB_REALLOC(
+               *ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
+       if(*ppdata == NULL) {
                talloc_destroy(ea_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
 
-       *ppdata = pdata;
+       pdata = *ppdata;
 
        /* Realloc the params space */
-       params = SMB_REALLOC(*pparams, 6*SIZEOFWORD);
-       if( params == NULL ) {
+       *pparams = (char *)SMB_REALLOC(*pparams, 6*SIZEOFWORD);
+       if(*pparams == NULL ) {
                talloc_destroy(ea_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
 
-       *pparams = params;
+       params = *pparams;
 
        /* Check that the dptr is valid */
        if(!(conn->dirptr = dptr_fetch_lanman2(dptr_num))) {
@@ -2018,8 +2117,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                 * could be mangled. Ensure we check the unmangled name.
                 */
 
-               if (mangle_is_mangled(resume_name, SNUM(conn))) {
-                       mangle_check_cache(resume_name, sizeof(resume_name)-1, SNUM(conn));
+               if (mangle_is_mangled(resume_name, conn->params)) {
+                       mangle_check_cache(resume_name, sizeof(resume_name)-1,
+                                          conn->params);
                }
 
                /*
@@ -2084,7 +2184,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
        SSVAL(params,4,0); /* Never an EA error */
        SSVAL(params,6,last_entry_off);
 
-       send_trans2_replies( outbuf, bufsize, params, 8, pdata, PTR_DIFF(p,pdata));
+       send_trans2_replies( outbuf, bufsize, params, 8, pdata, PTR_DIFF(p,pdata), max_data_bytes);
 
        if ((! *directory) && dptr_path(dptr_num))
                slprintf(directory,sizeof(directory)-1, "(%s)",dptr_path(dptr_num));
@@ -2106,7 +2206,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));
@@ -2114,6 +2214,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) {
@@ -2121,12 +2227,13 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
                return ERROR_DOS(ERRSRV,ERRinvdevice);
        }
 
-       pdata = SMB_REALLOC(*ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
-       if ( pdata == NULL ) {
+       *ppdata = (char *)SMB_REALLOC(
+               *ppdata, max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
+       if (*ppdata == NULL ) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
 
-       *ppdata = pdata;
+       pdata = *ppdata;
        memset((char *)pdata,'\0',max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
 
        switch (info_level) {
@@ -2134,7 +2241,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 18;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
 
@@ -2235,7 +2342,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_dev, (unsi
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 24;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
                        block_size = lp_block_size(snum);
@@ -2267,7 +2374,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 32;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
                        block_size = lp_block_size(snum);
@@ -2336,10 +2443,9 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        
                        fsp.conn = conn;
                        fsp.fnum = -1;
-                       fsp.fd = -1;
                        
                        /* access check */
-                       if (current_user.uid != 0) {
+                       if (current_user.ut.uid != 0) {
                                DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
                                        lp_servicename(SNUM(conn)),conn->user));
                                return ERROR_DOS(ERRDOS,ERRnoaccess);
@@ -2385,13 +2491,51 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                 */
 
                case SMB_QUERY_CIFS_UNIX_INFO:
-                       if (!lp_unix_extensions())
-                               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       if (!lp_unix_extensions()) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+                       }
                        data_len = 12;
                        SSVAL(pdata,0,CIFS_UNIX_MAJOR_VERSION);
                        SSVAL(pdata,2,CIFS_UNIX_MINOR_VERSION);
-                       SBIG_UINT(pdata,4,((SMB_BIG_UINT)CIFS_UNIX_POSIX_ACLS_CAP)); /* We have POSIX ACLs. */
+                       /* We have POSIX ACLs, pathname and locking capability. */
+                       SBIG_UINT(pdata,4,((SMB_BIG_UINT)(
+                                       CIFS_UNIX_POSIX_ACLS_CAP|
+                                       CIFS_UNIX_POSIX_PATHNAMES_CAP|
+                                       CIFS_UNIX_FCNTL_LOCKS_CAP)));
+                       break;
+
+               case SMB_QUERY_POSIX_FS_INFO:
+               {
+                       int rc;
+                       vfs_statvfs_struct svfs;
+
+                       if (!lp_unix_extensions()) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+                       }
+
+                       rc = SMB_VFS_STATVFS(conn, ".", &svfs);
+
+                       if (!rc) {
+                               data_len = 56;
+                               SIVAL(pdata,0,svfs.OptimalTransferSize);
+                               SIVAL(pdata,4,svfs.BlockSize);
+                               SBIG_UINT(pdata,8,svfs.TotalBlocks);
+                               SBIG_UINT(pdata,16,svfs.BlocksAvail);
+                               SBIG_UINT(pdata,24,svfs.UserBlocksAvail);
+                               SBIG_UINT(pdata,32,svfs.TotalFileNodes);
+                               SBIG_UINT(pdata,40,svfs.FreeFileNodes);
+                               SBIG_UINT(pdata,48,svfs.FsIdentifier);
+                               DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_POSIX_FS_INFO succsessful\n"));
+#ifdef EOPNOTSUPP
+                       } else if (rc == EOPNOTSUPP) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+#endif /* EOPNOTSUPP */
+                       } else {
+                               DEBUG(0,("vfs_statvfs() failed for service [%s]\n",lp_servicename(SNUM(conn))));
+                               return ERROR_DOS(ERRSRV,ERRerror);
+                       }
                        break;
+               }
 
                case SMB_MAC_QUERY_FS_INFO:
                        /*
@@ -2405,11 +2549,11 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        }
                        /* drop through */
                default:
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
 
-       send_trans2_replies( outbuf, bufsize, params, 0, pdata, data_len);
+       send_trans2_replies( outbuf, bufsize, params, 0, pdata, data_len, max_data_bytes);
 
        DEBUG( 4, ( "%s info_level = %d\n", smb_fn_name(CVAL(inbuf,smb_com)), info_level) );
 
@@ -2426,22 +2570,11 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
 {
        char *pdata = *ppdata;
        char *params = *pparams;
-       files_struct *fsp = NULL;
        uint16 info_level;
        int outsize;
-       SMB_NTQUOTA_STRUCT quotas;
-       
-       ZERO_STRUCT(quotas);
 
        DEBUG(10,("call_trans2setfsinfo: for service [%s]\n",lp_servicename(SNUM(conn))));
 
-       /* access check */
-       if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
-               DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
-                       lp_servicename(SNUM(conn)),conn->user));
-               return ERROR_DOS(ERRSRV,ERRaccess);
-       }
-
        /*  */
        if (total_params < 4) {
                DEBUG(0,("call_trans2setfsinfo: requires total_params(%d) >= 4 bytes!\n",
@@ -2460,7 +2593,7 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
                                uint32 client_unix_cap_high;
 
                                if (!lp_unix_extensions()) {
-                                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                                }
 
                                /* There should be 12 bytes of capabilities set. */
@@ -2472,76 +2605,99 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
                                client_unix_cap_low = IVAL(pdata,4);
                                client_unix_cap_high = IVAL(pdata,8);
                                /* Just print these values for now. */
-                               DEBUG(10,("call_trans2setfsinfo: set unix info. major = %u, minor = %u\
+                               DEBUG(10,("call_trans2setfsinfo: set unix info. major = %u, minor = %u \
 cap_low = 0x%x, cap_high = 0x%x\n",
                                        (unsigned int)client_unix_major,
                                        (unsigned int)client_unix_minor,
                                        (unsigned int)client_unix_cap_low,
                                        (unsigned int)client_unix_cap_high ));
 
+                               /* Here is where we must switch to posix pathname processing... */
+                               if (client_unix_cap_low & CIFS_UNIX_POSIX_PATHNAMES_CAP) {
+                                       lp_set_posix_pathnames();
+                                       mangle_change_to_posix();
+                               }
+
+                               if (client_unix_cap_low & CIFS_UNIX_FCNTL_LOCKS_CAP) {
+                                       lp_set_posix_cifsx_locktype(POSIX_LOCK);
+                               }
                                break;
                        }
                case SMB_FS_QUOTA_INFORMATION:
-                       /* note: normaly there're 48 bytes,
-                        * but we didn't use the last 6 bytes for now 
-                        * --metze 
-                        */
-                       fsp = file_fsp(params,0);
-                       if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
-                               DEBUG(3,("TRANSACT_GET_USER_QUOTA: no valid QUOTA HANDLE\n"));
-                               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
-                       }
+                       {
+                               files_struct *fsp = NULL;
+                               SMB_NTQUOTA_STRUCT quotas;
+       
+                               ZERO_STRUCT(quotas);
 
-                       if (total_data < 42) {
-                               DEBUG(0,("call_trans2setfsinfo: SET_FS_QUOTA: requires total_data(%d) >= 42 bytes!\n",
-                                       total_data));
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+                               /* access check */
+                               if ((current_user.ut.uid != 0)||!CAN_WRITE(conn)) {
+                                       DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
+                                               lp_servicename(SNUM(conn)),conn->user));
+                                       return ERROR_DOS(ERRSRV,ERRaccess);
+                               }
+
+                               /* note: normaly there're 48 bytes,
+                                * but we didn't use the last 6 bytes for now 
+                                * --metze 
+                                */
+                               fsp = file_fsp(params,0);
+                               if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
+                                       DEBUG(3,("TRANSACT_GET_USER_QUOTA: no valid QUOTA HANDLE\n"));
+                                       return ERROR_NT(NT_STATUS_INVALID_HANDLE);
+                               }
+
+                               if (total_data < 42) {
+                                       DEBUG(0,("call_trans2setfsinfo: SET_FS_QUOTA: requires total_data(%d) >= 42 bytes!\n",
+                                               total_data));
+                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                               }
                        
-                       /* unknown_1 24 NULL bytes in pdata*/
+                               /* unknown_1 24 NULL bytes in pdata*/
                
-                       /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
-                       quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
+                               /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
+                               quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
 #ifdef LARGE_SMB_OFF_T
-                       quotas.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28)) << 32);
+                               quotas.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28)) << 32);
 #else /* LARGE_SMB_OFF_T */
-                       if ((IVAL(pdata,28) != 0)&&
-                               ((quotas.softlim != 0xFFFFFFFF)||
-                               (IVAL(pdata,28)!=0xFFFFFFFF))) {
-                               /* more than 32 bits? */
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+                               if ((IVAL(pdata,28) != 0)&&
+                                       ((quotas.softlim != 0xFFFFFFFF)||
+                                       (IVAL(pdata,28)!=0xFFFFFFFF))) {
+                                       /* more than 32 bits? */
+                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                               }
 #endif /* LARGE_SMB_OFF_T */
                
-                       /* the hard quotas 8 bytes (SMB_BIG_UINT)*/
-                       quotas.hardlim = (SMB_BIG_UINT)IVAL(pdata,32);
+                               /* the hard quotas 8 bytes (SMB_BIG_UINT)*/
+                               quotas.hardlim = (SMB_BIG_UINT)IVAL(pdata,32);
 #ifdef LARGE_SMB_OFF_T
-                       quotas.hardlim |= (((SMB_BIG_UINT)IVAL(pdata,36)) << 32);
+                               quotas.hardlim |= (((SMB_BIG_UINT)IVAL(pdata,36)) << 32);
 #else /* LARGE_SMB_OFF_T */
-                       if ((IVAL(pdata,36) != 0)&&
-                               ((quotas.hardlim != 0xFFFFFFFF)||
-                               (IVAL(pdata,36)!=0xFFFFFFFF))) {
-                               /* more than 32 bits? */
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
+                               if ((IVAL(pdata,36) != 0)&&
+                                       ((quotas.hardlim != 0xFFFFFFFF)||
+                                       (IVAL(pdata,36)!=0xFFFFFFFF))) {
+                                       /* more than 32 bits? */
+                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                               }
 #endif /* LARGE_SMB_OFF_T */
                
-                       /* quota_flags 2 bytes **/
-                       quotas.qflags = SVAL(pdata,40);
+                               /* quota_flags 2 bytes **/
+                               quotas.qflags = SVAL(pdata,40);
                
-                       /* unknown_2 6 NULL bytes follow*/
+                               /* unknown_2 6 NULL bytes follow*/
                
-                       /* now set the quotas */
-                       if (vfs_set_ntquota(fsp, SMB_USER_FS_QUOTA_TYPE, NULL, &quotas)!=0) {
-                               DEBUG(0,("vfs_set_ntquota() failed for service [%s]\n",lp_servicename(SNUM(conn))));
-                               return ERROR_DOS(ERRSRV,ERRerror);
-                       }
+                               /* now set the quotas */
+                               if (vfs_set_ntquota(fsp, SMB_USER_FS_QUOTA_TYPE, NULL, &quotas)!=0) {
+                                       DEBUG(0,("vfs_set_ntquota() failed for service [%s]\n",lp_servicename(SNUM(conn))));
+                                       return ERROR_DOS(ERRSRV,ERRerror);
+                               }
                        
-                       break;
+                               break;
+                       }
                default:
                        DEBUG(3,("call_trans2setfsinfo: unknown level (0x%X) not implemented yet.\n",
                                info_level));
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        break;
        }
 
@@ -2556,25 +2712,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.
@@ -2706,6 +2843,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
        char *pdata = *ppdata;
        uint16 info_level;
        int mode=0;
+       int nlink;
        SMB_OFF_T file_size=0;
        SMB_BIG_UINT allocation_size=0;
        unsigned int data_size = 0;
@@ -2716,14 +2854,15 @@ 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 c_time;
+       time_t create_time, mtime, atime;
+       struct timespec create_time_ts, mtime_ts, atime_ts;
        files_struct *fsp = NULL;
-       TALLOC_CTX *ea_ctx = NULL;
+       TALLOC_CTX *data_ctx = NULL;
        struct ea_list *ea_list = NULL;
-       uint32 desired_access = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
+       uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
+       char *lock_data = NULL;
 
        if (!params)
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -2748,7 +2887,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                        pstrcpy(fname, fsp->fsp_name);
                        /* We know this name is ok, it's already passed the checks. */
                        
-               } else if(fsp && (fsp->is_directory || fsp->fd == -1)) {
+               } else if(fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
                        /*
                         * This is actually a QFILEINFO on a directory
                         * handle (returned from an NT SMB). NT5.0 seems
@@ -2761,14 +2900,14 @@ 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 = fsp->is_directory ? fsp->directory_delete_on_close : 0;
+                       delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
                } else {
                        /*
                         * Original code - this is an open file.
@@ -2776,19 +2915,19 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                        CHECK_FSP(fsp,conn);
 
                        pstrcpy(fname, fsp->fsp_name);
-                       if (SMB_VFS_FSTAT(fsp,fsp->fd,&sbuf) != 0) {
+                       if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0) {
                                DEBUG(3,("fstat of fnum %d failed (%s)\n", fsp->fnum, strerror(errno)));
                                return(UNIXERROR(ERRDOS,ERRbadfid));
                        }
-                       pos = fsp->position_information;
-                       delete_pending = fsp->delete_on_close;
-                       desired_access = fsp->desired_access;
+                       pos = fsp->fh->position_information;
+                       delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
+                       access_mask = fsp->access_mask;
                }
        } else {
                NTSTATUS status = NT_STATUS_OK;
 
                /* qpathinfo */
-               if (total_params < 6) {
+               if (total_params < 7) {
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
@@ -2796,36 +2935,54 @@ 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, False);
+               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);
+               if (delete_pending) {
+                       return ERROR_NT(NT_STATUS_DELETE_PENDING);
+               }
+       }
+
+       nlink = sbuf.st_nlink;
+
+       if ((nlink > 0) && S_ISDIR(sbuf.st_mode)) {
+               /* NTFS does not seem to count ".." */
+               nlink -= 1;
+       }
+
+       if ((nlink > 0) && delete_pending) {
+               nlink -= 1;
        }
 
-       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions())
-               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+       }
 
        DEBUG(3,("call_trans2qfilepathinfo %s (fnum = %d) level=%d call=%d total_data=%d\n",
                fname,fsp ? fsp->fnum : -1, info_level,tran_call,total_data));
@@ -2841,75 +2998,104 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                mode = FILE_ATTRIBUTE_NORMAL;
 
        fullpathname = fname;
-       file_size = get_file_size(sbuf);
-       if (mode & aDIR) {
-               /* This is necessary, as otherwise the desktop.ini file in
-                * this folder is ignored */
-               mode |= (lp_profile_acls(SNUM(conn)) ? aRONLY : 0);
-               file_size = 0;
-       }
+       if (!(mode & aDIR))
+               file_size = get_file_size(sbuf);
 
-       /* Pull any EA list from the data portion. */
-       if (info_level == SMB_INFO_QUERY_EAS_FROM_LIST) {
-               uint32 ea_size;
+       /* Pull out any data sent here before we realloc. */
+       switch (info_level) {
+               case SMB_INFO_QUERY_EAS_FROM_LIST:
+               {
+                       /* Pull any EA list from the data portion. */
+                       uint32 ea_size;
 
-               if (total_data < 4) {
-                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-               }
-               ea_size = IVAL(pdata,0);
+                       if (total_data < 4) {
+                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                       }
+                       ea_size = IVAL(pdata,0);
 
-               if (total_data > 0 && ea_size != total_data) {
-                       DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
+                       if (total_data > 0 && ea_size != total_data) {
+                               DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
 total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pdata,0) ));
-                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-               }
+                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                       }
 
-               if (!lp_ea_support(SNUM(conn))) {
-                       return ERROR_DOS(ERRDOS,ERReasnotsupported);
-               }
+                       if (!lp_ea_support(SNUM(conn))) {
+                               return ERROR_DOS(ERRDOS,ERReasnotsupported);
+                       }
 
-               if ((ea_ctx = talloc_init("ea_list")) == NULL) {
-                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+                       if ((data_ctx = talloc_init("ea_list")) == NULL) {
+                               return ERROR_NT(NT_STATUS_NO_MEMORY);
+                       }
+
+                       /* Pull out the list of names. */
+                       ea_list = read_ea_name_list(data_ctx, pdata + 4, ea_size - 4);
+                       if (!ea_list) {
+                               talloc_destroy(data_ctx);
+                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                       }
+                       break;
                }
 
-               /* Pull out the list of names. */
-               ea_list = read_ea_name_list(ea_ctx, pdata + 4, ea_size - 4);
-               if (!ea_list) {
-                       talloc_destroy(ea_ctx);
-                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               case SMB_QUERY_POSIX_LOCK:
+               {
+                       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);
+                       }
+
+                       if ((data_ctx = talloc_init("lock_request")) == NULL) {
+                               return ERROR_NT(NT_STATUS_NO_MEMORY);
+                       }
+
+                       /* Copy the lock range data. */
+                       lock_data = (char *)talloc_memdup(
+                               data_ctx, pdata, total_data);
+                       if (!lock_data) {
+                               talloc_destroy(data_ctx);
+                               return ERROR_NT(NT_STATUS_NO_MEMORY);
+                       }
                }
+               default:
+                       break;
        }
 
-       params = SMB_REALLOC(*pparams,2);
-       if (params == NULL) {
-               talloc_destroy(ea_ctx);
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if (*pparams == NULL) {
+               talloc_destroy(data_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
        SSVAL(params,0,0);
        data_size = max_data_bytes + DIR_ENTRY_SAFETY_MARGIN;
-       pdata = SMB_REALLOC(*ppdata, data_size); 
-       if ( pdata == NULL ) {
-               talloc_destroy(ea_ctx);
+       *ppdata = (char *)SMB_REALLOC(*ppdata, data_size); 
+       if (*ppdata == NULL ) {
+               talloc_destroy(data_ctx);
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *ppdata = pdata;
+       pdata = *ppdata;
 
-       c_time = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
+       create_time_ts = get_create_timespec(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
+       mtime_ts = get_mtimespec(&sbuf);
+       atime_ts = get_atimespec(&sbuf);
 
        allocation_size = get_allocation_size(conn,fsp,&sbuf);
 
        if (fsp) {
                if (fsp->pending_modtime) {
                        /* the pending modtime overrides the current modtime */
-                       sbuf.st_mtime = fsp->pending_modtime;
+                       mtime_ts.tv_sec = fsp->pending_modtime;
+                       mtime_ts.tv_nsec = 0;
                }
        } else {
                /* Do we have this path open ? */
                files_struct *fsp1 = file_find_di_first(sbuf.st_dev, sbuf.st_ino);
                if (fsp1 && fsp1->pending_modtime) {
                        /* the pending modtime overrides the current modtime */
-                       sbuf.st_mtime = fsp1->pending_modtime;
+                       mtime_ts.tv_sec = fsp1->pending_modtime;
+                       mtime_ts.tv_nsec = 0;
                }
                if (fsp1 && fsp1->initial_allocation_size) {
                        allocation_size = get_allocation_size(conn, fsp1, &sbuf);
@@ -2917,12 +3103,15 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
        }
 
        if (lp_dos_filetime_resolution(SNUM(conn))) {
-               c_time &= ~1;
-               sbuf.st_atime &= ~1;
-               sbuf.st_ctime &= ~1;
-               sbuf.st_mtime &= ~1;
+               dos_filetime_timespec(&create_time_ts);
+               dos_filetime_timespec(&mtime_ts);
+               dos_filetime_timespec(&atime_ts);
        }
 
+       create_time = convert_timespec_to_time_t(create_time_ts);
+       mtime = convert_timespec_to_time_t(mtime_ts);
+       atime = convert_timespec_to_time_t(atime_ts);
+
        /* NT expects the name to be in an exact form of the *full*
           filename. See the trans2 torture test */
        if (strequal(base_name,".")) {
@@ -2936,9 +3125,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                case SMB_INFO_STANDARD:
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_STANDARD\n"));
                        data_size = 22;
-                       put_dos_date2(pdata,l1_fdateCreation,c_time);
-                       put_dos_date2(pdata,l1_fdateLastAccess,sbuf.st_atime);
-                       put_dos_date2(pdata,l1_fdateLastWrite,sbuf.st_mtime); /* write time */
+                       srv_put_dos_date2(pdata,l1_fdateCreation,create_time);
+                       srv_put_dos_date2(pdata,l1_fdateLastAccess,atime);
+                       srv_put_dos_date2(pdata,l1_fdateLastWrite,mtime); /* write time */
                        SIVAL(pdata,l1_cbFile,(uint32)file_size);
                        SIVAL(pdata,l1_cbFileAlloc,(uint32)allocation_size);
                        SSVAL(pdata,l1_attrFile,mode);
@@ -2949,9 +3138,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EA_SIZE\n"));
                        data_size = 26;
-                       put_dos_date2(pdata,0,c_time);
-                       put_dos_date2(pdata,4,sbuf.st_atime);
-                       put_dos_date2(pdata,8,sbuf.st_mtime); /* write time */
+                       srv_put_dos_date2(pdata,0,create_time);
+                       srv_put_dos_date2(pdata,4,atime);
+                       srv_put_dos_date2(pdata,8,mtime); /* write time */
                        SIVAL(pdata,12,(uint32)file_size);
                        SIVAL(pdata,16,(uint32)allocation_size);
                        SSVAL(pdata,20,mode);
@@ -2976,18 +3165,18 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n"));
 
-                       ea_file_list = get_ea_list_from_file(ea_ctx, conn, fsp, fname, &total_ea_len);
+                       ea_file_list = get_ea_list_from_file(data_ctx, conn, fsp, fname, &total_ea_len);
                        ea_list = ea_list_union(ea_list, ea_file_list, &total_ea_len);
 
                        if (!ea_list || (total_ea_len > data_size)) {
-                               talloc_destroy(ea_ctx);
+                               talloc_destroy(data_ctx);
                                data_size = 4;
                                SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
                                break;
                        }
 
-                       data_size = fill_ea_buffer(ea_ctx, pdata, data_size, conn, ea_list);
-                       talloc_destroy(ea_ctx);
+                       data_size = fill_ea_buffer(data_ctx, pdata, data_size, conn, ea_list);
+                       talloc_destroy(data_ctx);
                        break;
                }
 
@@ -2998,21 +3187,21 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_ALL_EAS\n"));
 
-                       ea_ctx = talloc_init("ea_ctx");
-                       if (!ea_ctx) {
+                       data_ctx = talloc_init("ea_ctx");
+                       if (!data_ctx) {
                                return ERROR_NT(NT_STATUS_NO_MEMORY);
                        }
 
-                       ea_list = get_ea_list_from_file(ea_ctx, conn, fsp, fname, &total_ea_len);
+                       ea_list = get_ea_list_from_file(data_ctx, conn, fsp, fname, &total_ea_len);
                        if (!ea_list || (total_ea_len > data_size)) {
-                               talloc_destroy(ea_ctx);
+                               talloc_destroy(data_ctx);
                                data_size = 4;
                                SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
                                break;
                        }
 
-                       data_size = fill_ea_buffer(ea_ctx, pdata, data_size, conn, ea_list);
-                       talloc_destroy(ea_ctx);
+                       data_size = fill_ea_buffer(data_ctx, pdata, data_size, conn, ea_list);
+                       talloc_destroy(data_ctx);
                        break;
                }
 
@@ -3027,20 +3216,17 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                data_size = 40;
                                SIVAL(pdata,36,0);
                        }
-                       put_long_date(pdata,c_time);
-                       put_long_date(pdata+8,sbuf.st_atime);
-                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
-                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       put_long_date_timespec(pdata,create_time_ts);
+                       put_long_date_timespec(pdata+8,atime_ts);
+                       put_long_date_timespec(pdata+16,mtime_ts); /* write time */
+                       put_long_date_timespec(pdata+24,mtime_ts); /* change time */
                        SIVAL(pdata,32,mode);
 
                        DEBUG(5,("SMB_QFBI - "));
-                       {
-                               time_t create_time = c_time;
-                               DEBUG(5,("create: %s ", ctime(&create_time)));
-                       }
-                       DEBUG(5,("access: %s ", ctime(&sbuf.st_atime)));
-                       DEBUG(5,("write: %s ", ctime(&sbuf.st_mtime)));
-                       DEBUG(5,("change: %s ", ctime(&sbuf.st_mtime)));
+                       DEBUG(5,("create: %s ", ctime(&create_time)));
+                       DEBUG(5,("access: %s ", ctime(&atime)));
+                       DEBUG(5,("write: %s ", ctime(&mtime)));
+                       DEBUG(5,("change: %s ", ctime(&mtime)));
                        DEBUG(5,("mode: %x\n", mode));
                        break;
 
@@ -3051,11 +3237,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        data_size = 24;
                        SOFF_T(pdata,0,allocation_size);
                        SOFF_T(pdata,8,file_size);
-                       if (delete_pending & sbuf.st_nlink)
-                               SIVAL(pdata,16,sbuf.st_nlink - 1);
-                       else
-                               SIVAL(pdata,16,sbuf.st_nlink);
-                       SCVAL(pdata,20,0);
+                       SIVAL(pdata,16,nlink);
+                       SCVAL(pdata,20,delete_pending?1:0);
                        SCVAL(pdata,21,(mode&aDIR)?1:0);
                        SSVAL(pdata,22,0); /* Padding. */
                        break;
@@ -3079,8 +3262,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALTERNATE_NAME_INFORMATION\n"));
                        pstrcpy(short_name,base_name);
                        /* Mangle if not already 8.3 */
-                       if(!mangle_is_8_3(short_name, True, SNUM(conn))) {
-                               mangle_map(short_name,True,True,SNUM(conn));
+                       if(!mangle_is_8_3(short_name, True, conn->params)) {
+                               mangle_map(short_name,True,True,conn->params);
                        }
                        len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_UNICODE);
                        data_size = 4 + len;
@@ -3117,19 +3300,16 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                {
                        unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALL_INFORMATION\n"));
-                       put_long_date(pdata,c_time);
-                       put_long_date(pdata+8,sbuf.st_atime);
-                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
-                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       put_long_date_timespec(pdata,create_time_ts);
+                       put_long_date_timespec(pdata+8,atime_ts);
+                       put_long_date_timespec(pdata+16,mtime_ts); /* write time */
+                       put_long_date_timespec(pdata+24,mtime_ts); /* change time */
                        SIVAL(pdata,32,mode);
                        SIVAL(pdata,36,0); /* padding. */
                        pdata += 40;
                        SOFF_T(pdata,0,allocation_size);
                        SOFF_T(pdata,8,file_size);
-                       if (delete_pending && sbuf.st_nlink)
-                               SIVAL(pdata,16,sbuf.st_nlink - 1);
-                       else
-                               SIVAL(pdata,16,sbuf.st_nlink);
+                       SIVAL(pdata,16,nlink);
                        SCVAL(pdata,20,delete_pending);
                        SCVAL(pdata,21,(mode&aDIR)?1:0);
                        SSVAL(pdata,22,0);
@@ -3150,14 +3330,14 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                           BasicFileInformationTest. -tpot */
 
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
-                       SIVAL(pdata,0,sbuf.st_dev);
-                       SIVAL(pdata,4,sbuf.st_ino);
+                       SIVAL(pdata,0,sbuf.st_ino); /* FileIndexLow */
+                       SIVAL(pdata,4,sbuf.st_dev); /* FileIndexHigh */
                        data_size = 8;
                        break;
 
                case SMB_FILE_ACCESS_INFORMATION:
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
-                       SIVAL(pdata,0,desired_access);
+                       SIVAL(pdata,0,access_mask);
                        data_size = 4;
                        break;
 
@@ -3165,7 +3345,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        /* Pathname with leading '\'. */
                        {
                                size_t byte_len;
-                               byte_len = dos_PutUniCode(pdata+4,dos_fname,max_data_bytes,False);
+                               byte_len = dos_PutUniCode(pdata+4,dos_fname,(size_t)max_data_bytes,False);
                                DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NAME_INFORMATION\n"));
                                SIVAL(pdata,0,byte_len);
                                data_size = 4 + byte_len;
@@ -3209,7 +3389,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        if (mode & aDIR) {
                                data_size = 0;
                        } else {
-                               size_t byte_len = dos_PutUniCode(pdata+24,"::$DATA", 0xE, False);
+                               size_t byte_len = dos_PutUniCode(pdata+24,"::$DATA", (size_t)0xE, False);
                                SIVAL(pdata,0,0); /* ??? */
                                SIVAL(pdata,4,byte_len); /* Byte length of unicode string ::$DATA */
                                SOFF_T(pdata,8,file_size);
@@ -3230,10 +3410,10 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                case SMB_FILE_NETWORK_OPEN_INFORMATION:
                        DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n"));
-                       put_long_date(pdata,c_time);
-                       put_long_date(pdata+8,sbuf.st_atime);
-                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
-                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       put_long_date_timespec(pdata,create_time_ts);
+                       put_long_date_timespec(pdata+8,atime_ts);
+                       put_long_date_timespec(pdata+16,mtime_ts); /* write time */
+                       put_long_date_timespec(pdata+24,mtime_ts); /* change time */
                        SIVAL(pdata,32,allocation_size);
                        SOFF_T(pdata,40,file_size);
                        SIVAL(pdata,48,mode);
@@ -3263,9 +3443,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        SOFF_T(pdata,0,get_allocation_size(conn,fsp,&sbuf)); /* Number of bytes used on disk - 64 Bit */
                        pdata += 8;
 
-                       put_long_date(pdata,sbuf.st_ctime);       /* Creation Time 64 Bit */
-                       put_long_date(pdata+8,sbuf.st_atime);     /* Last access time 64 Bit */
-                       put_long_date(pdata+16,sbuf.st_mtime);    /* Last modification time 64 Bit */
+                       put_long_date_timespec(pdata,get_ctimespec(&sbuf));       /* Creation Time 64 Bit */
+                       put_long_date_timespec(pdata+8,get_atimespec(&sbuf));     /* Last access time 64 Bit */
+                       put_long_date_timespec(pdata+16,get_mtimespec(&sbuf));    /* Last modification time 64 Bit */
                        pdata += 24;
 
                        SIVAL(pdata,0,sbuf.st_uid);               /* user id for the owner */
@@ -3287,7 +3467,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        SIVAL(pdata,4,0);
                        pdata += 8;
 
-                       SINO_T(pdata,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
+                       SINO_T_VAL(pdata,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
                        pdata += 8;
                                
                        SIVAL(pdata,0, unix_perms_to_wire(sbuf.st_mode));     /* Standard UNIX file permissions */
@@ -3296,12 +3476,12 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
                        SIVAL(pdata,0,sbuf.st_nlink);             /* number of hard links */
                        SIVAL(pdata,4,0);
-                       pdata += 8+1;
+                       pdata += 8;
                        data_size = PTR_DIFF(pdata,(*ppdata));
 
                        {
                                int i;
-                               DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC"));
+                               DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
 
                                for (i=0; i<100; i++)
                                        DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
@@ -3340,8 +3520,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                                uint16 num_file_acls = 0;
                                uint16 num_def_acls = 0;
 
-                               if (fsp && !fsp->is_directory && (fsp->fd != -1)) {
-                                       file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fd);
+                               if (fsp && !fsp->is_directory && (fsp->fh->fd != -1)) {
+                                       file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
                                } else {
                                        file_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS);
                                }
@@ -3411,99 +3591,87 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                        }
 #endif
 
-               default:
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
-       }
-
-       send_trans2_replies(outbuf, bufsize, params, param_size, *ppdata, data_size);
-
-       return(-1);
-}
-
-/****************************************************************************
- Deal with the internal needs of setting the delete on close flag. Note that
- as the tdb locking is recursive, it is safe to call this from within 
- open_file_shared. JRA.
-****************************************************************************/
 
-NTSTATUS set_delete_on_close_internal(files_struct *fsp, BOOL delete_on_close, uint32 dosmode)
-{
-       if (delete_on_close) {
-               /*
-                * Only allow delete on close for writable files.
-                */
+               case SMB_QUERY_POSIX_LOCK:
+               {
+                       NTSTATUS status = NT_STATUS_INVALID_LEVEL;
+                       SMB_BIG_UINT count;
+                       SMB_BIG_UINT offset;
+                       uint32 lock_pid;
+                       enum brl_type lock_type;
 
-               if (!lp_delete_readonly(SNUM(fsp->conn))) {
-                       if (dosmode & aRONLY) {
-                               DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but file attribute is readonly.\n",
-                                       fsp->fsp_name ));
-                               return NT_STATUS_CANNOT_DELETE;
+                       if (total_data != POSIX_LOCK_DATA_SIZE) {
+                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                        }
-               }
-
-               /*
-                * Only allow delete on close for writable shares.
-                */
-
-               if (!CAN_WRITE(fsp->conn)) {
-                       DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but write access denied on share.\n",
-                               fsp->fsp_name ));
-                       return NT_STATUS_ACCESS_DENIED;
-               }
 
-               /*
-                * Only allow delete on close for files/directories opened with delete intent.
-                */
+                       switch (SVAL(pdata, POSIX_LOCK_TYPE_OFFSET)) {
+                               case POSIX_LOCK_TYPE_READ:
+                                       lock_type = READ_LOCK;
+                                       break;
+                               case POSIX_LOCK_TYPE_WRITE:
+                                       lock_type = WRITE_LOCK;
+                                       break;
+                               case POSIX_LOCK_TYPE_UNLOCK:
+                               default:
+                                       /* There's no point in asking for an unlock... */
+                                       talloc_destroy(data_ctx);
+                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                       }
 
-               if (!(fsp->desired_access & DELETE_ACCESS)) {
-                       DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but delete access denied.\n",
-                               fsp->fsp_name ));
-                       return NT_STATUS_ACCESS_DENIED;
+                       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 */
+
+                       status = query_lock(fsp,
+                                       &lock_pid,
+                                       &count,
+                                       &offset,
+                                       &lock_type,
+                                       POSIX_LOCK);
+
+                       if (ERROR_WAS_LOCK_DENIED(status)) {
+                               /* Here we need to report who has it locked... */
+                               data_size = POSIX_LOCK_DATA_SIZE;
+
+                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, lock_type);
+                               SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0);
+                               SIVAL(pdata, POSIX_LOCK_PID_OFFSET, lock_pid);
+#if defined(HAVE_LONGLONG)
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, (uint32)(offset & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET + 4, (uint32)((offset >> 32) & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, (uint32)(count & 0xFFFFFFFF));
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET + 4, (uint32)((count >> 32) & 0xFFFFFFFF));
+#else /* HAVE_LONGLONG */
+                               SIVAL(pdata, POSIX_LOCK_START_OFFSET, offset);
+                               SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, count);
+#endif /* HAVE_LONGLONG */
+
+                       } else if (NT_STATUS_IS_OK(status)) {
+                               /* For success we just return a copy of what we sent
+                                  with the lock type set to POSIX_LOCK_TYPE_UNLOCK. */
+                               data_size = POSIX_LOCK_DATA_SIZE;
+                               memcpy(pdata, lock_data, POSIX_LOCK_DATA_SIZE);
+                               SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, POSIX_LOCK_TYPE_UNLOCK);
+                       } else {
+                               return ERROR_NT(status);
+                       }
+                       break;
                }
-       }
 
-       if(fsp->is_directory) {
-               fsp->directory_delete_on_close = delete_on_close;
-               DEBUG(10, ("set_delete_on_close_internal: %s delete on close flag for fnum = %d, directory %s\n",
-                       delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
-       } else {
-               fsp->delete_on_close = delete_on_close;
-               DEBUG(10, ("set_delete_on_close_internal: %s delete on close flag for fnum = %d, file %s\n",
-                       delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
+               default:
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
-       return NT_STATUS_OK;
-}
-
-/****************************************************************************
- Sets the delete on close flag over all share modes on this file.
- Modify the share mode entry for all files open
- on this device and inode to tell other smbds we have
- changed the delete on close flag. This will be noticed
- in the close code, the last closer will delete the file
- if flag is set.
-****************************************************************************/
-
-NTSTATUS set_delete_on_close_over_all(files_struct *fsp, BOOL delete_on_close)
-{
-       DEBUG(10,("set_delete_on_close_over_all: %s delete on close flag for fnum = %d, file %s\n",
-               delete_on_close ? "Adding" : "Removing", fsp->fnum, fsp->fsp_name ));
-
-       if (fsp->is_directory || fsp->is_stat)
-               return NT_STATUS_OK;
-
-       if (lock_share_entry_fsp(fsp) == False)
-               return NT_STATUS_ACCESS_DENIED;
-
-       if (!modify_delete_flag(fsp->dev, fsp->inode, delete_on_close)) {
-               DEBUG(0,("set_delete_on_close_over_all: failed to change delete on close flag for file %s\n",
-                       fsp->fsp_name ));
-               unlock_share_entry_fsp(fsp);
-               return NT_STATUS_ACCESS_DENIED;
-       }
+       send_trans2_replies(outbuf, bufsize, params, param_size, *ppdata, data_size, max_data_bytes);
 
-       unlock_share_entry_fsp(fsp);
-       return NT_STATUS_OK;
+       return(-1);
 }
 
 /****************************************************************************
@@ -3511,10 +3679,8 @@ NTSTATUS set_delete_on_close_over_all(files_struct *fsp, BOOL delete_on_close)
  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;
@@ -3523,21 +3689,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. */
@@ -3545,20 +3699,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. */
@@ -3566,7 +3714,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;
        }
 
@@ -3576,22 +3725,855 @@ 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 ));
 
-       if (SMB_VFS_LINK(conn,oldname,newname) != 0) {
-               status = map_nt_error_from_unix(errno);
-               DEBUG(3,("hardlink_internals: Error %s hard link %s -> %s\n",
-                                nt_errstr(status), newname, oldname));
+       if (SMB_VFS_LINK(conn,oldname,newname) != 0) {
+               status = map_nt_error_from_unix(errno);
+               DEBUG(3,("hardlink_internals: Error %s hard link %s -> %s\n",
+                                nt_errstr(status), newname, oldname));
+       }
+
+       return status;
+}
+
+/****************************************************************************
+ Deal with SMB_INFO_SET_EA.
+****************************************************************************/
+
+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 < 10) {
+
+               /* OS/2 workplace shell seems to send SET_EA requests of "null"
+                  length. They seem to have no effect. Bug #3212. JRA */
+
+               if ((total_data == 4) && (IVAL(pdata,0) == 4)) {
+                       /* We're done. We only get EA info in this call. */
+                       return NT_STATUS_OK;
+               }
+
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       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;
+       }
+
+       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);
+
+       return status;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_DISPOSITION_INFO.
+****************************************************************************/
+
+static NTSTATUS smb_set_file_disposition_info(connection_struct *conn,
+                               const char *pdata,
+                               int total_data,
+                               files_struct *fsp,
+                               int dosmode)
+{
+       NTSTATUS status = NT_STATUS_OK;
+       BOOL delete_on_close;
+
+       if (total_data < 1) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (fsp == NULL) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       delete_on_close = (CVAL(pdata,0) ? True : False);
+
+       status = can_set_delete_on_close(fsp, delete_on_close, dosmode);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* 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;
+}
+
+/****************************************************************************
+ Deal with SMB_FILE_POSITION_INFORMATION.
+****************************************************************************/
+
+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;
+       }
+
+       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,("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;
+}
+
+/****************************************************************************
+ Deal with SMB_FILE_MODE_INFORMATION.
+****************************************************************************/
+
+static NTSTATUS smb_file_mode_information(connection_struct *conn,
+                               const char *pdata,
+                               int total_data)
+{
+       uint32 mode;
+
+       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;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_UNIX_LINK (create a UNIX symlink).
+****************************************************************************/
+
+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;
+
+       /* Set a symbolic link. */
+       /* Don't allow this if follow links is false. */
+
+       if (total_data == 0) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       if (!lp_symlinks(SNUM(conn))) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       srvstr_pull(inbuf, link_target, pdata, sizeof(link_target), total_data, STR_TERMINATE);
+
+       /* !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;
+
+               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);
+
+               status = check_name(conn, rel_name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+       }
+
+       DEBUG(10,("smb_set_file_unix_link: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n",
+                       newname, link_target ));
+
+       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,
+                               SMB_STRUCT_STAT *psbuf,
+                               const char *fname)
+{
+       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;
+       }
+
+       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;
+       }
+
+       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 status;
+                       }
+               }
+               TALLOC_FREE(br_lck);
+       }
+
+       return status;
+}
+
+/****************************************************************************
+ Deal with SMB_INFO_STANDARD.
+****************************************************************************/
+
+static NTSTATUS smb_set_info_standard(const char *pdata,
+                                       int total_data,
+                                       struct utimbuf *p_tvs)
+{
+       if (total_data < 12) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* access time */
+       p_tvs->actime = srv_make_unix_date2(pdata+l1_fdateLastAccess);
+       /* write time */
+       p_tvs->modtime = srv_make_unix_date2(pdata+l1_fdateLastWrite);
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_BASIC_INFO.
+****************************************************************************/
+
+static NTSTATUS smb_set_file_basic_info(const char *pdata,
+                                       int total_data,
+                                       struct utimbuf *p_tvs,
+                                       int *p_dosmode)
+{
+       /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
+       time_t write_time;
+       time_t changed_time;
+
+       if (total_data < 36) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* Ignore create time at offset pdata. */
+
+       /* access time */
+       p_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));
+
+       p_tvs->modtime = MIN(write_time, changed_time);
+
+       if (write_time > p_tvs->modtime && write_time != (time_t)-1) {
+               p_tvs->modtime = write_time;
+       }
+       /* Prefer a defined time to an undefined one. */
+       if (null_mtime(p_tvs->modtime)) {
+               p_tvs->modtime = null_mtime(write_time) ? changed_time : write_time;
+       }
+
+       /* attributes */
+       *p_dosmode = IVAL(pdata,32);
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ 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_OFF_T *p_size)
+{
+       SMB_BIG_UINT allocation_size;
+
+       if (total_data < 8) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       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 NT_STATUS_INVALID_PARAMETER;
+       }
+#endif /* LARGE_SMB_OFF_T */
+
+       DEBUG(10,("smb_set_file_allocation_info: Set file allocation info for file %s to %.0f\n",
+                       fname, (double)allocation_size ));
+
+       if (allocation_size) {
+               allocation_size = smb_roundup(conn, allocation_size);
+       }
+
+       if(allocation_size != get_file_size(*psbuf)) {
+               int ret = -1;
+               SMB_STRUCT_STAT new_sbuf;
+               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. */
+                       ret = vfs_allocate_file_space(fsp, allocation_size);
+                       if (ret == -1) {
+                               return map_nt_error_from_unix(errno);
+                       }
+                       if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&new_sbuf) != 0) {
+                               DEBUG(3,("smb_set_file_allocation_info: fstat of fnum %d failed (%s)\n",
+                                                       fsp->fnum, strerror(errno)));
+                               return map_nt_error_from_unix(errno);
+                       }
+               } else {
+                       /* Pathname or stat or directory file. */
+                       files_struct *new_fsp = NULL;
+                       NTSTATUS status;
+
+                       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;
+                       }
+                       ret = vfs_allocate_file_space(new_fsp, allocation_size);
+                       if (ret == -1) {
+                               status = map_nt_error_from_unix(errno);
+                               close_file(new_fsp,NORMAL_CLOSE);
+                               return status;
+                       }
+                       if (SMB_VFS_FSTAT(new_fsp,new_fsp->fh->fd,&new_sbuf) != 0) {
+                               DEBUG(3,("smb_set_file_allocation_info: fstat of fnum %d failed (%s)\n",
+                                               new_fsp->fnum, strerror(errno)));
+                               status = map_nt_error_from_unix(errno);
+                               close_file(new_fsp,NORMAL_CLOSE);
+                               return status;
+                       }
+                       close_file(new_fsp,NORMAL_CLOSE);
+               }
+
+               /* Allocate can truncate size... */
+               *p_size = get_file_size(new_sbuf);
+       }
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Deal with SMB_SET_FILE_END_OF_FILE_INFO.
+****************************************************************************/
+
+static NTSTATUS smb_set_file_end_of_file_info(connection_struct *conn,
+                                       const char *pdata,
+                                       int total_data,
+                                       const char *fname,
+                                       SMB_OFF_T *p_size)
+{
+       if (total_data < 8) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       *p_size = IVAL(pdata,0);
+#ifdef LARGE_SMB_OFF_T
+       *p_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)*p_size ));
+       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,
+                                       SMB_OFF_T *p_size,
+                                       struct utimbuf *p_tvs,
+                                       mode_t *p_unixmode,
+                                       int *p_dosmode)
+{
+       uid_t set_owner = (uid_t)SMB_UID_NO_CHANGE;
+       gid_t set_grp = (uid_t)SMB_GID_NO_CHANGE;
+       uint32 raw_unixmode;
+       BOOL delete_on_fail = False;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (total_data < 100) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       set_owner = VALID_STAT(*psbuf) ? psbuf->st_uid : (uid_t)SMB_UID_NO_CHANGE;
+       set_grp = VALID_STAT(*psbuf) ? psbuf->st_gid : (gid_t)SMB_GID_NO_CHANGE;
+
+       if(IVAL(pdata, 0) != SMB_SIZE_NO_CHANGE_LO &&
+          IVAL(pdata, 4) != SMB_SIZE_NO_CHANGE_HI) {
+               *p_size=IVAL(pdata,0); /* first 8 Bytes are size */
+#ifdef LARGE_SMB_OFF_T
+               *p_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 */
+       }
+
+       pdata+=24;          /* ctime & st_blocks are not changed */
+       p_tvs->actime = convert_timespec_to_time_t(interpret_long_date(pdata)); /* access_time */
+       p_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);
+       *p_unixmode = unix_perms_from_wire(conn, psbuf, raw_unixmode);
+       *p_dosmode = 0; /* Ensure dos mode change doesn't override this. */
+
+       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)*p_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.
+                */
+
+               uint32 file_type = IVAL(pdata,0);
+#if defined(HAVE_MAKEDEV)
+               uint32 dev_major = IVAL(pdata,4);
+               uint32 dev_minor = IVAL(pdata,12);
+#endif
+
+               SMB_DEV_T dev = (SMB_DEV_T)0;
+
+               if (raw_unixmode == SMB_MODE_NO_CHANGE) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+#if defined(HAVE_MAKEDEV)
+               dev = makedev(dev_major, dev_minor);
+#endif
+
+               switch (file_type) {
+#if defined(S_IFIFO)
+                       case UNIX_TYPE_FIFO:
+                               *p_unixmode |= S_IFIFO;
+                               break;
+#endif
+#if defined(S_IFSOCK)
+                       case UNIX_TYPE_SOCKET:
+                               *p_unixmode |= S_IFSOCK;
+                               break;
+#endif
+#if defined(S_IFCHR)
+                       case UNIX_TYPE_CHARDEV:
+                               *p_unixmode |= S_IFCHR;
+                               break;
+#endif
+#if defined(S_IFBLK)
+                       case UNIX_TYPE_BLKDEV:
+                               *p_unixmode |= S_IFBLK;
+                               break;
+#endif
+                       default:
+                               return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               DEBUG(10,("smb_set_file_unix_basic: SMB_SET_FILE_UNIX_BASIC doing mknod dev %.0f mode \
+0%o for file %s\n", (double)dev, *p_unixmode, fname ));
+
+               /* Ok - do the mknod. */
+               if (SMB_VFS_MKNOD(conn, fname, *p_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.
+                */
+
+               delete_on_fail = True;
+
+               if (lp_inherit_perms(SNUM(conn))) {
+                       inherit_access_acl(
+                               conn, parent_dirname(fname),
+                               fname, *p_unixmode);
+               }
+
+               if (SMB_VFS_STAT(conn, fname, psbuf) != 0) {
+                       status = map_nt_error_from_unix(errno);
+                       SMB_VFS_UNLINK(conn,fname);
+                       return status;
+               }
+
+               /* Ensure we don't try and change anything else. */
+               raw_unixmode = SMB_MODE_NO_CHANGE;
+               *p_size = get_file_size(*psbuf);
+               p_tvs->modtime = psbuf->st_mtime;
+               p_tvs->actime = psbuf->st_atime;
        }
 
-       return status;
+       /*
+        * 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)*p_unixmode, fname ));
+               if (SMB_VFS_CHMOD(conn,fname,*p_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;
+               }
+       }
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
- Reply to a TRANS2_SETFILEINFO (set file info by fileid).
+ 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,
@@ -3608,15 +4590,13 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
        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)
+       if (!params) {
                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
 
        ZERO_STRUCT(sbuf);
        ZERO_STRUCT(tvs);
@@ -3629,7 +4609,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
                fsp = file_fsp(params,0);
                info_level = SVAL(params,2);    
 
-               if(fsp && (fsp->is_directory || fsp->fd == -1)) {
+               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
@@ -3638,19 +4618,19 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
                        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);
+                               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->share_mode = FILE_DELETE_ON_CLOSE;
+                               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);
+                               send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
                                return(-1);
                        } else
                                return (UNIXERROR(ERRDOS,ERRbadpath));
@@ -3661,7 +4641,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
                        CHECK_FSP(fsp,conn);
 
                        pstrcpy(fname, fsp->fsp_name);
-                       fd = fsp->fd;
+                       fd = fsp->fh->fd;
 
                        if (SMB_VFS_FSTAT(fsp,fd,&sbuf) != 0) {
                                DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
@@ -3670,18 +4650,18 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
                }
        } else {
                /* set path info */
-               if (total_params < 6) {
+               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), -1, STR_TERMINATE, &status, False);
+               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);
                }
-               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);
                }
 
                /*
@@ -3690,11 +4670,12 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
 
                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);
+                       return UNIXERROR(ERRDOS,ERRbadpath);
                }    
 
-               if(!check_name(fname, conn)) {
-                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+               status = check_name(conn, fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
                }
 
        }
@@ -3702,21 +4683,23 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
        if (!CAN_WRITE(conn))
                return ERROR_DOS(ERRSRV,ERRaccess);
 
-       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions())
-               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+       }
 
-       if (VALID_STAT(sbuf))
+       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));
 
        /* Realloc the parameter size */
-       params = SMB_REALLOC(*pparams,2);
-       if(params == NULL) {
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if (*pparams == NULL) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
 
        SSVAL(params,0,0);
 
@@ -3731,277 +4714,112 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
        dosmode = dos_mode(conn,fname,&sbuf);
        unixmode = sbuf.st_mode;
 
-       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;
-
        switch (info_level) {
+
                case SMB_INFO_STANDARD:
                {
-                       if (total_data < 12) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+                       status = smb_set_info_standard(pdata,
+                                                       total_data,
+                                                       &tvs);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
-
-                       /* access time */
-                       tvs.actime = make_unix_date2(pdata+l1_fdateLastAccess);
-                       /* write time */
-                       tvs.modtime = make_unix_date2(pdata+l1_fdateLastWrite);
                        break;
                }
 
                case SMB_INFO_SET_EA:
                {
-                       struct ea_list *ea_list = NULL;
-                       TALLOC_CTX *ctx = NULL;
-
-                       if (total_data < 10) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       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);
-                       }
-
-                       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);
-
+                       status = smb_info_set_ea(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               fname);
                        if (!NT_STATUS_IS_OK(status)) {
                                return ERROR_NT(status);
                        }
-
-                       /* We're done. We only get EA info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
 
-#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);
-
-                       tvs.actime = make_unix_date2(pdata+8);
-                       tvs.modtime = make_unix_date2(pdata+12);
-                       size = IVAL(pdata,16);
-                       dosmode = IVAL(pdata,24);
-                       break;
-
-               /* 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);
-
-                       tvs.actime = make_unix_date2(pdata+8);
-                       tvs.modtime = make_unix_date2(pdata+12);
-                       size = IVAL(pdata,16);
-                       dosmode = IVAL(pdata,24);
-                       break;
-#endif
-
                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;
-
-                       if (total_data < 36) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       /* Ignore create time at offset pdata. */
-
-                       /* access time */
-                       tvs.actime = interpret_long_date(pdata+8);
-
-                       write_time = interpret_long_date(pdata+16);
-                       changed_time = 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;
+                       status = smb_set_file_basic_info(pdata,
+                                                       total_data,
+                                                       &tvs,
+                                                       &dosmode);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
-
-                       /* attributes */
-                       dosmode = IVAL(pdata,32);
                        break;
                }
 
                case SMB_FILE_ALLOCATION_INFORMATION:
                case SMB_SET_FILE_ALLOCATION_INFO:
                {
-                       int ret = -1;
-                       SMB_BIG_UINT allocation_size;
-
-                       if (total_data < 8) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       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_DOS(ERRDOS,ERRunknownlevel);
-#endif /* LARGE_SMB_OFF_T */
-                       DEBUG(10,("call_trans2setfilepathinfo: Set file allocation info for file %s to %.0f\n",
-                                       fname, (double)allocation_size ));
-
-                       if (allocation_size) {
-                               allocation_size = smb_roundup(conn, allocation_size);
-                       }
-
-                       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;
-                                       int access_mode = 0;
-                                       int action = 0;
-                                       if(global_oplock_break) {
-                                               /* Queue this file modify as we are the process of an oplock break.  */
-                                               DEBUG(2,("call_trans2setfilepathinfo: queueing message due to being "));
-                                               DEBUGADD(2,( "in oplock break state.\n"));
-                                               push_oplock_pending_smb_message(inbuf, length);
-                                               return -1;
-                                       }
-                                       new_fsp = open_file_shared1(conn, fname, &sbuf,FILE_WRITE_DATA,
-                                                                       SET_OPEN_MODE(DOS_OPEN_RDWR),
-                                                                       (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
-                                                                       FILE_ATTRIBUTE_NORMAL,
-                                                                       INTERNAL_OPEN_ONLY, &access_mode, &action);
-                                       if (new_fsp == NULL)
-                                               return(UNIXERROR(ERRDOS,ERRbadpath));
-                                       ret = vfs_allocate_file_space(new_fsp, allocation_size);
-                                       if (SMB_VFS_FSTAT(new_fsp,new_fsp->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,True);
-                               } 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;
-                                       }
+                       status = smb_set_file_allocation_info(conn,
+                                                               pdata,
+                                                               total_data,
+                                                               fsp,
+                                                               fname,
+                                                               &sbuf,
+                                                               &size);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                                       /* We have re-scheduled this call. */
+                                       return -1;
                                }
-                               if (ret == -1)
-                                       return ERROR_NT(NT_STATUS_DISK_FULL);
-
-                               /* Allocate can truncate size... */
-                               size = get_file_size(new_sbuf);
+                               return ERROR_NT(status);
                        }
-
                        break;
                }
 
                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);
+                       status = smb_set_file_end_of_file_info(conn,
+                                                               pdata,
+                                                               total_data,
+                                                               fname,
+                                                               &size);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
-
-                       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 ERROR_DOS(ERRDOS,ERRunknownlevel);
-#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;
-
-                       if (total_data < 1) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       delete_on_close = (CVAL(pdata,0) ? True : False);
-
-                       /* Just ignore this set on a path. */
-                       if (tran_call != TRANSACT2_SETFILEINFO)
-                               break;
-
-                       if (fsp == NULL)
-                               return(UNIXERROR(ERRDOS,ERRbadfid));
-
-                       status = set_delete_on_close_internal(fsp, delete_on_close, dosmode);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               return ERROR_NT(status);
+#if 0
+                       /* JRA - We used to just ignore this on a path ? 
+                        * Shouldn't this be invalid level on a pathname
+                        * based call ?
+                        */
+                       if (tran_call != TRANSACT2_SETFILEINFO) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
-
-                       /* The set is across all open files on this dev/inode pair. */
-                       status =set_delete_on_close_over_all(fsp, delete_on_close);
+#endif
+                       status = smb_set_file_disposition_info(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               dosmode);
                        if (!NT_STATUS_IS_OK(status)) {
                                return ERROR_NT(status);
                        }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
 
                case SMB_FILE_POSITION_INFORMATION:
                {
-                       SMB_BIG_UINT position_information;
-
-                       if (total_data < 8) {
-                               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                       }
-
-                       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_DOS(ERRDOS,ERRunknownlevel);
-#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->position_information = position_information;
+                       status = smb_file_position_information(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
-
-                       /* We're done. We only get position info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
 
                /* From tridge Samba4 : 
@@ -4012,20 +4830,13 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
 
                case SMB_FILE_MODE_INFORMATION:
                {
-                       uint32 mode;
-
-                       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);
+                       status = smb_file_mode_information(conn,
+                                               pdata,
+                                               total_data);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
-
-                       /* We're done. We only get mode info in this call. */
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
 
                /*
@@ -4034,328 +4845,118 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
 
                case SMB_SET_FILE_UNIX_BASIC:
                {
-                       uint32 raw_unixmode;
-
-                       if (total_data < 100) {
-                               return ERROR_NT(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 ERROR_DOS(ERRDOS,ERRunknownlevel);
-#endif /* LARGE_SMB_OFF_T */
-                       }
-                       pdata+=24;          /* ctime & st_blocks are not changed */
-                       tvs.actime = interpret_long_date(pdata); /* access_time */
-                       tvs.modtime = 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));
-
-                       if (!VALID_STAT(sbuf)) {
-
-                               /*
-                                * 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.
-                                */
-
-                               uint32 file_type = IVAL(pdata,0);
-#if defined(HAVE_MAKEDEV)
-                               uint32 dev_major = IVAL(pdata,4);
-                               uint32 dev_minor = IVAL(pdata,12);
-#endif
-
-                               uid_t myuid = geteuid();
-                               gid_t mygid = getegid();
-                               SMB_DEV_T dev = (SMB_DEV_T)0;
-
-                               if (tran_call == TRANSACT2_SETFILEINFO)
-                                       return(ERROR_DOS(ERRDOS,ERRnoaccess));
-
-                               if (raw_unixmode == SMB_MODE_NO_CHANGE) {
-                                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
-                               }
-
-#if defined(HAVE_MAKEDEV)
-                               dev = makedev(dev_major, dev_minor);
-#endif
-
-                               /* We can only create as the owner/group we are. */
-
-                               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));
-
-                               switch (file_type) {
-#if defined(S_IFIFO)
-                                       case UNIX_TYPE_FIFO:
-                                               unixmode |= S_IFIFO;
-                                               break;
-#endif
-#if defined(S_IFSOCK)
-                                       case UNIX_TYPE_SOCKET:
-                                               unixmode |= S_IFSOCK;
-                                               break;
-#endif
-#if defined(S_IFCHR)
-                                       case UNIX_TYPE_CHARDEV:
-                                               unixmode |= S_IFCHR;
-                                               break;
-#endif
-#if defined(S_IFBLK)
-                                       case UNIX_TYPE_BLKDEV:
-                                               unixmode |= S_IFBLK;
-                                               break;
-#endif
-                                       default:
-                                               return(ERROR_DOS(ERRDOS,ERRnoaccess));
-                               }
-
-                               DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_BASIC doing mknod dev %.0f mode \
-0%o for file %s\n", (double)dev, unixmode, fname ));
-
-                               /* Ok - do the mknod. */
-                               if (SMB_VFS_MKNOD(conn,fname, unixmode, dev) != 0)
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-
-                               inherit_access_acl(conn, fname, unixmode);
-
-                               SSVAL(params,0,0);
-                               send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                               return(-1);
-                       }
-
-                       /*
-                        * Deal with the UNIX specific mode set.
-                        */
-
-                       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));
-                       }
-
-                       /*
-                        * Deal with the UNIX specific uid set.
-                        */
-
-                       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));
+                       if (tran_call == TRANSACT2_SETFILEINFO) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
                        }
 
-                       /*
-                        * Deal with the UNIX specific gid set.
-                        */
-
-                       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));
+                       status = smb_set_file_unix_basic(conn,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname,
+                                                       &sbuf,
+                                                       &size,
+                                                       &tvs,
+                                                       &unixmode,
+                                                       &dosmode);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
                        break;
                }
 
                case SMB_SET_FILE_UNIX_LINK:
                {
-                       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));
-
-                       srvstr_pull(inbuf, link_target, pdata, sizeof(link_target), -1, STR_TERMINATE);
-
-                       /* !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;
-
-                               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);
-
-                               if (!check_name(rel_name, conn)) {
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
-                               }
+                       if (tran_call != TRANSACT2_SETPATHINFO) {
+                               /* We must have a pathname for this. */
+                               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);
-                       return(-1);
+                       status = smb_set_file_unix_link(conn,
+                                               inbuf,
+                                               pdata,
+                                               total_data,
+                                               fname);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
+                       }
+                       goto out;
                }
 
                case SMB_SET_FILE_UNIX_HLINK:
                {
-                       pstring oldname;
-                       char *newname = fname;
-
-                       /* Set a hard link. */
-                       srvstr_get_path(inbuf, oldname, pdata, sizeof(oldname), -1, STR_TERMINATE, &status, False);
-                       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);
                        }
-
-                       DEBUG(10,("call_trans2setfilepathinfo: SMB_SET_FILE_UNIX_LINK doing hard link %s -> %s\n",
-                               fname, oldname));
-
-                       status = hardlink_internals(conn, oldname, newname);
+                       status = smb_set_file_unix_hlink(conn,
+                                               inbuf,
+                                               pdata,
+                                               total_data,
+                                               fname);
                        if (!NT_STATUS_IS_OK(status)) {
                                return ERROR_NT(status);
                        }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
 
                case SMB_FILE_RENAME_INFORMATION:
                {
-                       BOOL overwrite;
-                       uint32 root_fid;
-                       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, False);
-                       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);
-                       }
+                       status = smb_file_rename_information(conn,
+                                                       inbuf,
+                                                       outbuf,
+                                                       pdata,
+                                                       total_data,
+                                                       fsp,
+                                                       fname);
                        if (!NT_STATUS_IS_OK(status)) {
+                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                                       /* We have re-scheduled this call. */
+                                       return -1;
+                               }
+                               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                                       return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV, ERRbadpath);
+                               }
                                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);
-                       return(-1);
+                       goto out;
                }
 
 #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));
+                       status = smb_set_posix_acl(conn,
+                                               pdata,
+                                               total_data,
+                                               fsp,
+                                               &sbuf,
+                                               fname);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
                        }
+                       goto out;
+               }
+#endif
 
-                       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));
+               case SMB_SET_POSIX_LOCK:
+               {
+                       status = smb_set_posix_lock(conn,
+                                               inbuf,
+                                               length,
+                                               pdata,
+                                               total_data,
+                                               fsp);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               if (blocking_lock_was_deferred(SVAL(inbuf,smb_mid))) {
+                                       /* We have re-scheduled this call. */
+                                       return -1;
+                               }
+                               return ERROR_NT(status);
                        }
-
-                       SSVAL(params,0,0);
-                       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-                       return(-1);
+                       goto out;
                }
-#endif
 
                default:
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
        /* get some defaults (no modifications) if any info is zero or -1. */
@@ -4372,10 +4973,11 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
        DEBUG(6,("size: %.0f ", (double)size));
 
        if (dosmode) {
-               if (S_ISDIR(sbuf.st_mode))
+               if (S_ISDIR(sbuf.st_mode)) {
                        dosmode |= aDIR;
-               else
+               } else {
                        dosmode &= ~aDIR;
+               }
        }
 
        DEBUG(6,("dosmode: %x\n"  , dosmode));
@@ -4419,35 +5021,32 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
 
                if (fd == -1) {
                        files_struct *new_fsp = NULL;
-                       int access_mode = 0;
-                       int action = 0;
-
-                       if(global_oplock_break) {
-                               /* Queue this file modify as we are the process of an oplock break.  */
 
-                               DEBUG(2,("call_trans2setfilepathinfo: queueing message due to being "));
-                               DEBUGADD(2,( "in oplock break state.\n"));
-
-                               push_oplock_pending_smb_message(inbuf, length);
-                               return -1;
-                       }
-
-                       new_fsp = open_file_shared(conn, fname, &sbuf,
-                                               SET_OPEN_MODE(DOS_OPEN_RDWR),
-                                               (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
+                       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,
-                                               INTERNAL_OPEN_ONLY, &access_mode, &action);
+                                               FORCE_OPLOCK_BREAK_TO_NONE,
+                                               NULL, &new_fsp);
        
-                       if (new_fsp == NULL)
-                               return(UNIXERROR(ERRDOS,ERRbadpath));
+                       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,True);
+                       close_file(new_fsp,NORMAL_CLOSE);
                } else {
                        ret = vfs_set_filelen(fsp, size);
                }
 
-               if (ret == -1)
+               if (ret == -1) {
                        return (UNIXERROR(ERRHRD,ERRdiskfull));
+               }
        }
 
        /*
@@ -4478,10 +5077,12 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                }
        }
 
+  out:
+
        SSVAL(params,0,0);
-       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
   
-       return(-1);
+       return -1;
 }
 
 /****************************************************************************
@@ -4495,38 +5096,41 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
        char *params = *pparams;
        char *pdata = *ppdata;
        pstring directory;
-       int ret = -1;
        SMB_STRUCT_STAT sbuf;
-       BOOL bad_path = False;
        NTSTATUS status = NT_STATUS_OK;
-       TALLOC_CTX *ctx = NULL;
        struct ea_list *ea_list = NULL;
 
        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, False);
+       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. */
-       if (total_data && !lp_ea_support(SNUM(conn))) {
+       if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
                return ERROR_NT(NT_STATUS_EAS_NOT_SUPPORTED);
        }
 
-       if (total_data) {
+       /*
+        * OS/2 workplace shell seems to send SET_EA requests of "null"
+        * length (4 bytes containing IVAL 4).
+        * They seem to have no effect. Bug #3212. JRA.
+        */
+
+       if (total_data != 4) {
                if (total_data < 10) {
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
@@ -4537,46 +5141,45 @@ static int call_trans2mkdir(connection_struct *conn, char *inbuf, char *outbuf,
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
-               ctx = talloc_init("TRANS2_MKDIR_SET_EA");
-               if (!ctx) {
-                       return ERROR_NT(NT_STATUS_NO_MEMORY);
-               }
-               ea_list = read_ea_list(ctx, pdata + 4, total_data - 4);
+               ea_list = read_ea_list(tmp_talloc_ctx(), pdata + 4,
+                                      total_data - 4);
                if (!ea_list) {
-                       talloc_destroy(ctx);
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
+       } else if (IVAL(pdata,0) != 4) {
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
-       if (check_name(directory,conn)) {
-               ret = vfs_MkDir(conn,directory,unix_mode(conn,aDIR,directory,True));
-       }
-  
-       if(ret < 0) {
-               talloc_destroy(ctx);
-               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 = create_directory(conn, directory);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
+       }
+  
        /* Try and set any given EA. */
-       if (total_data) {
+       if (ea_list) {
                status = set_ea(conn, NULL, directory, ea_list);
-               talloc_destroy(ctx);
                if (!NT_STATUS_IS_OK(status)) {
                        return ERROR_NT(status);
                }
        }
 
        /* Realloc the parameter and data sizes */
-       params = SMB_REALLOC(*pparams,2);
-       if(params == NULL) {
+       *pparams = (char *)SMB_REALLOC(*pparams,2);
+       if(*pparams == NULL) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
 
        SSVAL(params,0,0);
 
-       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
   
        return(-1);
 }
@@ -4606,15 +5209,15 @@ static int call_trans2findnotifyfirst(connection_struct *conn, char *inbuf, char
                case 2:
                        break;
                default:
-                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+                       return ERROR_NT(NT_STATUS_INVALID_LEVEL);
        }
 
        /* Realloc the parameter and data sizes */
-       params = SMB_REALLOC(*pparams,6);
-       if(params == NULL) {
+       *pparams = (char *)SMB_REALLOC(*pparams,6);
+       if (*pparams == NULL) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
 
        SSVAL(params,0,fnf_handle);
        SSVAL(params,2,0); /* No changes */
@@ -4625,7 +5228,7 @@ static int call_trans2findnotifyfirst(connection_struct *conn, char *inbuf, char
        if(fnf_handle == 0)
                fnf_handle = 257;
 
-       send_trans2_replies(outbuf, bufsize, params, 6, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 6, *ppdata, 0, max_data_bytes);
   
        return(-1);
 }
@@ -4644,16 +5247,16 @@ static int call_trans2findnotifynext(connection_struct *conn, char *inbuf, char
        DEBUG(3,("call_trans2findnotifynext\n"));
 
        /* Realloc the parameter and data sizes */
-       params = SMB_REALLOC(*pparams,4);
-       if(params == NULL) {
+       *pparams = (char *)SMB_REALLOC(*pparams,4);
+       if (*pparams == NULL) {
                return ERROR_NT(NT_STATUS_NO_MEMORY);
        }
-       *pparams = params;
+       params = *pparams;
 
        SSVAL(params,0,0); /* No changes */
        SSVAL(params,2,0); /* No EA errors */
 
-       send_trans2_replies(outbuf, bufsize, params, 4, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 4, *ppdata, 0, max_data_bytes);
   
        return(-1);
 }
@@ -4673,7 +5276,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);
        }
 
@@ -4682,12 +5285,12 @@ 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);
     
        SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_DFS_PATHNAMES);
-       send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);
+       send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size, max_data_bytes);
 
        return(-1);
 }
@@ -4713,11 +5316,11 @@ static int call_trans2ioctl(connection_struct *conn, char* inbuf, char* outbuf,
 
        if ((SVAL(inbuf,(smb_setup+4)) == LMCAT_SPL) &&
                        (SVAL(inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
-               pdata = SMB_REALLOC(*ppdata, 32);
-               if(pdata == NULL) {
+               *ppdata = (char *)SMB_REALLOC(*ppdata, 32);
+               if (*ppdata == NULL) {
                        return ERROR_NT(NT_STATUS_NO_MEMORY);
                }
-               *ppdata = pdata;
+               pdata = *ppdata;
 
                /* NOTE - THIS IS ASCII ONLY AT THE MOMENT - NOT SURE IF OS/2
                        CAN ACCEPT THIS IN UNICODE. JRA. */
@@ -4725,7 +5328,7 @@ static int call_trans2ioctl(connection_struct *conn, char* inbuf, char* outbuf,
                SSVAL(pdata,0,fsp->rap_print_jobid);                     /* Job number */
                srvstr_push( outbuf, pdata + 2, global_myname(), 15, STR_ASCII|STR_TERMINATE); /* Our NetBIOS name */
                srvstr_push( outbuf, pdata+18, lp_servicename(SNUM(conn)), 13, STR_ASCII|STR_TERMINATE); /* Service name */
-               send_trans2_replies(outbuf,bufsize,*pparams,0,*ppdata,32);
+               send_trans2_replies(outbuf,bufsize,*pparams,0,*ppdata,32, max_data_bytes);
                return(-1);
        } else {
                DEBUG(2,("Unknown TRANS2_IOCTL\n"));
@@ -4748,7 +5351,7 @@ int reply_findclose(connection_struct *conn,
 
        dptr_close(&dptr_num);
 
-       outsize = set_message(outbuf,0,0,True);
+       outsize = set_message(outbuf,0,0,False);
 
        DEBUG(3,("SMBfindclose dptr_num = %d\n", dptr_num));
 
@@ -4775,7 +5378,7 @@ int reply_findnclose(connection_struct *conn,
           findnotifyfirst - so any dptr_num is ok here. 
           Just ignore it. */
 
-       outsize = set_message(outbuf,0,0,True);
+       outsize = set_message(outbuf,0,0,False);
 
        DEBUG(3,("SMB_findnclose dptr_num = %d\n", dptr_num));
 
@@ -4783,66 +5386,232 @@ int reply_findnclose(connection_struct *conn,
        return(outsize);
 }
 
-/****************************************************************************
- Reply to a SMBtranss2 - just ignore it!
-****************************************************************************/
-
-int reply_transs2(connection_struct *conn,
-                 char *inbuf,char *outbuf,int length,int bufsize)
+int handle_trans2(connection_struct *conn,
+                 struct trans_state *state,
+                 char *inbuf, char *outbuf, int size, int bufsize)
 {
-       START_PROFILE(SMBtranss2);
-       DEBUG(4,("Ignoring transs2 of length %d\n",length));
-       END_PROFILE(SMBtranss2);
-       return(-1);
+       int outsize;
+
+       if (Protocol >= PROTOCOL_NT1) {
+               SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | 0x40); /* IS_LONG_NAME */
+       }
+
+       /* Now we must call the relevant TRANS2 function */
+       switch(state->call)  {
+       case TRANSACT2_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(Trans2_open);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_findfirst);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_findnext);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_qfsinfo);
+           break;
+       }
+
+       case TRANSACT2_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(Trans2_setfsinfo);
+               break;
+       }
+
+       case TRANSACT2_QPATHINFO:
+       case TRANSACT2_QFILEINFO:
+       {
+               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(Trans2_qpathinfo);
+               break;
+       }
+
+       case TRANSACT2_SETPATHINFO:
+       case TRANSACT2_SETFILEINFO:
+       {
+               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(Trans2_setpathinfo);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_findnotifyfirst);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_findnotifynext);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_mkdir);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_get_dfs_referral);
+               break;
+       }
+
+       case TRANSACT2_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(Trans2_ioctl);
+               break;
+       }
+
+       default:
+               /* Error in request */
+               DEBUG(2,("Unknown request %d in trans2 call\n", state->call));
+               outsize = ERROR_DOS(ERRSRV,ERRerror);
+       }
+
+       return outsize;
 }
 
 /****************************************************************************
  Reply to a SMBtrans2.
-****************************************************************************/
+ ****************************************************************************/
 
-int reply_trans2(connection_struct *conn,
-                char *inbuf,char *outbuf,int length,int bufsize)
+int reply_trans2(connection_struct *conn, char *inbuf,char *outbuf,
+                int size, int bufsize)
 {
        int outsize = 0;
-       unsigned int total_params = SVAL(inbuf, smb_tpscnt);
-       unsigned int total_data =SVAL(inbuf, smb_tdscnt);
-       unsigned int max_data_bytes = SVAL(inbuf, smb_mdrcnt);
-#if 0
-       unsigned int max_param_reply = SVAL(inbuf, smb_mprcnt);
-       unsigned int max_setup_fields = SVAL(inbuf, smb_msrcnt);
-       BOOL close_tid = BITSETW(inbuf+smb_flags,0);
-       BOOL no_final_response = BITSETW(inbuf+smb_flags,1);
-       int32 timeout = IVALS(inbuf,smb_timeout);
-#endif
-       unsigned int suwcnt = SVAL(inbuf, smb_suwcnt);
+       unsigned int dsoff = SVAL(inbuf, smb_dsoff);
+       unsigned int dscnt = SVAL(inbuf, smb_dscnt);
+       unsigned int psoff = SVAL(inbuf, smb_psoff);
+       unsigned int pscnt = SVAL(inbuf, smb_pscnt);
        unsigned int tran_call = SVAL(inbuf, smb_setup0);
-       char *params = NULL, *data = NULL;
-       unsigned int num_params, num_params_sofar, num_data, num_data_sofar;
-       START_PROFILE(SMBtrans2);
-
-       if(global_oplock_break && (tran_call == TRANSACT2_OPEN)) {
-               /* Queue this open message as we are the process of an
-                * oplock break.  */
+       struct trans_state *state;
+       NTSTATUS result;
 
-               DEBUG(2,("reply_trans2: queueing message trans2open due to being "));
-               DEBUGADD(2,( "in oplock break state.\n"));
+       START_PROFILE(SMBtrans2);
 
-               push_oplock_pending_smb_message(inbuf, length);
+       result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid));
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(2, ("Got invalid trans2 request: %s\n",
+                         nt_errstr(result)));
                END_PROFILE(SMBtrans2);
-               return -1;
+               return ERROR_NT(result);
        }
-       
+
        if (IS_IPC(conn) && (tran_call != TRANSACT2_OPEN)
             && (tran_call != TRANSACT2_GET_DFS_REFERRAL)) {
                END_PROFILE(SMBtrans2);
                return ERROR_DOS(ERRSRV,ERRaccess);
        }
 
-       outsize = set_message(outbuf,0,0,True);
+       if ((state = TALLOC_P(conn->mem_ctx, struct trans_state)) == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               END_PROFILE(SMBtrans2);
+               return ERROR_NT(NT_STATUS_NO_MEMORY);
+       }
+
+       state->cmd = SMBtrans2;
+
+       state->mid = SVAL(inbuf, smb_mid);
+       state->vuid = SVAL(inbuf, smb_uid);
+       state->setup_count = SVAL(inbuf, smb_suwcnt);
+       state->setup = NULL;
+       state->total_param = SVAL(inbuf, smb_tpscnt);
+       state->param = NULL;
+       state->total_data =  SVAL(inbuf, smb_tdscnt);
+       state->data = NULL;
+       state->max_param_return = SVAL(inbuf, smb_mprcnt);
+       state->max_data_return  = SVAL(inbuf, smb_mdrcnt);
+       state->max_setup_return = SVAL(inbuf, smb_msrcnt);
+       state->close_on_completion = BITSETW(inbuf+smb_vwv5,0);
+       state->one_way = BITSETW(inbuf+smb_vwv5,1);
+
+       state->call = tran_call;
 
        /* All trans2 messages we handle have smb_sucnt == 1 - ensure this
           is so as a sanity check */
-       if (suwcnt != 1) {
+       if (state->setup_count != 1) {
                /*
                 * Need to have rc=0 for ioctl to get job id for OS/2.
                 *  Network printing will fail if function is not successful.
@@ -4851,274 +5620,215 @@ int reply_trans2(connection_struct *conn,
                 *  Until DosPrintSetJobInfo with PRJINFO3 is supported,
                 *  outbuf doesn't have to be set(only job id is used).
                 */
-               if ( (suwcnt == 4) && (tran_call == TRANSACT2_IOCTL) &&
+               if ( (state->setup_count == 4) && (tran_call == TRANSACT2_IOCTL) &&
                                (SVAL(inbuf,(smb_setup+4)) == LMCAT_SPL) &&
                                (SVAL(inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
                        DEBUG(2,("Got Trans2 DevIOctl jobid\n"));
                } else {
-                       DEBUG(2,("Invalid smb_sucnt in trans2 call(%u)\n",suwcnt));
+                       DEBUG(2,("Invalid smb_sucnt in trans2 call(%u)\n",state->setup_count));
                        DEBUG(2,("Transaction is %d\n",tran_call));
+                       TALLOC_FREE(state);
                        END_PROFILE(SMBtrans2);
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
        }
-    
-       /* Allocate the space for the maximum needed parameters and data */
-       if (total_params > 0)
-               params = (char *)SMB_MALLOC(total_params);
-       if (total_data > 0)
-               data = (char *)SMB_MALLOC(total_data);
-  
-       if ((total_params && !params)  || (total_data && !data)) {
-               DEBUG(2,("Out of memory in reply_trans2\n"));
-               SAFE_FREE(params);
-               SAFE_FREE(data); 
-               END_PROFILE(SMBtrans2);
-               return ERROR_NT(NT_STATUS_NO_MEMORY);
-       }
-
-       /* Copy the param and data bytes sent with this request into
-          the params buffer */
-       num_params = num_params_sofar = SVAL(inbuf,smb_pscnt);
-       num_data = num_data_sofar = SVAL(inbuf, smb_dscnt);
 
-       if (num_params > total_params || num_data > total_data)
-               exit_server("invalid params in reply_trans2");
+       if ((dscnt > state->total_data) || (pscnt > state->total_param))
+               goto bad_param;
 
-       if(params) {
-               unsigned int psoff = SVAL(inbuf, smb_psoff);
-               if ((psoff + num_params < psoff) || (psoff + num_params < num_params))
+       if (state->total_data) {
+               /* Can't use talloc here, the core routines do realloc on the
+                * params and data. */
+               state->data = (char *)SMB_MALLOC(state->total_data);
+               if (state->data == NULL) {
+                       DEBUG(0,("reply_trans2: data malloc fail for %u "
+                                "bytes !\n", (unsigned int)state->total_data));
+                       TALLOC_FREE(state);
+                       END_PROFILE(SMBtrans2);
+                       return(ERROR_DOS(ERRDOS,ERRnomem));
+               }
+               if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt))
                        goto bad_param;
-               if ((smb_base(inbuf) + psoff + num_params > inbuf + length) ||
-                               (smb_base(inbuf) + psoff + num_params < smb_base(inbuf)))
+               if ((smb_base(inbuf)+dsoff+dscnt > inbuf + size) ||
+                   (smb_base(inbuf)+dsoff+dscnt < smb_base(inbuf)))
                        goto bad_param;
-               memcpy( params, smb_base(inbuf) + psoff, num_params);
+
+               memcpy(state->data,smb_base(inbuf)+dsoff,dscnt);
        }
-       if(data) {
-               unsigned int dsoff = SVAL(inbuf, smb_dsoff);
-               if ((dsoff + num_data < dsoff) || (dsoff + num_data < num_data))
+
+       if (state->total_param) {
+               /* Can't use talloc here, the core routines do realloc on the
+                * params and data. */
+               state->param = (char *)SMB_MALLOC(state->total_param);
+               if (state->param == NULL) {
+                       DEBUG(0,("reply_trans: param malloc fail for %u "
+                                "bytes !\n", (unsigned int)state->total_param));
+                       SAFE_FREE(state->data);
+                       TALLOC_FREE(state);
+                       END_PROFILE(SMBtrans2);
+                       return(ERROR_DOS(ERRDOS,ERRnomem));
+               } 
+               if ((psoff+pscnt < psoff) || (psoff+pscnt < pscnt))
                        goto bad_param;
-               if ((smb_base(inbuf) + dsoff + num_data > inbuf + length) ||
-                               (smb_base(inbuf) + dsoff + num_data < smb_base(inbuf)))
+               if ((smb_base(inbuf)+psoff+pscnt > inbuf + size) ||
+                   (smb_base(inbuf)+psoff+pscnt < smb_base(inbuf)))
                        goto bad_param;
-               memcpy( data, smb_base(inbuf) + dsoff, num_data);
+
+               memcpy(state->param,smb_base(inbuf)+psoff,pscnt);
        }
 
-       srv_signing_trans_start(SVAL(inbuf,smb_mid));
+       state->received_data  = dscnt;
+       state->received_param = pscnt;
 
-       if(num_data_sofar < total_data || num_params_sofar < total_params)  {
-               /* We need to send an interim response then receive the rest
-                  of the parameter/data bytes */
-               outsize = set_message(outbuf,0,0,True);
-               srv_signing_trans_stop();
-               if (!send_smb(smbd_server_fd(),outbuf))
-                       exit_server("reply_trans2: send_smb failed.");
+       if ((state->received_param == state->total_param) &&
+           (state->received_data == state->total_data)) {
 
-               while (num_data_sofar < total_data || 
-                      num_params_sofar < total_params) {
-                       BOOL ret;
-                       unsigned int param_disp;
-                       unsigned int param_off;
-                       unsigned int data_disp;
-                       unsigned int data_off;
+               outsize = handle_trans2(conn, state, inbuf, outbuf,
+                                       size, bufsize);
+               SAFE_FREE(state->data);
+               SAFE_FREE(state->param);
+               TALLOC_FREE(state);
+               END_PROFILE(SMBtrans2);
+               return outsize;
+       }
 
-                       ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
+       DLIST_ADD(conn->pending_trans, state);
 
-                       /* We need to re-calcuate the new length after we've read the secondary packet. */
-                       length = smb_len(inbuf) + 4;
-                       
-                       /*
-                        * The sequence number for the trans reply is always
-                        * based on the last secondary received.
-                        */
+       /* We need to send an interim response then receive the rest
+          of the parameter/data bytes */
+       outsize = set_message(outbuf,0,0,False);
+       show_msg(outbuf);
+       END_PROFILE(SMBtrans2);
+       return outsize;
 
-                       srv_signing_trans_start(SVAL(inbuf,smb_mid));
-
-                       if ((ret && 
-                            (CVAL(inbuf, smb_com) != SMBtranss2)) || !ret) {
-                               outsize = set_message(outbuf,0,0,True);
-                               if(ret)
-                                       DEBUG(0,("reply_trans2: Invalid secondary trans2 packet\n"));
-                               else
-                                       DEBUG(0,("reply_trans2: %s in getting secondary trans2 response.\n",
-                                                (smb_read_error == READ_ERROR) ? "error" : "timeout" ));
-                               goto bad_param;
-                       }
-      
-                       /* Revise total_params and total_data in case
-                           they have changed downwards */
-                       if (SVAL(inbuf, smb_tpscnt) < total_params)
-                               total_params = SVAL(inbuf, smb_tpscnt);
-                       if (SVAL(inbuf, smb_tdscnt) < total_data)
-                               total_data = SVAL(inbuf, smb_tdscnt);
-
-                       num_params = SVAL(inbuf,smb_spscnt);
-                       param_off = SVAL(inbuf, smb_spsoff);
-                       param_disp = SVAL(inbuf, smb_spsdisp);
-                       num_params_sofar += num_params;
-
-                       num_data = SVAL(inbuf, smb_sdscnt);
-                       data_off = SVAL(inbuf, smb_sdsoff);
-                       data_disp = SVAL(inbuf, smb_sdsdisp);
-                       num_data_sofar += num_data;
-
-                       if (num_params_sofar > total_params || num_data_sofar > total_data)
-                               goto bad_param;
-                       
-                       if (num_params) {
-                               if (param_disp + num_params > total_params)
-                                       goto bad_param;
-                               if ((param_disp + num_params < param_disp) ||
-                                               (param_disp + num_params < num_params))
-                                       goto bad_param;
-                               if (param_disp > total_params)
-                                       goto bad_param;
-                               if ((smb_base(inbuf) + param_off + num_params > inbuf + length) ||
-                                               (smb_base(inbuf) + param_off + num_params < smb_base(inbuf)))
-                                       goto bad_param;
-                               if (params + param_disp < params)
-                                       goto bad_param;
-
-                               memcpy( &params[param_disp], smb_base(inbuf) + param_off, num_params);
-                       }
-                       if (num_data) {
-                               if (data_disp + num_data > total_data)
-                                       goto bad_param;
-                               if ((data_disp + num_data < data_disp) ||
-                                               (data_disp + num_data < num_data))
-                                       goto bad_param;
-                               if (data_disp > total_data)
-                                       goto bad_param;
-                               if ((smb_base(inbuf) + data_off + num_data > inbuf + length) ||
-                                               (smb_base(inbuf) + data_off + num_data < smb_base(inbuf)))
-                                       goto bad_param;
-                               if (data + data_disp < data)
-                                       goto bad_param;
-
-                               memcpy( &data[data_disp], smb_base(inbuf) + data_off, num_data);
-                       }
+  bad_param:
+
+       DEBUG(0,("reply_trans2: invalid trans parameters\n"));
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+       END_PROFILE(SMBtrans2);
+       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+}
+
+
+/****************************************************************************
+ Reply to a SMBtranss2
+ ****************************************************************************/
+
+int reply_transs2(connection_struct *conn,
+                 char *inbuf,char *outbuf,int size,int bufsize)
+{
+       int outsize = 0;
+       unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp;
+       struct trans_state *state;
+
+       START_PROFILE(SMBtranss2);
+
+       show_msg(inbuf);
+
+       for (state = conn->pending_trans; state != NULL;
+            state = state->next) {
+               if (state->mid == SVAL(inbuf,smb_mid)) {
+                       break;
                }
        }
-       
-       if (Protocol >= PROTOCOL_NT1) {
-               SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | 0x40); /* IS_LONG_NAME */
+
+       if ((state == NULL) || (state->cmd != SMBtrans2)) {
+               END_PROFILE(SMBtranss2);
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
-       /* Now we must call the relevant TRANS2 function */
-       switch(tran_call)  {
-       case TRANSACT2_OPEN:
-               START_PROFILE_NESTED(Trans2_open);
-               outsize = call_trans2open(conn, inbuf, outbuf, bufsize, 
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_open);
-               break;
+       /* Revise state->total_param and state->total_data in case they have
+          changed downwards */
 
-       case TRANSACT2_FINDFIRST:
-               START_PROFILE_NESTED(Trans2_findfirst);
-               outsize = call_trans2findfirst(conn, inbuf, outbuf, bufsize,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_findfirst);
-               break;
+       if (SVAL(inbuf, smb_tpscnt) < state->total_param)
+               state->total_param = SVAL(inbuf, smb_tpscnt);
+       if (SVAL(inbuf, smb_tdscnt) < state->total_data)
+               state->total_data = SVAL(inbuf, smb_tdscnt);
 
-       case TRANSACT2_FINDNEXT:
-               START_PROFILE_NESTED(Trans2_findnext);
-               outsize = call_trans2findnext(conn, inbuf, outbuf, length, bufsize, 
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_findnext);
-               break;
+       pcnt = SVAL(inbuf, smb_spscnt);
+       poff = SVAL(inbuf, smb_spsoff);
+       pdisp = SVAL(inbuf, smb_spsdisp);
 
-       case TRANSACT2_QFSINFO:
-               START_PROFILE_NESTED(Trans2_qfsinfo);
-               outsize = call_trans2qfsinfo(conn, inbuf, outbuf, length, bufsize,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_qfsinfo);
-           break;
+       dcnt = SVAL(inbuf, smb_sdscnt);
+       doff = SVAL(inbuf, smb_sdsoff);
+       ddisp = SVAL(inbuf, smb_sdsdisp);
 
-       case TRANSACT2_SETFSINFO:
-               START_PROFILE_NESTED(Trans2_setfsinfo);
-               outsize = call_trans2setfsinfo(conn, inbuf, outbuf, length, bufsize, 
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_setfsinfo);
-               break;
+       state->received_param += pcnt;
+       state->received_data += dcnt;
+               
+       if ((state->received_data > state->total_data) ||
+           (state->received_param > state->total_param))
+               goto bad_param;
 
-       case TRANSACT2_QPATHINFO:
-       case TRANSACT2_QFILEINFO:
-               START_PROFILE_NESTED(Trans2_qpathinfo);
-               outsize = call_trans2qfilepathinfo(conn, inbuf, outbuf, length, bufsize, tran_call,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_qpathinfo);
-               break;
-       case TRANSACT2_SETPATHINFO:
-       case TRANSACT2_SETFILEINFO:
-               START_PROFILE_NESTED(Trans2_setpathinfo);
-               outsize = call_trans2setfilepathinfo(conn, inbuf, outbuf, length, bufsize, tran_call,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_setpathinfo);
-               break;
+       if (pcnt) {
+               if (pdisp+pcnt > state->total_param)
+                       goto bad_param;
+               if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
+                       goto bad_param;
+               if (pdisp > state->total_param)
+                       goto bad_param;
+               if ((smb_base(inbuf) + poff + pcnt > inbuf + size) ||
+                   (smb_base(inbuf) + poff + pcnt < smb_base(inbuf)))
+                       goto bad_param;
+               if (state->param + pdisp < state->param)
+                       goto bad_param;
 
-       case TRANSACT2_FINDNOTIFYFIRST:
-               START_PROFILE_NESTED(Trans2_findnotifyfirst);
-               outsize = call_trans2findnotifyfirst(conn, inbuf, outbuf, length, bufsize, 
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_findnotifyfirst);
-               break;
+               memcpy(state->param+pdisp,smb_base(inbuf)+poff,
+                      pcnt);
+       }
 
-       case TRANSACT2_FINDNOTIFYNEXT:
-               START_PROFILE_NESTED(Trans2_findnotifynext);
-               outsize = call_trans2findnotifynext(conn, inbuf, outbuf, length, bufsize, 
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_findnotifynext);
-               break;
-       case TRANSACT2_MKDIR:
-               START_PROFILE_NESTED(Trans2_mkdir);
-               outsize = call_trans2mkdir(conn, inbuf, outbuf, length, bufsize,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_mkdir);
-               break;
+       if (dcnt) {
+               if (ddisp+dcnt > state->total_data)
+                       goto bad_param;
+               if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
+                       goto bad_param;
+               if (ddisp > state->total_data)
+                       goto bad_param;
+               if ((smb_base(inbuf) + doff + dcnt > inbuf + size) ||
+                   (smb_base(inbuf) + doff + dcnt < smb_base(inbuf)))
+                       goto bad_param;
+               if (state->data + ddisp < state->data)
+                       goto bad_param;
 
-       case TRANSACT2_GET_DFS_REFERRAL:
-               START_PROFILE_NESTED(Trans2_get_dfs_referral);
-               outsize = call_trans2getdfsreferral(conn,inbuf,outbuf,length, bufsize,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_get_dfs_referral);
-               break;
-       case TRANSACT2_IOCTL:
-               START_PROFILE_NESTED(Trans2_ioctl);
-               outsize = call_trans2ioctl(conn,inbuf,outbuf,length, bufsize,
-                                         &params, total_params, &data, total_data, max_data_bytes);
-               END_PROFILE_NESTED(Trans2_ioctl);
-               break;
-       default:
-               /* Error in request */
-               DEBUG(2,("Unknown request %d in trans2 call\n", tran_call));
-               SAFE_FREE(params);
-               SAFE_FREE(data);
-               END_PROFILE(SMBtrans2);
-               srv_signing_trans_stop();
-               return ERROR_DOS(ERRSRV,ERRerror);
+               memcpy(state->data+ddisp, smb_base(inbuf)+doff,
+                      dcnt);      
        }
-       
-       /* As we do not know how many data packets will need to be
-          returned here the various call_trans2xxxx calls
-          must send their own. Thus a call_trans2xxx routine only
-          returns a value other than -1 when it wants to send
-          an error packet. 
-       */
-       
-       srv_signing_trans_stop();
 
-       SAFE_FREE(params);
-       SAFE_FREE(data);
-       END_PROFILE(SMBtrans2);
-       return outsize; /* If a correct response was needed the
-                          call_trans2xxx calls have already sent
-                          it. If outsize != -1 then it is returning */
+       if ((state->received_param < state->total_param) ||
+           (state->received_data < state->total_data)) {
+               END_PROFILE(SMBtranss2);
+               return -1;
+       }
+
+       /* construct_reply_common has done us the favor to pre-fill the
+        * command field with SMBtranss2 which is wrong :-)
+        */
+       SCVAL(outbuf,smb_com,SMBtrans2);
+
+       outsize = handle_trans2(conn, state, inbuf, outbuf, size, bufsize);
+
+       DLIST_REMOVE(conn->pending_trans, state);
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+
+       if (outsize == 0) {
+               END_PROFILE(SMBtranss2);
+               return(ERROR_DOS(ERRSRV,ERRnosupport));
+       }
+       
+       END_PROFILE(SMBtranss2);
+       return(outsize);
 
   bad_param:
 
-       srv_signing_trans_stop();
-       SAFE_FREE(params);
-       SAFE_FREE(data);
-       END_PROFILE(SMBtrans2);
+       DEBUG(0,("reply_transs2: invalid trans parameters\n"));
+       DLIST_REMOVE(conn->pending_trans, state);
+       SAFE_FREE(state->data);
+       SAFE_FREE(state->param);
+       TALLOC_FREE(state);
+       END_PROFILE(SMBtranss2);
        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }