wrap new GSSAPI code (from Simon) in #ifdef GSSAPI

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

diff --git a/openssh/openbsd-compat/getgrouplist.c b/openssh/openbsd-compat/getgrouplist.c
index 085cda8c3192c3b9de211eba86692def2a203a82..f7a27c339bb1865439be5b903493fc0ab7ca57cc 100644 (file)
--- a/openssh/openbsd-compat/getgrouplist.c
+++ b/openssh/openbsd-compat/getgrouplist.c
@@ -10,7 +10,11 @@
  * 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. Neither the name of the University nor the names of its contributors
+ * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,7 +36,7 @@
 #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 $";
+static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.7 1997/08/19 19:13:27 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -40,7 +44,6 @@ static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraad
  */
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
 #include <grp.h>
 
 int