summaryrefslogtreecommitdiff
path: root/libgpo
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-21 12:20:37 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-04-21 12:20:37 +0200
commit1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5 (patch)
tree753f1ec342fd54793e6ab795ef0064cb4f2e48e2 /libgpo
parentf128bfd44988a4db90222e7d5af5ab94337a065d (diff)
parent9b044be82906b651a70085898809bac0e77d832a (diff)
downloadsamba-1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5.tar.gz
samba-1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5.tar.bz2
samba-1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'libgpo')
-rw-r--r--libgpo/gpo_sec.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index 5547f1e0cb..f20746422c 100644
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -80,11 +80,7 @@ static bool gpo_sd_check_agp_object(const struct security_ace *ace)
static bool gpo_sd_check_agp_access_bits(uint32_t access_mask)
{
-#if _SAMBA_BUILD_ == 4
return (access_mask & SEC_ADS_CONTROL_ACCESS);
-#else
- return (access_mask & SEC_RIGHTS_EXTENDED);
-#endif
}
#if 0