- (dtucker) [canohost.c] Bug #336: Only check ip options if IP_OPTIONS is

   defined (fixes compile error on really old Linuxes).

diff --git a/ChangeLog b/ChangeLog
index eda970da41b006db838fbd7ca4e4b79098908b55..f96f07978f0303d60ce7127b18315f35f625a8a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030807
  - (dtucker) [session.c] Have session_break_req not attempt to send a break
    if TIOCSBRK and TIOCCBRK are not defined (eg Cygwin).
+ - (dtucker) [canohost.c] Bug #336: Only check ip options if IP_OPTIONS is
+   defined (eg really old Linux).
 
 20030802
  - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags.

diff --git a/canohost.c b/canohost.c
index 533f2c24af3f450bdb0db578cb06ebf358fdefd6..438175f768666c01178861060244b2227e6c8bef 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -159,6 +159,7 @@ get_remote_hostname(int socket, int use_dns)
 static void
 check_ip_options(int socket, char *ipaddr)
 {
+#ifdef IP_OPTIONS
        u_char options[200];
        char text[sizeof(options) * 3 + 1];
        socklen_t option_size;
@@ -181,6 +182,7 @@ check_ip_options(int socket, char *ipaddr)
                packet_disconnect("Connection from %.100s with IP options:%.800s",
                    ipaddr, text);
        }
+#endif /* IP_OPTIONS */
 }
 
 /*