- markus@cvs.openbsd.org 2004/03/05 10:53:58

     [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c]
     add IdentitiesOnly; ok djm@, pb@

1 files changed, 10 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index 2591e0dba..ce0d1f753 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,
         oDeprecated, oUnsupported
 } OpCodes;
 
@@ -147,6 +147,7 @@ static struct {
         { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },
         { "identityfile2", oIdentityFile },                     /* alias */
+        { "identitiesonly", oIdentitiesOnly },
         { "hostname", oHostName },
         { "hostkeyalias", oHostKeyAlias },
         { "proxycommand", oProxyCommand },
@@ -736,6 +737,10 @@ parse_int:
                 intptr = &options->enable_ssh_keysign;
                 goto parse_flag;
 
+        case oIdentitiesOnly:
+                intptr = &options->identities_only;
+                goto parse_flag;
+
         case oServerAliveInterval:
                 intptr = &options->server_alive_interval;
                 goto parse_time;
@@ -869,6 +874,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;
@@ -981,6 +987,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)