r6146: Added OS/2 EA support in trans2_open and trans2_mkdir. Fixed in nttrans_create.
[samba.git] / source / smbd / nttrans.c
index 375c6c44f63b40f50b15e749097ac9909f774ad6..70b3f0d0e00ce4479fda61a3f3379043710234e0 100644 (file)
@@ -1,7 +1,8 @@
 /*
    Unix SMB/CIFS implementation.
    SMB NT transaction handling
-   Copyright (C) Jeremy Allison 1994-1998
+   Copyright (C) Jeremy Allison                        1994-1998
+   Copyright (C) Stefan (metze) Metzmacher     2003
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 
-extern int Protocol;
+extern enum protocol_types Protocol;
 extern int smb_read_error;
 extern int global_oplock_break;
-extern BOOL case_sensitive;
-extern BOOL case_preserve;
-extern BOOL short_case_preserve;
+extern struct current_user current_user;
 
 static const char *known_nt_pipes[] = {
        "\\LANMAN",
@@ -40,6 +39,9 @@ static const char *known_nt_pipes[] = {
        "\\winreg",
        "\\spoolss",
        "\\netdfs",
+       "\\rpcecho",
+        "\\svcctl",
+       "\\eventlog",
        NULL
 };
 
@@ -52,6 +54,25 @@ struct generic_mapping file_generic_mapping = {
        FILE_GENERIC_ALL
 };
 
+static char *nttrans_realloc(char **ptr, size_t size)
+{
+       char *tptr = NULL;
+       if (ptr==NULL)
+               smb_panic("nttrans_realloc() called with NULL ptr\n");
+               
+       tptr = SMB_REALLOC(*ptr, size);
+       if(tptr == NULL) {
+               *ptr = NULL;
+               return NULL;
+       }
+       memset(tptr,'\0',size);
+
+       *ptr = tptr;
+
+       return tptr;
+}
+
+
 /****************************************************************************
  Send the required number of replies back.
  We assume all fields other than the data fields are
@@ -253,33 +274,33 @@ static BOOL saved_short_case_preserve;
  Save case semantics.
 ****************************************************************************/
 
-static void set_posix_case_semantics(uint32 file_attributes)
+static void set_posix_case_semantics(connection_struct *conn, uint32 file_attributes)
 {
        if(!(file_attributes & FILE_FLAG_POSIX_SEMANTICS))
                return;
 
-       saved_case_sensitive = case_sensitive;
-       saved_case_preserve = case_preserve;
-       saved_short_case_preserve = short_case_preserve;
+       saved_case_sensitive = conn->case_sensitive;
+       saved_case_preserve = conn->case_preserve;
+       saved_short_case_preserve = conn->short_case_preserve;
 
        /* Set to POSIX. */
-       case_sensitive = True;
-       case_preserve = True;
-       short_case_preserve = True;
+       conn->case_sensitive = True;
+       conn->case_preserve = True;
+       conn->short_case_preserve = True;
 }
 
 /****************************************************************************
  Restore case semantics.
 ****************************************************************************/
 
-static void restore_case_semantics(uint32 file_attributes)
+static void restore_case_semantics(connection_struct *conn, uint32 file_attributes)
 {
        if(!(file_attributes & FILE_FLAG_POSIX_SEMANTICS))
                return;
 
-       case_sensitive = saved_case_sensitive;
-       case_preserve = saved_case_preserve;
-       short_case_preserve = saved_short_case_preserve;
+       conn->case_sensitive = saved_case_sensitive;
+       conn->case_preserve = saved_case_preserve;
+       conn->short_case_preserve = saved_short_case_preserve;
 }
 
 /****************************************************************************
@@ -332,6 +353,12 @@ static int map_share_mode( char *fname, uint32 create_options,
                        uint32 *desired_access, uint32 share_access, uint32 file_attributes)
 {
        int smb_open_mode = -1;
+       uint32 original_desired_access = *desired_access;
+
+       /* This is a nasty hack - must fix... JRA. */
+       if (*desired_access == MAXIMUM_ALLOWED_ACCESS) {
+               *desired_access = FILE_GENERIC_ALL;
+       }
 
        /*
         * Convert GENERIC bits to specific bits.
@@ -403,6 +430,10 @@ static int map_share_mode( char *fname, uint32 create_options,
                DEBUG(10,("map_share_mode: FILE_SHARE_DELETE requested. open_mode = 0x%x\n", smb_open_mode));
        }
 
+       if(*desired_access & DELETE_ACCESS) {
+               DEBUG(10,("map_share_mode: DELETE_ACCESS requested. open_mode = 0x%x\n", smb_open_mode));
+       }
+
        /*
         * We need to store the intent to open for Delete. This
         * is what determines if a delete on close flag can be set.
@@ -410,11 +441,19 @@ static int map_share_mode( char *fname, uint32 create_options,
         * is the only practical way. JRA.
         */
 
-       if(*desired_access & DELETE_ACCESS) {
-               DEBUG(10,("map_share_mode: DELETE_ACCESS requested. open_mode = 0x%x\n", smb_open_mode));
-       }
-
        if (create_options & FILE_DELETE_ON_CLOSE) {
+               /*
+                * W2K3 bug compatibility mode... To set delete on close
+                * the redirector must have *specifically* set DELETE_ACCESS
+                * in the desired_access field. Just asking for GENERIC_ALL won't do. JRA.
+                */
+
+               if (!(original_desired_access & DELETE_ACCESS)) {
+                       DEBUG(5,("map_share_mode: FILE_DELETE_ON_CLOSE requested without \
+DELETE_ACCESS for file %s. (desired_access = 0x%lx)\n",
+                               fname, (unsigned long)*desired_access));
+                       return -1;
+               }
                /* Implicit delete access is *NOT* requested... */
                smb_open_mode |= DELETE_ON_CLOSE_FLAG;
                DEBUG(10,("map_share_mode: FILE_DELETE_ON_CLOSE requested. open_mode = 0x%x\n", smb_open_mode));
@@ -541,6 +580,7 @@ int reply_ntcreate_and_X(connection_struct *conn,
 {  
        int result;
        pstring fname;
+       enum FAKE_FILE_TYPE fake_file_type = FAKE_FILE_TYPE_NONE;
        uint32 flags = IVAL(inbuf,smb_ntcreate_Flags);
        uint32 desired_access = IVAL(inbuf,smb_ntcreate_DesiredAccess);
        uint32 file_attributes = IVAL(inbuf,smb_ntcreate_FileAttributes);
@@ -551,11 +591,9 @@ int reply_ntcreate_and_X(connection_struct *conn,
        SMB_BIG_UINT allocation_size = 0;
        int smb_ofun;
        int smb_open_mode;
-       int smb_attr = (file_attributes & SAMBA_ATTRIBUTES_MASK);
        /* Breakout the oplock request bits so we can set the
           reply bits separately. */
        int oplock_request = 0;
-       mode_t unixmode;
        int fmode=0,rmode=0;
        SMB_OFF_T file_len = 0;
        SMB_STRUCT_STAT sbuf;
@@ -565,6 +603,7 @@ int reply_ntcreate_and_X(connection_struct *conn,
        char *p = NULL;
        time_t c_time;
        BOOL extended_oplock_granted = False;
+       NTSTATUS status;
 
        START_PROFILE(SMBntcreateX);
 
@@ -598,7 +637,7 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
        
        if((smb_ofun = map_create_disposition( create_disposition )) == -1) {
                END_PROFILE(SMBntcreateX);
-               return(ERROR_DOS(ERRDOS,ERRnoaccess));
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
        /*
@@ -609,6 +648,7 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                /*
                 * This filename is relative to a directory fid.
                 */
+               pstring rel_fname;
                files_struct *dir_fsp = file_fsp(inbuf,smb_ntcreate_RootDirectoryFid);
                size_t dir_name_len;
 
@@ -619,7 +659,11 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
 
                if(!dir_fsp->is_directory) {
 
-                       srvstr_pull_buf(inbuf, fname, smb_buf(inbuf), sizeof(fname), STR_TERMINATE);
+                       srvstr_get_path(inbuf, fname, smb_buf(inbuf), sizeof(fname), 0, STR_TERMINATE, &status,False);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               END_PROFILE(SMBntcreateX);
+                               return ERROR_NT(status);
+                       }
 
                        /* 
                         * Check to see if this is a mac fork of some kind.
@@ -630,14 +674,12 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                                return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
                        }
 
-
                        /*
                          we need to handle the case when we get a
                          relative open relative to a file and the
                          pathname is blank - this is a reopen!
                          (hint from demyn plantenberg)
                        */
-                       
 
                        END_PROFILE(SMBntcreateX);
                        return(ERROR_DOS(ERRDOS,ERRbadfid));
@@ -655,21 +697,47 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                 */
 
                if(fname[dir_name_len-1] != '\\' && fname[dir_name_len-1] != '/') {
-                       pstrcat(fname, "\\");
+                       pstrcat(fname, "/");
                        dir_name_len++;
                }
 
-               srvstr_pull_buf(inbuf, &fname[dir_name_len], smb_buf(inbuf), sizeof(fname)-dir_name_len, STR_TERMINATE);
+               srvstr_get_path(inbuf, rel_fname, smb_buf(inbuf), sizeof(rel_fname), 0, STR_TERMINATE, &status,False);
+               if (!NT_STATUS_IS_OK(status)) {
+                       END_PROFILE(SMBntcreateX);
+                       return ERROR_NT(status);
+               }
+               pstrcat(fname, rel_fname);
        } else {
-               srvstr_pull_buf(inbuf, fname, smb_buf(inbuf), sizeof(fname), STR_TERMINATE);
+               srvstr_get_path(inbuf, fname, smb_buf(inbuf), sizeof(fname), 0, STR_TERMINATE, &status,False);
+               if (!NT_STATUS_IS_OK(status)) {
+                       END_PROFILE(SMBntcreateX);
+                       return ERROR_NT(status);
+               }
 
                /* 
                 * Check to see if this is a mac fork of some kind.
                 */
 
                if( strchr_m(fname, ':')) {
-                       END_PROFILE(SMBntcreateX);
-                       return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+                       
+#ifdef HAVE_SYS_QUOTAS
+                       if ((fake_file_type=is_fake_file(fname))!=FAKE_FILE_TYPE_NONE) {
+                               /*
+                                * here we go! support for changing the disk quotas --metze
+                                *
+                                * we need to fake up to open this MAGIC QUOTA file 
+                                * and return a valid FID
+                                *
+                                * w2k close this file directly after openening
+                                * xp also tries a QUERY_FILE_INFO on the file and then close it
+                                */
+                       } else {
+#endif
+                               END_PROFILE(SMBntcreateX);
+                               return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+#ifdef HAVE_SYS_QUOTAS
+                       }
+#endif
                }
        }
        
@@ -683,7 +751,7 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                                           share_access, 
                                           file_attributes)) == -1) {
                END_PROFILE(SMBntcreateX);
-               return ERROR_DOS(ERRDOS,ERRnoaccess);
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
        oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
@@ -699,12 +767,47 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
         * Check if POSIX semantics are wanted.
         */
                
-       set_posix_case_semantics(file_attributes);
+       set_posix_case_semantics(conn, file_attributes);
                
        unix_convert(fname,conn,0,&bad_path,&sbuf);
-               
-       unixmode = unix_mode(conn,smb_attr | aARCH, fname);
-    
+
+       /* FAKE_FILE is a special case */
+       if (fake_file_type == FAKE_FILE_TYPE_NONE) {
+               /* Normal file. */
+               if (bad_path) {
+                       restore_case_semantics(conn, file_attributes);
+                       END_PROFILE(SMBntcreateX);
+                       return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+               }
+               /* All file access must go through check_name() */
+               if (!check_name(fname,conn)) {
+                       restore_case_semantics(conn, file_attributes);
+                       END_PROFILE(SMBntcreateX);
+                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+               }
+       }
+
+#if 0
+       /* This is the correct thing to do (check every time) but can_delete is
+          expensive (it may have to read the parent directory permissions). So
+          for now we're not doing it unless we have a strong hint the client
+          is really going to delete this file. */
+       if (desired_access & DELETE_ACCESS) {
+#else
+       /* Setting FILE_SHARE_DELETE is the hint. */
+       if ((share_access & FILE_SHARE_DELETE) && (desired_access & DELETE_ACCESS)) {
+#endif
+               status = can_delete(conn, fname, file_attributes, bad_path, True);
+               /* We're only going to fail here if it's access denied, as that's the
+                  only error we care about for "can we delete this ?" questions. */
+               if (!NT_STATUS_IS_OK(status) && (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
+                                                NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE))) {
+                       restore_case_semantics(conn, file_attributes);
+                       END_PROFILE(SMBntcreateX);
+                       return ERROR_NT(status);
+               }
+       }
+
        /* 
         * If it's a request for a directory open, deal with it separately.
         */
@@ -718,14 +821,13 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
-               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, unixmode, &smb_action);
+               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, &smb_action);
                        
-               restore_case_semantics(file_attributes);
+               restore_case_semantics(conn, file_attributes);
 
                if(!fsp) {
-                       set_bad_path_error(errno, bad_path);
                        END_PROFILE(SMBntcreateX);
-                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                }
        } else {
                /*
@@ -745,12 +847,21 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                 * before issuing an oplock break request to
                 * our client. JRA.  */
 
-               fsp = open_file_shared1(conn,fname,&sbuf,
+               if (fake_file_type==FAKE_FILE_TYPE_NONE) {
+                       fsp = open_file_shared1(conn,fname,&sbuf,
                                        desired_access,
                                        smb_open_mode,
-                                       smb_ofun,unixmode, oplock_request,
+                                       smb_ofun,file_attributes,oplock_request,
                                        &rmode,&smb_action);
-
+               } else {
+                       /* to open a fake_file --metze */
+                       fsp = open_fake_file_shared1(fake_file_type,conn,fname,&sbuf,
+                                       desired_access,
+                                       smb_open_mode,
+                                       smb_ofun,file_attributes, oplock_request,
+                                       &rmode,&smb_action);
+               }
+               
                if (!fsp) { 
                        /* We cheat here. There are two cases we
                         * care about. One is a directory rename,
@@ -778,7 +889,7 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                                 */
 
                                if (create_options & FILE_NON_DIRECTORY_FILE) {
-                                       restore_case_semantics(file_attributes);
+                                       restore_case_semantics(conn, file_attributes);
                                        SSVAL(outbuf, smb_flg2, 
                                              SVAL(outbuf,smb_flg2) | FLAGS2_32_BIT_ERROR_CODES);
                                        END_PROFILE(SMBntcreateX);
@@ -786,25 +897,28 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
                                }
        
                                oplock_request = 0;
-                               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, unixmode, &smb_action);
+                               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, &smb_action);
                                
                                if(!fsp) {
-                                       restore_case_semantics(file_attributes);
-                                       set_bad_path_error(errno, bad_path);
+                                       restore_case_semantics(conn, file_attributes);
                                        END_PROFILE(SMBntcreateX);
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+                                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                                }
                        } else {
 
-                               restore_case_semantics(file_attributes);
-                               set_bad_path_error(errno, bad_path);
+                               restore_case_semantics(conn, file_attributes);
                                END_PROFILE(SMBntcreateX);
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
+                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                                       /* We have re-scheduled this call. */
+                                       clear_cached_errors();
+                                       return -1;
+                               }
+                               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                        }
                } 
        }
                
-       restore_case_semantics(file_attributes);
+       restore_case_semantics(conn, file_attributes);
                
        file_len = sbuf.st_size;
        fmode = dos_mode(conn,fname,&sbuf);
@@ -822,14 +936,20 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
        allocation_size |= (((SMB_BIG_UINT)IVAL(inbuf,smb_ntcreate_AllocationSize + 4)) << 32);
 #endif
        if (allocation_size && (allocation_size > (SMB_BIG_UINT)file_len)) {
-               fsp->initial_allocation_size = SMB_ROUNDUP(allocation_size,SMB_ROUNDUP_ALLOCATION_SIZE);
+               fsp->initial_allocation_size = smb_roundup(fsp->conn, allocation_size);
+               if (fsp->is_directory) {
+                       close_file(fsp,False);
+                       END_PROFILE(SMBntcreateX);
+                       /* 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,False);
                        END_PROFILE(SMBntcreateX);
                        return ERROR_NT(NT_STATUS_DISK_FULL);
                }
        } else {
-               fsp->initial_allocation_size = SMB_ROUNDUP(((SMB_BIG_UINT)file_len),SMB_ROUNDUP_ALLOCATION_SIZE);
+               fsp->initial_allocation_size = smb_roundup(fsp->conn,(SMB_BIG_UINT)file_len);
        }
 
        /* 
@@ -899,12 +1019,15 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
        p += 8;
        SIVAL(p,0,fmode); /* File Attributes. */
        p += 4;
-       SOFF_T(p, 0, get_allocation_size(fsp,&sbuf));
+       SOFF_T(p, 0, get_allocation_size(conn,fsp,&sbuf));
        p += 8;
        SOFF_T(p,0,file_len);
-       p += 12;
+       p += 8;
+       if (flags & EXTENDED_RESPONSE_REQUIRED)
+               SSVAL(p,2,0x7);
+       p += 4;
        SCVAL(p,0,fsp->is_directory ? 1 : 0);
-       
+
        DEBUG(5,("reply_ntcreate_and_X: fnum = %d, open name = %s\n", fsp->fnum, fsp->fsp_name));
 
        result = chain_reply(inbuf,outbuf,length,bufsize);
@@ -916,41 +1039,40 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib
  Reply to a NT_TRANSACT_CREATE call to open a pipe.
 ****************************************************************************/
 
-static int do_nt_transact_create_pipe( connection_struct *conn,
-                                       char *inbuf, char *outbuf, int length, 
-                                       int bufsize, char **ppsetup, char **ppparams, 
-                                       char **ppdata)
+static int do_nt_transact_create_pipe( connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count)
 {
        pstring fname;
-       int total_parameter_count = (int)IVAL(inbuf, smb_nt_TotalParameterCount);
        char *params = *ppparams;
        int ret;
        int pnum = -1;
        char *p = NULL;
+       NTSTATUS status;
 
        /*
         * Ensure minimum number of parameters sent.
         */
 
-       if(total_parameter_count < 54) {
-               DEBUG(0,("do_nt_transact_create_pipe - insufficient parameters (%u)\n", (unsigned int)total_parameter_count));
+       if(parameter_count < 54) {
+               DEBUG(0,("do_nt_transact_create_pipe - insufficient parameters (%u)\n", (unsigned int)parameter_count));
                return ERROR_DOS(ERRDOS,ERRnoaccess);
        }
 
-       srvstr_pull(inbuf, fname, params+53, sizeof(fname), total_parameter_count-53, STR_TERMINATE);
+       srvstr_get_path(inbuf, fname, params+53, sizeof(fname), parameter_count-53, STR_TERMINATE, &status, False);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
+       }
 
        if ((ret = nt_open_pipe(fname, conn, inbuf, outbuf, &pnum)) != 0)
                return ret;
        
        /* Realloc the size of parameters and data we will return */
-       params = Realloc(*ppparams, 69);
+       params = nttrans_realloc(ppparams, 69);
        if(params == NULL)
                return ERROR_DOS(ERRDOS,ERRnomem);
        
-       *ppparams = params;
-       
-       memset((char *)params,'\0',69);
-       
        p = params;
        SCVAL(p,0,NO_OPLOCK_RETURN);
        
@@ -987,7 +1109,7 @@ static NTSTATUS set_sd(files_struct *fsp, char *data, uint32 sd_len, uint32 secu
        TALLOC_CTX *mem_ctx;
        BOOL ret;
        
-       if (sd_len == 0) {
+       if (sd_len == 0 || !lp_nt_acl_support(SNUM(fsp->conn))) {
                return NT_STATUS_OK;
        }
 
@@ -1031,7 +1153,7 @@ static NTSTATUS set_sd(files_struct *fsp, char *data, uint32 sd_len, uint32 secu
        if (psd->off_dacl==0)
                security_info_sent &= ~DACL_SECURITY_INFORMATION;
        
-       ret = fsp->conn->vfs_ops.fset_nt_acl( fsp, fsp->fd, security_info_sent, psd);
+       ret = SMB_VFS_FSET_NT_ACL( fsp, fsp->fd, security_info_sent, psd);
        
        if (!ret) {
                talloc_destroy(mem_ctx);
@@ -1043,22 +1165,48 @@ static NTSTATUS set_sd(files_struct *fsp, char *data, uint32 sd_len, uint32 secu
        return NT_STATUS_OK;
 }
 
+/****************************************************************************
+ Read a list of EA names and data from an incoming data buffer. Create an ea_list with them.
+****************************************************************************/
+                                                                                                                             
+static struct ea_list *read_nttrans_ea_list(TALLOC_CTX *ctx, const char *pdata, size_t data_size)
+{
+       struct ea_list *ea_list_head = NULL;
+       size_t offset = 0;
+
+       if (data_size < 4) {
+               return NULL;
+       }
+
+       while (offset + 4 <= data_size) {
+               size_t next_offset = IVAL(pdata,offset);
+               struct ea_list *tmp;
+               struct ea_list *eal = read_ea_list_entry(ctx, pdata + offset + 4, data_size - offset - 4, NULL);
+
+               DLIST_ADD_END(ea_list_head, eal, tmp);
+               if (next_offset == 0) {
+                       break;
+               }
+               offset += next_offset;
+       }
+                                                                                                                             
+       return ea_list_head;
+}
+
 /****************************************************************************
  Reply to a NT_TRANSACT_CREATE call (needs to process SD's).
 ****************************************************************************/
 
-static int call_nt_transact_create(connection_struct *conn,
-                                       char *inbuf, char *outbuf, int length, 
-                                       int bufsize, char **ppsetup, char **ppparams, 
-                                       char **ppdata)
+static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
        pstring fname;
        char *params = *ppparams;
        char *data = *ppdata;
-       int total_parameter_count = (int)IVAL(inbuf, smb_nt_TotalParameterCount);
        /* Breakout the oplock request bits so we can set the reply bits separately. */
        int oplock_request = 0;
-       mode_t unixmode;
        int fmode=0,rmode=0;
        SMB_OFF_T file_len = 0;
        SMB_STRUCT_STAT sbuf;
@@ -1074,13 +1222,16 @@ static int call_nt_transact_create(connection_struct *conn,
        uint32 create_disposition;
        uint32 create_options;
        uint32 sd_len;
+       uint32 ea_len;
        uint16 root_dir_fid;
        SMB_BIG_UINT allocation_size = 0;
        int smb_ofun;
        int smb_open_mode;
-       int smb_attr;
        time_t c_time;
-       NTSTATUS nt_status;
+       struct ea_list *ea_list = NULL;
+       TALLOC_CTX *ctx = NULL;
+       char *pdata = NULL;
+       NTSTATUS status;
 
        DEBUG(5,("call_nt_transact_create\n"));
 
@@ -1091,7 +1242,10 @@ static int call_nt_transact_create(connection_struct *conn,
        if (IS_IPC(conn)) {
                if (lp_nt_pipe_support())
                        return do_nt_transact_create_pipe(conn, inbuf, outbuf, length, 
-                                       bufsize, ppsetup, ppparams, ppdata);
+                                       bufsize,
+                                       ppsetup, setup_count,
+                                       ppparams, parameter_count,
+                                       ppdata, data_count);
                else
                        return ERROR_DOS(ERRDOS,ERRnoaccess);
        }
@@ -1100,9 +1254,9 @@ static int call_nt_transact_create(connection_struct *conn,
         * Ensure minimum number of parameters sent.
         */
 
-       if(total_parameter_count < 54) {
-               DEBUG(0,("call_nt_transact_create - insufficient parameters (%u)\n", (unsigned int)total_parameter_count));
-               return ERROR_DOS(ERRDOS,ERRnoaccess);
+       if(parameter_count < 54) {
+               DEBUG(0,("call_nt_transact_create - insufficient parameters (%u)\n", (unsigned int)parameter_count));
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
        }
 
        flags = IVAL(params,0);
@@ -1112,11 +1266,33 @@ static int call_nt_transact_create(connection_struct *conn,
        create_disposition = IVAL(params,28);
        create_options = IVAL(params,32);
        sd_len = IVAL(params,36);
+       ea_len = IVAL(params,40);
        root_dir_fid = (uint16)IVAL(params,4);
-       smb_attr = (file_attributes & SAMBA_ATTRIBUTES_MASK);
+
+       /* Ensure the data_len is correct for the sd and ea values given. */
+       if ((ea_len + sd_len > data_count) ||
+                       (ea_len > data_count) || (sd_len > data_count) ||
+                       (ea_len + sd_len < ea_len) || (ea_len + sd_len < sd_len)) {
+               DEBUG(10,("call_nt_transact_create - ea_len = %u, sd_len = %u, data_count = %u\n",
+                       (unsigned int)ea_len, (unsigned int)sd_len, (unsigned int)data_count ));
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
+
+       if (ea_len) {
+               if (!lp_ea_support(SNUM(conn))) {
+                       DEBUG(10,("call_nt_transact_create - ea_len = %u but EA's not supported.\n",
+                               (unsigned int)ea_len ));
+                       return ERROR_NT(NT_STATUS_EAS_NOT_SUPPORTED);
+               }
+
+               if (ea_len < 10) {
+                       DEBUG(10,("call_nt_transact_create - ea_len = %u - too small (should be more than 10)\n",
+                               (unsigned int)ea_len ));
+                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               }
+       }
 
        if (create_options & FILE_OPEN_BY_FILE_ID) {
-               END_PROFILE(SMBntcreateX);
                return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
        }
 
@@ -1125,8 +1301,9 @@ static int call_nt_transact_create(connection_struct *conn,
         * NT values, as that's what our code is structured to accept.
         */    
 
-       if((smb_ofun = map_create_disposition( create_disposition )) == -1)
-               return ERROR_DOS(ERRDOS,ERRbadmem);
+       if((smb_ofun = map_create_disposition( create_disposition )) == -1) {
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+       }
 
        /*
         * Get the file name.
@@ -1136,7 +1313,6 @@ static int call_nt_transact_create(connection_struct *conn,
                /*
                 * This filename is relative to a directory fid.
                 */
-
                files_struct *dir_fsp = file_fsp(params,4);
                size_t dir_name_len;
 
@@ -1144,8 +1320,10 @@ static int call_nt_transact_create(connection_struct *conn,
                        return ERROR_DOS(ERRDOS,ERRbadfid);
 
                if(!dir_fsp->is_directory) {
-
-                       srvstr_pull(inbuf, fname, params+53, sizeof(fname), total_parameter_count-53, STR_TERMINATE);
+                       srvstr_get_path(inbuf, fname, params+53, sizeof(fname), parameter_count-53, STR_TERMINATE, &status, False);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
+                       }
 
                        /*
                         * Check to see if this is a mac fork of some kind.
@@ -1169,14 +1347,23 @@ static int call_nt_transact_create(connection_struct *conn,
                 */
 
                if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != '/')) {
-                       pstrcat(fname, "\\");
+                       pstrcat(fname, "/");
                        dir_name_len++;
                }
 
-               srvstr_pull(inbuf, &fname[dir_name_len], params+53, sizeof(fname)-dir_name_len, 
-                               total_parameter_count-53, STR_TERMINATE);
+               {
+                       pstring tmpname;
+                       srvstr_get_path(inbuf, tmpname, params+53, sizeof(tmpname), parameter_count-53, STR_TERMINATE, &status, False);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               return ERROR_NT(status);
+                       }
+                       pstrcat(fname, tmpname);
+               }
        } else {
-               srvstr_pull(inbuf, fname, params+53, sizeof(fname), total_parameter_count-53, STR_TERMINATE);
+               srvstr_get_path(inbuf, fname, params+53, sizeof(fname), parameter_count-53, STR_TERMINATE, &status, False);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return ERROR_NT(status);
+               }
 
                /*
                 * Check to see if this is a mac fork of some kind.
@@ -1193,7 +1380,7 @@ static int call_nt_transact_create(connection_struct *conn,
 
        if((smb_open_mode = map_share_mode( fname, create_options, &desired_access,
                                                share_access, file_attributes)) == -1)
-               return ERROR_DOS(ERRDOS,ERRnoaccess);
+               return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 
        oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
        oplock_request |= (flags & REQUEST_BATCH_OPLOCK) ? BATCH_OPLOCK : 0;
@@ -1202,14 +1389,61 @@ static int call_nt_transact_create(connection_struct *conn,
         * Check if POSIX semantics are wanted.
         */
 
-       set_posix_case_semantics(file_attributes);
+       set_posix_case_semantics(conn, file_attributes);
     
        RESOLVE_DFSPATH(fname, conn, inbuf, outbuf);
 
        unix_convert(fname,conn,0,&bad_path,&sbuf);
+       if (bad_path) {
+               restore_case_semantics(conn, file_attributes);
+               return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+       }
+       /* All file access must go through check_name() */
+       if (!check_name(fname,conn)) {
+               restore_case_semantics(conn, file_attributes);
+               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+       }
     
-       unixmode = unix_mode(conn,smb_attr | aARCH, fname);
-   
+#if 0
+       /* This is the correct thing to do (check every time) but can_delete is
+          expensive (it may have to read the parent directory permissions). So
+          for now we're not doing it unless we have a strong hint the client
+          is really going to delete this file. */
+       if (desired_access & DELETE_ACCESS) {
+#else
+       /* Setting FILE_SHARE_DELETE is the hint. */
+       if ((share_access & FILE_SHARE_DELETE) && (desired_access & DELETE_ACCESS)) {
+#endif
+               status = can_delete(conn, fname, file_attributes, bad_path, True);
+               /* We're only going to fail here if it's access denied, as that's the
+                  only error we care about for "can we delete this ?" questions. */
+               if (!NT_STATUS_IS_OK(status) && (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) ||
+                                                NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE))) {
+                       restore_case_semantics(conn, file_attributes);
+                       END_PROFILE(SMBntcreateX);
+                       return ERROR_NT(status);
+               }
+       }
+
+       if (ea_len) {
+               ctx = talloc_init("NTTRANS_CREATE_EA");
+               if (!ctx) {
+                       talloc_destroy(ctx);
+                       restore_case_semantics(conn, file_attributes);
+                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+               }
+
+               pdata = data + sd_len;
+
+               /* We have already checked that ea_len <= data_count here. */
+               ea_list = read_nttrans_ea_list(ctx, pdata, ea_len);
+               if (!ea_list ) {
+                       talloc_destroy(ctx);
+                       restore_case_semantics(conn, file_attributes);
+                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               }
+       }
+
        /*
         * If it's a request for a directory open, deal with it separately.
         */
@@ -1218,7 +1452,8 @@ static int call_nt_transact_create(connection_struct *conn,
 
                /* Can't open a temp directory. IFS kit test. */
                if (file_attributes & FILE_ATTRIBUTE_TEMPORARY) {
-                       END_PROFILE(SMBntcreateX);
+                       talloc_destroy(ctx);
+                       restore_case_semantics(conn, file_attributes);
                        return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                }
 
@@ -1230,12 +1465,12 @@ static int call_nt_transact_create(connection_struct *conn,
                 * CreateDirectory() call.
                 */
 
-               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, unixmode, &smb_action);
+               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, &smb_action);
 
                if(!fsp) {
-                       restore_case_semantics(file_attributes);
-                       set_bad_path_error(errno, bad_path);
-                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+                       talloc_destroy(ctx);
+                       restore_case_semantics(conn, file_attributes);
+                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                }
 
        } else {
@@ -1245,7 +1480,7 @@ static int call_nt_transact_create(connection_struct *conn,
                 */
 
                fsp = open_file_shared1(conn,fname,&sbuf,desired_access,
-                                               smb_open_mode,smb_ofun,unixmode,
+                                               smb_open_mode,smb_ofun,file_attributes,
                                                oplock_request,&rmode,&smb_action);
 
                if (!fsp) { 
@@ -1257,23 +1492,28 @@ static int call_nt_transact_create(connection_struct *conn,
                                 */
 
                                if (create_options & FILE_NON_DIRECTORY_FILE) {
-                                       restore_case_semantics(file_attributes);
+                                       restore_case_semantics(conn, file_attributes);
                                        SSVAL(outbuf, smb_flg2, SVAL(outbuf,smb_flg2) | FLAGS2_32_BIT_ERROR_CODES);
                                        return ERROR_NT(NT_STATUS_FILE_IS_A_DIRECTORY);
                                }
        
                                oplock_request = 0;
-                               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, unixmode, &smb_action);
+                               fsp = open_directory(conn, fname, &sbuf, desired_access, smb_open_mode, smb_ofun, &smb_action);
                                
                                if(!fsp) {
-                                       restore_case_semantics(file_attributes);
-                                       set_bad_path_error(errno, bad_path);
-                                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+                                       talloc_destroy(ctx);
+                                       restore_case_semantics(conn, file_attributes);
+                                       return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                                }
                        } else {
-                               restore_case_semantics(file_attributes);
-                               set_bad_path_error(errno, bad_path);
-                               return(UNIXERROR(ERRDOS,ERRnoaccess));
+                               talloc_destroy(ctx);
+                               restore_case_semantics(conn, file_attributes);
+                               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                                       /* We have re-scheduled this call. */
+                                       clear_cached_errors();
+                                       return -1;
+                               }
+                               return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
                        }
                } 
   
@@ -1283,9 +1523,10 @@ static int call_nt_transact_create(connection_struct *conn,
                        fmode = FILE_ATTRIBUTE_NORMAL;
 
                if (fmode & aDIR) {
+                       talloc_destroy(ctx);
                        close_file(fsp,False);
-                       restore_case_semantics(file_attributes);
-                       return ERROR_DOS(ERRDOS,ERRnoaccess);
+                       restore_case_semantics(conn, file_attributes);
+                       return ERROR_NT(NT_STATUS_ACCESS_DENIED);
                } 
 
                /* 
@@ -1294,24 +1535,54 @@ static int call_nt_transact_create(connection_struct *conn,
                 * correct bit for extended oplock reply.
                 */
     
-               if (oplock_request && lp_fake_oplocks(SNUM(conn)))
+               if (oplock_request && lp_fake_oplocks(SNUM(conn))) {
                        extended_oplock_granted = True;
+               }
   
-               if(oplock_request && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type))
+               if(oplock_request && EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
                        extended_oplock_granted = True;
+               }
        }
 
        /*
-        * Now try and apply the desired SD.
+        * According to the MS documentation, the only time the security
+        * descriptor is applied to the opened file is iff we *created* the
+        * file; an existing file stays the same.
+        * 
+        * Also, it seems (from observation) that you can open the file with
+        * any access mask but you can still write the sd. We need to override
+        * the granted access before we call set_sd
+        * Patch for bug #2242 from Tom Lackemann <cessnatomny@yahoo.com>.
         */
 
-       if (sd_len && !NT_STATUS_IS_OK(nt_status = set_sd( fsp, data, sd_len, ALL_SECURITY_INFORMATION))) {
-               close_file(fsp,False);
-               restore_case_semantics(file_attributes);
-               return ERROR_NT(nt_status);
-       }
+       if (lp_nt_acl_support(SNUM(conn)) && sd_len && smb_action == FILE_WAS_CREATED) {
+               uint32 saved_access = fsp->desired_access;
+
+               /* We have already checked that sd_len <= data_count here. */
+
+               fsp->desired_access = FILE_GENERIC_ALL;
+
+               status = set_sd( fsp, data, sd_len, ALL_SECURITY_INFORMATION);
+               if (!NT_STATUS_IS_OK(status)) {
+                       talloc_destroy(ctx);
+                       close_file(fsp,False);
+                       restore_case_semantics(conn, file_attributes);
+                       return ERROR_NT(status);
+               }
+               fsp->desired_access = saved_access;
+       }
        
-       restore_case_semantics(file_attributes);
+       if (ea_len && (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);
+                       restore_case_semantics(conn, file_attributes);
+                       return ERROR_NT(status);
+               }
+       }
+
+       restore_case_semantics(conn, file_attributes);
 
        /* Save the requested allocation size. */
        allocation_size = (SMB_BIG_UINT)IVAL(params,12);
@@ -1319,25 +1590,26 @@ static int call_nt_transact_create(connection_struct *conn,
        allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) << 32);
 #endif
        if (allocation_size && (allocation_size > file_len)) {
-               fsp->initial_allocation_size = SMB_ROUNDUP(allocation_size,SMB_ROUNDUP_ALLOCATION_SIZE);
-               if (vfs_allocate_file_space(fsp, fsp->initial_allocation_size) == -1) {
+               fsp->initial_allocation_size = smb_roundup(fsp->conn, allocation_size);
+               if (fsp->is_directory) {
                        close_file(fsp,False);
                        END_PROFILE(SMBntcreateX);
+                       /* 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,False);
                        return ERROR_NT(NT_STATUS_DISK_FULL);
                }
        } else {
-               fsp->initial_allocation_size = SMB_ROUNDUP(((SMB_BIG_UINT)file_len),SMB_ROUNDUP_ALLOCATION_SIZE);
+               fsp->initial_allocation_size = smb_roundup(fsp->conn, (SMB_BIG_UINT)file_len);
        }
 
        /* Realloc the size of parameters and data we will return */
-       params = Realloc(*ppparams, 69);
+       params = nttrans_realloc(ppparams, 69);
        if(params == NULL)
                return ERROR_DOS(ERRDOS,ERRnomem);
 
-       *ppparams = params;
-
-       memset((char *)params,'\0',69);
-
        p = params;
        if (extended_oplock_granted)
                SCVAL(p,0, BATCH_OPLOCK_RETURN);
@@ -1375,9 +1647,14 @@ static int call_nt_transact_create(connection_struct *conn,
        p += 8;
        SIVAL(p,0,fmode); /* File Attributes. */
        p += 4;
-       SOFF_T(p, 0, get_allocation_size(fsp,&sbuf));
+       SOFF_T(p, 0, get_allocation_size(conn,fsp,&sbuf));
        p += 8;
        SOFF_T(p,0,file_len);
+       p += 8;
+       if (flags & EXTENDED_RESPONSE_REQUIRED)
+               SSVAL(p,2,0x7);
+       p += 4;
+       SCVAL(p,0,fsp->is_directory ? 1 : 0);
 
        DEBUG(5,("call_nt_transact_create: open name = %s\n", fname));
 
@@ -1402,6 +1679,7 @@ int reply_ntcancel(connection_struct *conn,
        START_PROFILE(SMBntcancel);
        remove_pending_change_notify_requests_by_mid(mid);
        remove_pending_lock_requests_by_mid(mid);
+       srv_cancel_sign_response(mid);
        
        DEBUG(3,("reply_ntcancel: cancel called on mid = %d.\n", mid));
 
@@ -1409,6 +1687,241 @@ int reply_ntcancel(connection_struct *conn,
        return(-1);
 }
 
+/****************************************************************************
+ Copy a file.
+****************************************************************************/
+
+static NTSTATUS copy_internals(connection_struct *conn, char *oldname, char *newname, uint16 attrs)
+{
+       BOOL bad_path_oldname = False;
+       BOOL bad_path_newname = False;
+       SMB_STRUCT_STAT sbuf1, sbuf2;
+       pstring last_component_oldname;
+       pstring last_component_newname;
+       files_struct *fsp1,*fsp2;
+       uint16 fmode;
+       int access_mode;
+       int smb_action;
+       SMB_OFF_T ret=-1;
+       int close_ret;
+       NTSTATUS status = NT_STATUS_OK;
+
+       ZERO_STRUCT(sbuf1);
+       ZERO_STRUCT(sbuf2);
+
+       /* No wildcards. */
+       if (ms_has_wild(newname) || ms_has_wild(oldname)) {
+               return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
+       }
+
+       if (!CAN_WRITE(conn))
+               return NT_STATUS_MEDIA_WRITE_PROTECTED;
+
+       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;
+               }
+       }
+
+        /* Source must already exist. */
+       if (!VALID_STAT(sbuf1)) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+       if (!check_name(oldname,conn)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       /* Ensure attributes match. */
+       fmode = dos_mode(conn,oldname,&sbuf1);
+       if ((fmode & ~attrs) & (aHIDDEN | aSYSTEM))
+               return NT_STATUS_NO_SUCH_FILE;
+
+       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;
+               }
+       }
+
+       /* Disallow if newname already exists. */
+       if (VALID_STAT(sbuf2)) {
+               return NT_STATUS_OBJECT_NAME_COLLISION;
+       }
+
+       if (!check_name(newname,conn)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       /* No links from a directory. */
+       if (S_ISDIR(sbuf1.st_mode)) {
+               return NT_STATUS_FILE_IS_A_DIRECTORY;
+       }
+
+       /* Ensure this is within the share. */
+       if (!reduce_name(conn, oldname) != 0) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       DEBUG(10,("copy_internals: doing file copy %s to %s\n", oldname, newname));
+
+        fsp1 = open_file_shared1(conn,oldname,&sbuf1,FILE_READ_DATA,SET_DENY_MODE(DENY_ALL)|SET_OPEN_MODE(DOS_OPEN_RDONLY),
+                       (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),FILE_ATTRIBUTE_NORMAL,0,
+                       &access_mode,&smb_action);
+
+       if (!fsp1) {
+               status = NT_STATUS_ACCESS_DENIED;
+               if (unix_ERR_class == ERRDOS && unix_ERR_code == ERRbadshare)
+                       status = NT_STATUS_SHARING_VIOLATION;
+               unix_ERR_class = 0;
+               unix_ERR_code = 0;
+               unix_ERR_ntstatus = NT_STATUS_OK;
+               return status;
+       }
+
+       fsp2 = open_file_shared1(conn,newname,&sbuf2,FILE_WRITE_DATA,SET_DENY_MODE(DENY_ALL)|SET_OPEN_MODE(DOS_OPEN_WRONLY),
+                       (FILE_CREATE_IF_NOT_EXIST|FILE_EXISTS_FAIL),fmode,INTERNAL_OPEN_ONLY,
+                       &access_mode,&smb_action);
+
+       if (!fsp2) {
+               status = NT_STATUS_ACCESS_DENIED;
+               if (unix_ERR_class == ERRDOS && unix_ERR_code == ERRbadshare)
+                       status = NT_STATUS_SHARING_VIOLATION;
+               unix_ERR_class = 0;
+               unix_ERR_code = 0;
+               unix_ERR_ntstatus = NT_STATUS_OK;
+               close_file(fsp1,False);
+               return status;
+       }
+
+       if (sbuf1.st_size)
+               ret = vfs_transfer_file(fsp1, fsp2, sbuf1.st_size);
+
+       /*
+        * As we are opening fsp1 read-only we only expect
+        * an error on close on fsp2 if we are out of space.
+        * Thus we don't look at the error return from the
+        * close of fsp1.
+        */
+       close_file(fsp1,False);
+
+       /* Ensure the modtime is set correctly on the destination file. */
+       fsp_set_pending_modtime(fsp2, sbuf1.st_mtime);
+
+       close_ret = close_file(fsp2,False);
+
+       /* Grrr. We have to do this as open_file_shared1 adds aARCH when it
+          creates the file. This isn't the correct thing to do in the copy case. JRA */
+       file_set_dosmode(conn, newname, fmode, &sbuf2, True);
+
+       if (ret < (SMB_OFF_T)sbuf1.st_size) {
+               return NT_STATUS_DISK_FULL;
+       }
+
+       if (close_ret != 0) {
+               status = map_nt_error_from_unix(close_ret);
+               DEBUG(3,("copy_internals: Error %s copy file %s to %s\n",
+                       nt_errstr(status), oldname, newname));
+       }
+       return status;
+}
+
+/****************************************************************************
+ Reply to a NT rename request.
+****************************************************************************/
+
+int reply_ntrename(connection_struct *conn,
+                  char *inbuf,char *outbuf,int length,int bufsize)
+{
+       int outsize = 0;
+       pstring oldname;
+       pstring newname;
+       char *p;
+       NTSTATUS status;
+       uint16 attrs = SVAL(inbuf,smb_vwv0);
+       uint16 rename_type = SVAL(inbuf,smb_vwv1);
+
+       START_PROFILE(SMBntrename);
+
+       p = smb_buf(inbuf) + 1;
+       p += srvstr_get_path(inbuf, oldname, p, sizeof(oldname), 0, STR_TERMINATE, &status, True);
+       if (!NT_STATUS_IS_OK(status)) {
+               END_PROFILE(SMBntrename);
+               return ERROR_NT(status);
+       }
+
+       if( strchr_m(oldname, ':')) {
+               /* Can't rename a stream. */
+               END_PROFILE(SMBntrename);
+               return ERROR_NT(NT_STATUS_ACCESS_DENIED);
+       }
+
+       if (ms_has_wild(oldname)) {
+               END_PROFILE(SMBntrename);
+               return ERROR_NT(NT_STATUS_OBJECT_PATH_SYNTAX_BAD);
+       }
+
+       p++;
+       p += srvstr_get_path(inbuf, newname, p, sizeof(newname), 0, STR_TERMINATE, &status, False);
+       if (!NT_STATUS_IS_OK(status)) {
+               END_PROFILE(SMBntrename);
+               return ERROR_NT(status);
+       }
+       
+       RESOLVE_DFSPATH(oldname, conn, inbuf, outbuf);
+       RESOLVE_DFSPATH(newname, conn, inbuf, outbuf);
+       
+       DEBUG(3,("reply_ntrename : %s -> %s\n",oldname,newname));
+       
+       switch(rename_type) {
+               case RENAME_FLAG_RENAME:
+                       status = rename_internals(conn, oldname, newname, attrs, False);
+                       break;
+               case RENAME_FLAG_HARD_LINK:
+                       status = hardlink_internals(conn, oldname, newname);
+                       break;
+               case RENAME_FLAG_COPY:
+                       status = copy_internals(conn, oldname, newname, attrs);
+                       break;
+               case RENAME_FLAG_MOVE_CLUSTER_INFORMATION:
+                       status = NT_STATUS_INVALID_PARAMETER;
+                       break;
+               default:
+                       status = NT_STATUS_ACCESS_DENIED; /* Default error. */
+                       break;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               END_PROFILE(SMBntrename);
+               if (open_was_deferred(SVAL(inbuf,smb_mid))) {
+                       /* We have re-scheduled this call. */
+                       clear_cached_errors();
+                       return -1;
+               }
+               return ERROR_NT(status);
+       }
+
+       /*
+        * Win2k needs a changenotify request response before it will
+        * update after a rename..
+        */     
+       process_pending_change_notify_queue((time_t)0);
+       outsize = set_message(outbuf,0,0,True);
+  
+       END_PROFILE(SMBntrename);
+       return(outsize);
+}
+
 /****************************************************************************
  Reply to an unsolicited SMBNTtranss - just ignore it!
 ****************************************************************************/
@@ -1427,16 +1940,18 @@ int reply_nttranss(connection_struct *conn,
  don't allow a directory to be opened.
 ****************************************************************************/
 
-static int call_nt_transact_notify_change(connection_struct *conn,
-                                  char *inbuf, char *outbuf, int length,
-                                  int bufsize, 
-                                  char **ppsetup, 
-                                  char **ppparams, char **ppdata)
+static int call_nt_transact_notify_change(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
        char *setup = *ppsetup;
        files_struct *fsp;
        uint32 flags;
 
+        if(setup_count < 6)
+               return ERROR_DOS(ERRDOS,ERRbadfunc);
+
        fsp = file_fsp(setup,4);
        flags = IVAL(setup, 0);
 
@@ -1461,22 +1976,30 @@ name = %s\n", fsp->fsp_name ));
  Reply to an NT transact rename command.
 ****************************************************************************/
 
-static int call_nt_transact_rename(connection_struct *conn,
-                                  char *inbuf, char *outbuf, int length, 
-                                   int bufsize,
-                                   char **ppsetup, char **ppparams, char **ppdata)
+static int call_nt_transact_rename(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
        char *params = *ppparams;
        pstring new_name;
-       files_struct *fsp = file_fsp(params, 0);
-       BOOL replace_if_exists = (SVAL(params,2) & RENAME_REPLACE_IF_EXISTS) ? True : False;
+       files_struct *fsp = NULL;
+       BOOL replace_if_exists = False;
        NTSTATUS status;
 
+        if(parameter_count < 4)
+               return ERROR_DOS(ERRDOS,ERRbadfunc);
+
+       fsp = file_fsp(params, 0);
+       replace_if_exists = (SVAL(params,2) & RENAME_REPLACE_IF_EXISTS) ? True : False;
        CHECK_FSP(fsp, conn);
-       srvstr_pull(inbuf, new_name, params+4, sizeof(new_name), -1, STR_TERMINATE);
+       srvstr_get_path(inbuf, new_name, params+4, sizeof(new_name), -1, STR_TERMINATE, &status, True);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ERROR_NT(status);
+       }
 
        status = rename_internals(conn, fsp->fsp_name,
-                                 new_name, replace_if_exists);
+                                 new_name, 0, replace_if_exists);
        if (!NT_STATUS_IS_OK(status))
                return ERROR_NT(status);
 
@@ -1517,37 +2040,38 @@ static size_t get_null_nt_acl(TALLOC_CTX *mem_ctx, SEC_DESC **ppsd)
 }
 
 /****************************************************************************
- Reply to query a security descriptor - currently this is not implemented (it
- is planned to be though). Right now it just returns the same thing NT would
- when queried on a FAT filesystem. JRA.
+ Reply to query a security descriptor.
 ****************************************************************************/
 
-static int call_nt_transact_query_security_desc(connection_struct *conn,
-                                                char *inbuf, char *outbuf, 
-                                                int length, int bufsize, 
-                                                char **ppsetup, char **ppparams, char **ppdata)
+static int call_nt_transact_query_security_desc(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
-       uint32 max_data_count = IVAL(inbuf,smb_nt_MaxDataCount);
        char *params = *ppparams;
        char *data = *ppdata;
        prs_struct pd;
        SEC_DESC *psd = NULL;
        size_t sd_size;
+       uint32 security_info_wanted;
        TALLOC_CTX *mem_ctx;
+       files_struct *fsp = NULL;
 
-       files_struct *fsp = file_fsp(params,0);
+        if(parameter_count < 8)
+               return ERROR_DOS(ERRDOS,ERRbadfunc);
 
+       fsp = file_fsp(params,0);
        if(!fsp)
                return ERROR_DOS(ERRDOS,ERRbadfid);
 
+       security_info_wanted = IVAL(params,4);
+
        DEBUG(3,("call_nt_transact_query_security_desc: file = %s\n", fsp->fsp_name ));
 
-       params = Realloc(*ppparams, 4);
+       params = nttrans_realloc(ppparams, 4);
        if(params == NULL)
                return ERROR_DOS(ERRDOS,ERRnomem);
 
-       *ppparams = params;
-
        if ((mem_ctx = talloc_init("call_nt_transact_query_security_desc")) == NULL) {
                DEBUG(0,("call_nt_transact_query_security_desc: talloc_init failed.\n"));
                return ERROR_DOS(ERRDOS,ERRnomem);
@@ -1560,7 +2084,7 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
        if (!lp_nt_acl_support(SNUM(conn)))
                sd_size = get_null_nt_acl(mem_ctx, &psd);
        else
-               sd_size = conn->vfs_ops.fget_nt_acl(fsp, fsp->fd, &psd);
+               sd_size = SMB_VFS_FGET_NT_ACL(fsp, fsp->fd, security_info_wanted, &psd);
 
        if (sd_size == 0) {
                talloc_destroy(mem_ctx);
@@ -1583,16 +2107,12 @@ static int call_nt_transact_query_security_desc(connection_struct *conn,
         * Allocate the data we will point this at.
         */
 
-       data = Realloc(*ppdata, sd_size);
+       data = nttrans_realloc(ppdata, sd_size);
        if(data == NULL) {
                talloc_destroy(mem_ctx);
                return ERROR_DOS(ERRDOS,ERRnomem);
        }
 
-       *ppdata = data;
-
-       memset(data, '\0', sd_size);
-
        /*
         * Init the parse struct we will marshall into.
         */
@@ -1631,23 +2151,21 @@ security descriptor.\n"));
 }
 
 /****************************************************************************
- Reply to set a security descriptor. Map to UNIX perms.
+ Reply to set a security descriptor. Map to UNIX perms or POSIX ACLs.
 ****************************************************************************/
 
-static int call_nt_transact_set_security_desc(connection_struct *conn,
-                                                                       char *inbuf, char *outbuf, int length,
-                                                                       int bufsize, char **ppsetup, 
-                                                                       char **ppparams, char **ppdata)
+static int call_nt_transact_set_security_desc(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize,
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
-       uint32 total_parameter_count = IVAL(inbuf, smb_nts_TotalParameterCount);
        char *params= *ppparams;
        char *data = *ppdata;
-       uint32 total_data_count = (uint32)IVAL(inbuf, smb_nts_TotalDataCount);
        files_struct *fsp = NULL;
        uint32 security_info_sent = 0;
        NTSTATUS nt_status;
 
-       if(total_parameter_count < 8)
+       if(parameter_count < 8)
                return ERROR_DOS(ERRDOS,ERRbadfunc);
 
        if((fsp = file_fsp(params,0)) == NULL)
@@ -1661,10 +2179,10 @@ static int call_nt_transact_set_security_desc(connection_struct *conn,
        DEBUG(3,("call_nt_transact_set_security_desc: file = %s, sent 0x%x\n", fsp->fsp_name,
                (unsigned int)security_info_sent ));
 
-       if (total_data_count == 0)
+       if (data_count == 0)
                return ERROR_DOS(ERRDOS, ERRnoaccess);
 
-       if (!NT_STATUS_IS_OK(nt_status = set_sd( fsp, data, total_data_count, security_info_sent)))
+       if (!NT_STATUS_IS_OK(nt_status = set_sd( fsp, data, data_count, security_info_sent)))
                return ERROR_NT(nt_status);
 
   done:
@@ -1676,46 +2194,624 @@ static int call_nt_transact_set_security_desc(connection_struct *conn,
 /****************************************************************************
  Reply to NT IOCTL
 ****************************************************************************/
-static int call_nt_transact_ioctl(connection_struct *conn,
-                                 char *inbuf, char *outbuf, int length,
-                                  int bufsize, 
-                                  char **ppsetup, int setup_count,
-                                 char **ppparams, int parameter_count,
-                                 char **ppdata, int data_count)
+
+static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
 {
-       unsigned fnum, control;
+       uint32 function;
+       uint16 fidnum;
+       files_struct *fsp;
+       uint8 isFSctl;
+       uint8 compfilter;
        static BOOL logged_message;
+       char *pdata = *ppdata;
 
        if (setup_count != 8) {
                DEBUG(3,("call_nt_transact_ioctl: invalid setup count %d\n", setup_count));
                return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
        }
 
-       fnum = SVAL(*ppsetup, 4);
-       control = IVAL(*ppsetup, 0);
+       function = IVAL(*ppsetup, 0);
+       fidnum = SVAL(*ppsetup, 4);
+       isFSctl = CVAL(*ppsetup, 6);
+       compfilter = CVAL(*ppsetup, 7);
 
-       DEBUG(6,("call_nt_transact_ioctl: fnum=%d control=0x%x\n", 
-                fnum, control));
+       DEBUG(10,("call_nt_transact_ioctl: function[0x%08X] FID[0x%04X] isFSctl[0x%02X] compfilter[0x%02X]\n", 
+                function, fidnum, isFSctl, compfilter));
 
-       switch (control) {
-       case NTIOCTL_SET_SPARSE:
+       fsp=file_fsp(*ppsetup, 4);
+       /* this check is done in each implemented function case for now
+          because I don't want to break anything... --metze
+       FSP_BELONGS_CONN(fsp,conn);*/
+
+       switch (function) {
+       case FSCTL_SET_SPARSE:
                /* pretend this succeeded - tho strictly we should
                   mark the file sparse (if the local fs supports it)
                   so we can know if we need to pre-allocate or not */
+
+               DEBUG(10,("FSCTL_SET_SPARSE: called on FID[0x%04X](but not implemented)\n", fidnum));
                send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
                return -1;
+       
+       case FSCTL_0x000900C0:
+               /* pretend this succeeded - don't know what this really is
+                  but works ok like this --metze
+                */
+
+               DEBUG(10,("FSCTL_0x000900C0: called on FID[0x%04X](but not implemented)\n",fidnum));
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
+               return -1;
+
+       case FSCTL_GET_REPARSE_POINT:
+               /* pretend this fail - my winXP does it like this
+                * --metze
+                */
+
+               DEBUG(10,("FSCTL_GET_REPARSE_POINT: called on FID[0x%04X](but not implemented)\n",fidnum));
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_NOT_A_REPARSE_POINT, NULL, 0, NULL, 0);
+               return -1;
+
+       case FSCTL_SET_REPARSE_POINT:
+               /* pretend this fail - I'm assuming this because of the FSCTL_GET_REPARSE_POINT case.
+                * --metze
+                */
+
+               DEBUG(10,("FSCTL_SET_REPARSE_POINT: called on FID[0x%04X](but not implemented)\n",fidnum));
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_NOT_A_REPARSE_POINT, NULL, 0, NULL, 0);
+               return -1;
+                       
+       case FSCTL_GET_SHADOW_COPY_DATA: /* don't know if this name is right...*/
+       {
+               /*
+                * This is called to retrieve the number of Shadow Copies (a.k.a. snapshots)
+                * and return their volume names.  If max_data_count is 16, then it is just
+                * asking for the number of volumes and length of the combined names.
+                *
+                * pdata is the data allocated by our caller, but that uses
+                * total_data_count (which is 0 in our case) rather than max_data_count.
+                * Allocate the correct amount and return the pointer to let
+                * it be deallocated when we return.
+                */
+               SHADOW_COPY_DATA *shadow_data = NULL;
+               TALLOC_CTX *shadow_mem_ctx = NULL;
+               BOOL labels = False;
+               uint32 labels_data_count = 0;
+               uint32 i;
+               char *cur_pdata;
+
+               FSP_BELONGS_CONN(fsp,conn);
+
+               if (max_data_count < 16) {
+                       DEBUG(0,("FSCTL_GET_SHADOW_COPY_DATA: max_data_count(%u) < 16 is invalid!\n",
+                               max_data_count));
+                       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               }
+
+               if (max_data_count > 16) {
+                       labels = True;
+               }
+
+               shadow_mem_ctx = talloc_init("SHADOW_COPY_DATA");
+               if (shadow_mem_ctx == NULL) {
+                       DEBUG(0,("talloc_init(SHADOW_COPY_DATA) failed!\n"));
+                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+               }
+
+               shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,SHADOW_COPY_DATA);
+               if (shadow_data == NULL) {
+                       DEBUG(0,("talloc_zero() failed!\n"));
+                       talloc_destroy(shadow_mem_ctx);
+                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+               }
+               
+               shadow_data->mem_ctx = shadow_mem_ctx;
+               
+               /*
+                * Call the VFS routine to actually do the work.
+                */
+               if (SMB_VFS_GET_SHADOW_COPY_DATA(fsp, shadow_data, labels)!=0) {
+                       talloc_destroy(shadow_data->mem_ctx);
+                       if (errno == ENOSYS) {
+                               DEBUG(5,("FSCTL_GET_SHADOW_COPY_DATA: connectpath %s, not supported.\n", 
+                                       conn->connectpath));
+                               return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
+                       } else {
+                               DEBUG(0,("FSCTL_GET_SHADOW_COPY_DATA: connectpath %s, failed.\n", 
+                                       conn->connectpath));
+                               return ERROR_NT(NT_STATUS_UNSUCCESSFUL);                        
+                       }
+               }
+
+               labels_data_count = (shadow_data->num_volumes*2*sizeof(SHADOW_COPY_LABEL))+2;
+
+               if (!labels) {
+                       data_count = 16;
+               } else {
+                       data_count = 12+labels_data_count+4;
+               }
+
+               if (max_data_count<data_count) {
+                       DEBUG(0,("FSCTL_GET_SHADOW_COPY_DATA: max_data_count(%u) too small (%u) bytes needed!\n",
+                               max_data_count,data_count));
+                       talloc_destroy(shadow_data->mem_ctx);
+                       return ERROR_NT(NT_STATUS_BUFFER_TOO_SMALL);
+               }
+
+               pdata = nttrans_realloc(ppdata, data_count);
+               if (pdata == NULL) {
+                       talloc_destroy(shadow_data->mem_ctx);
+                       return ERROR_NT(NT_STATUS_NO_MEMORY);
+               }               
+
+               cur_pdata = pdata;
+
+               /* num_volumes 4 bytes */
+               SIVAL(pdata,0,shadow_data->num_volumes);
+
+               if (labels) {
+                       /* num_labels 4 bytes */
+                       SIVAL(pdata,4,shadow_data->num_volumes);
+               }
+
+               /* needed_data_count 4 bytes */
+               SIVAL(pdata,8,labels_data_count);
+
+               cur_pdata+=12;
+
+               DEBUG(10,("FSCTL_GET_SHADOW_COPY_DATA: %u volumes for path[%s].\n",
+                       shadow_data->num_volumes,fsp->fsp_name));
+               if (labels && shadow_data->labels) {
+                       for (i=0;i<shadow_data->num_volumes;i++) {
+                               srvstr_push(outbuf, cur_pdata, shadow_data->labels[i], 2*sizeof(SHADOW_COPY_LABEL), STR_UNICODE|STR_TERMINATE);
+                               cur_pdata+=2*sizeof(SHADOW_COPY_LABEL);
+                               DEBUGADD(10,("Label[%u]: '%s'\n",i,shadow_data->labels[i]));
+                       }
+               }
 
+               talloc_destroy(shadow_data->mem_ctx);
+
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, pdata, data_count);
+
+               return -1;
+        }
+        
+       case FSCTL_FIND_FILES_BY_SID: /* I hope this name is right */
+       {
+               /* pretend this succeeded - 
+                * 
+                * we have to send back a list with all files owned by this SID
+                *
+                * but I have to check that --metze
+                */
+               DOM_SID sid;
+               uid_t uid;
+               size_t sid_len = MIN(data_count-4,SID_MAX_SIZE);
+               
+               DEBUG(10,("FSCTL_FIND_FILES_BY_SID: called on FID[0x%04X]\n",fidnum));
+
+               FSP_BELONGS_CONN(fsp,conn);
+
+               /* unknown 4 bytes: this is not the length of the sid :-(  */
+               /*unknown = IVAL(pdata,0);*/
+               
+               sid_parse(pdata+4,sid_len,&sid);
+               DEBUGADD(10,("for SID: %s\n",sid_string_static(&sid)));
+
+               if (!NT_STATUS_IS_OK(sid_to_uid(&sid, &uid))) {
+                       DEBUG(0,("sid_to_uid: failed, sid[%s] sid_len[%lu]\n",
+                               sid_string_static(&sid),(unsigned long)sid_len));
+                       uid = (-1);
+               }
+               
+               /* we can take a look at the find source :-)
+                *
+                * find ./ -uid $uid  -name '*'   is what we need here
+                *
+                *
+                * and send 4bytes len and then NULL terminated unicode strings
+                * for each file
+                *
+                * but I don't know how to deal with the paged results
+                * (maybe we can hang the result anywhere in the fsp struct)
+                *
+                * we don't send all files at once
+                * and at the next we should *not* start from the beginning, 
+                * so we have to cache the result 
+                *
+                * --metze
+                */
+               
+               /* this works for now... */
+               send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
+               return -1;      
+       }       
        default:
                if (!logged_message) {
                        logged_message = True; /* Only print this once... */
-                       DEBUG(3,("call_nt_transact_ioctl(0x%x): Currently not implemented.\n",
-                                control));
+                       DEBUG(0,("call_nt_transact_ioctl(0x%x): Currently not implemented.\n",
+                                function));
                }
        }
 
        return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
 }
-   
+
+
+#ifdef HAVE_SYS_QUOTAS
+/****************************************************************************
+ Reply to get user quota 
+****************************************************************************/
+
+static int call_nt_transact_get_user_quota(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
+{
+       NTSTATUS nt_status = NT_STATUS_OK;
+       char *params = *ppparams;
+       char *pdata = *ppdata;
+       char *entry;
+       int data_len=0,param_len=0;
+       int qt_len=0;
+       int entry_len = 0;
+       files_struct *fsp = NULL;
+       uint16 level = 0;
+       size_t sid_len;
+       DOM_SID sid;
+       BOOL start_enum = True;
+       SMB_NTQUOTA_STRUCT qt;
+       SMB_NTQUOTA_LIST *tmp_list;
+       SMB_NTQUOTA_HANDLE *qt_handle = NULL;
+       extern struct current_user current_user;
+
+       ZERO_STRUCT(qt);
+
+       /* access check */
+       if (current_user.uid != 0) {
+               DEBUG(1,("get_user_quota: access_denied service [%s] user [%s]\n",
+                       lp_servicename(SNUM(conn)),conn->user));
+               return ERROR_DOS(ERRDOS,ERRnoaccess);
+       }
+
+       /*
+        * Ensure minimum number of parameters sent.
+        */
+
+       if (parameter_count < 4) {
+               DEBUG(0,("TRANSACT_GET_USER_QUOTA: requires %d >= 4 bytes parameters\n",parameter_count));
+               return ERROR_DOS(ERRDOS,ERRinvalidparam);
+       }
+       
+       /* maybe we can check the quota_fnum */
+       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);
+       }
+
+       /* the NULL pointer cheking for fsp->fake_file_handle->pd
+        * is done by CHECK_NTQUOTA_HANDLE_OK()
+        */
+       qt_handle = (SMB_NTQUOTA_HANDLE *)fsp->fake_file_handle->pd;
+
+       level = SVAL(params,2);
+       
+       /* unknown 12 bytes leading in params */ 
+       
+       switch (level) {
+               case TRANSACT_GET_USER_QUOTA_LIST_CONTINUE:
+                       /* seems that we should continue with the enum here --metze */
+
+                       if (qt_handle->quota_list!=NULL && 
+                           qt_handle->tmp_list==NULL) {
+               
+                               /* free the list */
+                               free_ntquota_list(&(qt_handle->quota_list));
+
+                               /* Realloc the size of parameters and data we will return */
+                               param_len = 4;
+                               params = nttrans_realloc(ppparams, param_len);
+                               if(params == NULL)
+                                       return ERROR_DOS(ERRDOS,ERRnomem);
+
+                               data_len = 0;
+                               SIVAL(params,0,data_len);
+
+                               break;
+                       }
+
+                       start_enum = False;
+
+               case TRANSACT_GET_USER_QUOTA_LIST_START:
+
+                       if (qt_handle->quota_list==NULL &&
+                               qt_handle->tmp_list==NULL) {
+                               start_enum = True;
+                       }
+
+                       if (start_enum && vfs_get_user_ntquota_list(fsp,&(qt_handle->quota_list))!=0)
+                               return ERROR_DOS(ERRSRV,ERRerror);
+
+                       /* Realloc the size of parameters and data we will return */
+                       param_len = 4;
+                       params = nttrans_realloc(ppparams, param_len);
+                       if(params == NULL)
+                               return ERROR_DOS(ERRDOS,ERRnomem);
+
+                       /* we should not trust the value in max_data_count*/
+                       max_data_count = MIN(max_data_count,2048);
+                       
+                       pdata = nttrans_realloc(ppdata, max_data_count);/* should be max data count from client*/
+                       if(pdata == NULL)
+                               return ERROR_DOS(ERRDOS,ERRnomem);
+
+                       entry = pdata;
+
+
+                       /* set params Size of returned Quota Data 4 bytes*/
+                       /* but set it later when we know it */
+               
+                       /* for each entry push the data */
+
+                       if (start_enum) {
+                               qt_handle->tmp_list = qt_handle->quota_list;
+                       }
+
+                       tmp_list = qt_handle->tmp_list;
+
+                       for (;((tmp_list!=NULL)&&((qt_len +40+SID_MAX_SIZE)<max_data_count));
+                               tmp_list=tmp_list->next,entry+=entry_len,qt_len+=entry_len) {
+
+                               sid_len = sid_size(&tmp_list->quotas->sid);
+                               entry_len = 40 + sid_len;
+
+                               /* nextoffset entry 4 bytes */
+                               SIVAL(entry,0,entry_len);
+               
+                               /* then the len of the SID 4 bytes */
+                               SIVAL(entry,4,sid_len);
+                               
+                               /* unknown data 8 bytes SMB_BIG_UINT */
+                               SBIG_UINT(entry,8,(SMB_BIG_UINT)0); /* this is not 0 in windows...-metze*/
+                               
+                               /* the used disk space 8 bytes SMB_BIG_UINT */
+                               SBIG_UINT(entry,16,tmp_list->quotas->usedspace);
+                               
+                               /* the soft quotas 8 bytes SMB_BIG_UINT */
+                               SBIG_UINT(entry,24,tmp_list->quotas->softlim);
+                               
+                               /* the hard quotas 8 bytes SMB_BIG_UINT */
+                               SBIG_UINT(entry,32,tmp_list->quotas->hardlim);
+                               
+                               /* and now the SID */
+                               sid_linearize(entry+40, sid_len, &tmp_list->quotas->sid);
+                       }
+                       
+                       qt_handle->tmp_list = tmp_list;
+                       
+                       /* overwrite the offset of the last entry */
+                       SIVAL(entry-entry_len,0,0);
+
+                       data_len = 4+qt_len;
+                       /* overwrite the params quota_data_len */
+                       SIVAL(params,0,data_len);
+
+                       break;
+
+               case TRANSACT_GET_USER_QUOTA_FOR_SID:
+                       
+                       /* unknown 4 bytes IVAL(pdata,0) */     
+                       
+                       if (data_count < 8) {
+                               DEBUG(0,("TRANSACT_GET_USER_QUOTA_FOR_SID: requires %d >= %d bytes data\n",data_count,8));
+                               return ERROR_DOS(ERRDOS,ERRunknownlevel);                               
+                       }
+
+                       sid_len = IVAL(pdata,4);
+                       /* Ensure this is less than 1mb. */
+                       if (sid_len > (1024*1024)) {
+                               return ERROR_DOS(ERRDOS,ERRnomem);
+                       }
+
+                       if (data_count < 8+sid_len) {
+                               DEBUG(0,("TRANSACT_GET_USER_QUOTA_FOR_SID: requires %d >= %lu bytes data\n",data_count,(unsigned long)(8+sid_len)));
+                               return ERROR_DOS(ERRDOS,ERRunknownlevel);                               
+                       }
+
+                       data_len = 4+40+sid_len;
+
+                       if (max_data_count < data_len) {
+                               DEBUG(0,("TRANSACT_GET_USER_QUOTA_FOR_SID: max_data_count(%d) < data_len(%d)\n",
+                                       max_data_count, data_len));
+                               param_len = 4;
+                               SIVAL(params,0,data_len);
+                               data_len = 0;
+                               nt_status = NT_STATUS_BUFFER_TOO_SMALL;
+                               break;
+                       }
+
+                       sid_parse(pdata+8,sid_len,&sid);
+               
+
+                       if (vfs_get_ntquota(fsp, SMB_USER_QUOTA_TYPE, &sid, &qt)!=0) {
+                               ZERO_STRUCT(qt);
+                               /* 
+                                * we have to return zero's in all fields 
+                                * instead of returning an error here
+                                * --metze
+                                */
+                       }
+
+                       /* Realloc the size of parameters and data we will return */
+                       param_len = 4;
+                       params = nttrans_realloc(ppparams, param_len);
+                       if(params == NULL)
+                               return ERROR_DOS(ERRDOS,ERRnomem);
+
+                       pdata = nttrans_realloc(ppdata, data_len);
+                       if(pdata == NULL)
+                               return ERROR_DOS(ERRDOS,ERRnomem);
+
+                       entry = pdata;
+
+                       /* set params Size of returned Quota Data 4 bytes*/
+                       SIVAL(params,0,data_len);
+       
+                       /* nextoffset entry 4 bytes */
+                       SIVAL(entry,0,0);
+       
+                       /* then the len of the SID 4 bytes */
+                       SIVAL(entry,4,sid_len);
+                       
+                       /* unknown data 8 bytes SMB_BIG_UINT */
+                       SBIG_UINT(entry,8,(SMB_BIG_UINT)0); /* this is not 0 in windows...-mezte*/
+                       
+                       /* the used disk space 8 bytes SMB_BIG_UINT */
+                       SBIG_UINT(entry,16,qt.usedspace);
+                       
+                       /* the soft quotas 8 bytes SMB_BIG_UINT */
+                       SBIG_UINT(entry,24,qt.softlim);
+                       
+                       /* the hard quotas 8 bytes SMB_BIG_UINT */
+                       SBIG_UINT(entry,32,qt.hardlim);
+                       
+                       /* and now the SID */
+                       sid_linearize(entry+40, sid_len, &sid);
+
+                       break;
+
+               default:
+                       DEBUG(0,("do_nt_transact_get_user_quota: fnum %d unknown level 0x%04hX\n",fsp->fnum,level));
+                       return ERROR_DOS(ERRSRV,ERRerror);
+                       break;
+       }
+
+       send_nt_replies(inbuf, outbuf, bufsize, nt_status, params, param_len, pdata, data_len);
+
+       return -1;
+}
+
+/****************************************************************************
+ Reply to set user quota
+****************************************************************************/
+
+static int call_nt_transact_set_user_quota(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, 
+                                  char **ppsetup, uint32 setup_count,
+                                 char **ppparams, uint32 parameter_count,
+                                 char **ppdata, uint32 data_count, uint32 max_data_count)
+{
+       char *params = *ppparams;
+       char *pdata = *ppdata;
+       int data_len=0,param_len=0;
+       SMB_NTQUOTA_STRUCT qt;
+       size_t sid_len;
+       DOM_SID sid;
+       files_struct *fsp = NULL;
+
+       ZERO_STRUCT(qt);
+
+       /* access check */
+       if (current_user.uid != 0) {
+               DEBUG(1,("set_user_quota: access_denied service [%s] user [%s]\n",
+                       lp_servicename(SNUM(conn)),conn->user));
+               return ERROR_DOS(ERRDOS,ERRnoaccess);
+       }
+
+       /*
+        * Ensure minimum number of parameters sent.
+        */
+
+       if (parameter_count < 2) {
+               DEBUG(0,("TRANSACT_SET_USER_QUOTA: requires %d >= 2 bytes parameters\n",parameter_count));
+               return ERROR_DOS(ERRDOS,ERRinvalidparam);
+       }
+       
+       /* maybe we can check the quota_fnum */
+       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 (data_count < 40) {
+               DEBUG(0,("TRANSACT_SET_USER_QUOTA: requires %d >= %d bytes data\n",data_count,40));
+               return ERROR_DOS(ERRDOS,ERRunknownlevel);               
+       }
+
+       /* offset to next quota record.
+        * 4 bytes IVAL(pdata,0)
+        * unused here...
+        */
+
+       /* sid len */
+       sid_len = IVAL(pdata,4);
+
+       if (data_count < 40+sid_len) {
+               DEBUG(0,("TRANSACT_SET_USER_QUOTA: requires %d >= %lu bytes data\n",data_count,(unsigned long)40+sid_len));
+               return ERROR_DOS(ERRDOS,ERRunknownlevel);               
+       }
+
+       /* unknown 8 bytes in pdata 
+        * maybe its the change time in NTTIME
+        */
+
+       /* the used space 8 bytes (SMB_BIG_UINT)*/
+       qt.usedspace = (SMB_BIG_UINT)IVAL(pdata,16);
+#ifdef LARGE_SMB_OFF_T
+       qt.usedspace |= (((SMB_BIG_UINT)IVAL(pdata,20)) << 32);
+#else /* LARGE_SMB_OFF_T */
+       if ((IVAL(pdata,20) != 0)&&
+               ((qt.usedspace != 0xFFFFFFFF)||
+               (IVAL(pdata,20)!=0xFFFFFFFF))) {
+               /* more than 32 bits? */
+               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       }
+#endif /* LARGE_SMB_OFF_T */
+
+       /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
+       qt.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
+#ifdef LARGE_SMB_OFF_T
+       qt.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28)) << 32);
+#else /* LARGE_SMB_OFF_T */
+       if ((IVAL(pdata,28) != 0)&&
+               ((qt.softlim != 0xFFFFFFFF)||
+               (IVAL(pdata,28)!=0xFFFFFFFF))) {
+               /* more than 32 bits? */
+               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       }
+#endif /* LARGE_SMB_OFF_T */
+
+       /* the hard quotas 8 bytes (SMB_BIG_UINT)*/
+       qt.hardlim = (SMB_BIG_UINT)IVAL(pdata,32);
+#ifdef LARGE_SMB_OFF_T
+       qt.hardlim |= (((SMB_BIG_UINT)IVAL(pdata,36)) << 32);
+#else /* LARGE_SMB_OFF_T */
+       if ((IVAL(pdata,36) != 0)&&
+               ((qt.hardlim != 0xFFFFFFFF)||
+               (IVAL(pdata,36)!=0xFFFFFFFF))) {
+               /* more than 32 bits? */
+               return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       }
+#endif /* LARGE_SMB_OFF_T */
+       
+       sid_parse(pdata+40,sid_len,&sid);
+       DEBUGADD(8,("SID: %s\n",sid_string_static(&sid)));
+
+       /* 44 unknown bytes left... */
+
+       if (vfs_set_ntquota(fsp, SMB_USER_QUOTA_TYPE, &sid, &qt)!=0) {
+               return ERROR_DOS(ERRSRV,ERRerror);      
+       }
+
+       send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, params, param_len, pdata, data_len);
+
+       return -1;
+}
+#endif /* HAVE_SYS_QUOTAS */
+
 /****************************************************************************
  Reply to a SMBNTtrans.
 ****************************************************************************/
@@ -1724,10 +2820,10 @@ int reply_nttrans(connection_struct *conn,
                        char *inbuf,char *outbuf,int length,int bufsize)
 {
        int  outsize = 0;
+       uint32 max_data_count = IVAL(inbuf,smb_nt_MaxDataCount);
 #if 0 /* Not used. */
        uint16 max_setup_count = CVAL(inbuf, smb_nt_MaxSetupCount);
        uint32 max_parameter_count = IVAL(inbuf, smb_nt_MaxParameterCount);
-       uint32 max_data_count = IVAL(inbuf,smb_nt_MaxDataCount);
 #endif /* Not used. */
        uint32 total_parameter_count = IVAL(inbuf, smb_nt_TotalParameterCount);
        uint32 total_data_count = IVAL(inbuf, smb_nt_TotalDataCount);
@@ -1773,15 +2869,21 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                        CVAL(inbuf, smb_wct), 19 + (setup_count/2)));
                goto bad_param;
        }
-    
+
+       /* Don't allow more than 128mb for each value. */
+       if ((total_parameter_count > (1024*1024*128)) || (total_data_count > (1024*1024*128))) {
+               END_PROFILE(SMBnttrans);
+               return ERROR_DOS(ERRDOS,ERRnomem);
+       }
+
        /* Allocate the space for the setup, the maximum needed parameters and data */
 
        if(setup_count > 0)
-               setup = (char *)malloc(setup_count);
+               setup = (char *)SMB_MALLOC(setup_count);
        if (total_parameter_count > 0)
-               params = (char *)malloc(total_parameter_count);
+               params = (char *)SMB_MALLOC(total_parameter_count);
        if (total_data_count > 0)
-               data = (char *)malloc(total_data_count);
+               data = (char *)SMB_MALLOC(total_data_count);
  
        if ((total_parameter_count && !params)  || (total_data_count && !data) ||
                                (setup_count && !setup)) {
@@ -1816,7 +2918,8 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                if ((parameter_offset + parameter_count < parameter_offset) ||
                                (parameter_offset + parameter_count < parameter_count))
                        goto bad_param;
-               if (smb_base(inbuf) + parameter_offset + parameter_count > inbuf + length)
+               if ((smb_base(inbuf) + parameter_offset + parameter_count > inbuf + length)||
+                               (smb_base(inbuf) + parameter_offset + parameter_count < smb_base(inbuf)))
                        goto bad_param;
 
                memcpy( params, smb_base(inbuf) + parameter_offset, parameter_count);
@@ -1826,17 +2929,21 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                DEBUG(10,("reply_nttrans: data_count = %d\n",data_count));
                if ((data_offset + data_count < data_offset) || (data_offset + data_count < data_count))
                        goto bad_param;
-               if (smb_base(inbuf) + data_offset + data_count > inbuf + length)
+               if ((smb_base(inbuf) + data_offset + data_count > inbuf + length) ||
+                               (smb_base(inbuf) + data_offset + data_count < smb_base(inbuf)))
                        goto bad_param;
 
                memcpy( data, smb_base(inbuf) + data_offset, data_count);
                dump_data(10, data, data_count);
        }
 
+       srv_signing_trans_start(SVAL(inbuf,smb_mid));
+
        if(num_data_sofar < total_data_count || num_params_sofar < total_parameter_count) {
                /* 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_nttrans: send_smb failed.");
 
@@ -1847,6 +2954,13 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 
                        ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
 
+                       /*
+                        * The sequence number for the trans reply is always
+                        * based on the last secondary received.
+                        */
+
+                       srv_signing_trans_start(SVAL(inbuf,smb_mid));
+
                        if((ret && (CVAL(inbuf, smb_com) != SMBnttranss)) || !ret) {
                                outsize = set_message(outbuf,0,0,True);
                                if(ret) {
@@ -1871,7 +2985,7 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 
                        data_count = IVAL(inbuf, smb_nts_DataCount);
                        data_displacement = IVAL(inbuf, smb_nts_DataDisplacement);
-                       data_offset = IVAL(inbuf, smb_nts_DataDisplacement);
+                       data_offset = IVAL(inbuf, smb_nts_DataOffset);
                        num_data_sofar += data_count;
 
                        if (num_params_sofar > total_parameter_count || num_data_sofar > total_data_count) {
@@ -1880,12 +2994,15 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                        }
 
                        if (parameter_count) {
-                               if (parameter_displacement + parameter_count >= total_parameter_count)
+                               if (parameter_displacement + parameter_count > total_parameter_count)
                                        goto bad_param;
                                if ((parameter_displacement + parameter_count < parameter_displacement) ||
                                                (parameter_displacement + parameter_count < parameter_count))
                                        goto bad_param;
-                               if (smb_base(inbuf) + parameter_offset + parameter_count >= inbuf + bufsize)
+                               if (parameter_displacement > total_parameter_count)
+                                       goto bad_param;
+                               if ((smb_base(inbuf) + parameter_offset + parameter_count >= inbuf + bufsize) ||
+                                               (smb_base(inbuf) + parameter_offset + parameter_count < smb_base(inbuf)))
                                        goto bad_param;
                                if (parameter_displacement + params < params)
                                        goto bad_param;
@@ -1894,12 +3011,15 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                        }
 
                        if (data_count) {
-                               if (data_displacement + data_count >= total_data_count)
+                               if (data_displacement + data_count > total_data_count)
                                        goto bad_param;
                                if ((data_displacement + data_count < data_displacement) ||
                                                (data_displacement + data_count < data_count))
                                        goto bad_param;
-                               if (smb_base(inbuf) + data_offset + data_count >= inbuf + bufsize)
+                               if (data_displacement > total_data_count)
+                                       goto bad_param;
+                               if ((smb_base(inbuf) + data_offset + data_count >= inbuf + bufsize) ||
+                                               (smb_base(inbuf) + data_offset + data_count < smb_base(inbuf)))
                                        goto bad_param;
                                if (data_displacement + data < data)
                                        goto bad_param;
@@ -1917,8 +3037,10 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                case NT_TRANSACT_CREATE:
                        START_PROFILE_NESTED(NT_transact_create);
                        outsize = call_nt_transact_create(conn, inbuf, outbuf,
-                                       length, bufsize, 
-                                       &setup, &params, &data);
+                                                       length, bufsize, 
+                                                       &setup, setup_count,
+                                                       &params, total_parameter_count, 
+                                                       &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_create);
                        break;
                case NT_TRANSACT_IOCTL:
@@ -1926,39 +3048,67 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                        outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
                                                         length, bufsize, 
                                                         &setup, setup_count,
-                                                        &params, parameter_count, 
-                                                        &data, data_count);
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_ioctl);
                        break;
                case NT_TRANSACT_SET_SECURITY_DESC:
                        START_PROFILE_NESTED(NT_transact_set_security_desc);
                        outsize = call_nt_transact_set_security_desc(conn, inbuf, outbuf, 
-                                       length, bufsize, 
-                                       &setup, &params, &data);
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_set_security_desc);
                        break;
                case NT_TRANSACT_NOTIFY_CHANGE:
                        START_PROFILE_NESTED(NT_transact_notify_change);
                        outsize = call_nt_transact_notify_change(conn, inbuf, outbuf, 
-                                       length, bufsize, 
-                                       &setup, &params, &data);
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_notify_change);
                        break;
                case NT_TRANSACT_RENAME:
                        START_PROFILE_NESTED(NT_transact_rename);
                        outsize = call_nt_transact_rename(conn, inbuf, outbuf,
-                                       length, bufsize,
-                                       &setup, &params, &data);
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_rename);
                        break;
 
                case NT_TRANSACT_QUERY_SECURITY_DESC:
                        START_PROFILE_NESTED(NT_transact_query_security_desc);
                        outsize = call_nt_transact_query_security_desc(conn, inbuf, outbuf, 
-                                       length, bufsize, 
-                                       &setup, &params, &data);
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
                        END_PROFILE_NESTED(NT_transact_query_security_desc);
                        break;
+#ifdef HAVE_SYS_QUOTAS
+               case NT_TRANSACT_GET_USER_QUOTA:
+                       START_PROFILE_NESTED(NT_transact_get_user_quota);
+                       outsize = call_nt_transact_get_user_quota(conn, inbuf, outbuf, 
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
+                       END_PROFILE_NESTED(NT_transact_get_user_quota);
+                       break;
+               case NT_TRANSACT_SET_USER_QUOTA:
+                       START_PROFILE_NESTED(NT_transact_set_user_quota);
+                       outsize = call_nt_transact_set_user_quota(conn, inbuf, outbuf, 
+                                                        length, bufsize, 
+                                                        &setup, setup_count,
+                                                        &params, total_parameter_count, 
+                                                        &data, total_data_count, max_data_count);
+                       END_PROFILE_NESTED(NT_transact_set_user_quota);
+                       break;                                  
+#endif /* HAVE_SYS_QUOTAS */
                default:
                        /* Error in request */
                        DEBUG(0,("reply_nttrans: Unknown request %d in nttrans call\n", function_code));
@@ -1966,6 +3116,7 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                        SAFE_FREE(params);
                        SAFE_FREE(data);
                        END_PROFILE(SMBnttrans);
+                       srv_signing_trans_stop();
                        return ERROR_DOS(ERRSRV,ERRerror);
        }
 
@@ -1976,6 +3127,8 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
                an error packet. 
        */
 
+       srv_signing_trans_stop();
+
        SAFE_FREE(setup);
        SAFE_FREE(params);
        SAFE_FREE(data);
@@ -1986,9 +3139,10 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 
  bad_param:
 
+       srv_signing_trans_stop();
        SAFE_FREE(params);
        SAFE_FREE(data);
        SAFE_FREE(setup);
        END_PROFILE(SMBnttrans);
-       return ERROR_DOS(ERRDOS,ERRinvalidparam);
+       return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
 }