From 09bbcf8788692f927b6c07c0ea812e7a5eff3b84 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 13 Feb 2019 12:42:56 +0100 Subject: 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 --- winsup/cygwin/ldap.h | 3 +-- 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"); -- cgit v1.2.3