- markus@cvs.openbsd.org 2002/06/20 23:05:56

     [servconf.c servconf.h session.c sshd.c]
     allow Compression=yes/no in sshd_config

1 files changed, 10 insertions, 2 deletions

diff --git a/servconf.c b/servconf.c
index 7a776ac8e..b7f941ab5 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.110 2002/05/15 21:56:38 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.111 2002/06/20 23:05:55 markus Exp $");
 
 #if defined(KRB4)
 #include <krb.h>
@@ -102,6 +102,7 @@ initialize_server_options(ServerOptions *options)
         options->challenge_response_authentication = -1;
         options->permit_empty_passwd = -1;
         options->use_login = -1;
+        options->compression = -1;
         options->allow_tcp_forwarding = -1;
         options->num_allow_users = 0;
         options->num_deny_users = 0;
@@ -224,6 +225,8 @@ fill_default_server_options(ServerOptions *options)
                 options->permit_empty_passwd = 0;
         if (options->use_login == -1)
                 options->use_login = 0;
+        if (options->compression == -1)
+                options->compression = 1;
         if (options->allow_tcp_forwarding == -1)
                 options->allow_tcp_forwarding = 1;
         if (options->gateway_ports == -1)
@@ -278,7 +281,7 @@ typedef enum {
         sPrintMotd, sPrintLastLog, sIgnoreRhosts,
         sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost,
         sStrictModes, sEmptyPasswd, sKeepAlives,
-        sUseLogin, sAllowTcpForwarding,
+        sUseLogin, sAllowTcpForwarding, sCompression,
         sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
         sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
@@ -342,6 +345,7 @@ static struct {
         { "strictmodes", sStrictModes },
         { "permitemptypasswords", sEmptyPasswd },
         { "uselogin", sUseLogin },
+        { "compression", sCompression },
         { "keepalive", sKeepAlives },
         { "allowtcpforwarding", sAllowTcpForwarding },
         { "allowusers", sAllowUsers },
@@ -704,6 +708,10 @@ parse_flag:
                 intptr = &options->use_login;
                 goto parse_flag;
 
+        case sCompression:
+                intptr = &options->compression;
+                goto parse_flag;
+
         case sGatewayPorts:
                 intptr = &options->gateway_ports;
                 goto parse_flag;