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 | 6b1367a7bcd23bf7d56f20647a806840ecc09882 (patch) | |
| tree | 47489c16d82f28b01e256a0d6cb992ffb9820b3c | |
| parent | 49cd08fdb80c3b0fa970e24cc473050fba43bf77 (diff) | |
| download | samba-6b1367a7bcd23bf7d56f20647a806840ecc09882.tar.gz samba-6b1367a7bcd23bf7d56f20647a806840ecc09882.tar.bz2 samba-6b1367a7bcd23bf7d56f20647a806840ecc09882.zip | |
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.
(This used to be commit ace7738e123b28f69c290f9f1de50011d230e14b)
| -rw-r--r-- | source3/lib/util_sid.c | 7 | ||||
| -rw-r--r-- | source3/torture/cmd_sam.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 9e533eb9fd..1439471f64 100644 --- a/source3/lib/util_sid.c +++ b/source3/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/source3/torture/cmd_sam.c b/source3/torture/cmd_sam.c index 0cd219cb45..eb8c17f2f9 100644 --- a/source3/torture/cmd_sam.c +++ b/source3/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; } |