diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2019-02-13 12:42:56 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2019-02-13 12:42:56 +0100 |
| commit | 09bbcf8788692f927b6c07c0ea812e7a5eff3b84 (patch) | |
| tree | 704239c4c8ad1db23f664c9961cc09b0bc81bac9 | |
| parent | 507982af79847f44c763ff70db15104d78174b2e (diff) | |
| download | cygnal-09bbcf8788692f927b6c07c0ea812e7a5eff3b84.tar.gz cygnal-09bbcf8788692f927b6c07c0ea812e7a5eff3b84.tar.bz2 cygnal-09bbcf8788692f927b6c07c0ea812e7a5eff3b84.zip | |
Cygwin: passwd/group: rename get_group_name to get_account_name
The function is the same for user and grou accounts.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/ldap.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/ldap.h b/winsup/cygwin/ldap.h index 993f5100c..4c2437a6f 100644 --- a/winsup/cygwin/ldap.h +++ b/winsup/cygwin/ldap.h @@ -60,8 +60,7 @@ public: /* User only */ gid_t get_primary_gid () { return get_num_attribute (L"primaryGroupID"); } gid_t get_unix_uid () { return get_num_attribute (L"uidNumber"); } - /* group only */ - PWCHAR get_group_name () + PWCHAR get_account_name () { return get_string_attribute (L"sAMAccountName"); } gid_t get_unix_gid () { return get_num_attribute (L"gidNumber"); } }; diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index b70e384f3..681a9f714 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -1980,7 +1980,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) PWCHAR val; if (cldap->fetch_ad_account (sid, true) - && (val = cldap->get_group_name ())) + && (val = cldap->get_account_name ())) { wcpcpy (name, val); wcpcpy (dom, L"BUILTIN"); |