diff options
| author | des <des@FreeBSD.org> | 2002-06-29 10:51:56 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-29 10:51:56 +0000 |
| commit | 2d6cae03f17019300424e86d8b093c55ed79c305 (patch) | |
| tree | 669f9e631122de923df645f3f78a1f051c9d2218 /crypto/openssh/readconf.c | |
| parent | a56e989df507678554319c1aab75a3ff04601696 (diff) | |
| download | FreeBSD-src-2d6cae03f17019300424e86d8b093c55ed79c305.zip FreeBSD-src-2d6cae03f17019300424e86d8b093c55ed79c305.tar.gz | |
Apply FreeBSD's configuration defaults.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/readconf.c')
| -rw-r--r-- | crypto/openssh/readconf.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 80d99fe..d45df25 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -13,6 +13,7 @@ #include "includes.h" RCSID("$OpenBSD: readconf.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $"); +RCSID("$FreeBSD$"); #include "ssh.h" #include "xmalloc.h" @@ -114,6 +115,7 @@ typedef enum { oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oVersionAddendum, oDeprecated } OpCodes; @@ -186,6 +188,7 @@ static struct { { "smartcarddevice", oSmartcardDevice }, { "clearallforwardings", oClearAllForwardings }, { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, + { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } }; @@ -669,6 +672,13 @@ parse_int: *intptr = value; break; + case oVersionAddendum: + ssh_version_set_addendum(strtok(s, "\n")); + do { + arg = strdelim(&s); + } while (arg != NULL && *arg != '\0'); + break; + case oDeprecated: debug("%s line %d: Deprecated option \"%s\"", filename, linenum, keyword); @@ -846,7 +856,7 @@ fill_default_options(Options * options) if (options->batch_mode == -1) options->batch_mode = 0; if (options->check_host_ip == -1) - options->check_host_ip = 1; + options->check_host_ip = 0; if (options->strict_host_key_checking == -1) options->strict_host_key_checking = 2; /* 2 is default */ if (options->compression == -1) |
