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

   1 $DragonFly: src/secure/usr.bin/ssh/Attic/readconf.c.patch,v 1.3 2005/07/11 22:49:45 corecode Exp $
   2 --- readconf.c.orig     2005-03-14 13:08:12.000000000 +0100
   3 +++ readconf.c  2005-07-11 11:01:23.000000000 +0200
   4 @@ -25,6 +25,7 @@
   5  #include "misc.h"
   6  #include "kex.h"
   7  #include "mac.h"
   8 +#include "uidswap.h"
   9
  10  /* Format of the configuration file:
  11
  12 @@ -106,6 +107,7 @@
  13         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
  14         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
  15         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
  16 +       oVersionAddendum,
  17         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
  18         oDeprecated, oUnsupported
  19  } OpCodes;
  20 @@ -194,6 +196,7 @@
  21         { "addressfamily", oAddressFamily },
  22         { "serveraliveinterval", oServerAliveInterval },
  23         { "serveralivecountmax", oServerAliveCountMax },
  24 +       { "versionaddendum", oVersionAddendum },
  25         { "sendenv", oSendEnv },
  26         { "controlpath", oControlPath },
  27         { "controlmaster", oControlMaster },
  28 @@ -772,6 +775,13 @@
  29                 intptr = &options->server_alive_count_max;
  30                 goto parse_int;
  31
  32 +       case oVersionAddendum:
  33 +               ssh_version_set_addendum(strtok(s, "\n"));
  34 +               do {
  35 +                       arg = strdelim(&s);
  36 +               } while (arg != NULL && *arg != '\0');
  37 +               break;
  38 +
  39         case oSendEnv:
  40                 while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
  41                         if (strchr(arg, '=') != NULL)
  42 @@ -988,7 +998,7 @@
  43         if (options->batch_mode == -1)
  44                 options->batch_mode = 0;
  45         if (options->check_host_ip == -1)
  46 -               options->check_host_ip = 1;
  47 +               options->check_host_ip = 0;
  48         if (options->strict_host_key_checking == -1)
  49                 options->strict_host_key_checking = 2;  /* 2 is default */
  50         if (options->compression == -1)