Import of OpenSSH 4.1p1

[gssapi-openssh.git] / openssh / openbsd-compat / bsd-misc.c

diff --git a/openssh/openbsd-compat/bsd-misc.c b/openssh/openbsd-compat/bsd-misc.c
index bc18b09c25643ac61bdb8078bf29edc94606d326..8e49321b4765d51f2a1fa9f89ed9008e77e3ef3e 100644 (file)
--- a/openssh/openbsd-compat/bsd-misc.c
+++ b/openssh/openbsd-compat/bsd-misc.c
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
  *
@@ -19,6 +20,10 @@
 
 RCSID("$Id$");
 
+#ifndef HAVE___PROGNAME
+char *__progname;
+#endif
+
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
  * Otherwise it may get clobbered by setproctitle()
@@ -117,17 +122,6 @@ int truncate(const char *path, off_t length)
 }
 #endif /* HAVE_TRUNCATE */
 
-#if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP)
-/*
- * Cygwin setgroups should be a noop.
- */
-int
-setgroups(size_t size, const gid_t *list)
-{
-       return (0);
-}
-#endif 
-
 #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP)
 int nanosleep(const struct timespec *req, struct timespec *rem)
 {