diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:56 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:56 +1000 |
commit | 9786e6e2a034a8273b5d0d3b8cd8caf063bb875a (patch) | |
tree | 0322eb7ffcdd5600fb25094e9627cd62291da2e4 /session.c | |
parent | 47655ee03a67ed89ef55c957e5a8183ca3113d2c (diff) |
- markus@cvs.openbsd.org 2005/07/25 11:59:40
[kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c]
[sshconnect2.c sshd.c sshd_config sshd_config.5]
add a new compression method that delays compression until the user
has been authenticated successfully and set compression to 'delayed'
for sshd.
this breaks older openssh clients (< 3.5) if they insist on
compression, so you have to re-enable compression in sshd_config.
ok djm@
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.185 2005/07/17 07:17:55 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.186 2005/07/25 11:59:40 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -56,6 +56,7 @@ RCSID("$OpenBSD: session.c,v 1.185 2005/07/17 07:17:55 djm Exp $"); | |||
56 | #include "serverloop.h" | 56 | #include "serverloop.h" |
57 | #include "canohost.h" | 57 | #include "canohost.h" |
58 | #include "session.h" | 58 | #include "session.h" |
59 | #include "kex.h" | ||
59 | #include "monitor_wrap.h" | 60 | #include "monitor_wrap.h" |
60 | 61 | ||
61 | #if defined(KRB5) && defined(USE_AFS) | 62 | #if defined(KRB5) && defined(USE_AFS) |
@@ -272,7 +273,7 @@ do_authenticated1(Authctxt *authctxt) | |||
272 | compression_level); | 273 | compression_level); |
273 | break; | 274 | break; |
274 | } | 275 | } |
275 | if (!options.compression) { | 276 | if (options.compression == COMP_NONE) { |
276 | debug2("compression disabled"); | 277 | debug2("compression disabled"); |
277 | break; | 278 | break; |
278 | } | 279 | } |