- (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI

   prototypes, removal of "register").

2 files changed, 7 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 7114edc57..28ee1d6c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
    Patch from djm@.
  - (dtucker) [configure.ac] Disable pointer-sign warnings on gcc 4.0+
    since they're not useful right now.  Patch from djm@.
+ - (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI
+   prototypes, removal of "register").
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3252,4 +3254,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3959 2005/11/10 03:46:48 dtucker Exp $
+$Id: ChangeLog,v 1.3960 2005/11/10 04:56:44 dtucker Exp $
diff --git a/openbsd-compat/getgrouplist.c b/openbsd-compat/getgrouplist.c
index 59c164f44..2a2b8878b 100644
--- a/openbsd-compat/getgrouplist.c
+++ b/openbsd-compat/getgrouplist.c
@@ -1,5 +1,6 @@
 /* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
 
+/*      $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
 /*
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -33,10 +34,6 @@
 
 #ifndef HAVE_GETGROUPLIST
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * get credential
  */
@@ -46,14 +43,10 @@ static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraad
 #include <grp.h>
 
 int
-getgrouplist(uname, agroup, groups, grpcnt)
-        const char *uname;
-        gid_t agroup;
-        register gid_t *groups;
-        int *grpcnt;
+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
 {
-        register struct group *grp;
-        register int i, ngroups;
+        struct group *grp;
+        int i, ngroups;
         int ret, maxgroups;
         int bail;