- (djm) [servconf.c] remove leftover droppings of AuthorizedKeysFile2

2 files changed, 2 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d3a85b26..b729c6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    whether it is accepted.  Also includes a warning fix on the program
    fragment uses (bad main() return type).
    bz#1900 and bz#1901 reported by g.esp AT free.fr; ok dtucker@
+ - (djm) [servconf.c] remove leftover droppings of AuthorizedKeysFile2
 
 20110515
  - (djm) OpenBSD CVS Sync
diff --git a/servconf.c b/servconf.c
index 03a503d0..f862fbfd 100644
--- a/servconf.c
+++ b/servconf.c
@@ -313,7 +313,7 @@ typedef enum {
 	sMaxStartups, sMaxAuthTries, sMaxSessions,
 	sBanner, sUseDNS, sHostbasedAuthentication,
 	sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
-	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
+	sClientAliveCountMax, sAuthorizedKeysFile,
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
 	sUsePrivilegeSeparation, sAllowAgentForwarding,
@@ -430,7 +430,6 @@ static struct {
 	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
 	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
 	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
-	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
 	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
 	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
 	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },