summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-12-20 03:29:21 +0100
committerDarren Tucker <dtucker@dtucker.net>2019-12-20 04:25:08 +0100
commit8784b02dc49e1c98df4e7aca466be2f652ed4ad1 (patch)
treebed5e3906b3b917ab50ce6e38587f1b5cc2d7e35
parentupstream: Remove now-obsolete config options from example in (diff)
downloadopenssh-8784b02dc49e1c98df4e7aca466be2f652ed4ad1.tar.xz
openssh-8784b02dc49e1c98df4e7aca466be2f652ed4ad1.zip
upstream: Remove obsolete opcodes from the configuation enum.
Patch from openbsd@academicsolutions.ch, ok djm@ OpenBSD-Commit-ID: 395c202228872ce8d9044cc08552ac969f51e01b
Diffstat (limited to '')
-rw-r--r--readconf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/readconf.c b/readconf.c
index 57b08c660..1b541e691 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.316 2019/12/20 02:11:38 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.317 2019/12/20 02:29:21 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -144,15 +144,15 @@ typedef enum {
oHost, oMatch, oInclude,
oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,
oGatewayPorts, oExitOnForwardFailure,
- oPasswordAuthentication, oRSAAuthentication,
+ oPasswordAuthentication,
oChallengeResponseAuthentication, oXAuthLocation,
- oIdentityFile, oHostname, oPort, oCipher, oRemoteForward, oLocalForward,
+ oIdentityFile, oHostname, oPort, oRemoteForward, oLocalForward,
oCertificateFile, oAddKeysToAgent, oIdentityAgent,
- oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
+ oUser, oEscapeChar, oProxyCommand,
oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
- oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
- oUsePrivilegedPort, oLogFacility, oLogLevel, oCiphers, oMacs,
+ oTCPKeepAlive, oNumberOfPasswordPrompts,
+ oLogFacility, oLogLevel, oCiphers, oMacs,
oPubkeyAuthentication,
oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,