Changeset 740 for vendor/current/source3/smbd/trans2.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/smbd/trans2.c (modified) (94 diffs)

vendor/current/source3/smbd/trans2.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "version.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/xattr.h"
+#include "../librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
+#include "trans2.h"
+#include "auth.h"
+#include "smbprofile.h"
+#include "rpc_server/srv_pipe_hnd.h"
+#include "libsmb/libsmb.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
@@ -500 +510 @@
         if (!lp_ea_support(SNUM(conn))) {
                 return NT_STATUS_EAS_NOT_SUPPORTED;
+        }
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_EA)) {
+                return NT_STATUS_ACCESS_DENIED;
         }
 
@@ -779 +793 @@
         int data_alignment_offset = 0;
         bool overflow = False;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
         int max_send = sconn->smb1.sessions.max_send;
 
@@ -799 +813 @@
                 reply_outbuf(req, 10, 0);
                 show_msg((char *)req->outbuf);
-                if (!srv_send_smb(smbd_server_fd(),
+                if (!srv_send_smb(sconn,
                                 (char *)req->outbuf,
                                 true, req->seqnum+1,
@@ -938 +952 @@
                 /* Send the packet */
                 show_msg((char *)req->outbuf);
-                if (!srv_send_smb(smbd_server_fd(),
+                if (!srv_send_smb(sconn,
                                 (char *)req->outbuf,
                                 true, req->seqnum+1,
@@ -1001 +1015 @@
         uint32 create_disposition;
         uint32 create_options = 0;
+        uint32_t private_flags = 0;
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -1072 +1087 @@
                                          &access_mask, &share_mode,
                                          &create_disposition,
-                                         &create_options)) {
+                                         &create_options,
+                                         &private_flags)) {
                 reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                 goto out;
@@ -1116 +1132 @@
                 oplock_request,                         /* oplock_request */
                 open_size,                              /* allocation_size */
+                private_flags,
                 NULL,                                   /* sd */
                 ea_list,                                /* ea_list */
@@ -1134 +1151 @@
         mtime = convert_timespec_to_time_t(smb_fname->st.st_ex_mtime);
         inode = smb_fname->st.st_ex_ino;
-        if (fattr & aDIR) {
+        if (fattr & FILE_ATTRIBUTE_DIRECTORY) {
                 close_file(req, fsp, ERROR_CLOSE);
                 reply_nterror(req, NT_STATUS_ACCESS_DENIED);
@@ -1479 +1496 @@
                                     const char *fname,
                                     const struct smb_filename *smb_fname,
-                                    uint64_t space_remaining,
+                                    int space_remaining,
                                     uint8_t align,
                                     bool do_pad,
@@ -1500 +1517 @@
         char *last_entry_ptr;
         bool was_8_3;
-        off_t off;
-        off_t pad = 0;
+        int off;
+        int pad = 0;
 
         *out_of_space = false;
@@ -1510 +1527 @@
         ZERO_STRUCT(cdate_ts);
 
-        if (!(mode & aDIR)) {
+        if (!(mode & FILE_ATTRIBUTE_DIRECTORY)) {
                 file_size = get_file_size_stat(&smb_fname->st);
         }
@@ -1535 +1552 @@
 
         /* align the record */
-        off = PTR_DIFF(pdata, base_data);
+        SMB_ASSERT(align >= 1);
+
+        off = (int)PTR_DIFF(pdata, base_data);
         pad = (off + (align-1)) & ~(align-1);
         pad -= off;
+
+        if (pad && pad > space_remaining) {
+                *out_of_space = true;
+                DEBUG(9,("smbd_marshall_dir_entry: out of space "
+                        "for padding (wanted %u, had %d)\n",
+                        (unsigned int)pad,
+                        space_remaining ));
+                return false; /* Not finished - just out of space */
+        }
+
         off += pad;
         /* initialize padding to 0 */
@@ -1544 +1573 @@
         }
         space_remaining -= pad;
+
+        DEBUG(10,("smbd_marshall_dir_entry: space_remaining = %d\n",
+                space_remaining ));
 
         pdata += pad;
@@ -1659 +1691 @@
                 if (PTR_DIFF(p + 255 + ea_len,pdata) > space_remaining) {
                         *out_of_space = true;
-                        DEBUG(9,("smbd_marshall_dir_entry: out of space\n"));
+                        DEBUG(9,("smbd_marshall_dir_entry: out of space "
+                                "(wanted %u, had %d)\n",
+                                (unsigned int)PTR_DIFF(p + 255 + ea_len,pdata),
+                                space_remaining ));
                         return False; /* Not finished - just out of space */
                 }
@@ -2037 +2072 @@
         if (PTR_DIFF(p,pdata) > space_remaining) {
                 *out_of_space = true;
-                DEBUG(9,("smbd_marshall_dir_entry: out of space\n"));
+                DEBUG(9,("smbd_marshall_dir_entry: out of space "
+                        "(wanted %u, had %d)\n",
+                        (unsigned int)PTR_DIFF(p,pdata),
+                        space_remaining ));
                 return false; /* Not finished - just out of space */
         }
@@ -2232 +2270 @@
         TALLOC_CTX *ctx = talloc_tos();
         struct dptr_struct *dirptr = NULL;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
 
         if (total_params < 13) {
@@ -2322 +2360 @@
                         mask_contains_wcard = True;
                 }
-                directory = talloc_strdup(talloc_tos(), "./");
+        } else {
+                *p = 0;
+        }
+
+        if (p == NULL || p == directory) {
+                /* Ensure we don't have a directory name of "". */
+                directory = talloc_strdup(talloc_tos(), ".");
                 if (!directory) {
                         reply_nterror(req, NT_STATUS_NO_MEMORY);
                         goto out;
                 }
-        } else {
-                *p = 0;
         }
 
@@ -2383 +2425 @@
 
         ntstatus = dptr_create(conn,
+                                NULL, /* fsp */
                                 directory,
                                 False,
@@ -2571 +2614 @@
         TALLOC_CTX *ctx = talloc_tos();
         struct dptr_struct *dirptr;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
 
         if (total_params < 13) {
@@ -2866 +2909 @@
 #endif
         extended_info->samba_gitcommitdate = 0;
-#ifdef SAMBA_VERSION_GIT_COMMIT_TIME
-        unix_to_nt_time(&extended_info->samba_gitcommitdate, SAMBA_VERSION_GIT_COMMIT_TIME);
+#ifdef SAMBA_VERSION_COMMIT_TIME
+        unix_to_nt_time(&extended_info->samba_gitcommitdate, SAMBA_VERSION_COMMIT_TIME);
 #endif
 
@@ -3117 +3160 @@
                 case SMB_QUERY_FS_DEVICE_INFO:
                 case SMB_FS_DEVICE_INFORMATION:
+                {
+                        uint32_t characteristics = FILE_DEVICE_IS_MOUNTED;
+
+                        if (!CAN_WRITE(conn)) {
+                                characteristics |= FILE_READ_ONLY_DEVICE;
+                        }
                         data_len = 8;
-                        SIVAL(pdata,0,0); /* dev type */
-                        SIVAL(pdata,4,0); /* characteristics */
-                        break;
+                        SIVAL(pdata,0,FILE_DEVICE_DISK); /* dev type */
+                        SIVAL(pdata,4,characteristics);
+                        break;
+                }
 
 #ifdef HAVE_SYS_QUOTAS
@@ -3157 +3207 @@
 
                         /* access check */
-                        if (conn->server_info->utok.uid != sec_initial_uid() &&
-                                        !conn->admin_user) {
+                        if (get_current_uid(conn) != 0) {
                                 DEBUG(0,("set_user_quota: access_denied "
                                          "service [%s] user [%s]\n",
                                          lp_servicename(SNUM(conn)),
-                                         conn->server_info->unix_name));
+                                         conn->session_info->unix_name));
                                 return NT_STATUS_ACCESS_DENIED;
                         }
@@ -3220 +3269 @@
                 {
                         bool large_write = lp_min_receive_file_size() &&
-                                        !srv_is_signing_active(smbd_server_conn);
-                        bool large_read = !srv_is_signing_active(smbd_server_conn);
+                                        !srv_is_signing_active(conn->sconn);
+                        bool large_read = !srv_is_signing_active(conn->sconn);
                         int encrypt_caps = 0;
 
@@ -3315 +3364 @@
                          */
                         if (nt_token_check_sid(&global_sid_Builtin_Guests,
-                                               conn->server_info->ptok)) {
+                                               conn->session_info->security_token)) {
                                 flags |= SMB_WHOAMI_GUEST;
                         }
@@ -3323 +3372 @@
                          */
                         if (nt_token_check_sid(&global_sid_Authenticated_Users,
-                                               conn->server_info->ptok)) {
+                                               conn->session_info->security_token)) {
                                 flags &= ~SMB_WHOAMI_GUEST;
                         }
@@ -3339 +3388 @@
                             + 4 /* SID bytes */
                             + 4 /* pad/reserved */
-                            + (conn->server_info->utok.ngroups * 8)
+                            + (conn->session_info->utok.ngroups * 8)
                                 /* groups list */
-                            + (conn->server_info->ptok->num_sids *
+                            + (conn->session_info->security_token->num_sids *
                                     SID_MAX_SIZE)
                                 /* SID list */;
@@ -3348 +3397 @@
                         SIVAL(pdata, 4, SMB_WHOAMI_MASK);
                         SBIG_UINT(pdata, 8,
-                                  (uint64_t)conn->server_info->utok.uid);
+                                  (uint64_t)conn->session_info->utok.uid);
                         SBIG_UINT(pdata, 16,
-                                  (uint64_t)conn->server_info->utok.gid);
+                                  (uint64_t)conn->session_info->utok.gid);
 
 
@@ -3365 +3414 @@
                         }
 
-                        SIVAL(pdata, 24, conn->server_info->utok.ngroups);
-                        SIVAL(pdata, 28, conn->server_info->num_sids);
+                        SIVAL(pdata, 24, conn->session_info->utok.ngroups);
+                        SIVAL(pdata, 28, conn->session_info->security_token->num_sids);
 
                         /* We walk the SID list twice, but this call is fairly
@@ -3373 +3422 @@
                          */
                         for (i = 0, sid_bytes = 0;
-                             i < conn->server_info->ptok->num_sids; ++i) {
+                             i < conn->session_info->security_token->num_sids; ++i) {
                                 sid_bytes += ndr_size_dom_sid(
-                                        &conn->server_info->ptok->user_sids[i],
-                                        NULL, 
+                                        &conn->session_info->security_token->sids[i],
                                         0);
                         }
@@ -3388 +3436 @@
 
                         /* GID list */
-                        for (i = 0; i < conn->server_info->utok.ngroups; ++i) {
+                        for (i = 0; i < conn->session_info->utok.ngroups; ++i) {
                                 SBIG_UINT(pdata, data_len,
-                                          (uint64_t)conn->server_info->utok.groups[i]);
+                                          (uint64_t)conn->session_info->utok.groups[i]);
                                 data_len += 8;
                         }
@@ -3396 +3444 @@
                         /* SID list */
                         for (i = 0;
-                            i < conn->server_info->ptok->num_sids; ++i) {
+                            i < conn->session_info->security_token->num_sids; ++i) {
                                 int sid_len = ndr_size_dom_sid(
-                                        &conn->server_info->ptok->user_sids[i],
-                                        NULL,
+                                        &conn->session_info->security_token->sids[i],
                                         0);
 
                                 sid_linearize(pdata + data_len, sid_len,
-                                    &conn->server_info->ptok->user_sids[i]);
+                                    &conn->session_info->security_token->sids[i]);
                                 data_len += sid_len;
                         }
@@ -3602 +3649 @@
                                 }
 
+                                if (req->sconn->smb1.echo_handler.trusted_fde) {
+                                        DEBUG( 2,("call_trans2setfsinfo: "
+                                                "request transport encryption disabled"
+                                                "with 'fork echo handler = yes'\n"));
+                                        reply_nterror(
+                                                req,
+                                                NT_STATUS_NOT_SUPPORTED);
+                                        return;
+                                }
+
                                 DEBUG( 4,("call_trans2setfsinfo: "
                                         "request transport encryption.\n"));
@@ -3645 +3702 @@
 
                                 /* access check */
-                                if (((conn->server_info->utok.uid != sec_initial_uid()) && !conn->admin_user)
-                                    ||!CAN_WRITE(conn)) {
+                                if ((get_current_uid(conn) != 0) || !CAN_WRITE(conn)) {
                                         DEBUG(0,("set_user_quota: access_denied service [%s] user [%s]\n",
                                                  lp_servicename(SNUM(conn)),
-                                                 conn->server_info->unix_name));
+                                                 conn->session_info->unix_name));
                                         reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                                         return;
@@ -3680 +3736 @@
 
                                 /* the soft quotas 8 bytes (uint64_t)*/
-                                quotas.softlim = (uint64_t)IVAL(pdata,24);
-#ifdef LARGE_SMB_OFF_T
-                                quotas.softlim |= (((uint64_t)IVAL(pdata,28)) << 32);
-#else /* LARGE_SMB_OFF_T */
-                                if ((IVAL(pdata,28) != 0)&&
-                                        ((quotas.softlim != 0xFFFFFFFF)||
-                                        (IVAL(pdata,28)!=0xFFFFFFFF))) {
-                                        /* more than 32 bits? */
-                                        reply_nterror(
-                                                req,
-                                                NT_STATUS_INVALID_PARAMETER);
-                                        return;
-                                }
-#endif /* LARGE_SMB_OFF_T */
+                                quotas.softlim = BVAL(pdata,24);
 
                                 /* the hard quotas 8 bytes (uint64_t)*/
-                                quotas.hardlim = (uint64_t)IVAL(pdata,32);
-#ifdef LARGE_SMB_OFF_T
-                                quotas.hardlim |= (((uint64_t)IVAL(pdata,36)) << 32);
-#else /* LARGE_SMB_OFF_T */
-                                if ((IVAL(pdata,36) != 0)&&
-                                        ((quotas.hardlim != 0xFFFFFFFF)||
-                                        (IVAL(pdata,36)!=0xFFFFFFFF))) {
-                                        /* more than 32 bits? */
-                                        reply_nterror(
-                                                req,
-                                                NT_STATUS_INVALID_PARAMETER);
-                                        return;
-                                }
-#endif /* LARGE_SMB_OFF_T */
+                                quotas.hardlim = BVAL(pdata,32);
 
                                 /* quota_flags 2 bytes **/
@@ -4163 +4193 @@
                                bool delete_pending,
                                struct timespec write_time_ts,
-                               bool ms_dfs_link,
                                struct ea_list *ea_list,
                                int lock_data_count,
@@ -4198 +4227 @@
                  info_level, max_data_bytes));
 
-        if (ms_dfs_link) {
-                mode = dos_mode_msdfs(conn, smb_fname);
-        } else {
-                mode = dos_mode(conn, smb_fname);
-        }
-
+        mode = dos_mode(conn, smb_fname);
         nlink = psbuf->st_ex_nlink;
 
-        if (nlink && (mode&aDIR)) {
+        if (nlink && (mode&FILE_ATTRIBUTE_DIRECTORY)) {
                 nlink = 1;
         }
@@ -4281 +4305 @@
                 files_struct *fsp1;
                 struct file_id fileid = vfs_file_id_from_sbuf(conn, psbuf);
-                fsp1 = file_find_di_first(fileid);
+                fsp1 = file_find_di_first(conn->sconn, fileid);
                 if (fsp1 && fsp1->initial_allocation_size) {
                         allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp1, psbuf);
@@ -4287 +4311 @@
         }
 
-        if (!(mode & aDIR)) {
+        if (!(mode & FILE_ATTRIBUTE_DIRECTORY)) {
                 file_size = get_file_size_stat(psbuf);
         }
@@ -4457 +4481 @@
                         SIVAL(pdata,16,nlink);
                         SCVAL(pdata,20,delete_pending?1:0);
-                        SCVAL(pdata,21,(mode&aDIR)?1:0);
+                        SCVAL(pdata,21,(mode&FILE_ATTRIBUTE_DIRECTORY)?1:0);
                         SSVAL(pdata,22,0); /* Padding. */
                         break;
@@ -4540 +4564 @@
                         SIVAL(pdata,16,nlink);
                         SCVAL(pdata,20,delete_pending);
-                        SCVAL(pdata,21,(mode&aDIR)?1:0);
+                        SCVAL(pdata,21,(mode&FILE_ATTRIBUTE_DIRECTORY)?1:0);
                         SSVAL(pdata,22,0);
                         pdata += 24;
@@ -4571 +4595 @@
                         SIVAL(pdata,    0x38, nlink);
                         SCVAL(pdata,    0x3C, delete_pending);
-                        SCVAL(pdata,    0x3D, (mode&aDIR)?1:0);
+                        SCVAL(pdata,    0x3D, (mode&FILE_ATTRIBUTE_DIRECTORY)?1:0);
                         SSVAL(pdata,    0x3E, 0); /* padding */
                         SBVAL(pdata,    0x40, file_index);
@@ -4721 +4745 @@
                         data_size = PTR_DIFF(pdata,(*ppdata));
 
-                        {
-                                int i;
-                                DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
-
-                                for (i=0; i<100; i++)
-                                        DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
-                                DEBUG(4,("\n"));
-                        }
+                        DEBUG(4,("smbd_do_qfilepathinfo: "
+                                 "SMB_QUERY_FILE_UNIX_BASIC\n"));
+                        dump_data(4, (uint8_t *)(*ppdata), data_size);
 
                         break;
@@ -4790 +4809 @@
                                 uint16 num_def_acls = 0;
 
-                                if (fsp && !fsp->is_directory && (fsp->fh->fd != -1)) {
+                                if (fsp && fsp->fh->fd != -1) {
                                         file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp);
                                 } else {
@@ -4879 +4898 @@
                         uint64_t count;
                         uint64_t offset;
-                        uint32 lock_pid;
+                        uint64_t smblctx;
                         enum brl_type lock_type;
 
                         /* We need an open file with a real fd for this. */
-                        if (!fsp || fsp->is_directory || fsp->fh->fd == -1) {
+                        if (!fsp || fsp->fh->fd == -1) {
                                 return NT_STATUS_INVALID_LEVEL;
                         }
@@ -4904 +4923 @@
                         }
 
-                        lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
+                        smblctx = (uint64_t)IVAL(pdata, POSIX_LOCK_PID_OFFSET);
 #if defined(HAVE_LONGLONG)
                         offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
@@ -4916 +4935 @@
 
                         status = query_lock(fsp,
-                                        &lock_pid,
+                                        &smblctx,
                                         &count,
                                         &offset,
@@ -4928 +4947 @@
                                 SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, lock_type);
                                 SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0);
-                                SIVAL(pdata, POSIX_LOCK_PID_OFFSET, lock_pid);
+                                SIVAL(pdata, POSIX_LOCK_PID_OFFSET, (uint32_t)smblctx);
 #if defined(HAVE_LONGLONG)
                                 SIVAL(pdata, POSIX_LOCK_START_OFFSET, (uint32)(offset & 0xFFFFFFFF));
@@ -4984 +5003 @@
         int lock_data_count = 0;
         char *lock_data = NULL;
-        bool ms_dfs_link = false;
         NTSTATUS status = NT_STATUS_OK;
 
@@ -5037 +5055 @@
                         /* We know this name is ok, it's already passed the checks. */
 
-                } else if(fsp->is_directory || fsp->fh->fd == -1) {
+                } else if(fsp->fh->fd == -1) {
                         /*
                          * This is actually a QFILEINFO on a directory
@@ -5067 +5085 @@
 
                         fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-                        get_file_infos(fileid, &delete_pending, &write_time_ts);
+                        get_file_infos(fileid, fsp->name_hash, &delete_pending, &write_time_ts);
                 } else {
                         /*
                          * Original code - this is an open file.
                          */
-                        if (!check_fsp(conn, req, fsp)) {
-                                return;
-                        }
-
                         if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
                                 DEBUG(3, ("fstat of fnum %d failed (%s)\n",
@@ -5084 +5098 @@
                         }
                         fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-                        get_file_infos(fileid, &delete_pending, &write_time_ts);
+                        get_file_infos(fileid, fsp->name_hash, &delete_pending, &write_time_ts);
                 }
 
         } else {
+                uint32_t name_hash;
                 char *fname = NULL;
 
@@ -5174 +5189 @@
                         }
 
+                        status = file_name_hash(conn,
+                                        smb_fname_str_dbg(smb_fname_base),
+                                        &name_hash);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                TALLOC_FREE(smb_fname_base);
+                                reply_nterror(req, status);
+                                return;
+                        }
+
                         fileid = vfs_file_id_from_sbuf(conn,
                                                        &smb_fname_base->st);
                         TALLOC_FREE(smb_fname_base);
-                        get_file_infos(fileid, &delete_pending, NULL);
+                        get_file_infos(fileid, name_hash, &delete_pending, NULL);
                         if (delete_pending) {
                                 reply_nterror(req, NT_STATUS_DELETE_PENDING);
@@ -5196 +5220 @@
                         }
 
-                } else if (!VALID_STAT(smb_fname->st) &&
-                           SMB_VFS_STAT(conn, smb_fname) &&
-                           (info_level != SMB_INFO_IS_NAME_VALID)) {
-                        ms_dfs_link = check_msdfs_link(conn,
-                                                       smb_fname->base_name,
-                                                       &smb_fname->st);
-
-                        if (!ms_dfs_link) {
+                } else {
+                        if (SMB_VFS_STAT(conn, smb_fname) != 0) {
                                 DEBUG(3,("call_trans2qfilepathinfo: "
                                          "SMB_VFS_STAT of %s failed (%s)\n",
@@ -5214 +5232 @@
                 }
 
+                status = file_name_hash(conn,
+                                smb_fname_str_dbg(smb_fname),
+                                &name_hash);
+                if (!NT_STATUS_IS_OK(status)) {
+                        reply_nterror(req, status);
+                        return;
+                }
+
                 fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-                get_file_infos(fileid, &delete_pending, &write_time_ts);
+                get_file_infos(fileid, name_hash, &delete_pending, &write_time_ts);
                 if (delete_pending) {
                         reply_nterror(req, NT_STATUS_DELETE_PENDING);
@@ -5327 +5353 @@
                                        fsp, smb_fname,
                                        delete_pending, write_time_ts,
-                                       ms_dfs_link, ea_list,
+                                       ea_list,
                                        lock_data_count, lock_data,
                                        req->flags2, max_data_bytes,
@@ -5349 +5375 @@
 NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
                 connection_struct *conn,
+                struct smb_request *req,
+                bool overwrite_if_exists,
                 const struct smb_filename *smb_fname_old,
-                const struct smb_filename *smb_fname_new)
+                struct smb_filename *smb_fname_new)
 {
         NTSTATUS status = NT_STATUS_OK;
@@ -5359 +5387 @@
         }
 
-        /* Disallow if newname already exists. */
         if (VALID_STAT(smb_fname_new->st)) {
-                return NT_STATUS_OBJECT_NAME_COLLISION;
+                if (overwrite_if_exists) {
+                        if (S_ISDIR(smb_fname_new->st.st_ex_mode)) {
+                                return NT_STATUS_FILE_IS_A_DIRECTORY;
+                        }
+                        status = unlink_internals(conn,
+                                                req,
+                                                FILE_ATTRIBUTE_NORMAL,
+                                                smb_fname_new,
+                                                false);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                return status;
+                        }
+                } else {
+                        /* Disallow if newname already exists. */
+                        return NT_STATUS_OBJECT_NAME_COLLISION;
+                }
         }
 
@@ -5408 +5450 @@
         }
 
+        if (fsp && !(fsp->access_mask & FILE_WRITE_ATTRIBUTES)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
         /* get some defaults (no modifications) if any info is zero or -1. */
         if (null_timespec(ft->create_time)) {
@@ -5511 +5557 @@
         if (dosmode) {
                 if (S_ISDIR(smb_fname_base->st.st_ex_mode)) {
-                        dosmode |= aDIR;
+                        dosmode |= FILE_ATTRIBUTE_DIRECTORY;
                 } else {
-                        dosmode &= ~aDIR;
+                        dosmode &= ~FILE_ATTRIBUTE_DIRECTORY;
                 }
         }
@@ -5561 +5607 @@
         }
 
+        if (fsp && !(fsp->access_mask & FILE_WRITE_DATA)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
         DEBUG(6,("smb_set_file_size: size: %.0f ", (double)size));
 
@@ -5591 +5641 @@
                 0,                                      /* root_dir_fid */
                 smb_fname_tmp,                          /* fname */
-                FILE_WRITE_ATTRIBUTES,                  /* access_mask */
+                FILE_WRITE_DATA,                        /* access_mask */
                 (FILE_SHARE_READ | FILE_SHARE_WRITE |   /* share_access */
                     FILE_SHARE_DELETE),
@@ -5599 +5649 @@
                 FORCE_OPLOCK_BREAK_TO_NONE,             /* oplock_request */
                 0,                                      /* allocation_size */
+                0,                                      /* private_flags */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
@@ -5666 +5717 @@
                 return NT_STATUS_INVALID_PARAMETER;
         }
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_EA)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
         status = set_ea(conn, fsp, smb_fname, ea_list);
 
@@ -5708 +5764 @@
                 return NT_STATUS_INVALID_PARAMETER;
         }
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_EA)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
         status = set_ea(conn, fsp, fsp->fsp_name, ea_list);
 
@@ -5758 +5819 @@
         /* The set is across all open files on this dev/inode pair. */
         if (!set_delete_on_close(fsp, delete_on_close,
-                                 &conn->server_info->utok)) {
+                                 &conn->session_info->utok)) {
                 return NT_STATUS_ACCESS_DENIED;
         }
@@ -5870 +5931 @@
                                         struct smb_request *req,
                                         const char *pdata, int total_data,
-                                        const struct smb_filename *smb_fname_new)
+                                        struct smb_filename *smb_fname_new)
 {
         char *oldname = NULL;
@@ -5902 +5963 @@
         }
 
-        return hardlink_internals(ctx, conn, smb_fname_old, smb_fname_new);
+        return hardlink_internals(ctx, conn, req, false,
+                        smb_fname_old, smb_fname_new);
+}
+
+/****************************************************************************
+ Deal with SMB2_FILE_RENAME_INFORMATION_INTERNAL
+****************************************************************************/
+
+static NTSTATUS smb2_file_rename_information(connection_struct *conn,
+                                            struct smb_request *req,
+                                            const char *pdata,
+                                            int total_data,
+                                            files_struct *fsp,
+                                            struct smb_filename *smb_fname_src)
+{
+        bool overwrite;
+        uint32_t len;
+        char *newname = NULL;
+        struct smb_filename *smb_fname_dst = NULL;
+        NTSTATUS status = NT_STATUS_OK;
+        TALLOC_CTX *ctx = talloc_tos();
+
+        if (!fsp) {
+                return NT_STATUS_INVALID_HANDLE;
+        }
+
+        if (total_data < 20) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        overwrite = (CVAL(pdata,0) ? True : False);
+        len = IVAL(pdata,16);
+
+        if (len > (total_data - 20) || (len == 0)) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        srvstr_get_path(ctx, pdata, req->flags2, &newname,
+                                &pdata[20], len, STR_TERMINATE,
+                                &status);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        DEBUG(10,("smb2_file_rename_information: got name |%s|\n",
+                                newname));
+
+        status = filename_convert(ctx,
+                                conn,
+                                req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                newname,
+                                UCF_SAVE_LCOMP,
+                                NULL,
+                                &smb_fname_dst);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        if (fsp->base_fsp) {
+                /* newname must be a stream name. */
+                if (newname[0] != ':') {
+                        return NT_STATUS_NOT_SUPPORTED;
+                }
+
+                /* Create an smb_fname to call rename_internals_fsp() with. */
+                status = create_synthetic_smb_fname(talloc_tos(),
+                    fsp->base_fsp->fsp_name->base_name, newname, NULL,
+                    &smb_fname_dst);
+                if (!NT_STATUS_IS_OK(status)) {
+                        goto out;
+                }
+
+                /*
+                 * Set the original last component, since
+                 * rename_internals_fsp() requires it.
+                 */
+                smb_fname_dst->original_lcomp = talloc_strdup(smb_fname_dst,
+                                                              newname);
+                if (smb_fname_dst->original_lcomp == NULL) {
+                        status = NT_STATUS_NO_MEMORY;
+                        goto out;
+                }
+
+        }
+
+        DEBUG(10,("smb2_file_rename_information: "
+                  "SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
+                  fsp->fnum, fsp_str_dbg(fsp),
+                  smb_fname_str_dbg(smb_fname_dst)));
+        status = rename_internals_fsp(conn, fsp, smb_fname_dst,
+                                (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
+                                overwrite);
+
+ out:
+        TALLOC_FREE(smb_fname_dst);
+        return status;
+}
+
+static NTSTATUS smb_file_link_information(connection_struct *conn,
+                                            struct smb_request *req,
+                                            const char *pdata,
+                                            int total_data,
+                                            files_struct *fsp,
+                                            struct smb_filename *smb_fname_src)
+{
+        bool overwrite;
+        uint32_t len;
+        char *newname = NULL;
+        struct smb_filename *smb_fname_dst = NULL;
+        NTSTATUS status = NT_STATUS_OK;
+        TALLOC_CTX *ctx = talloc_tos();
+
+        if (!fsp) {
+                return NT_STATUS_INVALID_HANDLE;
+        }
+
+        if (total_data < 20) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        overwrite = (CVAL(pdata,0) ? true : false);
+        len = IVAL(pdata,16);
+
+        if (len > (total_data - 20) || (len == 0)) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        srvstr_get_path(ctx, pdata, req->flags2, &newname,
+                                &pdata[20], len, STR_TERMINATE,
+                                &status);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        DEBUG(10,("smb_file_link_information: got name |%s|\n",
+                                newname));
+
+        status = filename_convert(ctx,
+                                conn,
+                                req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                newname,
+                                UCF_SAVE_LCOMP,
+                                NULL,
+                                &smb_fname_dst);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        if (fsp->base_fsp) {
+                /* No stream names. */
+                return NT_STATUS_NOT_SUPPORTED;
+        }
+
+        DEBUG(10,("smb_file_link_information: "
+                  "SMB_FILE_LINK_INFORMATION (fnum %d) %s -> %s\n",
+                  fsp->fnum, fsp_str_dbg(fsp),
+                  smb_fname_str_dbg(smb_fname_dst)));
+        status = hardlink_internals(ctx,
+                                conn,
+                                req,
+                                overwrite,
+                                fsp->fsp_name,
+                                smb_fname_dst);
+
+        TALLOC_FREE(smb_fname_dst);
+        return status;
 }
 
@@ -6013 +6239 @@
                         p[1] = '\0';
                 } else {
-                        base_name = talloc_strdup(ctx, "./");
+                        base_name = talloc_strdup(ctx, "");
                         if (!base_name) {
                                 return NT_STATUS_NO_MEMORY;
@@ -6149 +6375 @@
         uint64_t count;
         uint64_t offset;
-        uint32 lock_pid;
+        uint64_t smblctx;
         bool blocking_lock = False;
         enum brl_type lock_type;
@@ -6193 +6419 @@
         }
 
-        lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
+        smblctx = (uint64_t)IVAL(pdata, POSIX_LOCK_PID_OFFSET);
 #if defined(HAVE_LONGLONG)
         offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
@@ -6205 +6431 @@
 
         DEBUG(10,("smb_set_posix_lock: file %s, lock_type = %u,"
-                        "lock_pid = %u, count = %.0f, offset = %.0f\n",
+                        "smblctx = %llu, count = %.0f, offset = %.0f\n",
                 fsp_str_dbg(fsp),
                 (unsigned int)lock_type,
-                (unsigned int)lock_pid,
+                (unsigned long long)smblctx,
                 (double)count,
                 (double)offset ));
 
         if (lock_type == UNLOCK_LOCK) {
-                status = do_unlock(smbd_messaging_context(),
+                status = do_unlock(req->sconn->msg_ctx,
                                 fsp,
-                                lock_pid,
+                                smblctx,
                                 count,
                                 offset,
                                 POSIX_LOCK);
         } else {
-                uint32 block_smbpid;
-
-                struct byte_range_lock *br_lck = do_lock(smbd_messaging_context(),
+                uint64_t block_smblctx;
+
+                struct byte_range_lock *br_lck = do_lock(req->sconn->msg_ctx,
                                                         fsp,
-                                                        lock_pid,
+                                                        smblctx,
                                                         count,
                                                         offset,
@@ -6231 +6457 @@
                                                         blocking_lock,
                                                         &status,
-                                                        &block_smbpid,
+                                                        &block_smblctx,
                                                         NULL);
 
@@ -6245 +6471 @@
                                                 -1, /* infinite timeout. */
                                                 0,
-                                                lock_pid,
+                                                smblctx,
                                                 lock_type,
                                                 POSIX_LOCK,
                                                 offset,
                                                 count,
-                                                block_smbpid)) {
+                                                block_smblctx)) {
                                 TALLOC_FREE(br_lck);
                                 return status;
@@ -6282 +6508 @@
         }
 
+        if (fsp && !(fsp->access_mask & FILE_WRITE_ATTRIBUTES)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
         /* Set the attributes */
         dosmode = IVAL(pdata,32);
@@ -6324 +6554 @@
         if (total_data < 12) {
                 return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_ATTRIBUTES)) {
+                return NT_STATUS_ACCESS_DENIED;
         }
 
@@ -6382 +6616 @@
         if (allocation_size) {
                 allocation_size = smb_roundup(conn, allocation_size);
+        }
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_DATA)) {
+                return NT_STATUS_ACCESS_DENIED;
         }
 
@@ -6419 +6657 @@
                 FORCE_OPLOCK_BREAK_TO_NONE,             /* oplock_request */
                 0,                                      /* allocation_size */
+                0,                                      /* private_flags */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
@@ -6479 +6718 @@
                   "file %s to %.0f\n", smb_fname_str_dbg(smb_fname),
                   (double)size));
+
+        if (fsp && !(fsp->access_mask & FILE_WRITE_DATA)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
 
         return smb_set_file_size(conn, req,
@@ -6784 +7027 @@
 
         id = vfs_file_id_from_sbuf(conn, &sbuf);
-        for(all_fsps = file_find_di_first(id); all_fsps;
+        for(all_fsps = file_find_di_first(conn->sconn, id); all_fsps;
                         all_fsps = file_find_di_next(all_fsps)) {
                 /*
@@ -6928 +7171 @@
                 0,                                      /* oplock_request */
                 0,                                      /* allocation_size */
+                0,                                      /* private_flags */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
@@ -6984 +7228 @@
  Open/Create a file with POSIX semantics.
 ****************************************************************************/
+
+#define SMB_O_RDONLY_MAPPING (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)
+#define SMB_O_WRONLY_MAPPING (FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA)
 
 static NTSTATUS smb_posix_open(connection_struct *conn,
@@ -7000 +7247 @@
         uint32 create_disp = 0;
         uint32 access_mask = 0;
-        uint32 create_options = 0;
+        uint32 create_options = FILE_NON_DIRECTORY_FILE;
         NTSTATUS status = NT_STATUS_OK;
         mode_t unixmode = (mode_t)0;
@@ -7030 +7277 @@
         switch (wire_open_mode & SMB_ACCMODE) {
                 case SMB_O_RDONLY:
-                        access_mask = FILE_READ_DATA;
+                        access_mask = SMB_O_RDONLY_MAPPING;
                         break;
                 case SMB_O_WRONLY:
-                        access_mask = FILE_WRITE_DATA;
+                        access_mask = SMB_O_WRONLY_MAPPING;
                         break;
                 case SMB_O_RDWR:
-                        access_mask = FILE_READ_DATA|FILE_WRITE_DATA;
+                        access_mask = (SMB_O_RDONLY_MAPPING|
+                                        SMB_O_WRONLY_MAPPING);
                         break;
                 default:
@@ -7121 +7369 @@
         }
 
+        if ((wire_open_mode & SMB_O_DIRECTORY) ||
+                        VALID_STAT_OF_DIR(smb_fname->st)) {
+                if (access_mask != SMB_O_RDONLY_MAPPING) {
+                        return NT_STATUS_FILE_IS_A_DIRECTORY;
+                }
+                create_options &= ~FILE_NON_DIRECTORY_FILE;
+                create_options |= FILE_DIRECTORY_FILE;
+        }
+
         DEBUG(10,("smb_posix_open: file %s, smb_posix_flags = %u, mode 0%o\n",
                 smb_fname_str_dbg(smb_fname),
@@ -7135 +7392 @@
                     FILE_SHARE_DELETE),
                 create_disp,                            /* create_disposition*/
-                FILE_NON_DIRECTORY_FILE,                /* create_options */
+                create_options,                         /* create_options */
                 mod_unixmode,                           /* file_attributes */
                 oplock_request,                         /* oplock_request */
                 0,                                      /* allocation_size */
+                0,                                      /* private_flags */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
@@ -7268 +7526 @@
                 0,                                      /* oplock_request */
                 0,                                      /* allocation_size */
+                0,                                      /* private_flags */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
@@ -7528 +7787 @@
                                                              pdata, total_data,
                                                              fsp, smb_fname);
+                        break;
+                }
+
+                case SMB2_FILE_RENAME_INFORMATION_INTERNAL:
+                {
+                        /* SMB2 rename information. */
+                        status = smb2_file_rename_information(conn, req,
+                                                             pdata, total_data,
+                                                             fsp, smb_fname);
+                        break;
+                }
+
+                case SMB_FILE_LINK_INFORMATION:
+                {
+                        status = smb_file_link_information(conn, req,
+                                                        pdata, total_data,
+                                                        fsp, smb_fname);
                         break;
                 }
@@ -7638 +7914 @@
                 }
 
-                if(fsp->is_directory || fsp->fh->fd == -1) {
+                if(fsp->fh->fd == -1) {
                         /*
                          * This is actually a SETFILEINFO on a directory
@@ -7670 +7946 @@
                          */
                         if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) {
-                                fsp->fh->private_options |= FILE_DELETE_ON_CLOSE;
+                                fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE;
 
                                 DEBUG(3,("call_trans2setfilepathinfo: "
@@ -7690 +7966 @@
                          * Original code - this is an open file.
                          */
-                        if (!check_fsp(conn, req, fsp)) {
-                                return;
-                        }
-
                         if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
                                 DEBUG(3,("call_trans2setfilepathinfo: fstat "
@@ -7781 +8053 @@
                         return;
                 }
-                if (blocking_lock_was_deferred(req->mid)) {
+                if (blocking_lock_was_deferred_smb1(req->sconn, req->mid)) {
                         /* We have re-scheduled this call. */
                         return;
@@ -8100 +8372 @@
                         CAN ACCEPT THIS IN UNICODE. JRA. */
 
-                SSVAL(pdata,0,fsp->rap_print_jobid);                     /* Job number */
+                /* Job number */
+                if (fsp->print_file) {
+                        SSVAL(pdata, 0, fsp->print_file->rap_jobid);
+                } else {
+                        SSVAL(pdata, 0, 0);
+                }
                 srvstr_push(pdata, req->flags2, pdata + 2,
                             global_myname(), 15,
@@ -8123 +8400 @@
 {
         int dptr_num;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
 
         START_PROFILE(SMBfindclose);