6496972 misleading error message is printed if X11 forwarding setup fails

6504798 ssh fails for users when ngroups_max=32
6631713 ssh-socks5-proxy-connect is too greedy during initial negotiation
6635397 remove bsd-nextstep files from SunSSH

--HG--
rename : usr/src/cmd/ssh/include/bsd-nextstep.h => deleted_files/usr/src/cmd/ssh/include/bsd-nextstep.h
rename : usr/src/cmd/ssh/libopenbsd-compat/common/bsd-nextstep.c => deleted_files/usr/src/cmd/ssh/libopenbsd-compat/common/bsd-nextstep.c

4 files changed, 8 insertions, 82 deletions

diff --git a/usr/src/cmd/ssh/include/bsd-nextstep.h b/usr/src/cmd/ssh/include/bsd-nextstep.h
deleted file mode 100644
index 4aa776ee6e..0000000000
--- a/usr/src/cmd/ssh/include/bsd-nextstep.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef	_BSD_NEXTSTEP_H
-#define	_BSD_NEXTSTEP_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* $Id: bsd-nextstep.h,v 1.6 2001/03/19 13:42:22 mouring Exp $ */
-
-#ifdef HAVE_NEXT
-#include <sys/dir.h>
-
-/* NGROUPS_MAX is behind -lposix.  Use the BSD version which is NGROUPS */
-#undef NGROUPS_MAX
-#define NGROUPS_MAX NGROUPS
-
-/* NeXT's readdir() is BSD (struct direct) not POSIX (struct dirent) */
-#define dirent direct
-
-/* Swap out NeXT's BSD wait() for a more POSIX complient one */
-pid_t posix_wait(int *status);
-#define wait(a) posix_wait(a)
-
-/* #ifdef wrapped functions that need defining for clean compiling */
-pid_t getppid(void);
-void vhangup(void);
-int innetgr(const char *netgroup, const char *host, const char *user, 
-            const char *domain);
-
-/* TERMCAP */
-int tcgetattr(int fd, struct termios *t);
-int tcsetattr(int fd, int opt, const struct termios *t);
-int tcsetpgrp(int fd, pid_t pgrp);
-speed_t cfgetospeed(const struct termios *t);
-speed_t cfgetispeed(const struct termios *t);
-int cfsetospeed(struct termios *t, int speed);
-int cfsetispeed(struct termios *t, int speed);
-#endif /* HAVE_NEXT */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BSD_NEXTSTEP_H */
diff --git a/usr/src/cmd/ssh/include/config.h b/usr/src/cmd/ssh/include/config.h
index a2a524204b..8c76573868 100644
--- a/usr/src/cmd/ssh/include/config.h
+++ b/usr/src/cmd/ssh/include/config.h
@@ -82,9 +82,6 @@ extern "C" {
 /* Define if you have a broken realpath. */
 /* #undef BROKEN_REALPATH */
 
-/* Define if you are on NeXT */
-/* #undef HAVE_NEXT */
-
 /* Define if you are on NEWS-OS */
 /* #undef HAVE_NEWS4 */
 
diff --git a/usr/src/cmd/ssh/include/defines.h b/usr/src/cmd/ssh/include/defines.h
index 4b8bbebed6..893cc902fc 100644
--- a/usr/src/cmd/ssh/include/defines.h
+++ b/usr/src/cmd/ssh/include/defines.h
@@ -78,11 +78,14 @@ enum
 # define STDERR_FILENO   2
 #endif
 
-#ifndef NGROUPS_MAX	/* Disable groupaccess if NGROUP_MAX is not set */
-#ifdef NGROUPS
-#define NGROUPS_MAX NGROUPS
+/* Disable groupaccess if NGROUPS_UMAX, NGROUPS_MAX and NGROUPS are not set */
+#ifndef NGROUPS_UMAX
+#ifdef NGROUPS_MAX
+#define NGROUPS_UMAX NGROUPS_MAX
+#elif defined(NGROUPS)
+#define NGROUPS_UMAX NGROUPS
 #else
-#define NGROUPS_MAX 0
+#define NGROUPS_UMAX 0
 #endif
 #endif
 
diff --git a/usr/src/cmd/ssh/include/includes.h b/usr/src/cmd/ssh/include/includes.h
index 308b581e15..bc18be79c9 100644
--- a/usr/src/cmd/ssh/include/includes.h
+++ b/usr/src/cmd/ssh/include/includes.h
@@ -24,7 +24,7 @@ extern "C" {
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -79,9 +79,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_MAILLOCK_H
 # include <maillock.h> /* For _PATH_MAILDIR */
 #endif
-#ifdef HAVE_NEXT
-#  include <libc.h>
-#endif
 #include <unistd.h> /* For STDIN_FILENO, etc */
 #include <termios.h> /* Struct winsize */
 
@@ -182,7 +179,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include "version.h"
 #include "openbsd-compat.h"
 #include "bsd-cygwin_util.h"
-#include "bsd-nextstep.h"
 
 #include "entropy.h"
 #include "g11n.h"