s4:torture: Use SID constants

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 64977f5a719629df7e8f076ec1660dbc74a9f3bc..6a56514dc540ed8535cb31a46c5d72e433c43603 100644 (file)
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -142,7 +142,7 @@ static bool test_sd(struct torture_context *tctx, struct smbcli_state *cli)
        union smb_setfileinfo set;
        struct security_ace ace = {};
        struct security_descriptor *sd;
-       struct dom_sid *test_sid;
+       const struct dom_sid *test_sid;
 
        if (!torture_setup_dir(cli, BASEDIR))
                return false;
@@ -179,7 +179,7 @@ static bool test_sd(struct torture_context *tctx, struct smbcli_state *cli)
 
        torture_comment(tctx, "add a new ACE to the DACL\n");
 
-       test_sid = dom_sid_parse_talloc(tctx, SID_NT_AUTHENTICATED_USERS);
+       test_sid = &global_sid_Authenticated_Users;
 
        ace.type = SEC_ACE_TYPE_ACCESS_ALLOWED;
        ace.flags = 0;
@@ -231,7 +231,7 @@ static bool test_nttrans_create_ext(struct torture_context *tctx,
        union smb_fileinfo q = {};
        struct security_ace ace;
        struct security_descriptor *sd;
-       struct dom_sid *test_sid;
+       const struct dom_sid *test_sid;
        uint32_t attrib =
            FILE_ATTRIBUTE_HIDDEN |
            FILE_ATTRIBUTE_SYSTEM |
@@ -287,7 +287,7 @@ static bool test_nttrans_create_ext(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
 
        torture_comment(tctx, "adding a new ACE\n");
-       test_sid = dom_sid_parse_talloc(tctx, SID_NT_AUTHENTICATED_USERS);
+       test_sid = &global_sid_Authenticated_Users;
 
        ace.type = SEC_ACE_TYPE_ACCESS_ALLOWED;
        ace.flags = 0;

diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 415f223ef3ffe94f87550202676a1d4b73f20fd4..3b16db30f7ded0b156aa79867c5b1fb309513c9c 100644 (file)
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -2006,7 +2006,7 @@ static bool test_stream_permissions(struct torture_context *tctx,
        ace.type = SEC_ACE_TYPE_ACCESS_DENIED;
        ace.flags = 0;
        ace.access_mask = SEC_FILE_WRITE_DATA;
-       ace.trustee = *dom_sid_parse_talloc(tctx, SID_WORLD);
+       ace.trustee = global_sid_World;
 
        status = security_descriptor_dacl_add(sd, &ace);
        CHECK_STATUS(status, NT_STATUS_OK);