summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorsf@openbsd.org <sf@openbsd.org>2018-07-06 09:06:14 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:13:40 +1000
commitab39267fa1243d02b6c330615539fc4b21e17dc4 (patch)
treee1a1525b384e439f41f4a4b106a93efee07b6ac1 /servconf.c
parent95db395d2e56a6f868193aead6cadb2493f036c6 (diff)
upstream: Rename COMP_DELAYED to COMP_ZLIB
Only delayed compression is supported nowadays. ok markus@ OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/servconf.c b/servconf.c
index a54219f01..f5272b0f9 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.335 2018/07/04 13:49:31 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.336 2018/07/06 09:06:14 sf Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -349,7 +349,7 @@ fill_default_server_options(ServerOptions *options)
349 options->permit_user_env_whitelist = NULL; 349 options->permit_user_env_whitelist = NULL;
350 } 350 }
351 if (options->compression == -1) 351 if (options->compression == -1)
352 options->compression = COMP_DELAYED; 352 options->compression = COMP_ZLIB;
353 if (options->rekey_limit == -1) 353 if (options->rekey_limit == -1)
354 options->rekey_limit = 0; 354 options->rekey_limit = 0;
355 if (options->rekey_interval == -1) 355 if (options->rekey_interval == -1)
@@ -1170,8 +1170,8 @@ static const struct multistate multistate_permitrootlogin[] = {
1170 { NULL, -1 } 1170 { NULL, -1 }
1171}; 1171};
1172static const struct multistate multistate_compression[] = { 1172static const struct multistate multistate_compression[] = {
1173 { "yes", COMP_DELAYED }, 1173 { "yes", COMP_ZLIB },
1174 { "delayed", COMP_DELAYED }, 1174 { "delayed", COMP_ZLIB },
1175 { "no", COMP_NONE }, 1175 { "no", COMP_NONE },
1176 { NULL, -1 } 1176 { NULL, -1 }
1177}; 1177};