upstream: Rename COMP_DELAYED to COMP_ZLIB
Only delayed compression is supported nowadays.
ok markus@
OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
diff --git a/servconf.c b/servconf.c
index a54219f..f5272b0 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.335 2018/07/04 13:49:31 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.336 2018/07/06 09:06:14 sf Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -349,7 +349,7 @@
options->permit_user_env_whitelist = NULL;
}
if (options->compression == -1)
- options->compression = COMP_DELAYED;
+ options->compression = COMP_ZLIB;
if (options->rekey_limit == -1)
options->rekey_limit = 0;
if (options->rekey_interval == -1)
@@ -1170,8 +1170,8 @@
{ NULL, -1 }
};
static const struct multistate multistate_compression[] = {
- { "yes", COMP_DELAYED },
- { "delayed", COMP_DELAYED },
+ { "yes", COMP_ZLIB },
+ { "delayed", COMP_ZLIB },
{ "no", COMP_NONE },
{ NULL, -1 }
};