This is the mail archive of the cygwin-cvs@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[newlib-cygwin] Drop unused timeoput paramter to internal_getlogin


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

commit 6f93f1d6a54c593ff17415f465f5b351fa8d90cb
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Mar 17 15:42:59 2015 +0100

    Drop unused timeoput paramter to internal_getlogin
    
    	* grp.cc (internal_getgroups): Drop unused timeout parameter.
    	* pwdgrp.h (internal_getgroups): Ditto in prototype.
    	* uinfo.cc (internal_getlogin): Ditto in usage.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/ChangeLog | 6 ++++++
 winsup/cygwin/grp.cc    | 6 +-----
 winsup/cygwin/pwdgrp.h  | 2 +-
 winsup/cygwin/uinfo.cc  | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 97b8104..acc3205 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-17  Corinna Vinschen  <corinna@vinschen.de>
 
+	* grp.cc (internal_getgroups): Drop unused timeout parameter.
+	* pwdgrp.h (internal_getgroups): Ditto in prototype.
+	* uinfo.cc (internal_getlogin): Ditto in usage.
+
+2015-03-17  Corinna Vinschen  <corinna@vinschen.de>
+
 	* spawn.cc (find_exec): Fix a name change in case of a symlink which
 	can be opened as is.
 
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index 5e5f1d8..e1f5e4b 100644
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -552,12 +552,8 @@ endgrent_filtered (void *gr)
   ((gr_ent *) gr)->endgrent ();
 }
 
-/* timeout_ns (in 100ns units) is set to non-0 when called from
-   internal_getlogin.  This restricts fetching of the user's groups at process
-   tree startup to a (hopefully) bearable time.  */
 int
-internal_getgroups (int gidsetsize, gid_t *grouplist, cyg_ldap *pldap,
-		    const DWORD timeout_ns)
+internal_getgroups (int gidsetsize, gid_t *grouplist, cyg_ldap *pldap)
 {
   NTSTATUS status;
   HANDLE tok;
diff --git a/winsup/cygwin/pwdgrp.h b/winsup/cygwin/pwdgrp.h
index fe0cd8b..8a78d30 100644
--- a/winsup/cygwin/pwdgrp.h
+++ b/winsup/cygwin/pwdgrp.h
@@ -28,7 +28,7 @@ extern struct group *internal_getgrsid_from_db (cygpsid &sid);
 extern struct group *internal_getgrgid (gid_t, cyg_ldap * = NULL);
 extern struct group *internal_getgrnam (const char *, cyg_ldap * = NULL);
 
-extern int internal_getgroups (int, gid_t *, cyg_ldap *, const DWORD = 0);
+extern int internal_getgroups (int, gid_t *, cyg_ldap *);
 
 /* These functions are called from mkpasswd/mkgroup via cygwin_internal. */
 void *setpwent_filtered (int enums, PCWSTR enum_tdoms);
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 40e960a..b1025b0 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -125,7 +125,7 @@ internal_getlogin (cygheap_user &user)
   pwd = internal_getpwsid (user.sid (), &cldap);
   pgrp = internal_getgrsid (user.groups.pgsid, &cldap);
   if (!cygheap->pg.nss_cygserver_caching ())
-    internal_getgroups (0, NULL, &cldap, 3000000U); /* 300ms in 100ns units */
+    internal_getgroups (0, NULL, &cldap);
   if (!pwd)
     debug_printf ("user not found in passwd DB");
   else


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]