secure/usr.bin/ssh/readconf.c.patch

   1 $DragonFly: src/secure/usr.bin/ssh/Attic/readconf.c.patch,v 1.1 2004/07/31 20:05:00 geekgod Exp $
   2 --- readconf.c.orig     2004-03-08 13:12:36.000000000 +0100
   3 +++ readconf.c  2004-07-23 13:16:14.000000000 +0200
   4 @@ -106,6 +106,7 @@
   5         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
   6         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
   7         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
   8 +       oVersionAddendum,
   9         oDeprecated, oUnsupported
  10  } OpCodes;
  11
  12 @@ -193,6 +194,7 @@
  13         { "addressfamily", oAddressFamily },
  14         { "serveraliveinterval", oServerAliveInterval },
  15         { "serveralivecountmax", oServerAliveCountMax },
  16 +       { "versionaddendum", oVersionAddendum },
  17         { NULL, oBadOption }
  18  };
  19
  20 @@ -749,6 +751,13 @@
  21                 intptr = &options->server_alive_count_max;
  22                 goto parse_int;
  23
  24 +       case oVersionAddendum:
  25 +               ssh_version_set_addendum(strtok(s, "\n"));
  26 +               do {
  27 +                       arg = strdelim(&s);
  28 +               } while (arg != NULL && *arg != '\0');
  29 +               break;
  30 +
  31         case oDeprecated:
  32                 debug("%s line %d: Deprecated option \"%s\"",
  33                     filename, linenum, keyword);
  34 @@ -924,7 +933,7 @@
  35         if (options->batch_mode == -1)
  36                 options->batch_mode = 0;
  37         if (options->check_host_ip == -1)
  38 -               options->check_host_ip = 1;
  39 +               options->check_host_ip = 0;
  40         if (options->strict_host_key_checking == -1)
  41                 options->strict_host_key_checking = 2;  /* 2 is default */
  42         if (options->compression == -1)