diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/readconf.c b/readconf.c index da49a3944..cd2c81443 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.125 2003/11/12 16:39:58 jakob Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.126 2003/12/09 21:53:36 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -78,7 +78,7 @@ RCSID("$OpenBSD: readconf.c,v 1.125 2003/11/12 16:39:58 jakob Exp $"); | |||
78 | RSAAuthentication yes | 78 | RSAAuthentication yes |
79 | RhostsRSAAuthentication yes | 79 | RhostsRSAAuthentication yes |
80 | StrictHostKeyChecking yes | 80 | StrictHostKeyChecking yes |
81 | KeepAlives no | 81 | TcpKeepAlive no |
82 | IdentityFile ~/.ssh/identity | 82 | IdentityFile ~/.ssh/identity |
83 | Port 22 | 83 | Port 22 |
84 | EscapeChar ~ | 84 | EscapeChar ~ |
@@ -96,7 +96,7 @@ typedef enum { | |||
96 | oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, | 96 | oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, |
97 | oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, | 97 | oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, |
98 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, | 98 | oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, |
99 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, | 99 | oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts, |
100 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, | 100 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, |
101 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 101 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
102 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, | 102 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
@@ -169,7 +169,8 @@ static struct { | |||
169 | { "stricthostkeychecking", oStrictHostKeyChecking }, | 169 | { "stricthostkeychecking", oStrictHostKeyChecking }, |
170 | { "compression", oCompression }, | 170 | { "compression", oCompression }, |
171 | { "compressionlevel", oCompressionLevel }, | 171 | { "compressionlevel", oCompressionLevel }, |
172 | { "keepalive", oKeepAlives }, | 172 | { "tcpkeepalive", oTCPKeepAlive }, |
173 | { "keepalive", oTCPKeepAlive }, /* obsolete */ | ||
173 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, | 174 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, |
174 | { "loglevel", oLogLevel }, | 175 | { "loglevel", oLogLevel }, |
175 | { "dynamicforward", oDynamicForward }, | 176 | { "dynamicforward", oDynamicForward }, |
@@ -427,8 +428,8 @@ parse_yesnoask: | |||
427 | intptr = &options->compression; | 428 | intptr = &options->compression; |
428 | goto parse_flag; | 429 | goto parse_flag; |
429 | 430 | ||
430 | case oKeepAlives: | 431 | case oTCPKeepAlive: |
431 | intptr = &options->keepalives; | 432 | intptr = &options->tcp_keep_alive; |
432 | goto parse_flag; | 433 | goto parse_flag; |
433 | 434 | ||
434 | case oNoHostAuthenticationForLocalhost: | 435 | case oNoHostAuthenticationForLocalhost: |
@@ -826,7 +827,7 @@ initialize_options(Options * options) | |||
826 | options->check_host_ip = -1; | 827 | options->check_host_ip = -1; |
827 | options->strict_host_key_checking = -1; | 828 | options->strict_host_key_checking = -1; |
828 | options->compression = -1; | 829 | options->compression = -1; |
829 | options->keepalives = -1; | 830 | options->tcp_keep_alive = -1; |
830 | options->compression_level = -1; | 831 | options->compression_level = -1; |
831 | options->port = -1; | 832 | options->port = -1; |
832 | options->address_family = -1; | 833 | options->address_family = -1; |
@@ -909,8 +910,8 @@ fill_default_options(Options * options) | |||
909 | options->strict_host_key_checking = 2; /* 2 is default */ | 910 | options->strict_host_key_checking = 2; /* 2 is default */ |
910 | if (options->compression == -1) | 911 | if (options->compression == -1) |
911 | options->compression = 0; | 912 | options->compression = 0; |
912 | if (options->keepalives == -1) | 913 | if (options->tcp_keep_alive == -1) |
913 | options->keepalives = 1; | 914 | options->tcp_keep_alive = 1; |
914 | if (options->compression_level == -1) | 915 | if (options->compression_level == -1) |
915 | options->compression_level = 6; | 916 | options->compression_level = 6; |
916 | if (options->port == -1) | 917 | if (options->port == -1) |