1999-10-27 03:42:43 +00:00
|
|
|
/*
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* readconf.c
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Created: Sat Apr 22 00:03:10 1995 ylo
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Functions for reading the configuration files.
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2000-05-30 03:44:51 +00:00
|
|
|
RCSID("$Id: readconf.c,v 1.15 2000/05/30 03:44:53 damien Exp $");
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
|
|
|
#include "cipher.h"
|
|
|
|
#include "readconf.h"
|
2000-04-01 01:09:21 +00:00
|
|
|
#include "match.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "xmalloc.h"
|
2000-04-12 10:17:38 +00:00
|
|
|
#include "compat.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Format of the configuration file:
|
|
|
|
|
|
|
|
# Configuration data is parsed as follows:
|
|
|
|
# 1. command line options
|
|
|
|
# 2. user-specific file
|
|
|
|
# 3. system-wide file
|
|
|
|
# Any configuration value is only changed the first time it is set.
|
|
|
|
# Thus, host-specific definitions should be at the beginning of the
|
|
|
|
# configuration file, and defaults at the end.
|
|
|
|
|
|
|
|
# Host-specific declarations. These may override anything above. A single
|
|
|
|
# host may match multiple declarations; these are processed in the order
|
|
|
|
# that they are given in.
|
|
|
|
|
|
|
|
Host *.ngs.fi ngs.fi
|
|
|
|
FallBackToRsh no
|
|
|
|
|
|
|
|
Host fake.com
|
|
|
|
HostName another.host.name.real.org
|
|
|
|
User blaah
|
|
|
|
Port 34289
|
|
|
|
ForwardX11 no
|
|
|
|
ForwardAgent no
|
|
|
|
|
|
|
|
Host books.com
|
|
|
|
RemoteForward 9999 shadows.cs.hut.fi:9999
|
|
|
|
Cipher 3des
|
|
|
|
|
|
|
|
Host fascist.blob.com
|
|
|
|
Port 23123
|
|
|
|
User tylonen
|
|
|
|
RhostsAuthentication no
|
|
|
|
PasswordAuthentication no
|
|
|
|
|
|
|
|
Host puukko.hut.fi
|
|
|
|
User t35124p
|
|
|
|
ProxyCommand ssh-proxy %h %p
|
|
|
|
|
|
|
|
Host *.fr
|
|
|
|
UseRsh yes
|
|
|
|
|
|
|
|
Host *.su
|
|
|
|
Cipher none
|
|
|
|
PasswordAuthentication no
|
|
|
|
|
|
|
|
# Defaults for various options
|
|
|
|
Host *
|
|
|
|
ForwardAgent no
|
|
|
|
ForwardX11 yes
|
|
|
|
RhostsAuthentication yes
|
|
|
|
PasswordAuthentication yes
|
|
|
|
RSAAuthentication yes
|
|
|
|
RhostsRSAAuthentication yes
|
|
|
|
FallBackToRsh no
|
|
|
|
UseRsh no
|
|
|
|
StrictHostKeyChecking yes
|
|
|
|
KeepAlives no
|
|
|
|
IdentityFile ~/.ssh/identity
|
|
|
|
Port 22
|
|
|
|
EscapeChar ~
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Keyword tokens. */
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
typedef enum {
|
|
|
|
oBadOption,
|
|
|
|
oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,
|
|
|
|
oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh,
|
|
|
|
oSkeyAuthentication,
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef KRB4
|
1999-11-24 13:26:21 +00:00
|
|
|
oKerberosAuthentication,
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif /* KRB4 */
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
oKerberosTgtPassing, oAFSTokenPassing,
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
|
|
|
|
oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
|
|
|
|
oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
|
|
|
|
oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
|
|
|
|
oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, oTISAuthentication,
|
2000-04-29 13:57:08 +00:00
|
|
|
oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oIdentityFile2,
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
oGlobalKnownHostsFile2, oUserKnownHostsFile2, oDSAAuthentication
|
1999-10-27 03:42:43 +00:00
|
|
|
} OpCodes;
|
|
|
|
|
|
|
|
/* Textual representations of the tokens. */
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
static struct {
|
|
|
|
const char *name;
|
|
|
|
OpCodes opcode;
|
|
|
|
} keywords[] = {
|
|
|
|
{ "forwardagent", oForwardAgent },
|
|
|
|
{ "forwardx11", oForwardX11 },
|
|
|
|
{ "gatewayports", oGatewayPorts },
|
|
|
|
{ "useprivilegedport", oUsePrivilegedPort },
|
|
|
|
{ "rhostsauthentication", oRhostsAuthentication },
|
|
|
|
{ "passwordauthentication", oPasswordAuthentication },
|
|
|
|
{ "rsaauthentication", oRSAAuthentication },
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
{ "dsaauthentication", oDSAAuthentication },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "skeyauthentication", oSkeyAuthentication },
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef KRB4
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "kerberosauthentication", oKerberosAuthentication },
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif /* KRB4 */
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "kerberostgtpassing", oKerberosTgtPassing },
|
|
|
|
{ "afstokenpassing", oAFSTokenPassing },
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "fallbacktorsh", oFallBackToRsh },
|
|
|
|
{ "usersh", oUseRsh },
|
|
|
|
{ "identityfile", oIdentityFile },
|
2000-04-29 13:57:08 +00:00
|
|
|
{ "identityfile2", oIdentityFile2 },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "hostname", oHostName },
|
|
|
|
{ "proxycommand", oProxyCommand },
|
|
|
|
{ "port", oPort },
|
|
|
|
{ "cipher", oCipher },
|
2000-04-12 10:17:38 +00:00
|
|
|
{ "ciphers", oCiphers },
|
|
|
|
{ "protocol", oProtocol },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "remoteforward", oRemoteForward },
|
|
|
|
{ "localforward", oLocalForward },
|
|
|
|
{ "user", oUser },
|
|
|
|
{ "host", oHost },
|
|
|
|
{ "escapechar", oEscapeChar },
|
|
|
|
{ "rhostsrsaauthentication", oRhostsRSAAuthentication },
|
|
|
|
{ "globalknownhostsfile", oGlobalKnownHostsFile },
|
|
|
|
{ "userknownhostsfile", oUserKnownHostsFile },
|
2000-04-29 13:57:08 +00:00
|
|
|
{ "globalknownhostsfile2", oGlobalKnownHostsFile2 },
|
|
|
|
{ "userknownhostsfile2", oUserKnownHostsFile2 },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "connectionattempts", oConnectionAttempts },
|
|
|
|
{ "batchmode", oBatchMode },
|
|
|
|
{ "checkhostip", oCheckHostIP },
|
|
|
|
{ "stricthostkeychecking", oStrictHostKeyChecking },
|
|
|
|
{ "compression", oCompression },
|
|
|
|
{ "compressionlevel", oCompressionLevel },
|
|
|
|
{ "keepalive", oKeepAlives },
|
|
|
|
{ "numberofpasswordprompts", oNumberOfPasswordPrompts },
|
|
|
|
{ "tisauthentication", oTISAuthentication },
|
|
|
|
{ "loglevel", oLogLevel },
|
|
|
|
{ NULL, 0 }
|
1999-11-11 06:57:39 +00:00
|
|
|
};
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/* Characters considered whitespace in strtok calls. */
|
|
|
|
#define WHITESPACE " \t\r\n"
|
|
|
|
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Adds a local TCP/IP port forward to options. Never returns if there is an
|
|
|
|
* error.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-12-06 00:47:28 +00:00
|
|
|
add_local_forward(Options *options, u_short port, const char *host,
|
|
|
|
u_short host_port)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
Forward *fwd;
|
|
|
|
extern uid_t original_real_uid;
|
|
|
|
if (port < IPPORT_RESERVED && original_real_uid != 0)
|
|
|
|
fatal("Privileged ports can only be forwarded by root.\n");
|
|
|
|
if (options->num_local_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)
|
|
|
|
fatal("Too many local forwards (max %d).", SSH_MAX_FORWARDS_PER_DIRECTION);
|
|
|
|
fwd = &options->local_forwards[options->num_local_forwards++];
|
|
|
|
fwd->port = port;
|
|
|
|
fwd->host = xstrdup(host);
|
|
|
|
fwd->host_port = host_port;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Adds a remote TCP/IP port forward to options. Never returns if there is
|
|
|
|
* an error.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-12-06 00:47:28 +00:00
|
|
|
add_remote_forward(Options *options, u_short port, const char *host,
|
|
|
|
u_short host_port)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
Forward *fwd;
|
|
|
|
if (options->num_remote_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)
|
|
|
|
fatal("Too many remote forwards (max %d).",
|
|
|
|
SSH_MAX_FORWARDS_PER_DIRECTION);
|
|
|
|
fwd = &options->remote_forwards[options->num_remote_forwards++];
|
|
|
|
fwd->port = port;
|
|
|
|
fwd->host = xstrdup(host);
|
|
|
|
fwd->host_port = host_port;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Returns the number of the token pointed to by cp of length len. Never
|
|
|
|
* returns if the token is not known.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
static OpCodes
|
1999-11-24 13:26:21 +00:00
|
|
|
parse_token(const char *cp, const char *filename, int linenum)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
unsigned int i;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
for (i = 0; keywords[i].name; i++)
|
1999-11-25 00:54:57 +00:00
|
|
|
if (strcasecmp(cp, keywords[i].name) == 0)
|
1999-11-24 13:26:21 +00:00
|
|
|
return keywords[i].opcode;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "%s: line %d: Bad configuration option: %s\n",
|
|
|
|
filename, linenum, cp);
|
|
|
|
return oBadOption;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Processes a single option line as used in the configuration files. This
|
|
|
|
* only sets those values that have not already been set.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-15 04:25:10 +00:00
|
|
|
int
|
|
|
|
process_config_line(Options *options, const char *host,
|
1999-11-24 13:26:21 +00:00
|
|
|
char *line, const char *filename, int linenum,
|
|
|
|
int *activep)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-25 00:54:57 +00:00
|
|
|
char buf[256], *cp, *string, **charptr, *cp2;
|
1999-12-06 00:47:28 +00:00
|
|
|
int opcode, *intptr, value;
|
|
|
|
u_short fwd_port, fwd_host_port;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Skip leading whitespace. */
|
|
|
|
cp = line + strspn(line, WHITESPACE);
|
|
|
|
if (!*cp || *cp == '\n' || *cp == '#')
|
|
|
|
return 0;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/* Get the keyword. (Each line is supposed to begin with a keyword). */
|
1999-11-24 13:26:21 +00:00
|
|
|
cp = strtok(cp, WHITESPACE);
|
|
|
|
opcode = parse_token(cp, filename, linenum);
|
|
|
|
|
|
|
|
switch (opcode) {
|
|
|
|
case oBadOption:
|
1999-11-25 00:54:57 +00:00
|
|
|
/* don't panic, but count bad options */
|
|
|
|
return -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
/* NOTREACHED */
|
|
|
|
case oForwardAgent:
|
|
|
|
intptr = &options->forward_agent;
|
|
|
|
parse_flag:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing yes/no argument.", filename, linenum);
|
|
|
|
value = 0; /* To avoid compiler warning... */
|
|
|
|
if (strcmp(cp, "yes") == 0 || strcmp(cp, "true") == 0)
|
|
|
|
value = 1;
|
|
|
|
else if (strcmp(cp, "no") == 0 || strcmp(cp, "false") == 0)
|
|
|
|
value = 0;
|
|
|
|
else
|
|
|
|
fatal("%.200s line %d: Bad yes/no argument.", filename, linenum);
|
|
|
|
if (*activep && *intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oForwardX11:
|
|
|
|
intptr = &options->forward_x11;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oGatewayPorts:
|
|
|
|
intptr = &options->gateway_ports;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oUsePrivilegedPort:
|
|
|
|
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;
|
|
|
|
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
case oDSAAuthentication:
|
|
|
|
intptr = &options->dsa_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case oRSAAuthentication:
|
|
|
|
intptr = &options->rsa_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oRhostsRSAAuthentication:
|
|
|
|
intptr = &options->rhosts_rsa_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oTISAuthentication:
|
|
|
|
/* fallthrough, there is no difference on the client side */
|
|
|
|
case oSkeyAuthentication:
|
|
|
|
intptr = &options->skey_authentication;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#ifdef KRB4
|
1999-11-24 13:26:21 +00:00
|
|
|
case oKerberosAuthentication:
|
|
|
|
intptr = &options->kerberos_authentication;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif /* KRB4 */
|
|
|
|
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
case oKerberosTgtPassing:
|
|
|
|
intptr = &options->kerberos_tgt_passing;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case oAFSTokenPassing:
|
|
|
|
intptr = &options->afs_token_passing;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
case oFallBackToRsh:
|
|
|
|
intptr = &options->fallback_to_rsh;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oUseRsh:
|
|
|
|
intptr = &options->use_rsh;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oBatchMode:
|
|
|
|
intptr = &options->batch_mode;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oCheckHostIP:
|
|
|
|
intptr = &options->check_host_ip;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oStrictHostKeyChecking:
|
|
|
|
intptr = &options->strict_host_key_checking;
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing yes/no argument.",
|
|
|
|
filename, linenum);
|
|
|
|
value = 0; /* To avoid compiler warning... */
|
|
|
|
if (strcmp(cp, "yes") == 0 || strcmp(cp, "true") == 0)
|
|
|
|
value = 1;
|
|
|
|
else if (strcmp(cp, "no") == 0 || strcmp(cp, "false") == 0)
|
|
|
|
value = 0;
|
|
|
|
else if (strcmp(cp, "ask") == 0)
|
|
|
|
value = 2;
|
|
|
|
else
|
|
|
|
fatal("%.200s line %d: Bad yes/no/ask argument.", filename, linenum);
|
|
|
|
if (*activep && *intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oCompression:
|
|
|
|
intptr = &options->compression;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oKeepAlives:
|
|
|
|
intptr = &options->keepalives;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case oNumberOfPasswordPrompts:
|
|
|
|
intptr = &options->number_of_password_prompts;
|
|
|
|
goto parse_int;
|
|
|
|
|
|
|
|
case oCompressionLevel:
|
|
|
|
intptr = &options->compression_level;
|
|
|
|
goto parse_int;
|
|
|
|
|
|
|
|
case oIdentityFile:
|
2000-04-29 13:57:08 +00:00
|
|
|
case oIdentityFile2:
|
1999-11-24 13:26:21 +00:00
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (*activep) {
|
2000-04-29 13:57:08 +00:00
|
|
|
intptr = (opcode == oIdentityFile) ?
|
|
|
|
&options->num_identity_files :
|
|
|
|
&options->num_identity_files2;
|
|
|
|
if (*intptr >= SSH_MAX_IDENTITY_FILES)
|
1999-11-24 13:26:21 +00:00
|
|
|
fatal("%.200s line %d: Too many identity files specified (max %d).",
|
|
|
|
filename, linenum, SSH_MAX_IDENTITY_FILES);
|
2000-04-29 13:57:08 +00:00
|
|
|
charptr = (opcode == oIdentityFile) ?
|
|
|
|
&options->identity_files[*intptr] :
|
|
|
|
&options->identity_files2[*intptr];
|
|
|
|
*charptr = xstrdup(cp);
|
|
|
|
*intptr = *intptr + 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oUser:
|
|
|
|
charptr = &options->user;
|
|
|
|
parse_string:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (*activep && *charptr == NULL)
|
|
|
|
*charptr = xstrdup(cp);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oGlobalKnownHostsFile:
|
|
|
|
charptr = &options->system_hostfile;
|
|
|
|
goto parse_string;
|
|
|
|
|
|
|
|
case oUserKnownHostsFile:
|
|
|
|
charptr = &options->user_hostfile;
|
|
|
|
goto parse_string;
|
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
case oGlobalKnownHostsFile2:
|
|
|
|
charptr = &options->system_hostfile2;
|
|
|
|
goto parse_string;
|
|
|
|
|
|
|
|
case oUserKnownHostsFile2:
|
|
|
|
charptr = &options->user_hostfile2;
|
|
|
|
goto parse_string;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case oHostName:
|
|
|
|
charptr = &options->hostname;
|
|
|
|
goto parse_string;
|
|
|
|
|
|
|
|
case oProxyCommand:
|
|
|
|
charptr = &options->proxy_command;
|
|
|
|
string = xstrdup("");
|
|
|
|
while ((cp = strtok(NULL, WHITESPACE)) != NULL) {
|
|
|
|
string = xrealloc(string, strlen(string) + strlen(cp) + 2);
|
|
|
|
strcat(string, " ");
|
|
|
|
strcat(string, cp);
|
|
|
|
}
|
|
|
|
if (*activep && *charptr == NULL)
|
|
|
|
*charptr = string;
|
|
|
|
else
|
|
|
|
xfree(string);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case oPort:
|
|
|
|
intptr = &options->port;
|
|
|
|
parse_int:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (cp[0] < '0' || cp[0] > '9')
|
|
|
|
fatal("%.200s line %d: Bad number.", filename, linenum);
|
1999-11-25 00:54:57 +00:00
|
|
|
|
|
|
|
/* Octal, decimal, or hex format? */
|
|
|
|
value = strtol(cp, &cp2, 0);
|
|
|
|
if (cp == cp2)
|
|
|
|
fatal("%.200s line %d: Bad number.", filename, linenum);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*activep && *intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oConnectionAttempts:
|
|
|
|
intptr = &options->connection_attempts;
|
|
|
|
goto parse_int;
|
|
|
|
|
|
|
|
case oCipher:
|
|
|
|
intptr = &options->cipher;
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
2000-05-30 03:44:51 +00:00
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
1999-11-24 13:26:21 +00:00
|
|
|
value = cipher_number(cp);
|
|
|
|
if (value == -1)
|
|
|
|
fatal("%.200s line %d: Bad cipher '%s'.",
|
|
|
|
filename, linenum, cp ? cp : "<NONE>");
|
|
|
|
if (*activep && *intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
2000-04-12 10:17:38 +00:00
|
|
|
case oCiphers:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
2000-05-30 03:44:51 +00:00
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
2000-04-12 10:17:38 +00:00
|
|
|
if (!ciphers_valid(cp))
|
2000-05-09 01:02:59 +00:00
|
|
|
fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.",
|
2000-04-12 10:17:38 +00:00
|
|
|
filename, linenum, cp ? cp : "<NONE>");
|
|
|
|
if (*activep && options->ciphers == NULL)
|
|
|
|
options->ciphers = xstrdup(cp);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oProtocol:
|
|
|
|
intptr = &options->protocol;
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
2000-05-30 03:44:51 +00:00
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
2000-04-12 10:17:38 +00:00
|
|
|
value = proto_spec(cp);
|
|
|
|
if (value == SSH_PROTO_UNKNOWN)
|
|
|
|
fatal("%.200s line %d: Bad protocol spec '%s'.",
|
|
|
|
filename, linenum, cp ? cp : "<NONE>");
|
|
|
|
if (*activep && *intptr == SSH_PROTO_UNKNOWN)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case oLogLevel:
|
|
|
|
intptr = (int *) &options->log_level;
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
value = log_level_number(cp);
|
|
|
|
if (value == (LogLevel) - 1)
|
|
|
|
fatal("%.200s line %d: unsupported log level '%s'\n",
|
|
|
|
filename, linenum, cp ? cp : "<NONE>");
|
|
|
|
if (*activep && (LogLevel) * intptr == -1)
|
|
|
|
*intptr = (LogLevel) value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oRemoteForward:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (cp[0] < '0' || cp[0] > '9')
|
|
|
|
fatal("%.200s line %d: Badly formatted port number.",
|
|
|
|
filename, linenum);
|
|
|
|
fwd_port = atoi(cp);
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing second argument.",
|
|
|
|
filename, linenum);
|
1999-12-06 00:47:28 +00:00
|
|
|
if (sscanf(cp, "%255[^:]:%hu", buf, &fwd_host_port) != 2)
|
1999-11-24 13:26:21 +00:00
|
|
|
fatal("%.200s line %d: Badly formatted host:port.",
|
|
|
|
filename, linenum);
|
|
|
|
if (*activep)
|
|
|
|
add_remote_forward(options, fwd_port, buf, fwd_host_port);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oLocalForward:
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (cp[0] < '0' || cp[0] > '9')
|
|
|
|
fatal("%.200s line %d: Badly formatted port number.",
|
|
|
|
filename, linenum);
|
|
|
|
fwd_port = atoi(cp);
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing second argument.",
|
|
|
|
filename, linenum);
|
1999-12-06 00:47:28 +00:00
|
|
|
if (sscanf(cp, "%255[^:]:%hu", buf, &fwd_host_port) != 2)
|
1999-11-24 13:26:21 +00:00
|
|
|
fatal("%.200s line %d: Badly formatted host:port.",
|
|
|
|
filename, linenum);
|
|
|
|
if (*activep)
|
|
|
|
add_local_forward(options, fwd_port, buf, fwd_host_port);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case oHost:
|
|
|
|
*activep = 0;
|
|
|
|
while ((cp = strtok(NULL, WHITESPACE)) != NULL)
|
|
|
|
if (match_pattern(host, cp)) {
|
|
|
|
debug("Applying options for %.100s", cp);
|
|
|
|
*activep = 1;
|
|
|
|
break;
|
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
/* Avoid garbage check below, as strtok already returned NULL. */
|
1999-11-24 13:26:21 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
case oEscapeChar:
|
|
|
|
intptr = &options->escape_char;
|
|
|
|
cp = strtok(NULL, WHITESPACE);
|
|
|
|
if (!cp)
|
|
|
|
fatal("%.200s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (cp[0] == '^' && cp[2] == 0 &&
|
|
|
|
(unsigned char) cp[1] >= 64 && (unsigned char) cp[1] < 128)
|
|
|
|
value = (unsigned char) cp[1] & 31;
|
|
|
|
else if (strlen(cp) == 1)
|
|
|
|
value = (unsigned char) cp[0];
|
|
|
|
else if (strcmp(cp, "none") == 0)
|
|
|
|
value = -2;
|
|
|
|
else {
|
|
|
|
fatal("%.200s line %d: Bad escape character.",
|
|
|
|
filename, linenum);
|
|
|
|
/* NOTREACHED */
|
|
|
|
value = 0; /* Avoid compiler warning. */
|
|
|
|
}
|
|
|
|
if (*activep && *intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
fatal("process_config_line: Unimplemented opcode %d", opcode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that there is no garbage at end of line. */
|
|
|
|
if (strtok(NULL, WHITESPACE) != NULL)
|
|
|
|
fatal("%.200s line %d: garbage at end of line.",
|
|
|
|
filename, linenum);
|
|
|
|
return 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Reads the config file and modifies the options accordingly. Options
|
|
|
|
* should already be initialized before this call. This never returns if
|
|
|
|
* there is an error. If the file does not exist, this returns immediately.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
read_config_file(const char *filename, const char *host, Options *options)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
FILE *f;
|
|
|
|
char line[1024];
|
|
|
|
int active, linenum;
|
|
|
|
int bad_options = 0;
|
|
|
|
|
|
|
|
/* Open the file. */
|
|
|
|
f = fopen(filename, "r");
|
|
|
|
if (!f)
|
|
|
|
return;
|
|
|
|
|
|
|
|
debug("Reading configuration data %.200s", filename);
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Mark that we are now processing the options. This flag is turned
|
|
|
|
* on/off by Host specifications.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
active = 1;
|
|
|
|
linenum = 0;
|
|
|
|
while (fgets(line, sizeof(line), f)) {
|
|
|
|
/* Update line number counter. */
|
|
|
|
linenum++;
|
|
|
|
if (process_config_line(options, host, line, filename, linenum, &active) != 0)
|
|
|
|
bad_options++;
|
|
|
|
}
|
|
|
|
fclose(f);
|
|
|
|
if (bad_options > 0)
|
|
|
|
fatal("%s: terminating, %d bad configuration options\n",
|
|
|
|
filename, bad_options);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Initializes options to special values that indicate that they have not yet
|
|
|
|
* been set. Read_config_file will only set options with this value. Options
|
|
|
|
* are processed in the following order: command line, user config file,
|
|
|
|
* system config file. Last, fill_default_options is called.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
initialize_options(Options * options)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(options, 'X', sizeof(*options));
|
|
|
|
options->forward_agent = -1;
|
|
|
|
options->forward_x11 = -1;
|
|
|
|
options->gateway_ports = -1;
|
|
|
|
options->use_privileged_port = -1;
|
|
|
|
options->rhosts_authentication = -1;
|
|
|
|
options->rsa_authentication = -1;
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
options->dsa_authentication = -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->skey_authentication = -1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef KRB4
|
1999-11-24 13:26:21 +00:00
|
|
|
options->kerberos_authentication = -1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
options->kerberos_tgt_passing = -1;
|
|
|
|
options->afs_token_passing = -1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
options->password_authentication = -1;
|
|
|
|
options->rhosts_rsa_authentication = -1;
|
|
|
|
options->fallback_to_rsh = -1;
|
|
|
|
options->use_rsh = -1;
|
|
|
|
options->batch_mode = -1;
|
|
|
|
options->check_host_ip = -1;
|
|
|
|
options->strict_host_key_checking = -1;
|
|
|
|
options->compression = -1;
|
|
|
|
options->keepalives = -1;
|
|
|
|
options->compression_level = -1;
|
|
|
|
options->port = -1;
|
|
|
|
options->connection_attempts = -1;
|
|
|
|
options->number_of_password_prompts = -1;
|
|
|
|
options->cipher = -1;
|
2000-04-12 10:17:38 +00:00
|
|
|
options->ciphers = NULL;
|
|
|
|
options->protocol = SSH_PROTO_UNKNOWN;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->num_identity_files = 0;
|
2000-04-29 13:57:08 +00:00
|
|
|
options->num_identity_files2 = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->hostname = NULL;
|
|
|
|
options->proxy_command = NULL;
|
|
|
|
options->user = NULL;
|
|
|
|
options->escape_char = -1;
|
|
|
|
options->system_hostfile = NULL;
|
|
|
|
options->user_hostfile = NULL;
|
2000-04-29 13:57:08 +00:00
|
|
|
options->system_hostfile2 = NULL;
|
|
|
|
options->user_hostfile2 = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->num_local_forwards = 0;
|
|
|
|
options->num_remote_forwards = 0;
|
|
|
|
options->log_level = (LogLevel) - 1;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Called after processing other sources of option data, this fills those
|
|
|
|
* options for which no value has been specified with their default values.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
fill_default_options(Options * options)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->forward_agent == -1)
|
2000-05-30 03:44:51 +00:00
|
|
|
options->forward_agent = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->forward_x11 == -1)
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
options->forward_x11 = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->gateway_ports == -1)
|
|
|
|
options->gateway_ports = 0;
|
|
|
|
if (options->use_privileged_port == -1)
|
|
|
|
options->use_privileged_port = 1;
|
|
|
|
if (options->rhosts_authentication == -1)
|
|
|
|
options->rhosts_authentication = 1;
|
|
|
|
if (options->rsa_authentication == -1)
|
|
|
|
options->rsa_authentication = 1;
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
if (options->dsa_authentication == -1)
|
|
|
|
options->dsa_authentication = 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->skey_authentication == -1)
|
|
|
|
options->skey_authentication = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef KRB4
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->kerberos_authentication == -1)
|
|
|
|
options->kerberos_authentication = 1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif /* KRB4 */
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->kerberos_tgt_passing == -1)
|
|
|
|
options->kerberos_tgt_passing = 1;
|
|
|
|
if (options->afs_token_passing == -1)
|
|
|
|
options->afs_token_passing = 1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif /* AFS */
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->password_authentication == -1)
|
|
|
|
options->password_authentication = 1;
|
|
|
|
if (options->rhosts_rsa_authentication == -1)
|
|
|
|
options->rhosts_rsa_authentication = 1;
|
|
|
|
if (options->fallback_to_rsh == -1)
|
|
|
|
options->fallback_to_rsh = 1;
|
|
|
|
if (options->use_rsh == -1)
|
|
|
|
options->use_rsh = 0;
|
|
|
|
if (options->batch_mode == -1)
|
|
|
|
options->batch_mode = 0;
|
|
|
|
if (options->check_host_ip == -1)
|
|
|
|
options->check_host_ip = 1;
|
|
|
|
if (options->strict_host_key_checking == -1)
|
|
|
|
options->strict_host_key_checking = 2; /* 2 is default */
|
|
|
|
if (options->compression == -1)
|
|
|
|
options->compression = 0;
|
|
|
|
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->connection_attempts == -1)
|
|
|
|
options->connection_attempts = 4;
|
|
|
|
if (options->number_of_password_prompts == -1)
|
|
|
|
options->number_of_password_prompts = 3;
|
|
|
|
/* Selected in ssh_login(). */
|
|
|
|
if (options->cipher == -1)
|
|
|
|
options->cipher = SSH_CIPHER_NOT_SET;
|
2000-05-09 01:02:59 +00:00
|
|
|
/* options->ciphers, default set in myproposals.h */
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->protocol == SSH_PROTO_UNKNOWN)
|
2000-04-29 13:57:08 +00:00
|
|
|
options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->num_identity_files == 0) {
|
|
|
|
options->identity_files[0] =
|
|
|
|
xmalloc(2 + strlen(SSH_CLIENT_IDENTITY) + 1);
|
|
|
|
sprintf(options->identity_files[0], "~/%.100s", SSH_CLIENT_IDENTITY);
|
|
|
|
options->num_identity_files = 1;
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (options->num_identity_files2 == 0) {
|
|
|
|
options->identity_files2[0] =
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
xmalloc(2 + strlen(SSH_CLIENT_ID_DSA) + 1);
|
|
|
|
sprintf(options->identity_files2[0], "~/%.100s", SSH_CLIENT_ID_DSA);
|
2000-04-29 13:57:08 +00:00
|
|
|
options->num_identity_files2 = 1;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->escape_char == -1)
|
|
|
|
options->escape_char = '~';
|
|
|
|
if (options->system_hostfile == NULL)
|
|
|
|
options->system_hostfile = SSH_SYSTEM_HOSTFILE;
|
|
|
|
if (options->user_hostfile == NULL)
|
|
|
|
options->user_hostfile = SSH_USER_HOSTFILE;
|
2000-04-29 13:57:08 +00:00
|
|
|
if (options->system_hostfile2 == NULL)
|
|
|
|
options->system_hostfile2 = SSH_SYSTEM_HOSTFILE2;
|
|
|
|
if (options->user_hostfile2 == NULL)
|
|
|
|
options->user_hostfile2 = SSH_USER_HOSTFILE2;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->log_level == (LogLevel) - 1)
|
|
|
|
options->log_level = SYSLOG_LEVEL_INFO;
|
|
|
|
/* 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 */
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|