summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorsf@openbsd.org <sf@openbsd.org>2018-07-09 13:37:10 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:13:41 +1000
commit168b46f405d6736960ba7930389eecb9b6710b7e (patch)
treeaab4c134cce64b06caefa41246805d69daab4fe8 /monitor_wrap.c
parentab39267fa1243d02b6c330615539fc4b21e17dc4 (diff)
upstream: Revert previous two commits
It turns out we still support pre-auth compression on the client. Therefore revert the previous two commits: date: 2018/07/06 09:06:14; author: sf; commitid: yZVYKIRtUZWD9CmE; Rename COMP_DELAYED to COMP_ZLIB Only delayed compression is supported nowadays. ok markus@ date: 2018/07/06 09:05:01; author: sf; commitid: rEGuT5UgI9f6kddP; Remove leftovers from pre-authentication compression Support for this has been removed in 2016. COMP_DELAYED will be renamed in a later commit. ok markus@ OpenBSD-Commit-ID: cdfef526357e4e1483c86cf599491b2dafb77772
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e280fd2ad..012ab01a9 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.100 2018/07/06 09:05:01 sf Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.101 2018/07/09 13:37:10 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,6 +84,8 @@
84#include "ssherr.h" 84#include "ssherr.h"
85 85
86/* Imports */ 86/* Imports */
87extern z_stream incoming_stream;
88extern z_stream outgoing_stream;
87extern struct monitor *pmonitor; 89extern struct monitor *pmonitor;
88extern Buffer loginmsg; 90extern Buffer loginmsg;
89extern ServerOptions options; 91extern ServerOptions options;