summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog1
-rw-r--r--acconfig.h3
-rw-r--r--configure.in8
-rw-r--r--packet.c4
5 files changed, 15 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 4bcb1ae68..2c7dab97e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -60,6 +60,7 @@ Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords
60Tom Bertelson's <tbert@abac.com> - AIX auth fixes 60Tom Bertelson's <tbert@abac.com> - AIX auth fixes
61Tor-Ake Fransson <torake@hotmail.com> - AIX support 61Tor-Ake Fransson <torake@hotmail.com> - AIX support
62Tudor Bosman <tudorb@jm.nu> - MD5 password support 62Tudor Bosman <tudorb@jm.nu> - MD5 password support
63Udo Schweigert <ust@cert.siemens.de> - ReliantUNIX support
63Zack Weinberg <zack@wolery.cumb.org> - GNOME askpass enhancement 64Zack Weinberg <zack@wolery.cumb.org> - GNOME askpass enhancement
64 65
65Apologies to anyone I have missed. 66Apologies to anyone I have missed.
diff --git a/ChangeLog b/ChangeLog
index 5aea81e79..8567d3659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120000711 120000711
2 - (djm) Fixup for AIX getuserattr() support from Tom Bertelson 2 - (djm) Fixup for AIX getuserattr() support from Tom Bertelson
3 <tbert@abac.com> 3 <tbert@abac.com>
4 - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de>
4 5
520000709 620000709
6 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from 7 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
diff --git a/acconfig.h b/acconfig.h
index 4757b66bc..4528be678 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,6 +6,9 @@
6 6
7@TOP@ 7@TOP@
8 8
9/* Define if your system choked on IP TOS setting */
10#undef IP_TOS_IS_BROKEN
11
9/* Define if you have the getuserattr function. */ 12/* Define if you have the getuserattr function. */
10#undef HAVE_GETUSERATTR 13#undef HAVE_GETUSERATTR
11 14
diff --git a/configure.in b/configure.in
index f4f47cd45..52184db52 100644
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,14 @@ case "$host" in
138 CFLAGS="$CFLAGS -DSUNOS4" 138 CFLAGS="$CFLAGS -DSUNOS4"
139 AC_CHECK_FUNCS(getpwanam) 139 AC_CHECK_FUNCS(getpwanam)
140 ;; 140 ;;
141*-sni-sysv*)
142 CFLAGS="$CFLAGS -I/usr/local/include"
143 LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
144 MANTYPE='$(CATMAN)'
145 AC_DEFINE(IP_TOS_IS_BROKEN)
146 mansubdir=cat
147 LIBS="$LIBS -lgen -lnsl -lsocket -lucb"
148 ;;
141*-*-sysv*) 149*-*-sysv*)
142 CFLAGS="$CFLAGS -I/usr/local/include" 150 CFLAGS="$CFLAGS -I/usr/local/include"
143 LDFLAGS="$LDFLAGS -L/usr/local/lib" 151 LDFLAGS="$LDFLAGS -L/usr/local/lib"
diff --git a/packet.c b/packet.c
index 137d0181a..56080cbb1 100644
--- a/packet.c
+++ b/packet.c
@@ -1237,7 +1237,7 @@ packet_set_interactive(int interactive, int keepalives)
1237 * Set IP options for an interactive connection. Use 1237 * Set IP options for an interactive connection. Use
1238 * IPTOS_LOWDELAY and TCP_NODELAY. 1238 * IPTOS_LOWDELAY and TCP_NODELAY.
1239 */ 1239 */
1240#ifdef IP_TOS 1240#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
1241 int lowdelay = IPTOS_LOWDELAY; 1241 int lowdelay = IPTOS_LOWDELAY;
1242 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &lowdelay, 1242 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &lowdelay,
1243 sizeof(lowdelay)) < 0) 1243 sizeof(lowdelay)) < 0)
@@ -1251,7 +1251,7 @@ packet_set_interactive(int interactive, int keepalives)
1251 * Set IP options for a non-interactive connection. Use 1251 * Set IP options for a non-interactive connection. Use
1252 * IPTOS_THROUGHPUT. 1252 * IPTOS_THROUGHPUT.
1253 */ 1253 */
1254#ifdef IP_TOS 1254#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
1255 int throughput = IPTOS_THROUGHPUT; 1255 int throughput = IPTOS_THROUGHPUT;
1256 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput, 1256 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput,
1257 sizeof(throughput)) < 0) 1257 sizeof(throughput)) < 0)