diff options
Diffstat (limited to 'libcli/security/access_check.c')
| -rw-r--r-- | libcli/security/access_check.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c index e7c48cae08..35ee05716e 100644 --- a/libcli/security/access_check.c +++ b/libcli/security/access_check.c @@ -179,6 +179,10 @@ NTSTATUS se_access_check(const struct security_descriptor *sd, bits_remaining)); } +#if (_SAMBA_BUILD_ >= 4) + /* s3 had this with #if 0 previously. To be sure the merge + doesn't change any behaviour, we have the above #if check + on _SAMBA_BUILD_. */ if (access_desired & SEC_FLAG_SYSTEM_SECURITY) { if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) { bits_remaining &= ~SEC_FLAG_SYSTEM_SECURITY; @@ -186,6 +190,7 @@ NTSTATUS se_access_check(const struct security_descriptor *sd, return NT_STATUS_PRIVILEGE_NOT_HELD; } } +#endif /* a NULL dacl allows access */ if ((sd->type & SEC_DESC_DACL_PRESENT) && sd->dacl == NULL) { |