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

diff --git a/CREDITS b/CREDITS
index 4bcb1ae681be2bf69229020e1ec53a895c76ed4a..2c7dab97ecb8d58fcc0241321146e4518dcce56c 100644 (file)
--- 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 5aea81e798f01348d8883343b6fe3c2b3c3dc218..8567d36597a876e362182855b9aa78dd7c3f3c21 100644 (file)
--- 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 4757b66bcb5c3bf8e49d03a748ef8588f86960cf..4528be6787e478acd46de1e32ef323a8b30f5285 100644 (file)
--- 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 f4f47cd453c938fa704a53876bf2202c7de8e0e9..52184db52c3b1115b4c6b5eb36d6498bf7957f8e 100644 (file)
--- 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 137d0181a19f584e35bc16b38273d2d11d3b2416..56080cbb118c4feb40aa12b917cc28b625bcdbe4 100644 (file)
--- 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)