sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Fix for uidtoname not returning DOMAIN\name but just name. This caused

Browse Source 
printer_access_check to break in a domain environment.
Jeremy.
(This used to be commit 0fc1a461504f87c145f5f91189bd767989c488f2)
This commit is contained in:
Jeremy Allison 2000-10-25 20:02:25 +00:00
parent 2094856942
commit 7b1cf88670
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/nsswitch/wb_client.c
View File

@ -77,6 +77,7 @@ BOOL winbind_lookup_sid(DOM_SID *sid, fstring dom_name, fstring name, enum SID_N
if (result == NSS_STATUS_SUCCESS) {
parse_domain_user(response.data.name.name, dom_name, name);
*name_type = (enum SID_NAME_USE)response.data.name.type;
DEBUG(10,("winbind_lookup_sid: SUCCESS: SID %s -> %s %s\n", sid_str, dom_name, name ));
}
return (result == NSS_STATUS_SUCCESS);
@ -265,6 +266,8 @@ int winbind_initgroups(char *user, gid_t gid)
result = wb_getgroups(user, &groups);
DEBUG(10,("wb_getgroups: %s: result = %s\n", user, result == NSS_STATUS_SUCCESS ? "SUCCESS" : "FAIL"));
if (result != -1) {
int ngroups = result, i;
BOOL is_member = False;
@ -350,16 +353,18 @@ BOOL winbind_uidtoname(fstring name, uid_t uid)
{
DOM_SID sid;
fstring dom_name;
fstring user_name;
enum SID_NAME_USE name_type;
if (!winbind_uid_to_sid(&sid, uid))
return False;
if (!winbind_lookup_sid(&sid, dom_name, name, &name_type))
if (!winbind_lookup_sid(&sid, dom_name, user_name, &name_type))
return False;
if (name_type != SID_NAME_USER)
return False;
slprintf(name, sizeof(fstring)-1, "%s%s%s", dom_name, lp_winbind_separator(), user_name );
return True;
}
@ -371,16 +376,18 @@ BOOL winbind_gidtoname(fstring name, gid_t gid)
{
DOM_SID sid;
fstring dom_name;
fstring group_name;
enum SID_NAME_USE name_type;
if (!winbind_gid_to_sid(&sid, gid))
return False;
if (!winbind_lookup_sid(&sid, dom_name, name, &name_type))
if (!winbind_lookup_sid(&sid, dom_name, group_name, &name_type))
return False;
if (name_type != SID_NAME_USER)
return False;
slprintf(name, sizeof(fstring)-1, "%s%s%s", dom_name, lp_winbind_separator(), group_name );
return True;
}