From: djm <djm>
Date: Mon, 10 Jul 2000 23:29:50 +0000 (+0000)
Subject:  - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>
X-Git-Tag: ABOUT_TO_ADD_INET_ATON~5
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/132dd316840bcad05dd96336f6cafa8afb85b5a2

 - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>
---

diff --git a/CREDITS b/CREDITS
index 4bcb1ae6..2c7dab97 100644
--- a/CREDITS
+++ b/CREDITS
@@ -60,6 +60,7 @@ Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords
 Tom Bertelson's <tbert@abac.com> - AIX auth fixes
 Tor-Ake Fransson <torake@hotmail.com> - AIX support
 Tudor Bosman <tudorb@jm.nu> - MD5 password support
+Udo Schweigert <ust@cert.siemens.de> - ReliantUNIX support
 Zack Weinberg <zack@wolery.cumb.org> - GNOME askpass enhancement
 
 Apologies to anyone I have missed.
diff --git a/ChangeLog b/ChangeLog
index 5aea81e7..8567d365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20000711
  - (djm) Fixup for AIX getuserattr() support from Tom Bertelson
    <tbert@abac.com>
+ - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>
 
 20000709
  - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
diff --git a/acconfig.h b/acconfig.h
index 4757b66b..4528be67 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,6 +6,9 @@
 
 @TOP@
 
+/* Define if your system choked on IP TOS setting */
+#undef IP_TOS_IS_BROKEN
+
 /* Define if you have the getuserattr function.  */
 #undef HAVE_GETUSERATTR
 
diff --git a/configure.in b/configure.in
index f4f47cd4..52184db5 100644
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,14 @@ case "$host" in
 	CFLAGS="$CFLAGS -DSUNOS4"
 	AC_CHECK_FUNCS(getpwanam)
 	;;
+*-sni-sysv*)
+	CFLAGS="$CFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
+	MANTYPE='$(CATMAN)'
+	AC_DEFINE(IP_TOS_IS_BROKEN)
+	mansubdir=cat
+	LIBS="$LIBS -lgen -lnsl -lsocket -lucb"
+	;;
 *-*-sysv*)
 	CFLAGS="$CFLAGS -I/usr/local/include"
 	LDFLAGS="$LDFLAGS -L/usr/local/lib"
diff --git a/packet.c b/packet.c
index 137d0181..56080cbb 100644
--- a/packet.c
+++ b/packet.c
@@ -1237,7 +1237,7 @@ packet_set_interactive(int interactive, int keepalives)
 		 * Set IP options for an interactive connection.  Use
 		 * IPTOS_LOWDELAY and TCP_NODELAY.
 		 */
-#ifdef IP_TOS
+#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
 		int lowdelay = IPTOS_LOWDELAY;
 		if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &lowdelay,
 		    sizeof(lowdelay)) < 0)
@@ -1251,7 +1251,7 @@ packet_set_interactive(int interactive, int keepalives)
 		 * Set IP options for a non-interactive connection.  Use
 		 * IPTOS_THROUGHPUT.
 		 */
-#ifdef IP_TOS
+#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
 		int throughput = IPTOS_THROUGHPUT;
 		if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput,
 		    sizeof(throughput)) < 0)