summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorsf@openbsd.org <sf@openbsd.org>2018-07-10 09:36:58 +0000
committerDamien Miller <djm@mindrot.org>2018-07-11 09:52:08 +1000
commit984bacfaacbbe31c35191b828fb5b5b2f0362c36 (patch)
tree72ffe63312c4d8673332a9a0354ea7456a7294e7 /monitor_wrap.c
parent120a1ec74e8d9d29f4eb9a27972ddd22351ddef9 (diff)
upstream: re-remove some pre-auth compression bits
This time, make sure to not remove things that are necessary for pre-auth compression on the client. Add a comment that pre-auth compression is still supported in the client. ok markus@ OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e970da2e3..f291ac085 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.104 2018/07/10 09:13:30 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.105 2018/07/10 09:36:58 sf Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -84,8 +84,6 @@
84#include "ssherr.h" 84#include "ssherr.h"
85 85
86/* Imports */ 86/* Imports */
87extern z_stream incoming_stream;
88extern z_stream outgoing_stream;
89extern struct monitor *pmonitor; 87extern struct monitor *pmonitor;
90extern struct sshbuf *loginmsg; 88extern struct sshbuf *loginmsg;
91extern ServerOptions options; 89extern ServerOptions options;