Changeset 740 for vendor/current/source3/smbd/dosmode.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/dosmode.c (modified) (27 diffs)

vendor/current/source3/smbd/dosmode.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
+#include "../libcli/security/security.h"
+#include "smbd/smbd.h"
 
 static uint32_t filter_mode_by_protocol(uint32_t mode)
@@ -34 +37 @@
 }
 
-static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
-{
-#if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
-        if (sbuf->st_ex_size > sbuf->st_ex_blocks * (SMB_OFF_T)STAT_ST_BLOCKSIZE) {
-                return FILE_ATTRIBUTE_SPARSE;
-        }
-#endif
-        return 0;
-}
-
 static int set_link_read_only_flag(const SMB_STRUCT_STAT *const sbuf)
 {
@@ -49 +42 @@
 #if LINKS_READ_ONLY
         if (S_ISLNK(sbuf->st_mode) && S_ISDIR(sbuf->st_mode))
-                return aRONLY;
+                return FILE_ATTRIBUTE_READONLY;
 #endif
 #endif
@@ -181 +174 @@
                 /* Original Samba method - map inverse of user "w" bit. */
                 if ((smb_fname->st.st_ex_mode & S_IWUSR) == 0) {
-                        result |= aRONLY;
+                        result |= FILE_ATTRIBUTE_READONLY;
                 }
         } else if (ro_opts == MAP_READONLY_PERMISSIONS) {
                 /* Check actual permissions for read-only. */
                 if (!can_write_to_file(conn, smb_fname)) {
-                        result |= aRONLY;
+                        result |= FILE_ATTRIBUTE_READONLY;
                 }
         } /* Else never set the readonly bit. */
 
         if (MAP_ARCHIVE(conn) && ((smb_fname->st.st_ex_mode & S_IXUSR) != 0))
-                result |= aARCH;
+                result |= FILE_ATTRIBUTE_ARCHIVE;
 
         if (MAP_SYSTEM(conn) && ((smb_fname->st.st_ex_mode & S_IXGRP) != 0))
-                result |= aSYSTEM;
+                result |= FILE_ATTRIBUTE_SYSTEM;
 
         if (MAP_HIDDEN(conn) && ((smb_fname->st.st_ex_mode & S_IXOTH) != 0))
-                result |= aHIDDEN;   
+                result |= FILE_ATTRIBUTE_HIDDEN;
 
         if (S_ISDIR(smb_fname->st.st_ex_mode))
-                result = aDIR | (result & aRONLY);
-
-        result |= set_sparse_flag(&smb_fname->st);
+                result = FILE_ATTRIBUTE_DIRECTORY | (result & FILE_ATTRIBUTE_READONLY);
+
         result |= set_link_read_only_flag(&smb_fname->st);
 
         DEBUG(8,("dos_mode_from_sbuf returning "));
 
-        if (result & aHIDDEN) DEBUG(8, ("h"));
-        if (result & aRONLY ) DEBUG(8, ("r"));
-        if (result & aSYSTEM) DEBUG(8, ("s"));
-        if (result & aDIR   ) DEBUG(8, ("d"));
-        if (result & aARCH  ) DEBUG(8, ("a"));
+        if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
+        if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
+        if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
+        if (result & FILE_ATTRIBUTE_DIRECTORY   ) DEBUG(8, ("d"));
+        if (result & FILE_ATTRIBUTE_ARCHIVE  ) DEBUG(8, ("a"));
 
         DEBUG(8,("\n"));
@@ -250 +242 @@
                                 ) {
 #endif
-                        DEBUG(1,("get_ea_dos_attributes: Cannot get attribute "
+                        DEBUG(1,("get_ea_dos_attribute: Cannot get attribute "
                                  "from EA on file %s: Error = %s\n",
                                  smb_fname_str_dbg(smb_fname),
@@ -262 +254 @@
         blob.length = sizeret;
 
-        ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &dosattrib,
+        ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &dosattrib,
                         (ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB);
+
+        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                DEBUG(1,("get_ea_dos_attribute: bad ndr decode "
+                         "from EA on file %s: Error = %s\n",
+                         smb_fname_str_dbg(smb_fname),
+                         ndr_errstr(ndr_err)));
+                return false;
+        }
 
         DEBUG(10,("get_ea_dos_attribute: %s attr = %s\n",
@@ -282 +282 @@
                                                         create_time);
 
-                                DEBUG(10,("get_ea_dos_attributes: file %s case 1 "
+                                DEBUG(10,("get_ea_dos_attribute: file %s case 1 "
                                         "set btime %s\n",
                                         smb_fname_str_dbg(smb_fname),
@@ -304 +304 @@
                                                         create_time);
 
-                                DEBUG(10,("get_ea_dos_attributes: file %s case 3 "
+                                DEBUG(10,("get_ea_dos_attribute: file %s case 3 "
                                         "set btime %s\n",
                                         smb_fname_str_dbg(smb_fname),
@@ -311 +311 @@
                         }
                         break;
-                        default:
-                                DEBUG(1,("get_ea_dos_attributes: Badly formed DOSATTRIB on "
-                                         "file %s - %s\n", smb_fname_str_dbg(smb_fname),
-                                         attrstr));
+                default:
+                        DEBUG(1,("get_ea_dos_attribute: Badly formed DOSATTRIB on "
+                                 "file %s - %s\n", smb_fname_str_dbg(smb_fname),
+                                 attrstr));
                         return false;
         }
 
         if (S_ISDIR(smb_fname->st.st_ex_mode)) {
-                dosattr |= aDIR;
-        }
-        *pattr = (uint32)(dosattr & SAMBA_ATTRIBUTES_MASK);
+                dosattr |= FILE_ATTRIBUTE_DIRECTORY;
+        }
+        /* FILE_ATTRIBUTE_SPARSE is valid on get but not on set. */
+        *pattr = (uint32)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE));
 
         DEBUG(8,("get_ea_dos_attribute returning (0x%x)", dosattr));
 
-        if (dosattr & aHIDDEN) DEBUG(8, ("h"));
-        if (dosattr & aRONLY ) DEBUG(8, ("r"));
-        if (dosattr & aSYSTEM) DEBUG(8, ("s"));
-        if (dosattr & aDIR   ) DEBUG(8, ("d"));
-        if (dosattr & aARCH  ) DEBUG(8, ("a"));
+        if (dosattr & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
+        if (dosattr & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
+        if (dosattr & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
+        if (dosattr & FILE_ATTRIBUTE_DIRECTORY   ) DEBUG(8, ("d"));
+        if (dosattr & FILE_ATTRIBUTE_ARCHIVE  ) DEBUG(8, ("a"));
 
         DEBUG(8,("\n"));
@@ -348 +349 @@
         enum ndr_err_code ndr_err;
         DATA_BLOB blob;
-        files_struct *fsp = NULL;
-        bool ret = false;
 
         if (!lp_store_dos_attributes(SNUM(conn))) {
@@ -365 +364 @@
                                 smb_fname->st.st_ex_btime);
 
+        DEBUG(10,("set_ea_dos_attributes: set attribute 0x%x, btime = %s on file %s\n",
+                (unsigned int)dosmode,
+                time_to_asc(convert_timespec_to_time_t(smb_fname->st.st_ex_btime)),
+                smb_fname_str_dbg(smb_fname) ));
+
         ndr_err = ndr_push_struct_blob(
-                        &blob, talloc_tos(), NULL, &dosattrib,
+                        &blob, talloc_tos(), &dosattrib,
                         (ndr_push_flags_fn_t)ndr_push_xattr_DOSATTRIB);
 
@@ -382 +386 @@
                              SAMBA_XATTR_DOS_ATTRIB, blob.data, blob.length,
                              0) == -1) {
+                bool ret = false;
+                files_struct *fsp = NULL;
+
                 if((errno != EPERM) && (errno != EACCES)) {
                         if (errno == ENOSYS
@@ -414 +421 @@
                 if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname,
                                                       &fsp)))
-                        return ret;
+                        return false;
                 become_root();
-                if (SMB_VFS_SETXATTR(conn, smb_fname->base_name,
+                if (SMB_VFS_FSETXATTR(fsp,
                                      SAMBA_XATTR_DOS_ATTRIB, blob.data,
                                      blob.length, 0) == 0) {
@@ -459 +466 @@
                 if (p[0] == '.' && !((p[1] == '\0') ||
                                 (p[1] == '.' && p[2] == '\0'))) {
-                        result |= aHIDDEN;
+                        result |= FILE_ATTRIBUTE_HIDDEN;
                 }
         }
@@ -467 +474 @@
         /* Optimization : Only call is_hidden_path if it's not already
            hidden. */
-        if (!(result & aHIDDEN) &&
+        if (!(result & FILE_ATTRIBUTE_HIDDEN) &&
             IS_HIDDEN_PATH(conn, smb_fname->base_name)) {
-                result |= aHIDDEN;
+                result |= FILE_ATTRIBUTE_HIDDEN;
         }
 
@@ -480 +487 @@
         DEBUG(8,("dos_mode_msdfs returning "));
 
-        if (result & aHIDDEN) DEBUG(8, ("h"));
-        if (result & aRONLY ) DEBUG(8, ("r"));
-        if (result & aSYSTEM) DEBUG(8, ("s"));
-        if (result & aDIR   ) DEBUG(8, ("d"));
-        if (result & aARCH  ) DEBUG(8, ("a"));
+        if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
+        if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
+        if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
+        if (result & FILE_ATTRIBUTE_DIRECTORY   ) DEBUG(8, ("d"));
+        if (result & FILE_ATTRIBUTE_ARCHIVE  ) DEBUG(8, ("a"));
         if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));
 
@@ -501 +508 @@
         uint32_t dos_stat_flags = 0;
 
-        if (dosmode & aARCH)
+        if (dosmode & FILE_ATTRIBUTE_ARCHIVE)
                 dos_stat_flags |= UF_DOS_ARCHIVE;
-        if (dosmode & aHIDDEN)
+        if (dosmode & FILE_ATTRIBUTE_HIDDEN)
                 dos_stat_flags |= UF_DOS_HIDDEN;
-        if (dosmode & aRONLY)
+        if (dosmode & FILE_ATTRIBUTE_READONLY)
                 dos_stat_flags |= UF_DOS_RO;
-        if (dosmode & aSYSTEM)
+        if (dosmode & FILE_ATTRIBUTE_SYSTEM)
                 dos_stat_flags |= UF_DOS_SYSTEM;
         if (dosmode & FILE_ATTRIBUTE_NONINDEXED)
@@ -534 +541 @@
 
         if (smb_fname->st.st_ex_flags & UF_DOS_ARCHIVE)
-                *dosmode |= aARCH;
+                *dosmode |= FILE_ATTRIBUTE_ARCHIVE;
         if (smb_fname->st.st_ex_flags & UF_DOS_HIDDEN)
-                *dosmode |= aHIDDEN;
+                *dosmode |= FILE_ATTRIBUTE_HIDDEN;
         if (smb_fname->st.st_ex_flags & UF_DOS_RO)
-                *dosmode |= aRONLY;
+                *dosmode |= FILE_ATTRIBUTE_READONLY;
         if (smb_fname->st.st_ex_flags & UF_DOS_SYSTEM)
-                *dosmode |= aSYSTEM;
+                *dosmode |= FILE_ATTRIBUTE_SYSTEM;
         if (smb_fname->st.st_ex_flags & UF_DOS_NOINDEX)
                 *dosmode |= FILE_ATTRIBUTE_NONINDEXED;
+        if (smb_fname->st.st_ex_flags & FILE_ATTRIBUTE_SPARSE)
+                *dosmode |= FILE_ATTRIBUTE_SPARSE;
         if (S_ISDIR(smb_fname->st.st_ex_mode))
-                *dosmode |= aDIR;
-
-        *dosmode |= set_sparse_flag(&smb_fname->st);
+                *dosmode |= FILE_ATTRIBUTE_DIRECTORY;
+
         *dosmode |= set_link_read_only_flag(&smb_fname->st);
 
@@ -630 +638 @@
                 if (p[0] == '.' && !((p[1] == '\0') ||
                                 (p[1] == '.' && p[2] == '\0'))) {
-                        result |= aHIDDEN;
+                        result |= FILE_ATTRIBUTE_HIDDEN;
                 }
         }
@@ -639 +647 @@
         if (!used_stat_dos_flags) {
                 /* Get the DOS attributes from an EA by preference. */
-                if (get_ea_dos_attribute(conn, smb_fname, &result)) {
-                        result |= set_sparse_flag(&smb_fname->st);
-                } else {
+                if (!get_ea_dos_attribute(conn, smb_fname, &result)) {
                         result |= dos_mode_from_sbuf(conn, smb_fname);
                 }
         }
 
-        offline = SMB_VFS_IS_OFFLINE(conn, smb_fname->base_name, &smb_fname->st);
+        offline = SMB_VFS_IS_OFFLINE(conn, smb_fname, &smb_fname->st);
         if (S_ISREG(smb_fname->st.st_ex_mode) && offline) {
                 result |= FILE_ATTRIBUTE_OFFLINE;
@@ -653 +659 @@
         /* Optimization : Only call is_hidden_path if it's not already
            hidden. */
-        if (!(result & aHIDDEN) &&
+        if (!(result & FILE_ATTRIBUTE_HIDDEN) &&
             IS_HIDDEN_PATH(conn, smb_fname->base_name)) {
-                result |= aHIDDEN;
+                result |= FILE_ATTRIBUTE_HIDDEN;
         }
 
@@ -666 +672 @@
         DEBUG(8,("dos_mode returning "));
 
-        if (result & aHIDDEN) DEBUG(8, ("h"));
-        if (result & aRONLY ) DEBUG(8, ("r"));
-        if (result & aSYSTEM) DEBUG(8, ("s"));
-        if (result & aDIR   ) DEBUG(8, ("d"));
-        if (result & aARCH  ) DEBUG(8, ("a"));
+        if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
+        if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
+        if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
+        if (result & FILE_ATTRIBUTE_DIRECTORY   ) DEBUG(8, ("d"));
+        if (result & FILE_ATTRIBUTE_ARCHIVE  ) DEBUG(8, ("a"));
         if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));
 
@@ -707 +713 @@
 
         if (S_ISDIR(smb_fname->st.st_ex_mode))
-                dosmode |= aDIR;
+                dosmode |= FILE_ATTRIBUTE_DIRECTORY;
         else
-                dosmode &= ~aDIR;
+                dosmode &= ~FILE_ATTRIBUTE_DIRECTORY;
 
         new_create_timespec = smb_fname->st.st_ex_btime;
@@ -717 +723 @@
         if (dosmode & FILE_ATTRIBUTE_OFFLINE) {
                 if (!(old_mode & FILE_ATTRIBUTE_OFFLINE)) {
-                        lret = SMB_VFS_SET_OFFLINE(conn, smb_fname->base_name);
+                        lret = SMB_VFS_SET_OFFLINE(conn, smb_fname);
                         if (lret == -1) {
                                 DEBUG(0, ("set_dos_mode: client has asked to "
@@ -807 +813 @@
         if (S_ISDIR(smb_fname->st.st_ex_mode) && (unixmode & S_ISGID) &&
                         geteuid() != sec_initial_uid() &&
-                        !current_user_in_group(smb_fname->st.st_ex_gid)) {
+                        !current_user_in_group(conn, smb_fname->st.st_ex_gid)) {
                 DEBUG(3,("file_set_dosmode: setgid bit cannot be "
                         "set for directory %s\n",
@@ -814 +820 @@
                 return -1;
         }
-
 
         ret = SMB_VFS_CHMOD(conn, smb_fname->base_name, unixmode);
@@ -865 +870 @@
 }
 
+
+NTSTATUS file_set_sparse(connection_struct *conn,
+                         files_struct *fsp,
+                         bool sparse)
+{
+        uint32_t old_dosmode;
+        uint32_t new_dosmode;
+        NTSTATUS status;
+
+        if (!CAN_WRITE(conn)) {
+                DEBUG(9,("file_set_sparse: fname[%s] set[%u] "
+                        "on readonly share[%s]\n",
+                        smb_fname_str_dbg(fsp->fsp_name),
+                        sparse,
+                        lp_servicename(SNUM(conn))));
+                return NT_STATUS_MEDIA_WRITE_PROTECTED;
+        }
+
+        if (!(fsp->access_mask & FILE_WRITE_DATA) &&
+                        !(fsp->access_mask & FILE_WRITE_ATTRIBUTES)) {
+                DEBUG(9,("file_set_sparse: fname[%s] set[%u] "
+                        "access_mask[0x%08X] - access denied\n",
+                        smb_fname_str_dbg(fsp->fsp_name),
+                        sparse,
+                        fsp->access_mask));
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        DEBUG(10,("file_set_sparse: setting sparse bit %u on file %s\n",
+                  sparse, smb_fname_str_dbg(fsp->fsp_name)));
+
+        if (!lp_store_dos_attributes(SNUM(conn))) {
+                return NT_STATUS_INVALID_DEVICE_REQUEST;
+        }
+
+        status = vfs_stat_fsp(fsp);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        old_dosmode = dos_mode(conn, fsp->fsp_name);
+
+        if (sparse && !(old_dosmode & FILE_ATTRIBUTE_SPARSE)) {
+                new_dosmode = old_dosmode | FILE_ATTRIBUTE_SPARSE;
+        } else if (!sparse && (old_dosmode & FILE_ATTRIBUTE_SPARSE)) {
+                new_dosmode = old_dosmode & ~FILE_ATTRIBUTE_SPARSE;
+        } else {
+                return NT_STATUS_OK;
+        }
+
+        /* Store the DOS attributes in an EA. */
+        if (!set_ea_dos_attribute(conn, fsp->fsp_name,
+                                  new_dosmode)) {
+                if (errno == 0) {
+                        errno = EIO;
+                }
+                return map_nt_error_from_unix(errno);
+        }
+
+        notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+                     FILE_NOTIFY_CHANGE_ATTRIBUTES,
+                     fsp->fsp_name->base_name);
+
+        fsp->is_sparse = sparse;
+
+        return NT_STATUS_OK;
+}
+
 /*******************************************************************
  Wrapper around the VFS ntimes that possibly allows DOS semantics rather