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

   defined (fixes compile error on really old Linuxes).

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d3d879fe..0f2f798e1 100644
--- 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.
@@ -789,4 +791,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2880 2003/08/07 03:24:24 dtucker Exp $
+$Id: ChangeLog,v 1.2881 2003/08/07 03:29:04 dtucker Exp $
diff --git a/canohost.c b/canohost.c
index 533f2c24a..438175f76 100644
--- 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 */
 }
 
 /*