1 files changed, 30 insertions, 0 deletions

diff --git a/readconf.c b/readconf.c
index 1df5ce2d9..899ff3f0e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -81,6 +81,8 @@ RCSID("$OpenBSD: readconf.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
      RhostsRSAAuthentication yes
      StrictHostKeyChecking yes
      KeepAlives no
+     ProtocolKeepAlives 0
+     SetupTimeOut 0
      IdentityFile ~/.ssh/identity
      Port 22
      EscapeChar ~
@@ -115,6 +117,7 @@ typedef enum {
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign,
+        oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated
 } OpCodes;
 
@@ -188,6 +191,8 @@ static struct {
         { "clearallforwardings", oClearAllForwardings },
         { "enablesshkeysign", oEnableSSHKeysign },
         { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
+        { "protocolkeepalives", oProtocolKeepAlives },
+        { "setuptimeout", oSetupTimeOut },
         { NULL, oBadOption }
 };
 
@@ -281,6 +286,13 @@ process_config_line(Options *options, const char *host,
         u_short fwd_port, fwd_host_port;
         char sfwd_host_port[6];
 
+        /* Strip trailing whitespace */
+        for(len = strlen(line) - 1; len > 0; len--) {
+                if (strchr(WHITESPACE, line[len]) == NULL)
+                        break;
+                line[len] = '\0';
+        }
+
         s = line;
         /* Get the keyword. (Each line is supposed to begin with a keyword). */
         keyword = strdelim(&s);
@@ -415,6 +427,14 @@ parse_flag:
                 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;
@@ -767,6 +787,8 @@ initialize_options(Options * options)
         options->strict_host_key_checking = -1;
         options->compression = -1;
         options->keepalives = -1;
+        options->protocolkeepalives = -1;
+        options->setuptimeout = -1;
         options->compression_level = -1;
         options->port = -1;
         options->connection_attempts = -1;
@@ -855,6 +877,14 @@ fill_default_options(Options * options)
                 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->compression_level == -1)
                 options->compression_level = 6;
         if (options->port == -1)