diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2019-12-20 02:42:43 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2019-12-20 02:42:43 +0000 |
| commit | 5d41716a598efabb2a9bc703cd8eff6455c22526 (patch) | |
| tree | d24e41948d281f82f1af22f7159232ed1a9c94a4 /usr.bin/ssh/readconf.c | |
| parent | 284e5a6a4fb01f1ef9bbc5197e35cf883e3e483b (diff) | |
Move always unsupported keywords to be grouped with the other ones.
Move oSecurityProvider to match the order in the OpCodes enum.
Patch from openbsd@academicsolutions.ch, ok djm@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 82e631c0246..d92c708ad9e 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.317 2019/12/20 02:29:21 dtucker Exp $ */ +/* $OpenBSD: readconf.c,v 1.318 2019/12/20 02:42:42 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -183,6 +183,9 @@ static struct { { "afstokenpassing", oUnsupported }, { "kerberosauthentication", oUnsupported }, { "kerberostgtpassing", oUnsupported }, + { "rsaauthentication", oUnsupported }, + { "rhostsrsaauthentication", oUnsupported }, + { "compressionlevel", oUnsupported }, /* Sometimes-unsupported options */ #if defined(GSSAPI) @@ -199,10 +202,6 @@ static struct { { "smartcarddevice", oUnsupported }, { "pkcs11provider", oUnsupported }, #endif - { "securitykeyprovider", oSecurityKeyProvider }, - { "rsaauthentication", oUnsupported }, - { "rhostsrsaauthentication", oUnsupported }, - { "compressionlevel", oUnsupported }, { "forwardagent", oForwardAgent }, { "forwardx11", oForwardX11 }, @@ -296,6 +295,7 @@ static struct { { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, { "ignoreunknown", oIgnoreUnknown }, { "proxyjump", oProxyJump }, + { "securitykeyprovider", oSecurityKeyProvider }, { NULL, oBadOption } }; |