summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorDavid O'Neill <dmo@samba.org>2001-01-15 18:36:50 +0000
committerDavid O'Neill <dmo@samba.org>2001-01-15 18:36:50 +0000
commit27922c0430bf28dca910d2a2903cf410a4187643 (patch)
tree155ab8add4ecdfd39a5975d4f99349a8742afde7 /source3/lib
parent99f36944364016c33cc63f6be509fa22b7bba619 (diff)
downloadsamba-27922c0430bf28dca910d2a2903cf410a4187643.tar.gz
samba-27922c0430bf28dca910d2a2903cf410a4187643.tar.bz2
samba-27922c0430bf28dca910d2a2903cf410a4187643.zip
Changes from APPLIANCE_HEAD:
source/rpc_parse/parse_lsa.c - off by one unistr length bug in init_lsa_trans_name() source/lib/util_sid.c - resolve more BUILTIN sid values to names. source/nsswitch/wb_client.c - fix typo in debug message - set errno on error so we don't get bogus value from last failure. source/rpc_server/srv_spoolss_nt.c - add debug to track number of open printer handles for ease of tracking handle leaks in the future. source/rpc_server/srv_lsa.c - fix off-by-one string bug. This was preventing NT from displaying names for well-know SIDs in printer permissions dialog. (This used to be commit 59229b9025cff54cbdd05e374616ffbf9c6fee33)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util_sid.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 94144bbbd1..98d4e77712 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -76,8 +76,14 @@ static known_sid_users nt_authority_users[] = {
{ 18, SID_NAME_ALIAS, "SYSTEM"},
{ 0, (enum SID_NAME_USE)0, NULL}};
-static known_sid_users builtin_users[] = {
- { DOMAIN_USER_RID_ADMIN, SID_NAME_USER, "Administrator" },
+static known_sid_users builtin_groups[] = {
+ { BUILTIN_ALIAS_RID_ADMINS, SID_NAME_ALIAS, "Administrators" },
+ { BUILTIN_ALIAS_RID_USERS, SID_NAME_ALIAS, "Users" },
+ { BUILTIN_ALIAS_RID_GUESTS, SID_NAME_ALIAS, "Guests" },
+ { BUILTIN_ALIAS_RID_ACCOUNT_OPS, SID_NAME_ALIAS, "Account Operators" },
+ { BUILTIN_ALIAS_RID_SYSTEM_OPS, SID_NAME_ALIAS, "Server Operators" },
+ { BUILTIN_ALIAS_RID_PRINT_OPS, SID_NAME_ALIAS, "Print Operators" },
+ { BUILTIN_ALIAS_RID_BACKUP_OPS, SID_NAME_ALIAS, "Backup Operators" },
{ 0, (enum SID_NAME_USE)0, NULL}};
static struct sid_name_map_info
@@ -90,8 +96,7 @@ sid_name_map[] =
{
{ &global_sam_sid, global_myname, NULL},
{ &global_sam_sid, global_myworkgroup, NULL},
- { &global_sid_Builtin, "BUILTIN", NULL},
- { &global_sid_Builtin, "", &builtin_users[0]},
+ { &global_sid_Builtin, "BUILTIN", &builtin_groups[0]},
{ &global_sid_World_Domain, "", &everyone_users[0] },
{ &global_sid_Creator_Owner_Domain, "", &creator_owner_users[0] },
{ &global_sid_NT_Authority, "NT Authority", &nt_authority_users[0] },