← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libcli/security/access_check.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:
libcli/security/access_check.c
158
158
{
159
159
        uint32_t i;
160
160
        uint32_t bits_remaining;
 
161
        uint32_t explicitly_denied_bits = 0;
161
162
 
162
163
        *access_granted = access_desired;
163
164
        bits_remaining = access_desired;
232
233
                        break;
233
234
                case SEC_ACE_TYPE_ACCESS_DENIED:
234
235
                case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
235
 
                        if (bits_remaining & ace->access_mask) {
236
 
                                return NT_STATUS_ACCESS_DENIED;
237
 
                        }
 
236
                        explicitly_denied_bits |= (bits_remaining & ace->access_mask);
238
237
                        break;
239
238
                default:        /* Other ACE types not handled/supported */
240
239
                        break;
241
240
                }
242
241
        }
243
242
 
 
243
        bits_remaining |= explicitly_denied_bits;
 
244
 
244
245
done:
245
246
        if (bits_remaining != 0) {
246
247
                *access_granted = bits_remaining;