=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v retrieving revision 1.102.2.2 retrieving revision 1.103 diff -u -r1.102.2.2 -r1.103 --- src/usr.bin/ssh/readconf.c 2004/03/04 18:18:16 1.102.2.2 +++ src/usr.bin/ssh/readconf.c 2003/04/01 10:10:23 1.103 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.102.2.2 2004/03/04 18:18:16 brad Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.103 2003/04/01 10:10:23 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -57,6 +57,7 @@ Host fascist.blob.com Port 23123 User tylonen + RhostsAuthentication no PasswordAuthentication no Host puukko.hut.fi @@ -74,11 +75,12 @@ Host * ForwardAgent no ForwardX11 no + RhostsAuthentication yes PasswordAuthentication yes RSAAuthentication yes RhostsRSAAuthentication yes StrictHostKeyChecking yes - TcpKeepAlive no + KeepAlives no IdentityFile ~/.ssh/identity Port 22 EscapeChar ~ @@ -89,24 +91,31 @@ typedef enum { oBadOption, - oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts, + oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, oPasswordAuthentication, oRSAAuthentication, oChallengeResponseAuthentication, oXAuthLocation, +#if defined(KRB4) || defined(KRB5) + oKerberosAuthentication, +#endif +#if defined(AFS) || defined(KRB5) + oKerberosTgtPassing, +#endif +#ifdef AFS + oAFSTokenPassing, +#endif oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward, oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression, - oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts, + oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, - oServerAliveInterval, oServerAliveCountMax, - oDeprecated, oUnsupported + oEnableSSHKeysign, oRekeyLimit, + oDeprecated } OpCodes; /* Textual representations of the tokens. */ @@ -117,11 +126,10 @@ } keywords[] = { { "forwardagent", oForwardAgent }, { "forwardx11", oForwardX11 }, - { "forwardx11trusted", oForwardX11Trusted }, { "xauthlocation", oXAuthLocation }, { "gatewayports", oGatewayPorts }, { "useprivilegedport", oUsePrivilegedPort }, - { "rhostsauthentication", oDeprecated }, + { "rhostsauthentication", oRhostsAuthentication }, { "passwordauthentication", oPasswordAuthentication }, { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, { "kbdinteractivedevices", oKbdInteractiveDevices }, @@ -133,16 +141,15 @@ { "challengeresponseauthentication", oChallengeResponseAuthentication }, { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */ { "tisauthentication", oChallengeResponseAuthentication }, /* alias */ - { "kerberosauthentication", oUnsupported }, - { "kerberostgtpassing", oUnsupported }, - { "afstokenpassing", oUnsupported }, -#if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -#else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, +#if defined(KRB4) || defined(KRB5) + { "kerberosauthentication", oKerberosAuthentication }, #endif +#if defined(AFS) || defined(KRB5) + { "kerberostgtpassing", oKerberosTgtPassing }, +#endif +#ifdef AFS + { "afstokenpassing", oAFSTokenPassing }, +#endif { "fallbacktorsh", oDeprecated }, { "usersh", oDeprecated }, { "identityfile", oIdentityFile }, @@ -170,28 +177,18 @@ { "stricthostkeychecking", oStrictHostKeyChecking }, { "compression", oCompression }, { "compressionlevel", oCompressionLevel }, - { "tcpkeepalive", oTCPKeepAlive }, - { "keepalive", oTCPKeepAlive }, /* obsolete */ + { "keepalive", oKeepAlives }, { "numberofpasswordprompts", oNumberOfPasswordPrompts }, { "loglevel", oLogLevel }, { "dynamicforward", oDynamicForward }, { "preferredauthentications", oPreferredAuthentications }, { "hostkeyalgorithms", oHostKeyAlgorithms }, { "bindaddress", oBindAddress }, -#ifdef SMARTCARD { "smartcarddevice", oSmartcardDevice }, -#else - { "smartcarddevice", oUnsupported }, -#endif { "clearallforwardings", oClearAllForwardings }, { "enablesshkeysign", oEnableSSHKeysign }, - { "verifyhostkeydns", oVerifyHostKeyDNS }, { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, { "rekeylimit", oRekeyLimit }, - { "connecttimeout", oConnectTimeout }, - { "addressfamily", oAddressFamily }, - { "serveraliveinterval", oServerAliveInterval }, - { "serveralivecountmax", oServerAliveCountMax }, { NULL, oBadOption } }; @@ -283,13 +280,6 @@ u_short fwd_port, fwd_host_port; char sfwd_host_port[6]; - /* Strip trailing whitespace */ - for(len = strlen(line) - 1; len > 0; len--) { - if (strchr(WHITESPACE, line[len]) == NULL) - break; - line[len] = '\0'; - } - s = line; /* Get the keyword. (Each line is supposed to begin with a keyword). */ keyword = strdelim(&s); @@ -306,20 +296,6 @@ /* don't panic, but count bad options */ return -1; /* NOTREACHED */ - case oConnectTimeout: - intptr = &options->connection_timeout; -parse_time: - arg = strdelim(&s); - if (!arg || *arg == '\0') - fatal("%s line %d: missing time value.", - filename, linenum); - if ((value = convtime(arg)) == -1) - fatal("%s line %d: invalid time value.", - filename, linenum); - if (*intptr == -1) - *intptr = value; - break; - case oForwardAgent: intptr = &options->forward_agent; parse_flag: @@ -341,10 +317,6 @@ intptr = &options->forward_x11; goto parse_flag; - case oForwardX11Trusted: - intptr = &options->forward_x11_trusted; - goto parse_flag; - case oGatewayPorts: intptr = &options->gateway_ports; goto parse_flag; @@ -353,6 +325,10 @@ intptr = &options->use_privileged_port; goto parse_flag; + case oRhostsAuthentication: + intptr = &options->rhosts_authentication; + goto parse_flag; + case oPasswordAuthentication: intptr = &options->password_authentication; goto parse_flag; @@ -384,15 +360,21 @@ case oChallengeResponseAuthentication: intptr = &options->challenge_response_authentication; goto parse_flag; - - case oGssAuthentication: - intptr = &options->gss_authentication; +#if defined(KRB4) || defined(KRB5) + case oKerberosAuthentication: + intptr = &options->kerberos_authentication; goto parse_flag; - - case oGssDelegateCreds: - intptr = &options->gss_deleg_creds; +#endif +#if defined(AFS) || defined(KRB5) + case oKerberosTgtPassing: + intptr = &options->kerberos_tgt_passing; goto parse_flag; - +#endif +#ifdef AFS + case oAFSTokenPassing: + intptr = &options->afs_token_passing; + goto parse_flag; +#endif case oBatchMode: intptr = &options->batch_mode; goto parse_flag; @@ -401,13 +383,8 @@ intptr = &options->check_host_ip; goto parse_flag; - case oVerifyHostKeyDNS: - intptr = &options->verify_host_key_dns; - goto parse_yesnoask; - case oStrictHostKeyChecking: intptr = &options->strict_host_key_checking; -parse_yesnoask: arg = strdelim(&s); if (!arg || *arg == '\0') fatal("%.200s line %d: Missing yes/no/ask argument.", @@ -429,8 +406,8 @@ intptr = &options->compression; goto parse_flag; - case oTCPKeepAlive: - intptr = &options->tcp_keep_alive; + case oKeepAlives: + intptr = &options->keepalives; goto parse_flag; case oNoHostAuthenticationForLocalhost: @@ -536,8 +513,6 @@ goto parse_string; case oProxyCommand: - if (s == NULL) - fatal("%.200s line %d: Missing argument.", filename, linenum); charptr = &options->proxy_command; len = strspn(s, WHITESPACE "="); if (*activep && *charptr == NULL) @@ -675,7 +650,7 @@ fatal("%.200s line %d: Badly formatted port number.", filename, linenum); if (*activep) - add_local_forward(options, fwd_port, "socks", 0); + add_local_forward(options, fwd_port, "socks4", 0); break; case oClearAllForwardings: @@ -715,43 +690,15 @@ *intptr = value; break; - case oAddressFamily: - arg = strdelim(&s); - intptr = &options->address_family; - if (strcasecmp(arg, "inet") == 0) - value = AF_INET; - else if (strcasecmp(arg, "inet6") == 0) - value = AF_INET6; - else if (strcasecmp(arg, "any") == 0) - value = AF_UNSPEC; - else - fatal("Unsupported AddressFamily \"%s\"", arg); - if (*activep && *intptr == -1) - *intptr = value; - break; - case oEnableSSHKeysign: intptr = &options->enable_ssh_keysign; goto parse_flag; - case oServerAliveInterval: - intptr = &options->server_alive_interval; - goto parse_time; - - case oServerAliveCountMax: - intptr = &options->server_alive_count_max; - goto parse_int; - case oDeprecated: debug("%s line %d: Deprecated option \"%s\"", filename, linenum, keyword); return 0; - case oUnsupported: - error("%s line %d: Unsupported option \"%s\"", - filename, linenum, keyword); - return 0; - default: fatal("process_config_line: Unimplemented opcode %d", opcode); } @@ -818,15 +765,22 @@ memset(options, 'X', sizeof(*options)); options->forward_agent = -1; options->forward_x11 = -1; - options->forward_x11_trusted = -1; options->xauth_location = NULL; options->gateway_ports = -1; options->use_privileged_port = -1; + options->rhosts_authentication = -1; options->rsa_authentication = -1; options->pubkey_authentication = -1; options->challenge_response_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; +#if defined(KRB4) || defined(KRB5) + options->kerberos_authentication = -1; +#endif +#if defined(AFS) || defined(KRB5) + options->kerberos_tgt_passing = -1; +#endif +#ifdef AFS + options->afs_token_passing = -1; +#endif options->password_authentication = -1; options->kbd_interactive_authentication = -1; options->kbd_interactive_devices = NULL; @@ -836,12 +790,10 @@ options->check_host_ip = -1; options->strict_host_key_checking = -1; options->compression = -1; - options->tcp_keep_alive = -1; + options->keepalives = -1; options->compression_level = -1; options->port = -1; - options->address_family = -1; options->connection_attempts = -1; - options->connection_timeout = -1; options->number_of_password_prompts = -1; options->cipher = -1; options->ciphers = NULL; @@ -868,9 +820,6 @@ options->enable_ssh_keysign = - 1; options->no_host_authentication_for_localhost = - 1; options->rekey_limit = - 1; - options->verify_host_key_dns = -1; - options->server_alive_interval = -1; - options->server_alive_count_max = -1; } /* @@ -887,24 +836,32 @@ options->forward_agent = 0; if (options->forward_x11 == -1) options->forward_x11 = 0; - if (options->forward_x11_trusted == -1) - options->forward_x11_trusted = 0; if (options->xauth_location == NULL) options->xauth_location = _PATH_XAUTH; if (options->gateway_ports == -1) options->gateway_ports = 0; if (options->use_privileged_port == -1) options->use_privileged_port = 0; + if (options->rhosts_authentication == -1) + options->rhosts_authentication = 0; if (options->rsa_authentication == -1) options->rsa_authentication = 1; if (options->pubkey_authentication == -1) options->pubkey_authentication = 1; if (options->challenge_response_authentication == -1) options->challenge_response_authentication = 1; - if (options->gss_authentication == -1) - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; +#if defined(KRB4) || defined(KRB5) + if (options->kerberos_authentication == -1) + options->kerberos_authentication = 1; +#endif +#if defined(AFS) || defined(KRB5) + if (options->kerberos_tgt_passing == -1) + options->kerberos_tgt_passing = 1; +#endif +#ifdef AFS + if (options->afs_token_passing == -1) + options->afs_token_passing = 1; +#endif if (options->password_authentication == -1) options->password_authentication = 1; if (options->kbd_interactive_authentication == -1) @@ -921,14 +878,12 @@ options->strict_host_key_checking = 2; /* 2 is default */ if (options->compression == -1) options->compression = 0; - if (options->tcp_keep_alive == -1) - options->tcp_keep_alive = 1; + if (options->keepalives == -1) + options->keepalives = 1; if (options->compression_level == -1) options->compression_level = 6; if (options->port == -1) options->port = 0; /* Filled in ssh_connect. */ - if (options->address_family == -1) - options->address_family = AF_UNSPEC; if (options->connection_attempts == -1) options->connection_attempts = 1; if (options->number_of_password_prompts == -1) @@ -983,12 +938,6 @@ options->enable_ssh_keysign = 0; if (options->rekey_limit == -1) options->rekey_limit = 0; - if (options->verify_host_key_dns == -1) - options->verify_host_key_dns = 0; - if (options->server_alive_interval == -1) - options->server_alive_interval = 0; - if (options->server_alive_count_max == -1) - options->server_alive_count_max = 3; /* options->proxy_command should not be set by default */ /* options->user will be set in the main program if appropriate */ /* options->hostname will be set in the main program if appropriate */