selftest: Run samba.tests.dns in :local environment so it can access credentials

[obnox/samba/samba-obnox.git] / libgpo / gpo_sec.c

diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index 05b011b81d3890cccb0763670f06cbb8d201c4a6..af73697e56e8ae32523d05916693c3787264de0c 100644 (file)
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -22,12 +22,6 @@
 #include "../libgpo/gpo.h"
 #include "auth.h"
 #include "../librpc/ndr/libndr.h"
-#if _SAMBA_BUILD_ == 4
-#include "libgpo/ads_convenience.h"
-#include "librpc/gen_ndr/security.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "../libcli/security/secace.h"
-#endif
 
 /****************************************************************
 ****************************************************************/
@@ -53,11 +47,13 @@ static bool gpo_sd_check_agp_object_guid(const struct security_ace_object *objec
                                       &ext_right_apg_guid)) {
                                return true;
                        }
+                       /* FALL TROUGH */
                case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT:
                        if (GUID_equal(&object->inherited_type.inherited_type,
                                       &ext_right_apg_guid)) {
                                return true;
                        }
+                       /* FALL TROUGH */
                default:
                        break;
        }
@@ -109,7 +105,7 @@ static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace,
 
        if (gpo_sd_check_agp_object(ace) &&
            gpo_sd_check_agp_access_bits(ace->access_mask) &&
-           nt_token_check_sid(&ace->trustee, token)) {
+           security_token_has_sid(token, &ace->trustee)) {
                sid_str = dom_sid_string(NULL, &ace->trustee);
                DEBUG(10,("gpo_sd_check_ace_denied_object: "
                        "Access denied as of ace for %s\n",
@@ -131,7 +127,7 @@ static NTSTATUS gpo_sd_check_ace_allowed_object(const struct security_ace *ace,
 
        if (gpo_sd_check_agp_object(ace) &&
            gpo_sd_check_agp_access_bits(ace->access_mask) &&
-           nt_token_check_sid(&ace->trustee, token)) {
+           security_token_has_sid(token, &ace->trustee)) {
                sid_str = dom_sid_string(NULL, &ace->trustee);
                DEBUG(10,("gpo_sd_check_ace_allowed_object: "
                        "Access granted as of ace for %s\n",