[newlib-cygwin] Cygwin: passwd/group: rename get_group_name to get_account_name

Corinna Vinschen corinna@sourceware.org
Wed Feb 13 12:18:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=09bbcf8788692f927b6c07c0ea812e7a5eff3b84

commit 09bbcf8788692f927b6c07c0ea812e7a5eff3b84
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Feb 13 12:42:56 2019 +0100

    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>

Diff:
---
 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 993f510..4c2437a 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 b70e384..681a9f7 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");



More information about the Cygwin-cvs mailing list