JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: passwd/group: rename get_group_name to get_account_name

Browse Source 
The function is the same for user and grou accounts.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-02-13 12:42:56 +01:00
parent 507982af79
commit 09bbcf8788
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
winsup/cygwin/ldap.h
View File

@ -60,8 +60,7 @@ public:
/* User only */ /* User only */
gid_t get_primary_gid () { return get_num_attribute (L"primaryGroupID"); } gid_t get_primary_gid () { return get_num_attribute (L"primaryGroupID"); }
gid_t get_unix_uid () { return get_num_attribute (L"uidNumber"); } gid_t get_unix_uid () { return get_num_attribute (L"uidNumber"); }
/* group only */ PWCHAR get_account_name ()
PWCHAR get_group_name ()
{ return get_string_attribute (L"sAMAccountName"); } { return get_string_attribute (L"sAMAccountName"); }
gid_t get_unix_gid () { return get_num_attribute (L"gidNumber"); } gid_t get_unix_gid () { return get_num_attribute (L"gidNumber"); }
}; };

2
winsup/cygwin/uinfo.cc
View File

@ -1980,7 +1980,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
PWCHAR val; PWCHAR val;
if (cldap->fetch_ad_account (sid, true) if (cldap->fetch_ad_account (sid, true)
&& (val = cldap->get_group_name ())) && (val = cldap->get_account_name ()))
{ {
wcpcpy (name, val); wcpcpy (name, val);
wcpcpy (dom, L"BUILTIN"); wcpcpy (dom, L"BUILTIN");