vfs_gpfs: Remove gpfs:prealloc from manpage

[gd/samba-autobuild/.git] / libgpo / gpo_sec.c

diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index c27ca55f977fd6368879d4bb04d191051b4831b0..82887bc7e1909fed2a2dacb06945f2759bf1f823 100644 (file)
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -47,11 +47,15 @@ static bool gpo_sd_check_agp_object_guid(const struct security_ace_object *objec
                                       &ext_right_apg_guid)) {
                                return true;
                        }
+
+                       FALL_THROUGH;
                case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT:
                        if (GUID_equal(&object->inherited_type.inherited_type,
                                       &ext_right_apg_guid)) {
                                return true;
                        }
+
+                       FALL_THROUGH;
                default:
                        break;
        }
@@ -99,16 +103,13 @@ static bool gpo_sd_check_read_access_bits(uint32_t access_mask)
 static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace,
                                               const struct security_token *token)
 {
-       char *sid_str;
-
        if (gpo_sd_check_agp_object(ace) &&
            gpo_sd_check_agp_access_bits(ace->access_mask) &&
-           nt_token_check_sid(&ace->trustee, token)) {
-               sid_str = dom_sid_string(NULL, &ace->trustee);
+           security_token_has_sid(token, &ace->trustee)) {
+               struct dom_sid_buf sid_str;
                DEBUG(10,("gpo_sd_check_ace_denied_object: "
                        "Access denied as of ace for %s\n",
-                       sid_str));
-               talloc_free(sid_str);
+                       dom_sid_str_buf(&ace->trustee, &sid_str)));
                return NT_STATUS_ACCESS_DENIED;
        }
 
@@ -121,17 +122,13 @@ static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace,
 static NTSTATUS gpo_sd_check_ace_allowed_object(const struct security_ace *ace,
                                                const struct security_token *token)
 {
-       char *sid_str;
-
        if (gpo_sd_check_agp_object(ace) &&
            gpo_sd_check_agp_access_bits(ace->access_mask) &&
-           nt_token_check_sid(&ace->trustee, token)) {
-               sid_str = dom_sid_string(NULL, &ace->trustee);
+           security_token_has_sid(token, &ace->trustee)) {
+               struct dom_sid_buf sid_str;
                DEBUG(10,("gpo_sd_check_ace_allowed_object: "
                        "Access granted as of ace for %s\n",
-                       sid_str));
-               talloc_free(sid_str);
-
+                       dom_sid_str_buf(&ace->trustee, &sid_str)));
                return NT_STATUS_OK;
        }