summary refs log tree commit diff
path: root/grp
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-24 17:43:22 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-24 17:43:22 +0000
commitd47aac39992cb1dd705d8c584f4d3979d7ce4602 (patch)
tree00f122d0949ace189446bb9e8f4939ce170dcfde /grp
parente951d34052a3e76fa3045de7b9368e65115b1345 (diff)
downloadglibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.tar.gz
glibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.tar.xz
glibc-d47aac39992cb1dd705d8c584f4d3979d7ce4602.zip
Update.
1998-06-24  Ulrich Drepper  <drepper@cygnus.com>

	* manager.c (pthread_free): Undo patch from 980430.
	Reported by David Wragg <dpw@doc.ic.ac.uk>.
Diffstat (limited to 'grp')
-rw-r--r--grp/initgroups.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/grp/initgroups.c b/grp/initgroups.c
index 2150fa968c..f42c92db9a 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -60,7 +60,7 @@ compat_call (service_user *nip, const char *user, gid_t group, long int *start,
   end_function endgrent_fct;
 
   setgrent_fct = __nss_lookup_function (nip, "setgrent");
-  status = (*setgrent_fct) ();
+  status = _CALL_DL_FCT (setgrent_fct, ());
   if (status != NSS_STATUS_SUCCESS)
     return status;
 
@@ -71,9 +71,10 @@ compat_call (service_user *nip, const char *user, gid_t group, long int *start,
 
   do
     {
-      while ((status =
-	      (*getgrent_fct) (&grpbuf, tmpbuf, buflen, errnop)) ==
-	     NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
+      while ((status = _CALL_DL_FCT (getgrent_fct,
+				     (&grpbuf, tmpbuf, buflen, errnop)),
+	      status == NSS_STATUS_TRYAGAIN)
+	     && *errnop == ERANGE)
         {
           buflen *= 2;
           tmpbuf = __alloca (buflen);
@@ -114,7 +115,7 @@ compat_call (service_user *nip, const char *user, gid_t group, long int *start,
   while (status == NSS_STATUS_SUCCESS);
 
  done:
-  (*endgrent_fct) ();
+  _CALL_DL_FCT (endgrent_fct, ());
 
   return NSS_STATUS_SUCCESS;
 }
@@ -177,8 +178,8 @@ initgroups (user, group)
 	status = compat_call (nip, user, group, &start, &size, groups,
 			      limit, &errno);
       else
-	status = (*fct) (user, group, &start, &size, groups, limit,
-			 &errno);
+	status = _CALL_DL_FCT (fct, (user, group, &start, &size, groups, limit,
+				     &errno));
 
       if (nip->next == NULL)
 	no_more = -1;