Merge 4.0p1 to the trunk.

1 files changed, 12 insertions, 8 deletions

diff --git a/compat.c b/compat.c
index 2fdebe7fa..4086e853e 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.70 2003/11/02 11:01:03 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.71 2005/03/01 10:09:52 djm Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -62,24 +62,28 @@ compat_datafellows(const char *version)
                   "OpenSSH_2.1*,"
                   "OpenSSH_2.2*",       SSH_OLD_SESSIONID|SSH_BUG_BANNER|
                                         SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
-                                        SSH_BUG_EXTEOF},
+                                        SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
                 { "OpenSSH_2.3.0*",     SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES|
                                         SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
-                                        SSH_BUG_EXTEOF},
+                                        SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
                 { "OpenSSH_2.3.*",      SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                        SSH_OLD_FORWARD_ADDR},
                 { "OpenSSH_2.5.0p1*,"
                   "OpenSSH_2.5.1p1*",
                                         SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX|
-                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+                                        SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                        SSH_OLD_FORWARD_ADDR},
                 { "OpenSSH_2.5.0*,"
                   "OpenSSH_2.5.1*,"
                   "OpenSSH_2.5.2*",     SSH_OLD_DHGEX|SSH_BUG_NOREKEY|
-                                        SSH_BUG_EXTEOF},
-                { "OpenSSH_2.5.3*",     SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
+                                        SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
+                { "OpenSSH_2.5.3*",     SSH_BUG_NOREKEY|SSH_BUG_EXTEOF|
+                                        SSH_OLD_FORWARD_ADDR},
                 { "OpenSSH_2.*,"
                   "OpenSSH_3.0*,"
-                  "OpenSSH_3.1*",       SSH_BUG_EXTEOF},
+                  "OpenSSH_3.1*",       SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
+                { "OpenSSH_3.*",        SSH_OLD_FORWARD_ADDR },
                 { "Sun_SSH_1.0*",       SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
                 { "OpenSSH*",           0 },
                 { "*MindTerm*",         0 },