diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-16 10:05:02 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-16 10:12:18 +1100 |
| commit | 70b020ca7698c30f3c0647f620d690aba7674022 (patch) | |
| tree | a257da906db9670ba90a12ea22a208b6fb9367f8 /source4/ntvfs | |
| parent | 29929a3c463f0e4a0ade9e351ce86ec3bbf59035 (diff) | |
| download | samba-70b020ca7698c30f3c0647f620d690aba7674022.tar.gz samba-70b020ca7698c30f3c0647f620d690aba7674022.tar.bz2 samba-70b020ca7698c30f3c0647f620d690aba7674022.zip | |
s4-pvfs: fixed mask handling for SEC_FLAG_MAXIMUM_ALLOWED
This matches the sec_access_check() code
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 7a204b4d43..4680b17b79 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -517,8 +517,8 @@ NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs, } if (*access_mask & SEC_FLAG_MAXIMUM_ALLOWED) { - *access_mask = max_bits; - return NT_STATUS_OK; + *access_mask |= max_bits; + *access_mask &= ~SEC_FLAG_MAXIMUM_ALLOWED; } if (uid != 0 && (*access_mask & SEC_FLAG_SYSTEM_SECURITY)) { |