upstream commit
restore pre-auth compression support in the client -- the
previous commit was intended to remove it from the server only.
remove a few server-side pre-auth compression bits that escaped
adjust wording of Compression directive in sshd_config(5)
pointed out by naddy@ ok markus@
Upstream-ID: d23696ed72a228dacd4839dd9f2dec424ba2016b
diff --git a/servconf.c b/servconf.c
index 51feb05..4bf0b2a 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.296 2016/09/28 16:33:07 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.297 2016/09/28 20:32:42 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -920,8 +920,8 @@
{ NULL, -1 }
};
static const struct multistate multistate_compression[] = {
- { "delayed", COMP_DELAYED },
{ "yes", COMP_DELAYED },
+ { "delayed", COMP_DELAYED },
{ "no", COMP_NONE },
{ NULL, -1 }
};