comparison cli-runopts.c @ 996:47643024fc90

Disable non-delayed zlib for server
author Matt Johnston <matt@ucc.asn.au>
date Wed, 28 Jan 2015 21:38:27 +0800
parents 6fb4c010c448
children ad14e2e71190
comparison
equal deleted inserted replaced
995:6fb4c010c448 996:47643024fc90
154 #endif 154 #endif
155 #ifdef ENABLE_CLI_PROXYCMD 155 #ifdef ENABLE_CLI_PROXYCMD
156 cli_opts.proxycmd = NULL; 156 cli_opts.proxycmd = NULL;
157 #endif 157 #endif
158 #ifndef DISABLE_ZLIB 158 #ifndef DISABLE_ZLIB
159 opts.enable_compress = 1; 159 opts.compress_mode = DROPBEAR_COMPRESS_ON;
160 #endif 160 #endif
161 #ifdef ENABLE_USER_ALGO_LIST 161 #ifdef ENABLE_USER_ALGO_LIST
162 opts.cipher_list = NULL; 162 opts.cipher_list = NULL;
163 opts.mac_list = NULL; 163 opts.mac_list = NULL;
164 #endif 164 #endif
607 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s", 607 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s",
608 argv0, cli_opts.remotehost, cli_opts.remoteport, 608 argv0, cli_opts.remotehost, cli_opts.remoteport,
609 passthrough_args, remainder); 609 passthrough_args, remainder);
610 #ifndef DISABLE_ZLIB 610 #ifndef DISABLE_ZLIB
611 /* The stream will be incompressible since it's encrypted. */ 611 /* The stream will be incompressible since it's encrypted. */
612 opts.enable_compress = 0; 612 opts.compress_mode = DROPBEAR_COMPRESS_OFF;
613 #endif 613 #endif
614 m_free(passthrough_args); 614 m_free(passthrough_args);
615 } 615 }
616 m_free(hostbuf); 616 m_free(hostbuf);
617 } 617 }