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>
This commit is contained in:
Corinna Vinschen 2015-03-17 15:42:59 +01:00
parent 727be86828
commit 6f93f1d6a5
No known key found for this signature in database
GPG Key ID: F536069DAE444FA0
4 changed files with 9 additions and 7 deletions

View File

@ -1,3 +1,9 @@
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

View File

@ -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;

View File

@ -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);

View File

@ -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