diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-27 12:19:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:08 +1000 |
| commit | cbd72ab93bc35aa71a55b190cd999dda4106be07 (patch) | |
| tree | 72327385378a4efdd39c2a4f46b096f33a5b11cc /source3 | |
| parent | 33ce8633d6a5e5cc54209c92397025114f0a46ea (diff) | |
| download | samba-cbd72ab93bc35aa71a55b190cd999dda4106be07.tar.gz samba-cbd72ab93bc35aa71a55b190cd999dda4106be07.tar.bz2 samba-cbd72ab93bc35aa71a55b190cd999dda4106be07.zip | |
libcli/security Don't export privs[] as a global variable
Instead, provide access functions for the LSA and net sam callers
for the information they need.
They still only enumerate the first 8 privileges that have traditionally
been exposed.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 7 | ||||
| -rw-r--r-- | source3/utils/net_sam.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index 6eee899530..c787502a35 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -39,8 +39,6 @@ #define MAX_LOOKUP_SIDS 0x5000 /* 20480 */ -extern PRIVS privs[]; - enum lsa_handle_type { LSA_HANDLE_POLICY_TYPE = 1, LSA_HANDLE_ACCOUNT_TYPE }; struct lsa_info { @@ -1454,7 +1452,6 @@ NTSTATUS _lsa_EnumPrivs(struct pipes_struct *p, uint32 enum_context = *r->in.resume_handle; int num_privs = num_privileges_in_short_list(); struct lsa_PrivEntry *entries = NULL; - struct lsa_LUIDAttribute luid; /* remember that the enum_context starts at 0 and not 1 */ @@ -1495,9 +1492,9 @@ NTSTATUS _lsa_EnumPrivs(struct pipes_struct *p, entries[i].luid.high = 0; } else { - init_lsa_StringLarge(&entries[i].name, privs[i].name); + init_lsa_StringLarge(&entries[i].name, sec_privilege_name_from_index(i)); - entries[i].luid.low = get_privilege_luid( &privs[i].privilege_mask ); + entries[i].luid.low = sec_privilege_from_index(i); entries[i].luid.high = 0; } } diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index 99eac045e0..6a9e261ea0 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -631,8 +631,6 @@ static int net_sam_policy(struct net_context *c, int argc, const char **argv) return net_run_function(c, argc, argv, "net sam policy", func); } -extern PRIVS privs[]; - static int net_sam_rights_list(struct net_context *c, int argc, const char **argv) { @@ -647,10 +645,10 @@ static int net_sam_rights_list(struct net_context *c, int argc, if (argc == 0) { int i; - int num = count_all_privileges(); + int num = num_privileges_in_short_list(); for (i=0; i<num; i++) { - d_printf("%s\n", privs[i].name); + d_printf("%s\n", sec_privilege_name_from_index(i)); } return 0; } |