Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 57 insertions, 36 deletions

diff --git a/readconf.c b/readconf.c
index 0a1788ba0..3af3038bb 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -78,9 +78,7 @@ RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $");
      RSAAuthentication yes
      RhostsRSAAuthentication yes
      StrictHostKeyChecking yes
-     KeepAlives no
-     ProtocolKeepAlives 0
-     SetupTimeOut 0
+     TcpKeepAlive no
      IdentityFile ~/.ssh/identity
      Port 22
      EscapeChar ~
@@ -91,14 +89,14 @@ RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $");
 
 typedef enum {
         oBadOption,
-        oForwardAgent, oForwardX11, oGatewayPorts,
+        oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts,
         oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,
         oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
         oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
-        oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts,
+        oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
         oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,
         oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
@@ -107,6 +105,7 @@ typedef enum {
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
+        oServerAliveInterval, oServerAliveCountMax,
         oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated, oUnsupported
 } OpCodes;
@@ -119,6 +118,7 @@ static struct {
 } keywords[] = {
         { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },
+        { "forwardx11trusted", oForwardX11Trusted },
         { "xauthlocation", oXAuthLocation },
         { "gatewayports", oGatewayPorts },
         { "useprivilegedport", oUsePrivilegedPort },
@@ -171,7 +171,8 @@ static struct {
         { "stricthostkeychecking", oStrictHostKeyChecking },
         { "compression", oCompression },
         { "compressionlevel", oCompressionLevel },
-        { "keepalive", oKeepAlives },
+        { "tcpkeepalive", oTCPKeepAlive },
+        { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },
         { "loglevel", oLogLevel },
         { "dynamicforward", oDynamicForward },
@@ -185,15 +186,13 @@ static struct {
 #endif
         { "clearallforwardings", oClearAllForwardings },
         { "enablesshkeysign", oEnableSSHKeysign },
-#ifdef DNS
         { "verifyhostkeydns", oVerifyHostKeyDNS },
-#else
-        { "verifyhostkeydns", oUnsupported },
-#endif
         { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
         { "rekeylimit", oRekeyLimit },
         { "connecttimeout", oConnectTimeout },
         { "addressfamily", oAddressFamily },
+        { "serveraliveinterval", oServerAliveInterval },
+        { "serveralivecountmax", oServerAliveCountMax },
         { "protocolkeepalives", oProtocolKeepAlives },
         { "setuptimeout", oSetupTimeOut },
         { NULL, oBadOption }
@@ -314,7 +313,7 @@ process_config_line(Options *options, const char *host,
                 /* NOTREACHED */
         case oConnectTimeout:
                 intptr = &options->connection_timeout;
-/* parse_time: */
+parse_time:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
                         fatal("%s line %d: missing time value.",
@@ -347,6 +346,10 @@ parse_flag:
                 intptr = &options->forward_x11;
                 goto parse_flag;
 
+        case oForwardX11Trusted:
+                intptr = &options->forward_x11_trusted;
+                goto parse_flag;
+
         case oGatewayPorts:
                 intptr = &options->gateway_ports;
                 goto parse_flag;
@@ -405,10 +408,11 @@ parse_flag:
 
         case oVerifyHostKeyDNS:
                 intptr = &options->verify_host_key_dns;
-                goto parse_flag;
+                goto parse_yesnoask;
 
         case oStrictHostKeyChecking:
                 intptr = &options->strict_host_key_checking;
+parse_yesnoask:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
                         fatal("%.200s line %d: Missing yes/no/ask argument.",
@@ -430,22 +434,14 @@ parse_flag:
                 intptr = &options->compression;
                 goto parse_flag;
 
-        case oKeepAlives:
-                intptr = &options->keepalives;
+        case oTCPKeepAlive:
+                intptr = &options->tcp_keep_alive;
                 goto parse_flag;
 
         case oNoHostAuthenticationForLocalhost:
                 intptr = &options->no_host_authentication_for_localhost;
                 goto parse_flag;
 
-        case oProtocolKeepAlives:
-                intptr = &options->protocolkeepalives;
-                goto parse_int;
-
-        case oSetupTimeOut:
-                intptr = &options->setuptimeout;
-                goto parse_int;
-
         case oNumberOfPasswordPrompts:
                 intptr = &options->number_of_password_prompts;
                 goto parse_int;
@@ -743,6 +739,19 @@ parse_int:
                 intptr = &options->enable_ssh_keysign;
                 goto parse_flag;
 
+        case oServerAliveInterval:
+        case oProtocolKeepAlives: /* Debian-specific compatibility alias */
+                intptr = &options->server_alive_interval;
+                goto parse_time;
+
+        case oServerAliveCountMax:
+                intptr = &options->server_alive_count_max;
+                goto parse_int;
+
+        case oSetupTimeOut:
+                intptr = &options->setuptimeout;
+                goto parse_int;
+
         case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);
@@ -819,6 +828,7 @@ initialize_options(Options * options)
         memset(options, 'X', sizeof(*options));
         options->forward_agent = -1;
         options->forward_x11 = -1;
+        options->forward_x11_trusted = -1;
         options->xauth_location = NULL;
         options->gateway_ports = -1;
         options->use_privileged_port = -1;
@@ -836,8 +846,7 @@ initialize_options(Options * options)
         options->check_host_ip = -1;
         options->strict_host_key_checking = -1;
         options->compression = -1;
-        options->keepalives = -1;
-        options->protocolkeepalives = -1;
+        options->tcp_keep_alive = -1;
         options->setuptimeout = -1;
         options->compression_level = -1;
         options->port = -1;
@@ -871,6 +880,8 @@ initialize_options(Options * options)
         options->no_host_authentication_for_localhost = - 1;
         options->rekey_limit = - 1;
         options->verify_host_key_dns = -1;
+        options->server_alive_interval = -1;
+        options->server_alive_count_max = -1;
 }
 
 /*
@@ -887,6 +898,8 @@ fill_default_options(Options * options)
                 options->forward_agent = 0;
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
+        if (options->forward_x11_trusted == -1)
+                options->forward_x11_trusted = 0;
         if (options->xauth_location == NULL)
                 options->xauth_location = _PATH_XAUTH;
         if (options->gateway_ports == -1)
@@ -900,7 +913,7 @@ fill_default_options(Options * options)
         if (options->challenge_response_authentication == -1)
                 options->challenge_response_authentication = 1;
         if (options->gss_authentication == -1)
-                options->gss_authentication = 1;
+                options->gss_authentication = 0;
         if (options->gss_deleg_creds == -1)
                 options->gss_deleg_creds = 0;
         if (options->password_authentication == -1)
@@ -919,16 +932,8 @@ fill_default_options(Options * options)
                 options->strict_host_key_checking = 2;  /* 2 is default */
         if (options->compression == -1)
                 options->compression = 0;
-        if (options->keepalives == -1)
-                options->keepalives = 1;
-        if (options->protocolkeepalives == -1){
-          if (options->batch_mode == 1) /*in batch mode, default is 5mins */
-                options->protocolkeepalives = 300;
-          else  options->protocolkeepalives = 0;}
-        if (options->setuptimeout == -1){
-          if (options->batch_mode == 1) /*in batch mode, default is 5mins */
-                options->setuptimeout = 300;
-          else  options->setuptimeout = 0;}
+        if (options->tcp_keep_alive == -1)
+                options->tcp_keep_alive = 1;
         if (options->compression_level == -1)
                 options->compression_level = 6;
         if (options->port == -1)
@@ -991,6 +996,22 @@ fill_default_options(Options * options)
                 options->rekey_limit = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
+        if (options->server_alive_interval == -1) {
+                /* in batch mode, default is 5mins */
+                if (options->batch_mode == 1)
+                        options->server_alive_interval = 300;
+                else
+                        options->server_alive_interval = 0;
+        }
+        if (options->server_alive_count_max == -1)
+                options->server_alive_count_max = 3;
+        if (options->setuptimeout == -1) {
+                /* in batch mode, default is 5mins */
+                if (options->batch_mode == 1)
+                        options->setuptimeout = 300;
+                else
+                        options->setuptimeout = 0;
+        }
         /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */