diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-04-09 11:46:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:33 -0500 |
| commit | 83e11ba86c2401ece3c845fd10c22b84e6be7811 (patch) | |
| tree | 4441dcc906c860effaadcf6e730245ef10626103 /source3/utils | |
| parent | 16167208cfb5d8f995126a4af98911240d58e007 (diff) | |
| download | samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.gz samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.tar.bz2 samba-83e11ba86c2401ece3c845fd10c22b84e6be7811.zip | |
r6263: Get rid of generate_wellknown_sids, they are const static and initializable
statically.
Volker
(This used to be commit 3493d9f383567d286e69c0e60c0708ed400a04d9)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 14 | ||||
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index ca9470c865..6e884c24df 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1909,7 +1909,6 @@ rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name, NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0; struct acct_info *groups; - DOM_SID global_sid_Builtin; BOOL global = False; BOOL local = False; BOOL builtin = False; @@ -1931,8 +1930,6 @@ rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name, builtin = True; } - string_to_sid(&global_sid_Builtin, "S-1-5-32"); - /* Get sam policy handle */ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, @@ -3278,7 +3275,6 @@ rpc_aliaslist_internals(const DOM_SID *domain_sid, const char *domain_name, { NTSTATUS result; POLICY_HND connect_pol; - DOM_SID global_sid_Builtin; result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); @@ -3286,8 +3282,6 @@ rpc_aliaslist_internals(const DOM_SID *domain_sid, const char *domain_name, if (!NT_STATUS_IS_OK(result)) goto done; - string_to_sid(&global_sid_Builtin, "S-1-5-32"); - result = rpc_fetch_domain_aliases(cli, mem_ctx, &connect_pol, &global_sid_Builtin); @@ -3304,14 +3298,6 @@ rpc_aliaslist_internals(const DOM_SID *domain_sid, const char *domain_name, static void init_user_token(NT_USER_TOKEN *token, DOM_SID *user_sid) { - DOM_SID global_sid_World; - DOM_SID global_sid_Network; - DOM_SID global_sid_Authenticated_Users; - - string_to_sid(&global_sid_World, "S-1-1-0"); - string_to_sid(&global_sid_Network, "S-1-5-2"); - string_to_sid(&global_sid_Authenticated_Users, "S-1-5-11"); - token->num_sids = 4; token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4); diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 3ddfc5c9d9..fa38004fe6 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -24,8 +24,6 @@ #include "includes.h" #include "utils/net.h" -extern DOM_SID global_sid_Builtin; - static void display_group_mem_info(uint32 rid, SAM_GROUP_MEM_INFO *g) { int i; |