From 168b46f405d6736960ba7930389eecb9b6710b7e Mon Sep 17 00:00:00 2001 From: "sf@openbsd.org" Date: Mon, 9 Jul 2018 13:37:10 +0000 Subject: 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 --- servconf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'servconf.c') diff --git a/servconf.c b/servconf.c index f5272b0f9..97c268e3c 100644 --- a/servconf.c +++ b/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.336 2018/07/06 09:06:14 sf Exp $ */ +/* $OpenBSD: servconf.c,v 1.337 2018/07/09 13:37:10 sf Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -349,7 +349,7 @@ fill_default_server_options(ServerOptions *options) options->permit_user_env_whitelist = NULL; } if (options->compression == -1) - options->compression = COMP_ZLIB; + options->compression = COMP_DELAYED; if (options->rekey_limit == -1) options->rekey_limit = 0; if (options->rekey_interval == -1) @@ -1170,8 +1170,8 @@ static const struct multistate multistate_permitrootlogin[] = { { NULL, -1 } }; static const struct multistate multistate_compression[] = { - { "yes", COMP_ZLIB }, - { "delayed", COMP_ZLIB }, + { "yes", COMP_DELAYED }, + { "delayed", COMP_DELAYED }, { "no", COMP_NONE }, { NULL, -1 } }; -- cgit v1.2.3