The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / compat.c

diff --git a/openssh/compat.c b/openssh/compat.c
index b3960b506fd50e4b3c0ddac8e241750edf088c58..0b3df86428f5c4f407387327f1fc4920ca93eb53 100644 (file)
--- a/openssh/compat.c
+++ b/openssh/compat.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -23,11 +24,16 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.66 2003/04/01 10:31:26 markus Exp $");
 
+#include <sys/types.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "xmalloc.h"
 #include "buffer.h"
 #include "packet.h"
-#include "xmalloc.h"
 #include "compat.h"
 #include "log.h"
 #include "match.h"
@@ -62,34 +68,31 @@ 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_OLD_GSSAPI},
+                                       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},
-               { "OpenSSH_2.9p*",      SSH_OLD_GSSAPI },
+                                       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|SSH_BUG_GSS_EMPTYUSER|
-                                       SSH_BUG_GSSAPI_BER},
-               { "OpenSSH_3.2*,"
-                 "OpenSSH_3.3*,"
-                 "OpenSSH_3.4*,"
-                 "OpenSSH_3.5*,"
-                 "OpenSSH_3.6.1*",     SSH_BUG_GSSAPI_BER},
+                 "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 },
+               { "OpenSSH_4*",         0 },
+               { "OpenSSH*",           SSH_NEW_OPENSSH },
                { "*MindTerm*",         0 },
                { "2.1.0*",             SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                        SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
@@ -131,7 +134,8 @@ compat_datafellows(const char *version)
                { "2.3.*",              SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5|
                                        SSH_BUG_FIRSTKEX },
                { "2.4",                SSH_OLD_SESSIONID },    /* Van Dyke */
-               { "2.*",                SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX },
+               { "2.*",                SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX|
+                                       SSH_BUG_RFWD_ADDR },
                { "3.0.*",              SSH_BUG_DEBUG },
                { "3.0 SecureCRT*",     SSH_OLD_SESSIONID },
                { "1.7 SecureFX*",      SSH_OLD_SESSIONID },
@@ -139,12 +143,9 @@ compat_datafellows(const char *version)
                  "1.2.19*,"
                  "1.2.20*,"
                  "1.2.21*,"
-                 "1.2.22*",            SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
+                 "1.2.22*",            SSH_BUG_IGNOREMSG },
                { "1.3.2*",             /* F-Secure */
-                                       SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
-               { "1.2.1*,"
-                 "1.2.2*,"
-                 "1.2.3*",             SSH_BUG_K5USER },
+                                       SSH_BUG_IGNOREMSG },
                { "*SSH Compatible Server*",                    /* Netscreen */
                                        SSH_BUG_PASSWORDPAD },
                { "*OSU_0*,"
@@ -169,6 +170,15 @@ compat_datafellows(const char *version)
                    strlen(check[i].pat), 0) == 1) {
                        debug("match: %s pat %s", version, check[i].pat);
                        datafellows = check[i].bugs;
+                       /* Check to see if the remote side is OpenSSH and not HPN */
+                       if(strstr(version,"OpenSSH") != NULL)
+                       {
+                               if (strstr(version,"hpn") == NULL)
+                               {
+                                       datafellows |= SSH_BUG_LARGEWINDOW;
+                                       debug("Remote is NON-HPN aware");
+                               }
+                       }
                        return;
                }
        }
@@ -196,7 +206,7 @@ proto_spec(const char *spec)
                        ret |= SSH_PROTO_2;
                        break;
                default:
-                       log("ignoring bad proto spec: '%s'.", p);
+                       logit("ignoring bad proto spec: '%s'.", p);
                        break;
                }
        }