summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c12
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 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.128 2004/03/05 10:53:58 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -105,7 +105,7 @@ typedef enum {
105 oClearAllForwardings, oNoHostAuthenticationForLocalhost, 105 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
106 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, 106 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
107 oAddressFamily, oGssAuthentication, oGssDelegateCreds, 107 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
108 oServerAliveInterval, oServerAliveCountMax, 108 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
109 oDeprecated, oUnsupported 109 oDeprecated, oUnsupported
110} OpCodes; 110} OpCodes;
111 111
@@ -147,6 +147,7 @@ static struct {
147 { "usersh", oDeprecated }, 147 { "usersh", oDeprecated },
148 { "identityfile", oIdentityFile }, 148 { "identityfile", oIdentityFile },
149 { "identityfile2", oIdentityFile }, /* alias */ 149 { "identityfile2", oIdentityFile }, /* alias */
150 { "identitiesonly", oIdentitiesOnly },
150 { "hostname", oHostName }, 151 { "hostname", oHostName },
151 { "hostkeyalias", oHostKeyAlias }, 152 { "hostkeyalias", oHostKeyAlias },
152 { "proxycommand", oProxyCommand }, 153 { "proxycommand", oProxyCommand },
@@ -736,6 +737,10 @@ parse_int:
736 intptr = &options->enable_ssh_keysign; 737 intptr = &options->enable_ssh_keysign;
737 goto parse_flag; 738 goto parse_flag;
738 739
740 case oIdentitiesOnly:
741 intptr = &options->identities_only;
742 goto parse_flag;
743
739 case oServerAliveInterval: 744 case oServerAliveInterval:
740 intptr = &options->server_alive_interval; 745 intptr = &options->server_alive_interval;
741 goto parse_time; 746 goto parse_time;
@@ -869,6 +874,7 @@ initialize_options(Options * options)
869 options->smartcard_device = NULL; 874 options->smartcard_device = NULL;
870 options->enable_ssh_keysign = - 1; 875 options->enable_ssh_keysign = - 1;
871 options->no_host_authentication_for_localhost = - 1; 876 options->no_host_authentication_for_localhost = - 1;
877 options->identities_only = - 1;
872 options->rekey_limit = - 1; 878 options->rekey_limit = - 1;
873 options->verify_host_key_dns = -1; 879 options->verify_host_key_dns = -1;
874 options->server_alive_interval = -1; 880 options->server_alive_interval = -1;
@@ -981,6 +987,8 @@ fill_default_options(Options * options)
981 clear_forwardings(options); 987 clear_forwardings(options);
982 if (options->no_host_authentication_for_localhost == - 1) 988 if (options->no_host_authentication_for_localhost == - 1)
983 options->no_host_authentication_for_localhost = 0; 989 options->no_host_authentication_for_localhost = 0;
990 if (options->identities_only == -1)
991 options->identities_only = 0;
984 if (options->enable_ssh_keysign == -1) 992 if (options->enable_ssh_keysign == -1)
985 options->enable_ssh_keysign = 0; 993 options->enable_ssh_keysign = 0;
986 if (options->rekey_limit == -1) 994 if (options->rekey_limit == -1)