From 31044dd8e6419b305779408a4b3b0fbd8eab11b5 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Mon, 30 Nov 1998 15:08:58 +0000 Subject: - adding builtin[alias]db. - lib/sids.c: generate_sam_sid() modified to take a domain name: it now generates "DOMAIN_NAME.SID". reasons: 1) if you run multiple samba servers on the same machine under different netbios names as members of a domain, they won't all use the same SID, which is a _big_ mistake but it would happen _by default_. 2) we have (had) a problem with sid_to_string() and string_to_sid() which cause SIDs to be incorrectly read. one of the major reasons for *NOT* making this change was so as not to disrupt existing users. but as they will be anyway by this bug, we might as well go ahead. - passdb/smbpass.c: wanted to change the meaning of the name in the smbpasswd file to an "nt" name not a "unix" name. this is probably not a good idea: reverted this. - output formatting / bug-fixing in rpcclient query_useraliases code. (This used to be commit e4930f5f48f8246ceec8add8bf769954a963190c) --- source3/lib/domain_namemap.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source3/lib/domain_namemap.c') diff --git a/source3/lib/domain_namemap.c b/source3/lib/domain_namemap.c index 3de5b60785..cc96a014c4 100644 --- a/source3/lib/domain_namemap.c +++ b/source3/lib/domain_namemap.c @@ -273,8 +273,6 @@ static void delete_map_list(ubi_slList *map_list) ***************************************************************************/ static BOOL make_mydomain_sid(DOM_NAME_MAP *grp, DOM_MAP_TYPE type) { - DEBUG(10,("make_mydomain_sid\n")); - if (!map_domain_name_to_sid(&grp->sid, &(grp->nt_domain))) { DEBUG(0,("make_mydomain_sid: unknown domain %s\n", @@ -287,8 +285,10 @@ static BOOL make_mydomain_sid(DOM_NAME_MAP *grp, DOM_MAP_TYPE type) /* * only builtin aliases are recognised in S-1-5-20 */ + DEBUG(10,("make_mydomain_sid: group %s in builtin domain\n", + grp->nt_name)); - if (!lookup_builtin_alias_name(grp->nt_name, "BUILTIN", &grp->sid, &grp->type)) + if (lookup_builtin_alias_name(grp->nt_name, "BUILTIN", &grp->sid, &grp->type) != 0x0) { DEBUG(0,("unix group %s mapped to an unrecognised BUILTIN domain name %s\n", grp->unix_name, grp->nt_name)); @@ -584,9 +584,6 @@ static ubi_slList *load_name_map(DOM_MAP_TYPE type) if (!*unixname) continue; - DEBUG(5,("unixname = %s, ntname = %s.\n", - unixname, nt_name)); - p = strchr(nt_name, '\\'); if (p == NULL) @@ -602,9 +599,11 @@ static ubi_slList *load_name_map(DOM_MAP_TYPE type) fstrcpy(nt_group , p); } - if (make_name_entry(&new_ep, nt_domain, nt_name, unixname, type)) + if (make_name_entry(&new_ep, nt_domain, nt_group, unixname, type)) { ubi_slAddTail(map_list, (ubi_slNode *)new_ep); + DEBUG(5,("unixname = %s, ntname = %s\\%s type = %d\n", + unixname, nt_domain, nt_group, new_ep->grp.type)); } } -- cgit