Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / openbsd-compat / getgrouplist.c

diff --git a/openssh/openbsd-compat/getgrouplist.c b/openssh/openbsd-compat/getgrouplist.c
index f7a27c339bb1865439be5b903493fc0ab7ca57cc..a57d7d3886269490d25415ffea581d78a0be4a79 100644 (file)
--- a/openssh/openbsd-compat/getgrouplist.c
+++ b/openssh/openbsd-compat/getgrouplist.c
@@ -1,3 +1,4 @@
+/*     $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.
@@ -10,11 +11,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,30 +28,25 @@
  * SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */
+
 #include "includes.h"
 
 #ifndef HAVE_GETGROUPLIST
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.7 1997/08/19 19:13:27 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * get credential
  */
 #include <sys/types.h>
 #include <string.h>
+#include <unistd.h>
 #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;