Add a more friendly way to deal with files that are installed into /etc.
[dragonfly.git] / secure / usr.bin / ssh / readconf.c.patch
1 # $DragonFly: src/secure/usr.bin/ssh/Attic/readconf.c.patch,v 1.2 2004/08/30 21:59:58 geekgod Exp $
2 --- /home/sullrich/openssh-3.9p1/readconf.c     2004-07-17 06:12:08.000000000 +0000
3 +++ readconf.c  2004-08-20 16:35:01.000000000 +0000
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,
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 @@ -753,6 +756,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 @@ -962,7 +972,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)