summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-21 01:09:47 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-21 01:09:47 +0000
commit23e0f667f88fabb38fd22cedf50e81e78fb99e3e (patch)
treecc55e9a9d007a61a2f4cd1469e1b8f786ee38313 /sshd.c
parent9721e92ba8ec5e1c1c3926ce94260605b73243b3 (diff)
- 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
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index 9ac43a88..feea3ce2 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.245 2002/06/11 05:46:20 mpech Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.246 2002/06/20 23:05:56 markus Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -1765,6 +1765,10 @@ do_ssh2_kex(void)
myproposal[PROPOSAL_MAC_ALGS_CTOS] =
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
}
+ if (!options.compression) {
+ myproposal[PROPOSAL_COMP_ALGS_CTOS] =
+ myproposal[PROPOSAL_COMP_ALGS_STOC] = "none";
+ }
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
/* start key exchange */