- (djm) Avoid warnings for missing broken IP_TOS. Patch from Mark Miller

   <markm@swoon.net>

diff --git a/ChangeLog b/ChangeLog
index 91da3447d2bb6d4642e539885c4c036e6eadc163..14bb944a8b766910a3ebc04f089c3f5d03fab41b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,9 @@
  - (djm) Fix PAM fix
  - (djm) Remove 'noreplace' flag from sshd_config in RPM spec files. This
    change is being made as 2.5.x configfiles are not back-compatible with
-  2.3.x.
+   2.3.x.
+ - (djm) Avoid warnings for missing broken IP_TOS. Patch from Mark Miller
+   <markm@swoon.net>
 
 20010226
  - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.

diff --git a/packet.c b/packet.c
index fb431455360c5d49b13eda96deebb27a5c34d2b7..5213e43e898ffee60c39e7abbca46904553faaa8 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1232,8 +1232,10 @@ void
 packet_set_interactive(int interactive)
 {
        static int called = 0;
+#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
        int lowdelay = IPTOS_LOWDELAY;
        int throughput = IPTOS_THROUGHPUT;
+#endif
        int on = 1;
 
        if (called)