Changeset 733 for branches/samba-3.5.x/source3/smbd

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

Location:

branches/samba-3.5.x/source3/smbd

Files:

• file_access.c (modified) (2 diffs)
• nttrans.c (modified) (1 diff)
• open.c (modified) (3 diffs)
• posix_acls.c (modified) (1 diff)
• process.c (modified) (1 diff)
• reply.c (modified) (4 diffs)
• trans2.c (modified) (2 diffs)

branches/samba-3.5.x/source3/smbd/file_access.c

@@ -38 +38 @@
         if (conn->server_info->utok.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
+                return true;
+        }
+
+        if (access_mask == DELETE_ACCESS &&
+                        VALID_STAT(smb_fname->st) &&
+                        S_ISLNK(smb_fname->st.st_ex_mode)) {
+                /* We can always delete a symlink. */
                 return true;
         }
@@ -116 +123 @@
          * by owner of directory. */
         if (smb_fname_parent->st.st_ex_mode & S_ISVTX) {
-                if(SMB_VFS_STAT(conn, smb_fname) != 0) {
-                        if (errno == ENOENT) {
-                                /* If the file doesn't already exist then
-                                 * yes we'll be able to delete it. */
-                                ret = true;
-                                goto out;
-                        }
-                        DEBUG(10,("can_delete_file_in_directory: can't "
-                                  "stat file %s (%s)",
-                                  smb_fname_str_dbg(smb_fname),
-                                  strerror(errno) ));
-                        ret = false;
+                if (!VALID_STAT(smb_fname->st)) {
+                        /* If the file doesn't already exist then
+                         * yes we'll be able to delete it. */
+                        ret = true;
                         goto out;
                 }

branches/samba-3.5.x/source3/smbd/nttrans.c

@@ -1884 +1884 @@
         }
         if (!(security_info_wanted & SECINFO_DACL)) {
+                psd->type &= ~SEC_DESC_DACL_PRESENT;
                 psd->dacl = NULL;
         }
         if (!(security_info_wanted & SECINFO_SACL)) {
+                psd->type &= ~SEC_DESC_SACL_PRESENT;
                 psd->sacl = NULL;
         }

branches/samba-3.5.x/source3/smbd/open.c

@@ -94 +94 @@
                         smb_fname_str_dbg(smb_fname),
                         (unsigned int)*access_granted ));
+                return NT_STATUS_OK;
+        }
+
+        if (access_mask == DELETE_ACCESS &&
+                        VALID_STAT(smb_fname->st) &&
+                        S_ISLNK(smb_fname->st.st_ex_mode)) {
+                /* We can always delete a symlink. */
+                DEBUG(10,("smbd_check_open_rights: not checking ACL "
+                        "on DELETE_ACCESS on symlink %s.\n",
+                        smb_fname_str_dbg(smb_fname) ));
                 return NT_STATUS_OK;
         }
@@ -1432 +1442 @@
         }
 
-        status = check_name(conn, smb_fname->base_name);
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
         if (!posix_open) {
                 new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
@@ -3309 +3314 @@
         }
 
-        /* All file access must go through check_name() */
-
-        status = check_name(conn, smb_fname->base_name);
-        if (!NT_STATUS_IS_OK(status)) {
-                goto fail;
-        }
-
         status = create_file_unixpath(
                 conn, req, smb_fname, access_mask, share_access,

branches/samba-3.5.x/source3/smbd/posix_acls.c

@@ -1124 +1124 @@
 ****************************************************************************/
 
-#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA|FILE_READ_ATTRIBUTES)
-#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA|FILE_WRITE_ATTRIBUTES)
+#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA)
+#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA)
 #define FILE_SPECIFIC_EXECUTE_BITS (FILE_EXECUTE)
 

branches/samba-3.5.x/source3/smbd/process.c

@@ -1274 +1274 @@
         /* Make sure this is an SMB packet. smb_size contains NetBIOS header
          * so subtract 4 from it. */
-        if (!valid_smb_header(req->inbuf)
-            || (size < (smb_size - 4))) {
+        if ((size < (smb_size - 4)) ||
+            !valid_smb_header(req->inbuf)) {
                 DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
                          smb_len(req->inbuf)));

branches/samba-3.5.x/source3/smbd/reply.c

@@ -4430 +4430 @@
         SSVAL(req->outbuf,smb_vwv4,nwritten>>16);
 
-        if (nwritten < (ssize_t)numtowrite) {
-                SCVAL(req->outbuf,smb_rcls,ERRHRD);
-                SSVAL(req->outbuf,smb_err,ERRdiskfull);
-        }
-
         DEBUG(3,("writeX fnum=%d num=%d wrote=%d\n",
                 fsp->fnum, (int)numtowrite, (int)nwritten));
@@ -6291 +6286 @@
         struct smb_filename *smb_fname_src = NULL;
         struct smb_filename *smb_fname_dst = NULL;
+        uint32_t src_ucf_flags = lp_posix_pathnames() ? UCF_UNIX_NAME_LOOKUP : UCF_COND_ALLOW_WCARD_LCOMP;
+        uint32_t dst_ucf_flags = UCF_SAVE_LCOMP | (lp_posix_pathnames() ? 0 : UCF_COND_ALLOW_WCARD_LCOMP);
 
         START_PROFILE(SMBmv);
@@ -6320 +6317 @@
                                   req->flags2 & FLAGS2_DFS_PATHNAMES,
                                   name,
-                                  UCF_COND_ALLOW_WCARD_LCOMP,
+                                  src_ucf_flags,
                                   &src_has_wcard,
                                   &smb_fname_src);
@@ -6338 +6335 @@
                                   req->flags2 & FLAGS2_DFS_PATHNAMES,
                                   newname,
-                                  UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP,
+                                  dst_ucf_flags,
                                   &dest_has_wcard,
                                   &smb_fname_dst);

branches/samba-3.5.x/source3/smbd/trans2.c

@@ -7736 +7736 @@
         } else {
                 char *fname = NULL;
+                uint32_t ucf_flags = 0;
 
                 /* set path info */
@@ -7752 +7753 @@
                 }
 
+                if (info_level == SMB_SET_FILE_UNIX_BASIC ||
+                                info_level == SMB_SET_FILE_UNIX_INFO2 ||
+                                info_level == SMB_FILE_RENAME_INFORMATION ||
+                                info_level == SMB_POSIX_PATH_UNLINK) {
+                        ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+                }
+
                 status = filename_convert(req, conn,
                                          req->flags2 & FLAGS2_DFS_PATHNAMES,
                                          fname,
-                                         0,
+                                         ucf_flags,
                                          NULL,
                                          &smb_fname);