diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-09-30 02:28:28 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-30 02:28:28 +0000 |
| commit | ace7738e123b28f69c290f9f1de50011d230e14b (patch) | |
| tree | f43c9a10860d164ba2f1384fa3015d67b4464470 | |
| parent | f68825e93371e3d3403167f608d1da0d7ada1a04 (diff) | |
| download | samba-ace7738e123b28f69c290f9f1de50011d230e14b.tar.gz | |
Fix the compile issue in bin/samtest, and make the 'system' token just have the
System sid. This avoids comparing with ACEs that we don't yet support in the
ADS Domain security descriptor.
| -rw-r--r-- | source/lib/util_sid.c | 7 | ||||
| -rw-r--r-- | source/torture/cmd_sam.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c index 9e533eb9fd1..1439471f64b 100644 --- a/source/lib/util_sid.c +++ b/source/lib/util_sid.c @@ -61,7 +61,7 @@ NT_USER_TOKEN anonymous_token = { static DOM_SID system_sid_array[4]; NT_USER_TOKEN system_token = { - 4, + 1, system_sid_array }; @@ -134,10 +134,7 @@ void generate_wellknown_sids(void) sid_copy( &anonymous_token.user_sids[2], &global_sid_Anonymous); /* Create the system token. */ - sid_copy( &system_token.user_sids[0], &global_sid_World); - sid_copy( &system_token.user_sids[1], &global_sid_Authenticated_Users); - sid_copy( &system_token.user_sids[2], &global_sid_Builtin_Administrators); - sid_copy( &system_token.user_sids[3], &global_sid_System); + sid_copy( &system_token.user_sids[0], &global_sid_System); initialised = True; } diff --git a/source/torture/cmd_sam.c b/source/torture/cmd_sam.c index 0cd219cb459..eb8c17f2f96 100644 --- a/source/torture/cmd_sam.c +++ b/source/torture/cmd_sam.c @@ -379,7 +379,7 @@ static NTSTATUS cmd_lookup_account_sid(struct samtest_state *st, TALLOC_CTX *mem return NT_STATUS_INVALID_PARAMETER; } - if (!NT_STATUS_IS_OK(status = context_sam_get_account_by_sid(st->context, st->token, USER_ALL_ACCESS, &sid, &account))) { + if (!NT_STATUS_IS_OK(status = sam_get_account_by_sid(st->context, st->token, USER_ALL_ACCESS, &sid, &account))) { printf("context_sam_get_account_by_sid failed: %s\n", nt_errstr(status)); return status; } @@ -400,7 +400,7 @@ static NTSTATUS cmd_lookup_account_name(struct samtest_state *st, TALLOC_CTX *me } - if (!NT_STATUS_IS_OK(status = context_sam_get_account_by_name(st->context, st->token, USER_ALL_ACCESS, argv[1], argv[2], &account))) { + if (!NT_STATUS_IS_OK(status = sam_get_account_by_name(st->context, st->token, USER_ALL_ACCESS, argv[1], argv[2], &account))) { printf("context_sam_get_account_by_sid failed: %s\n", nt_errstr(status)); return status; } |