smbd: some write time fixes
[tprouty/samba.git] / source / smbd / nttrans.c
index 739bf01ef91e55211142f0c2248b37d9fbcda1e5..0b48fa2c4d522104de041149bb013ccec8ead3b7 100644 (file)
@@ -66,7 +66,8 @@ static char *nttrans_realloc(char **ptr, size_t size)
  HACK ! Always assumes smb_setup field is zero.
 ****************************************************************************/
 
-void send_nt_replies(struct smb_request *req, NTSTATUS nt_error,
+void send_nt_replies(connection_struct *conn,
+                       struct smb_request *req, NTSTATUS nt_error,
                     char *params, int paramsize,
                     char *pdata, int datasize)
 {
@@ -242,8 +243,10 @@ void send_nt_replies(struct smb_request *req, NTSTATUS nt_error,
 
                /* Send the packet */
                show_msg((char *)req->outbuf);
-               if (!send_smb(smbd_server_fd(),(char *)req->outbuf)) {
-                       exit_server_cleanly("send_nt_replies: send_smb failed.");
+               if (!srv_send_smb(smbd_server_fd(),
+                               (char *)req->outbuf,
+                               IS_CONN_ENCRYPTED(conn))) {
+                       exit_server_cleanly("send_nt_replies: srv_send_smb failed.");
                }
 
                TALLOC_FREE(req->outbuf);
@@ -268,6 +271,9 @@ void send_nt_replies(struct smb_request *req, NTSTATUS nt_error,
 
 /****************************************************************************
  Is it an NTFS stream name ?
+ An NTFS file name is <path>.<extention>:<stream name>:<stream type>
+ $DATA can be used as both a stream name and a stream type. A missing stream
+ name or type implies $DATA.
 ****************************************************************************/
 
 bool is_ntfs_stream_name(const char *fname)
@@ -278,52 +284,6 @@ bool is_ntfs_stream_name(const char *fname)
        return (strchr_m(fname, ':') != NULL) ? True : False;
 }
 
-struct case_semantics_state {
-       connection_struct *conn;
-       bool case_sensitive;
-       bool case_preserve;
-       bool short_case_preserve;
-};
-
-/****************************************************************************
- Restore case semantics.
-****************************************************************************/
-static int restore_case_semantics(struct case_semantics_state *state)
-{
-       state->conn->case_sensitive = state->case_sensitive;
-       state->conn->case_preserve = state->case_preserve;
-       state->conn->short_case_preserve = state->short_case_preserve;
-       return 0;
-}
-
-/****************************************************************************
- Save case semantics.
-****************************************************************************/
-static struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX *mem_ctx,
-                                                            connection_struct *conn)
-{
-       struct case_semantics_state *result;
-
-       if (!(result = talloc(mem_ctx, struct case_semantics_state))) {
-               DEBUG(0, ("talloc failed\n"));
-               return NULL;
-       }
-
-       result->conn = conn;
-       result->case_sensitive = conn->case_sensitive;
-       result->case_preserve = conn->case_preserve;
-       result->short_case_preserve = conn->short_case_preserve;
-
-       /* Set to POSIX. */
-       conn->case_sensitive = True;
-       conn->case_preserve = True;
-       conn->short_case_preserve = True;
-
-       talloc_set_destructor(result, restore_case_semantics);
-
-       return result;
-}
-
 /****************************************************************************
  Reply to an NT create and X call on a pipe
 ****************************************************************************/
@@ -452,448 +412,13 @@ static void do_ntcreate_pipe_open(connection_struct *conn,
        chain_reply(req);
 }
 
-static NTSTATUS create_file(connection_struct *conn,
-                           struct smb_request *req,
-                           uint16_t root_dir_fid,
-                           char *fname,
-                           uint32_t flags,
-                           uint32_t access_mask,
-                           uint32_t file_attributes,
-                           uint32_t share_access,
-                           uint32_t create_disposition,
-                           uint32_t create_options,
-                           int oplock_request,
-                           SMB_BIG_UINT allocation_size,
-                           struct security_descriptor *sd,
-                           struct ea_list *ea_list,
-
-                           files_struct **result,
-                           int *pinfo,
-                           uint8_t *poplock_granted,
-                           SMB_STRUCT_STAT *psbuf,
-                           SMB_OFF_T *pfile_len)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct case_semantics_state *case_state = NULL;
-       uint32_t fattr;
-       SMB_OFF_T file_len = 0;
-       SMB_STRUCT_STAT sbuf;
-       int info = FILE_WAS_OPENED;
-       files_struct *fsp = NULL;
-       uint8_t oplock_granted = NO_OPLOCK_RETURN;
-       NTSTATUS status;
-
-       DEBUG(10,("reply_ntcreate_and_X: flags = 0x%x, access_mask = 0x%x "
-                 "file_attributes = 0x%x, share_access = 0x%x, "
-                 "create_disposition = 0x%x create_options = 0x%x "
-                 "root_dir_fid = 0x%x, fname = %s\n",
-                 (unsigned int)flags,
-                 (unsigned int)access_mask,
-                 (unsigned int)file_attributes,
-                 (unsigned int)share_access,
-                 (unsigned int)create_disposition,
-                 (unsigned int)create_options,
-                 (unsigned int)root_dir_fid,
-                 fname));
-
-       SET_STAT_INVALID(sbuf);
-
-       if (create_options & FILE_OPEN_BY_FILE_ID) {
-               status = NT_STATUS_NOT_SUPPORTED;
-               goto fail;
-       }
-
-       /*
-        * Get the file name.
-        */
-
-       if (root_dir_fid != 0) {
-               /*
-                * This filename is relative to a directory fid.
-                */
-               char *parent_fname = NULL;
-               files_struct *dir_fsp = file_fsp(root_dir_fid);
-
-               if (dir_fsp == NULL) {
-                       status = NT_STATUS_INVALID_HANDLE;
-                       goto fail;
-               }
-
-               if (!dir_fsp->is_directory) {
-
-                       /*
-                        * Check to see if this is a mac fork of some kind.
-                        */
-
-                       if (is_ntfs_stream_name(fname)) {
-                               status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
-                               goto fail;
-                       }
-
-                       /*
-                         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)
-                       */
-
-                       status = NT_STATUS_INVALID_HANDLE;
-                       goto fail;
-               }
-
-               if (ISDOT(dir_fsp->fsp_name)) {
-                       /*
-                        * We're at the toplevel dir, the final file name
-                        * must not contain ./, as this is filtered out
-                        * normally by srvstr_get_path and unix_convert
-                        * explicitly rejects paths containing ./.
-                        */
-                       parent_fname = talloc_strdup(talloc_tos(), "");
-                       if (parent_fname == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto fail;
-                       }
-               } else {
-                       size_t dir_name_len = strlen(dir_fsp->fsp_name);
-
-                       /*
-                        * Copy in the base directory name.
-                        */
-
-                       parent_fname = TALLOC_ARRAY(talloc_tos(), char,
-                                                   dir_name_len+2);
-                       if (parent_fname == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto fail;
-                       }
-                       memcpy(parent_fname, dir_fsp->fsp_name,
-                              dir_name_len+1);
-
-                       /*
-                        * Ensure it ends in a '/'.
-                        * We used TALLOC_SIZE +2 to add space for the '/'.
-                        */
-
-                       if(dir_name_len
-                          && (parent_fname[dir_name_len-1] != '\\')
-                          && (parent_fname[dir_name_len-1] != '/')) {
-                               parent_fname[dir_name_len] = '/';
-                               parent_fname[dir_name_len+1] = '\0';
-                       }
-               }
-
-               fname = talloc_asprintf(talloc_tos(), "%s%s", parent_fname,
-                                       fname);
-               if (fname == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto fail;
-               }
-       } else {
-               /*
-                * Check to see if this is a mac fork of some kind.
-                */
-
-               if (is_ntfs_stream_name(fname)) {
-                       enum FAKE_FILE_TYPE fake_file_type;
-
-                       fake_file_type = is_fake_file(fname);
-
-                       if (fake_file_type == FAKE_FILE_TYPE_NONE) {
-                               return NT_STATUS_OBJECT_PATH_NOT_FOUND;
-                       }
-
-                       /*
-                        * 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
-                        */
-                       status = open_fake_file(conn, fake_file_type, fname,
-                                               access_mask, &fsp);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               goto fail;
-                       }
-
-                       goto done;
-               }
-       }
-
-       oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
-       if (oplock_request) {
-               oplock_request |= (flags & REQUEST_BATCH_OPLOCK)
-                       ? BATCH_OPLOCK : 0;
-       }
-
-       status = resolve_dfspath(
-               talloc_tos(), conn, req->flags2 & FLAGS2_DFS_PATHNAMES,
-               fname, &fname);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               /*
-                * For PATH_NOT_COVERED we had
-                * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
-                *                 ERRSRV, ERRbadpath);
-                * Need to fix in callers
-                */
-               goto fail;
-       }
-
-       /*
-        * Ordinary file or directory.
-        */
-
-       /*
-        * Check if POSIX semantics are wanted.
-        */
-
-       if (file_attributes & FILE_FLAG_POSIX_SEMANTICS) {
-               case_state = set_posix_case_semantics(talloc_tos(), conn);
-               file_attributes &= ~FILE_FLAG_POSIX_SEMANTICS;
-       }
-
-       status = unix_convert(talloc_tos(), conn, fname, False, &fname, NULL,
-                             &sbuf);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       /* All file access must go through check_name() */
-
-       status = check_name(conn, fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       /* 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 the client
-        * is forcing FILE_CREATE let the filesystem take care of the
-        * permissions. */
-
-       /* Setting FILE_SHARE_DELETE is the hint. */
-
-       if (lp_acl_check_permissions(SNUM(conn))
-           && (create_disposition != FILE_CREATE)
-           && (share_access & FILE_SHARE_DELETE)
-           && (access_mask & DELETE_ACCESS)
-           && (((dos_mode(conn, fname, &sbuf) & FILE_ATTRIBUTE_READONLY)
-                && !lp_delete_readonly(SNUM(conn)))
-               || !can_delete_file_in_directory(conn, fname))) {
-               status = NT_STATUS_ACCESS_DENIED;
-               goto fail;
-       }
-
-#if 0
-       /* We need to support SeSecurityPrivilege for this. */
-       if ((access_mask & SEC_RIGHT_SYSTEM_SECURITY) &&
-                       !user_has_privileges(current_user.nt_user_token,
-                               &se_security)) {
-               status = NT_STATUS_PRIVILEGE_NOT_HELD;
-               goto fail;
-       }
-#endif
-
-       /*
-        * If it's a request for a directory open, deal with it separately.
-        */
-
-       if (create_options & FILE_DIRECTORY_FILE) {
-
-               /* Can't open a temp directory. IFS kit test. */
-               if (file_attributes & FILE_ATTRIBUTE_TEMPORARY) {
-                       status = NT_STATUS_INVALID_PARAMETER;
-                       goto fail;
-               }
-
-               /*
-                * We will get a create directory here if the Win32
-                * app specified a security descriptor in the
-                * CreateDirectory() call.
-                */
-
-               oplock_request = 0;
-               status = open_directory(
-                       conn, req, fname, &sbuf, access_mask, share_access,
-                       create_disposition, create_options, file_attributes,
-                       &info, &fsp);
-       } else {
-
-               /*
-                * Ordinary file case.
-                */
-
-               status = open_file_ntcreate(
-                       conn, req, fname, &sbuf, access_mask, share_access,
-                       create_disposition, create_options, file_attributes,
-                       oplock_request, &info, &fsp);
-
-               if (NT_STATUS_EQUAL(status, NT_STATUS_FILE_IS_A_DIRECTORY)) {
-
-                       /*
-                        * Fail the open if it was explicitly a non-directory
-                        * file.
-                        */
-
-                       if (create_options & FILE_NON_DIRECTORY_FILE) {
-                               status = NT_STATUS_FILE_IS_A_DIRECTORY;
-                               goto fail;
-                       }
-
-                       oplock_request = 0;
-                       status = open_directory(
-                               conn, req, fname, &sbuf, access_mask,
-                               share_access, create_disposition,
-                               create_options, file_attributes,
-                               &info, &fsp);
-               }
-       }
-
-       TALLOC_FREE(case_state);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               goto fail;
-       }
-
-       /*
-        * 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 != NULL) && (info == FILE_WAS_CREATED)
-           && lp_nt_acl_support(SNUM(conn))) {
-
-               uint32_t sec_info_sent = ALL_SECURITY_INFORMATION;
-               uint32_t saved_access_mask = fsp->access_mask;
-
-               if (sd->owner_sid==0) {
-                       sec_info_sent &= ~OWNER_SECURITY_INFORMATION;
-               }
-               if (sd->group_sid==0) {
-                       sec_info_sent &= ~GROUP_SECURITY_INFORMATION;
-               }
-               if (sd->sacl==0) {
-                       sec_info_sent &= ~SACL_SECURITY_INFORMATION;
-               }
-               if (sd->dacl==0) {
-                       sec_info_sent &= ~DACL_SECURITY_INFORMATION;
-               }
-
-               fsp->access_mask = FILE_GENERIC_ALL;
-
-               status = SMB_VFS_FSET_NT_ACL(
-                       fsp, fsp->fh->fd, sec_info_sent, sd);
-
-               fsp->access_mask = saved_access_mask;
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       goto fail;
-               }
-       }
-
-       if ((ea_list != NULL) && (info == FILE_WAS_CREATED)) {
-               status = set_ea(conn, fsp, fname, ea_list);
-               if (!NT_STATUS_IS_OK(status)) {
-                       goto fail;
-               }
-       }
-
-       file_len = sbuf.st_size;
-       fattr = dos_mode(conn,fname,&sbuf);
-       if(fattr == 0) {
-               fattr = FILE_ATTRIBUTE_NORMAL;
-       }
-       if (!fsp->is_directory && (fattr & aDIR)) {
-               status = NT_STATUS_ACCESS_DENIED;
-               goto fail;
-       }
-
-       /* Save the requested allocation size. */
-       if ((info == FILE_WAS_CREATED) || (info == FILE_WAS_OVERWRITTEN)) {
-               if (allocation_size
-                   && (allocation_size > (SMB_BIG_UINT)file_len)) {
-                       fsp->initial_allocation_size = smb_roundup(
-                               fsp->conn, allocation_size);
-                       if (fsp->is_directory) {
-                               /* Can't set allocation size on a directory. */
-                               status = NT_STATUS_ACCESS_DENIED;
-                               goto fail;
-                       }
-                       if (vfs_allocate_file_space(
-                                   fsp, fsp->initial_allocation_size) == -1) {
-                               status = NT_STATUS_DISK_FULL;
-                               goto fail;
-                       }
-               } else {
-                       fsp->initial_allocation_size = smb_roundup(fsp->conn,(SMB_BIG_UINT)file_len);
-               }
-       }
-
-       /*
-        * If the caller set the extended oplock request bit
-        * and we granted one (by whatever means) - set the
-        * correct bit for extended oplock reply.
-        */
-
-       if (oplock_request &&
-           (lp_fake_oplocks(SNUM(conn))
-            || EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type))) {
-
-               /*
-                * Exclusive oplock granted
-                */
-
-               if (flags & REQUEST_BATCH_OPLOCK) {
-                       oplock_granted = BATCH_OPLOCK_RETURN;
-               } else {
-                       oplock_granted = EXCLUSIVE_OPLOCK_RETURN;
-               }
-       } else if (fsp->oplock_type == LEVEL_II_OPLOCK) {
-               oplock_granted = LEVEL_II_OPLOCK_RETURN;
-       } else {
-               oplock_granted = NO_OPLOCK_RETURN;
-       }
-
- done:
-       DEBUG(10, ("create_file: info=%d, oplock_granted=%d, file_len=%lu\n",
-                  info, (int)oplock_granted, (unsigned long)file_len));
-
-       *result = fsp;
-       *pinfo = info;
-       *poplock_granted = oplock_granted;
-       *psbuf = sbuf;
-       *pfile_len = file_len;
-       TALLOC_FREE(frame);
-       return NT_STATUS_OK;
-
- fail:
-       DEBUG(10, ("create_file: %s\n", nt_errstr(status)));
-
-       if (fsp != NULL) {
-               close_file(fsp, ERROR_CLOSE);
-               fsp = NULL;
-       }
-       TALLOC_FREE(frame);
-       return status;
-}
-
 /****************************************************************************
  Reply to an NT create and X call.
 ****************************************************************************/
 
-void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
+void reply_ntcreate_and_X(struct smb_request *req)
 {
+       connection_struct *conn = req->conn;
        char *fname = NULL;
        uint32 flags;
        uint32 access_mask;
@@ -905,7 +430,6 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
        SMB_BIG_UINT allocation_size;
        /* Breakout the oplock request bits so we can set the
           reply bits separately. */
-       int oplock_request = 0;
        uint32 fattr=0;
        SMB_OFF_T file_len = 0;
        SMB_STRUCT_STAT sbuf;
@@ -916,6 +440,7 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
        struct timespec a_timespec;
        struct timespec m_timespec;
        NTSTATUS status;
+       int oplock_request;
        uint8_t oplock_granted = NO_OPLOCK_RETURN;
        TALLOC_CTX *ctx = talloc_tos();
 
@@ -964,6 +489,12 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
                        (unsigned int)root_dir_fid,
                        fname));
 
+       /*
+        * we need to remove ignored bits when they come directly from the client
+        * because we reuse some of them for internal stuff
+        */
+       create_options &= ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
        /*
         * If it's an IPC, use the pipe handler.
         */
@@ -973,18 +504,22 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
                        do_ntcreate_pipe_open(conn, req);
                        END_PROFILE(SMBntcreateX);
                        return;
-               } else {
-                       reply_doserror(req, ERRDOS, ERRnoaccess);
-                       END_PROFILE(SMBntcreateX);
-                       return;
                }
+               reply_doserror(req, ERRDOS, ERRnoaccess);
+               END_PROFILE(SMBntcreateX);
+               return;
+       }
+
+       oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
+       if (oplock_request) {
+               oplock_request |= (flags & REQUEST_BATCH_OPLOCK)
+                       ? BATCH_OPLOCK : 0;
        }
 
-       status = create_file(conn, req, root_dir_fid, fname, flags,
-                            access_mask, file_attributes, share_access,
-                            create_disposition, create_options,
-                            oplock_request, allocation_size, NULL, NULL,
-                            &fsp, &info, &oplock_granted, &sbuf, &file_len);
+       status = create_file(conn, req, root_dir_fid, fname,
+                            access_mask, share_access, create_disposition,
+                            create_options, file_attributes, oplock_request,
+                            allocation_size, NULL, NULL, &fsp, &info, &sbuf);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(req->mid)) {
@@ -1002,6 +537,37 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
                return;
        }
 
+       /*
+        * If the caller set the extended oplock request bit
+        * and we granted one (by whatever means) - set the
+        * correct bit for extended oplock reply.
+        */
+
+       if (oplock_request &&
+           (lp_fake_oplocks(SNUM(conn))
+            || EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type))) {
+
+               /*
+                * Exclusive oplock granted
+                */
+
+               if (flags & REQUEST_BATCH_OPLOCK) {
+                       oplock_granted = BATCH_OPLOCK_RETURN;
+               } else {
+                       oplock_granted = EXCLUSIVE_OPLOCK_RETURN;
+               }
+       } else if (fsp->oplock_type == LEVEL_II_OPLOCK) {
+               oplock_granted = LEVEL_II_OPLOCK_RETURN;
+       } else {
+               oplock_granted = NO_OPLOCK_RETURN;
+       }
+
+       file_len = sbuf.st_size;
+       fattr = dos_mode(conn,fsp->fsp_name,&sbuf);
+       if (fattr == 0) {
+               fattr = FILE_ATTRIBUTE_NORMAL;
+       }
+
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                /* This is very strange. We
                 * return 50 words, but only set
@@ -1065,7 +631,7 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
                uint32 perms = 0;
                p += 25;
                if (fsp->is_directory
-                   || can_write_to_file(conn, fname, &sbuf)) {
+                   || can_write_to_file(conn, fsp->fsp_name, &sbuf)) {
                        perms = FILE_GENERIC_ALL;
                } else {
                        perms = FILE_GENERIC_READ|FILE_EXECUTE;
@@ -1172,7 +738,7 @@ static void do_nt_transact_create_pipe(connection_struct *conn,
        DEBUG(5,("do_nt_transact_create_pipe: open name = %s\n", fname));
 
        /* Send the required number of replies */
-       send_nt_replies(req, NT_STATUS_OK, params, param_len, *ppdata, 0);
+       send_nt_replies(conn, req, NT_STATUS_OK, params, param_len, *ppdata, 0);
 
        return;
 }
@@ -1181,46 +747,20 @@ static void do_nt_transact_create_pipe(connection_struct *conn,
  Internal fn to set security descriptors.
 ****************************************************************************/
 
-static NTSTATUS set_sd(files_struct *fsp, char *data, uint32 sd_len, uint32 security_info_sent)
+static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
+                      uint32 security_info_sent)
 {
-       prs_struct pd;
        SEC_DESC *psd = NULL;
-       TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
        if (sd_len == 0 || !lp_nt_acl_support(SNUM(fsp->conn))) {
                return NT_STATUS_OK;
        }
 
-       /*
-        * Init the parse struct we will unmarshall from.
-        */
-
-       if ((mem_ctx = talloc_init("set_sd")) == NULL) {
-               DEBUG(0,("set_sd: talloc_init failed.\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       prs_init(&pd, 0, mem_ctx, UNMARSHALL);
-
-       /*
-        * Setup the prs_struct to point at the memory we just
-        * allocated.
-        */
-
-       prs_give_memory( &pd, data, sd_len, False);
+       status = unmarshall_sec_desc(talloc_tos(), data, sd_len, &psd);
 
-       /*
-        * Finally, unmarshall from the data buffer.
-        */
-
-       if(!sec_io_desc( "sd data", &psd, &pd, 1)) {
-               DEBUG(0,("set_sd: Error in unmarshalling security descriptor.\n"));
-               /*
-                * Return access denied for want of a better error message..
-                */
-               talloc_destroy(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        if (psd->owner_sid==0) {
@@ -1236,9 +776,16 @@ static NTSTATUS set_sd(files_struct *fsp, char *data, uint32 sd_len, uint32 secu
                security_info_sent &= ~DACL_SECURITY_INFORMATION;
        }
 
-       status = SMB_VFS_FSET_NT_ACL( fsp, fsp->fh->fd, security_info_sent, psd);
+       if (fsp->fh->fd != -1) {
+               status = SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd);
+       }
+       else {
+               status = SMB_VFS_SET_NT_ACL(fsp, fsp->fsp_name,
+                                           security_info_sent, psd);
+       }
+
+       TALLOC_FREE(psd);
 
-       talloc_destroy(mem_ctx);
        return status;
 }
 
@@ -1288,7 +835,6 @@ static void call_nt_transact_create(connection_struct *conn,
        char *params = *ppparams;
        char *data = *ppdata;
        /* Breakout the oplock request bits so we can set the reply bits separately. */
-       int oplock_request = 0;
        uint32 fattr=0;
        SMB_OFF_T file_len = 0;
        SMB_STRUCT_STAT sbuf;
@@ -1302,7 +848,7 @@ static void call_nt_transact_create(connection_struct *conn,
        uint32 create_disposition;
        uint32 create_options;
        uint32 sd_len;
-       struct security_descriptor *sd;
+       struct security_descriptor *sd = NULL;
        uint32 ea_len;
        uint16 root_dir_fid;
        struct timespec c_timespec;
@@ -1312,6 +858,7 @@ static void call_nt_transact_create(connection_struct *conn,
        NTSTATUS status;
        size_t param_len;
        SMB_BIG_UINT allocation_size;
+       int oplock_request;
        uint8_t oplock_granted;
        TALLOC_CTX *ctx = talloc_tos();
 
@@ -1329,10 +876,9 @@ static void call_nt_transact_create(connection_struct *conn,
                                ppparams, parameter_count,
                                ppdata, data_count);
                        return;
-               } else {
-                       reply_doserror(req, ERRDOS, ERRnoaccess);
-                       return;
                }
+               reply_doserror(req, ERRDOS, ERRnoaccess);
+               return;
        }
 
        /*
@@ -1359,6 +905,12 @@ static void call_nt_transact_create(connection_struct *conn,
        allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) << 32);
 #endif
 
+       /*
+        * we need to remove ignored bits when they come directly from the client
+        * because we reuse some of them for internal stuff
+        */
+       create_options &= ~NTCREATEX_OPTIONS_MUST_IGNORE_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)
@@ -1371,6 +923,9 @@ static void call_nt_transact_create(connection_struct *conn,
        }
 
        if (sd_len) {
+               DEBUG(10, ("call_nt_transact_create - sd_len = %d\n",
+                          sd_len));
+
                status = unmarshall_sec_desc(ctx, (uint8_t *)data, sd_len,
                                             &sd);
                if (!NT_STATUS_IS_OK(status)) {
@@ -1416,26 +971,57 @@ static void call_nt_transact_create(connection_struct *conn,
                return;
        }
 
-       status = create_file(conn, req, root_dir_fid, fname, flags,
-                            access_mask, file_attributes, share_access,
-                            create_disposition, create_options,
-                            oplock_request, allocation_size, sd, ea_list,
-                            &fsp, &info, &oplock_granted, &sbuf, &file_len);
+       oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
+       if (oplock_request) {
+               oplock_request |= (flags & REQUEST_BATCH_OPLOCK)
+                       ? BATCH_OPLOCK : 0;
+       }
+
+       status = create_file(conn, req, root_dir_fid, fname,
+                            access_mask, share_access, create_disposition,
+                            create_options, file_attributes, oplock_request,
+                            allocation_size, sd, ea_list, &fsp, &info, &sbuf);
 
        if(!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(req->mid)) {
                        /* We have re-scheduled this call, no error. */
                        return;
                }
-               if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       reply_botherror(req, status, ERRDOS, ERRfilexists);
-               }
-               else {
-                       reply_nterror(req, status);
-               }
+               reply_openerror(req, status);
                return;
        }
 
+       /*
+        * If the caller set the extended oplock request bit
+        * and we granted one (by whatever means) - set the
+        * correct bit for extended oplock reply.
+        */
+
+       if (oplock_request &&
+           (lp_fake_oplocks(SNUM(conn))
+            || EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type))) {
+
+               /*
+                * Exclusive oplock granted
+                */
+
+               if (flags & REQUEST_BATCH_OPLOCK) {
+                       oplock_granted = BATCH_OPLOCK_RETURN;
+               } else {
+                       oplock_granted = EXCLUSIVE_OPLOCK_RETURN;
+               }
+       } else if (fsp->oplock_type == LEVEL_II_OPLOCK) {
+               oplock_granted = LEVEL_II_OPLOCK_RETURN;
+       } else {
+               oplock_granted = NO_OPLOCK_RETURN;
+       }
+
+       file_len = sbuf.st_size;
+       fattr = dos_mode(conn,fsp->fsp_name,&sbuf);
+       if (fattr == 0) {
+               fattr = FILE_ATTRIBUTE_NORMAL;
+       }
+
        /* Realloc the size of parameters and data we will return */
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                /* Extended response is 32 more byyes. */
@@ -1499,7 +1085,7 @@ static void call_nt_transact_create(connection_struct *conn,
                uint32 perms = 0;
                p += 25;
                if (fsp->is_directory
-                   || can_write_to_file(conn, fname, &sbuf)) {
+                   || can_write_to_file(conn, fsp->fsp_name, &sbuf)) {
                        perms = FILE_GENERIC_ALL;
                } else {
                        perms = FILE_GENERIC_READ|FILE_EXECUTE;
@@ -1507,10 +1093,10 @@ static void call_nt_transact_create(connection_struct *conn,
                SIVAL(p,0,perms);
        }
 
-       DEBUG(5,("call_nt_transact_create: open name = %s\n", fname));
+       DEBUG(5,("call_nt_transact_create: open name = %s\n", fsp->fsp_name));
 
        /* Send the required number of replies */
-       send_nt_replies(req, NT_STATUS_OK, params, param_len, *ppdata, 0);
+       send_nt_replies(conn, req, NT_STATUS_OK, params, param_len, *ppdata, 0);
 
        return;
 }
@@ -1520,7 +1106,7 @@ static void call_nt_transact_create(connection_struct *conn,
  conn POINTER CAN BE NULL HERE !
 ****************************************************************************/
 
-void reply_ntcancel(connection_struct *conn, struct smb_request *req)
+void reply_ntcancel(struct smb_request *req)
 {
        /*
         * Go through and cancel any pending change notifies.
@@ -1657,7 +1243,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx,
        close_file(fsp1,NORMAL_CLOSE);
 
        /* Ensure the modtime is set correctly on the destination file. */
-       fsp_set_pending_modtime(fsp2, get_mtimespec(&sbuf1));
+       set_close_write_time(fsp2, get_mtimespec(&sbuf1));
 
        status = close_file(fsp2,NORMAL_CLOSE);
 
@@ -1682,8 +1268,9 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx,
  Reply to a NT rename request.
 ****************************************************************************/
 
-void reply_ntrename(connection_struct *conn, struct smb_request *req)
+void reply_ntrename(struct smb_request *req)
 {
+       connection_struct *conn = req->conn;
        char *oldname = NULL;
        char *newname = NULL;
        char *p;
@@ -1776,7 +1363,7 @@ void reply_ntrename(connection_struct *conn, struct smb_request *req)
                case RENAME_FLAG_RENAME:
                        status = rename_internals(ctx, conn, req, oldname,
                                        newname, attrs, False, src_has_wcard,
-                                       dest_has_wcard);
+                                       dest_has_wcard, DELETE_ACCESS);
                        break;
                case RENAME_FLAG_HARD_LINK:
                        if (src_has_wcard || dest_has_wcard) {
@@ -1904,7 +1491,7 @@ static void call_nt_transact_notify_change(connection_struct *conn,
                 * here.
                 */
 
-               change_notify_reply(req->inbuf, max_param_count, fsp->notify);
+               change_notify_reply(fsp->conn, req->inbuf, max_param_count, fsp->notify);
 
                /*
                 * change_notify_reply() above has independently sent its
@@ -1917,7 +1504,9 @@ static void call_nt_transact_notify_change(connection_struct *conn,
         * No changes pending, queue the request
         */
 
-       status = change_notify_add_request(req->inbuf, max_param_count, filter,
+       status = change_notify_add_request(req,
+                       max_param_count,
+                       filter,
                        recursive, fsp);
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);
@@ -1939,7 +1528,6 @@ static void call_nt_transact_rename(connection_struct *conn,
        char *params = *ppparams;
        char *new_name = NULL;
        files_struct *fsp = NULL;
-       bool replace_if_exists = False;
        bool dest_has_wcard = False;
        NTSTATUS status;
        TALLOC_CTX *ctx = talloc_tos();
@@ -1950,7 +1538,6 @@ static void call_nt_transact_rename(connection_struct *conn,
        }
 
        fsp = file_fsp(SVAL(params, 0));
-       replace_if_exists = (SVAL(params,2) & RENAME_REPLACE_IF_EXISTS) ? True : False;
        if (!check_fsp(conn, req, fsp, &current_user)) {
                return;
        }
@@ -1962,31 +1549,13 @@ static void call_nt_transact_rename(connection_struct *conn,
                return;
        }
 
-       status = rename_internals(ctx,
-                       conn,
-                       req,
-                       fsp->fsp_name,
-                       new_name,
-                       0,
-                       replace_if_exists,
-                       False,
-                       dest_has_wcard);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               if (open_was_deferred(req->mid)) {
-                       /* We have re-scheduled this call. */
-                       return;
-               }
-               reply_nterror(req, status);
-               return;
-       }
-
        /*
-        * Rename was successful.
+        * W2K3 ignores this request as the RAW-RENAME test
+        * demonstrates, so we do.
         */
-       send_nt_replies(req, NT_STATUS_OK, NULL, 0, NULL, 0);
+       send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0, NULL, 0);
 
-       DEBUG(3,("nt transact rename from = %s, to = %s succeeded.\n",
+       DEBUG(3,("nt transact rename from = %s, to = %s ignored!\n",
                 fsp->fsp_name, new_name));
 
        return;
@@ -2025,13 +1594,12 @@ static void call_nt_transact_query_security_desc(connection_struct *conn,
 {
        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;
        NTSTATUS status;
+       DATA_BLOB blob;
 
         if(parameter_count < 8) {
                reply_doserror(req, ERRDOS, ERRbadfunc);
@@ -2055,40 +1623,37 @@ static void call_nt_transact_query_security_desc(connection_struct *conn,
                return;
        }
 
-       if ((mem_ctx = talloc_init("call_nt_transact_query_security_desc")) == NULL) {
-               DEBUG(0,("call_nt_transact_query_security_desc: talloc_init failed.\n"));
-               reply_doserror(req, ERRDOS, ERRnomem);
-               return;
-       }
-
        /*
         * Get the permissions to return.
         */
 
        if (!lp_nt_acl_support(SNUM(conn))) {
-               status = get_null_nt_acl(mem_ctx, &psd);
+               status = get_null_nt_acl(talloc_tos(), &psd);
        } else {
-               status = SMB_VFS_FGET_NT_ACL(fsp, fsp->fh->fd,
-                                            security_info_wanted, &psd);
+               if (fsp->fh->fd != -1) {
+                       status = SMB_VFS_FGET_NT_ACL(
+                               fsp, security_info_wanted, &psd);
+               }
+               else {
+                       status = SMB_VFS_GET_NT_ACL(
+                               conn, fsp->fsp_name, security_info_wanted, &psd);
+               }
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               talloc_destroy(mem_ctx);
                reply_nterror(req, status);
                return;
        }
 
-       sd_size = sec_desc_size(psd);
+       sd_size = ndr_size_security_descriptor(psd, 0);
 
        DEBUG(3,("call_nt_transact_query_security_desc: sd_size = %lu.\n",(unsigned long)sd_size));
 
        SIVAL(params,0,(uint32)sd_size);
 
-       if(max_data_count < sd_size) {
-
-               send_nt_replies(req, NT_STATUS_BUFFER_TOO_SMALL,
+       if (max_data_count < sd_size) {
+               send_nt_replies(conn, req, NT_STATUS_BUFFER_TOO_SMALL,
                                params, 4, *ppdata, 0);
-               talloc_destroy(mem_ctx);
                return;
        }
 
@@ -2098,46 +1663,23 @@ static void call_nt_transact_query_security_desc(connection_struct *conn,
 
        data = nttrans_realloc(ppdata, sd_size);
        if(data == NULL) {
-               talloc_destroy(mem_ctx);
                reply_doserror(req, ERRDOS, ERRnomem);
                return;
        }
 
-       /*
-        * Init the parse struct we will marshall into.
-        */
-
-       prs_init(&pd, 0, mem_ctx, MARSHALL);
-
-       /*
-        * Setup the prs_struct to point at the memory we just
-        * allocated.
-        */
-
-       prs_give_memory( &pd, data, (uint32)sd_size, False);
-
-       /*
-        * Finally, linearize into the outgoing buffer.
-        */
+       status = marshall_sec_desc(talloc_tos(), psd,
+                                  &blob.data, &blob.length);
 
-       if(!sec_io_desc( "sd data", &psd, &pd, 1)) {
-               DEBUG(0,("call_nt_transact_query_security_desc: Error in marshalling \
-security descriptor.\n"));
-               /*
-                * Return access denied for want of a better error message..
-                */
-               talloc_destroy(mem_ctx);
-               reply_unixerror(req, ERRDOS, ERRnoaccess);
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
                return;
        }
 
-       /*
-        * Now we can delete the security descriptor.
-        */
+       SMB_ASSERT(sd_size == blob.length);
+       memcpy(data, blob.data, sd_size);
 
-       talloc_destroy(mem_ctx);
+       send_nt_replies(conn, req, NT_STATUS_OK, params, 4, data, (int)sd_size);
 
-       send_nt_replies(req, NT_STATUS_OK, params, 4, data, (int)sd_size);
        return;
 }
 
@@ -2159,7 +1701,7 @@ static void call_nt_transact_set_security_desc(connection_struct *conn,
        char *data = *ppdata;
        files_struct *fsp = NULL;
        uint32 security_info_sent = 0;
-       NTSTATUS nt_status;
+       NTSTATUS status;
 
        if(parameter_count < 8) {
                reply_doserror(req, ERRDOS, ERRbadfunc);
@@ -2185,14 +1727,15 @@ static void call_nt_transact_set_security_desc(connection_struct *conn,
                return;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = set_sd( fsp, data, data_count, security_info_sent))) {
-               reply_nterror(req, nt_status);
+       status = set_sd(fsp, (uint8 *)data, data_count, security_info_sent);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
                return;
        }
 
   done:
-
-       send_nt_replies(req, NT_STATUS_OK, NULL, 0, NULL, 0);
+       send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0, NULL, 0);
        return;
 }
 
@@ -2241,7 +1784,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                   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(req, NT_STATUS_OK, NULL, 0, NULL, 0);
+               send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0, NULL, 0);
                return;
 
        case FSCTL_CREATE_OR_GET_OBJECT_ID:
@@ -2267,7 +1810,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                push_file_id_16(pdata, &fsp->file_id);
                memcpy(pdata+16,create_volume_objectid(conn,objid),16);
                push_file_id_16(pdata+32, &fsp->file_id);
-               send_nt_replies(req, NT_STATUS_OK, NULL, 0,
+               send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0,
                                pdata, data_count);
                return;
        }
@@ -2412,7 +1955,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
 
                talloc_destroy(shadow_data->mem_ctx);
 
-               send_nt_replies(req, NT_STATUS_OK, NULL, 0,
+               send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0,
                                pdata, data_count);
 
                return;
@@ -2440,11 +1983,12 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                /*unknown = IVAL(pdata,0);*/
 
                sid_parse(pdata+4,sid_len,&sid);
-               DEBUGADD(10,("for SID: %s\n",sid_string_static(&sid)));
+               DEBUGADD(10, ("for SID: %s\n", sid_string_dbg(&sid)));
 
                if (!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));
+                                sid_string_dbg(&sid),
+                                (unsigned long)sid_len));
                        uid = (-1);
                }
 
@@ -2467,7 +2011,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                 */
 
                /* this works for now... */
-               send_nt_replies(req, NT_STATUS_OK, NULL, 0, NULL, 0);
+               send_nt_replies(conn, req, NT_STATUS_OK, NULL, 0, NULL, 0);
                return;
        }
        default:
@@ -2621,7 +2165,8 @@ static void call_nt_transact_get_user_quota(connection_struct *conn,
                        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);
+                               sid_len = ndr_size_dom_sid(
+                                       &tmp_list->quotas->sid, 0);
                                entry_len = 40 + sid_len;
 
                                /* nextoffset entry 4 bytes */
@@ -2752,7 +2297,7 @@ static void call_nt_transact_get_user_quota(connection_struct *conn,
                        break;
        }
 
-       send_nt_replies(req, nt_status, params, param_len,
+       send_nt_replies(conn, req, nt_status, params, param_len,
                        pdata, data_len);
 }
 
@@ -2873,7 +2418,7 @@ static void call_nt_transact_set_user_quota(connection_struct *conn,
 #endif /* LARGE_SMB_OFF_T */
 
        sid_parse(pdata+40,sid_len,&sid);
-       DEBUGADD(8,("SID: %s\n",sid_string_static(&sid)));
+       DEBUGADD(8,("SID: %s\n", sid_string_dbg(&sid)));
 
        /* 44 unknown bytes left... */
 
@@ -2882,7 +2427,7 @@ static void call_nt_transact_set_user_quota(connection_struct *conn,
                return;
        }
 
-       send_nt_replies(req, NT_STATUS_OK, params, param_len,
+       send_nt_replies(conn, req, NT_STATUS_OK, params, param_len,
                        pdata, data_len);
 }
 #endif /* HAVE_SYS_QUOTAS */
@@ -3019,16 +2564,18 @@ static void handle_nttrans(connection_struct *conn,
  Reply to a SMBNTtrans.
 ****************************************************************************/
 
-void reply_nttrans(connection_struct *conn, struct smb_request *req)
+void reply_nttrans(struct smb_request *req)
 {
-       uint32 pscnt;
-       uint32 psoff;
-       uint32 dscnt;
-       uint32 dsoff;
+       connection_struct *conn = req->conn;
+       uint32_t pscnt;
+       uint32_t psoff;
+       uint32_t dscnt;
+       uint32_t dsoff;
        uint16 function_code;
        NTSTATUS result;
        struct trans_state *state;
-       int size;
+       uint32_t size;
+       uint32_t av_size;
 
        START_PROFILE(SMBnttrans);
 
@@ -3039,6 +2586,7 @@ void reply_nttrans(connection_struct *conn, struct smb_request *req)
        }
 
        size = smb_len(req->inbuf) + 4;
+       av_size = smb_len(req->inbuf);
        pscnt = IVAL(req->inbuf,smb_nt_ParameterCount);
        psoff = IVAL(req->inbuf,smb_nt_ParameterOffset);
        dscnt = IVAL(req->inbuf,smb_nt_DataCount);
@@ -3114,12 +2662,17 @@ void reply_nttrans(connection_struct *conn, struct smb_request *req)
                        END_PROFILE(SMBnttrans);
                        return;
                }
-               if ((dsoff+dscnt < dsoff) || (dsoff+dscnt < dscnt))
+
+               if (dscnt > state->total_data ||
+                               dsoff+dscnt < dsoff) {
                        goto bad_param;
-               if ((smb_base(req->inbuf)+dsoff+dscnt
-                    > (char *)req->inbuf + size) ||
-                   (smb_base(req->inbuf)+dsoff+dscnt < smb_base(req->inbuf)))
+               }
+
+               if (dsoff > av_size ||
+                               dscnt > av_size ||
+                               dsoff+dscnt > av_size) {
                        goto bad_param;
+               }
 
                memcpy(state->data,smb_base(req->inbuf)+dsoff,dscnt);
        }
@@ -3136,12 +2689,17 @@ void reply_nttrans(connection_struct *conn, struct smb_request *req)
                        END_PROFILE(SMBnttrans);
                        return;
                }
-               if ((psoff+pscnt < psoff) || (psoff+pscnt < pscnt))
+
+               if (pscnt > state->total_param ||
+                               psoff+pscnt < psoff) {
                        goto bad_param;
-               if ((smb_base(req->inbuf)+psoff+pscnt
-                    > (char *)req->inbuf + size) ||
-                   (smb_base(req->inbuf)+psoff+pscnt < smb_base(req->inbuf)))
+               }
+
+               if (psoff > av_size ||
+                               pscnt > av_size ||
+                               psoff+pscnt > av_size) {
                        goto bad_param;
+               }
 
                memcpy(state->param,smb_base(req->inbuf)+psoff,pscnt);
        }
@@ -3210,12 +2768,13 @@ void reply_nttrans(connection_struct *conn, struct smb_request *req)
  Reply to a SMBnttranss
  ****************************************************************************/
 
-void reply_nttranss(connection_struct *conn, struct smb_request *req)
+void reply_nttranss(struct smb_request *req)
 {
-       unsigned int pcnt,poff,dcnt,doff,pdisp,ddisp;
+       connection_struct *conn = req->conn;
+       uint32_t pcnt,poff,dcnt,doff,pdisp,ddisp;
        struct trans_state *state;
-
-       int size;
+       uint32_t av_size;
+       uint32_t size;
 
        START_PROFILE(SMBnttranss);
 
@@ -3252,6 +2811,7 @@ void reply_nttranss(connection_struct *conn, struct smb_request *req)
        }
 
        size = smb_len(req->inbuf) + 4;
+       av_size = smb_len(req->inbuf);
 
        pcnt = IVAL(req->inbuf,smb_nts_ParameterCount);
        poff = IVAL(req->inbuf, smb_nts_ParameterOffset);
@@ -3269,38 +2829,38 @@ void reply_nttranss(connection_struct *conn, struct smb_request *req)
                goto bad_param;
 
        if (pcnt) {
-               if (pdisp+pcnt > state->total_param)
+               if (pdisp > state->total_param ||
+                               pcnt > state->total_param ||
+                               pdisp+pcnt > state->total_param ||
+                               pdisp+pcnt < pdisp) {
                        goto bad_param;
-               if ((pdisp+pcnt < pdisp) || (pdisp+pcnt < pcnt))
-                       goto bad_param;
-               if (pdisp > state->total_param)
-                       goto bad_param;
-               if ((smb_base(req->inbuf) + poff + pcnt
-                    > (char *)req->inbuf + size) ||
-                   (smb_base(req->inbuf) + poff + pcnt
-                    < smb_base(req->inbuf)))
-                       goto bad_param;
-               if (state->param + pdisp < state->param)
+               }
+
+               if (poff > av_size ||
+                               pcnt > av_size ||
+                               poff+pcnt > av_size ||
+                               poff+pcnt < poff) {
                        goto bad_param;
+               }
 
                memcpy(state->param+pdisp, smb_base(req->inbuf)+poff,
                       pcnt);
        }
 
        if (dcnt) {
-               if (ddisp+dcnt > state->total_data)
+               if (ddisp > state->total_data ||
+                               dcnt > state->total_data ||
+                               ddisp+dcnt > state->total_data ||
+                               ddisp+dcnt < ddisp) {
                        goto bad_param;
-               if ((ddisp+dcnt < ddisp) || (ddisp+dcnt < dcnt))
-                       goto bad_param;
-               if (ddisp > state->total_data)
-                       goto bad_param;
-               if ((smb_base(req->inbuf) + doff + dcnt
-                    > (char *)req->inbuf + size) ||
-                   (smb_base(req->inbuf) + doff + dcnt
-                    < smb_base(req->inbuf)))
-                       goto bad_param;
-               if (state->data + ddisp < state->data)
+               }
+
+               if (ddisp > av_size ||
+                               dcnt > av_size ||
+                               ddisp+dcnt > av_size ||
+                               ddisp+dcnt < ddisp) {
                        goto bad_param;
+               }
 
                memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,
                       dcnt);