← Back to branch summary

~ubuntu-branches/ubuntu/utopic/samba/utopic

« back to all changes in this revision

Viewing changes to source3/smbd/file_access.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-02-21 09:06:34 UTC
  • mfrom: (0.39.23 sid)
  • Revision ID: package-import@ubuntu.com-20120221090634-svd7q7m33pfz0847
Tags: 2:3.6.3-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module.
* Dropped:
  - debian/patches/fix-samba-printer-browsing.patch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source3/smbd/file_access.c
44
44
                return true;
45
45
        }
46
46
 
 
47
        if (access_mask == DELETE_ACCESS &&
 
48
                        VALID_STAT(smb_fname->st) &&
 
49
                        S_ISLNK(smb_fname->st.st_ex_mode)) {
 
50
                /* We can always delete a symlink. */
 
51
                return true;
 
52
        }
 
53
 
47
54
        status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
48
55
                                    (SECINFO_OWNER |
49
56
                                     SECINFO_GROUP |
130
137
        /* sticky bit means delete only by owner of file or by root or
131
138
         * by owner of directory. */
132
139
        if (smb_fname_parent->st.st_ex_mode & S_ISVTX) {
133
 
                if(SMB_VFS_STAT(conn, smb_fname) != 0) {
134
 
                        if (errno == ENOENT) {
135
 
                                /* If the file doesn't already exist then
136
 
                                 * yes we'll be able to delete it. */
137
 
                                ret = true;
138
 
                                goto out;
139
 
                        }
140
 
                        DEBUG(10,("can_delete_file_in_directory: can't "
141
 
                                  "stat file %s (%s)",
142
 
                                  smb_fname_str_dbg(smb_fname),
143
 
                                  strerror(errno) ));
144
 
                        ret = false;
 
140
                if (!VALID_STAT(smb_fname->st)) {
 
141
                        /* If the file doesn't already exist then
 
142
                         * yes we'll be able to delete it. */
 
143
                        ret = true;
145
144
                        goto out;
146
145
                }
147
146