Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).

1 files changed, 10 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index dfd83c1b9..2b8ff58d6 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.128 2004/03/05 10:53:58 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -105,7 +105,7 @@ typedef enum {
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-        oServerAliveInterval, oServerAliveCountMax,
+        oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated, oUnsupported
 } OpCodes;
@@ -148,6 +148,7 @@ static struct {
         { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },
         { "identityfile2", oIdentityFile },                     /* alias */
+        { "identitiesonly", oIdentitiesOnly },
         { "hostname", oHostName },
         { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },
@@ -739,6 +740,10 @@ parse_int:
                 intptr = &options->enable_ssh_keysign;
                 goto parse_flag;
 
+        case oIdentitiesOnly:
+                intptr = &options->identities_only;
+                goto parse_flag;
+
         case oServerAliveInterval:
         case oProtocolKeepAlives: /* Debian-specific compatibility alias */
                 intptr = &options->server_alive_interval;
@@ -878,6 +883,7 @@ initialize_options(Options * options)
         options->smartcard_device = NULL;
         options->enable_ssh_keysign = - 1;
         options->no_host_authentication_for_localhost = - 1;
+        options->identities_only = - 1;
         options->rekey_limit = - 1;
         options->verify_host_key_dns = -1;
         options->server_alive_interval = -1;
@@ -990,6 +996,8 @@ fill_default_options(Options * options)
                 clear_forwardings(options);
         if (options->no_host_authentication_for_localhost == - 1)
                 options->no_host_authentication_for_localhost = 0;
+        if (options->identities_only == -1)
+                options->identities_only = 0;
         if (options->enable_ssh_keysign == -1)
                 options->enable_ssh_keysign = 0;
         if (options->rekey_limit == -1)