1999-10-27 03:42:43 +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
|
|
|
*
|
2000-09-16 02:29:08 +00:00
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2001-07-04 04:48:36 +00:00
|
|
|
RCSID("$OpenBSD: servconf.c,v 1.86 2001/06/26 17:41:49 dugsong Exp $");
|
2001-01-22 05:34:40 +00:00
|
|
|
|
|
|
|
#ifdef KRB4
|
|
|
|
#include <krb.h>
|
|
|
|
#endif
|
2001-07-04 04:48:36 +00:00
|
|
|
#ifdef AFS
|
|
|
|
#include <kafs.h>
|
|
|
|
#endif
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "log.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "servconf.h"
|
|
|
|
#include "xmalloc.h"
|
2000-04-12 10:17:38 +00:00
|
|
|
#include "compat.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "pathnames.h"
|
|
|
|
#include "tildexpand.h"
|
|
|
|
#include "misc.h"
|
|
|
|
#include "cipher.h"
|
2001-02-15 03:01:59 +00:00
|
|
|
#include "kex.h"
|
|
|
|
#include "mac.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void add_listen_addr(ServerOptions *, char *, u_short);
|
|
|
|
static void add_one_listen_addr(ServerOptions *, char *, u_short);
|
2000-01-14 04:45:46 +00:00
|
|
|
|
2001-01-22 05:34:40 +00:00
|
|
|
/* AF_UNSPEC or AF_INET or AF_INET6 */
|
|
|
|
extern int IPv4or6;
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/* Initializes the server options to their default values. */
|
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
initialize_server_options(ServerOptions *options)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(options, 0, sizeof(*options));
|
2000-01-14 04:45:46 +00:00
|
|
|
options->num_ports = 0;
|
|
|
|
options->ports_from_cmdline = 0;
|
|
|
|
options->listen_addrs = NULL;
|
2000-11-13 11:57:25 +00:00
|
|
|
options->num_host_key_files = 0;
|
2000-05-01 23:23:45 +00:00
|
|
|
options->pid_file = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->server_key_bits = -1;
|
|
|
|
options->login_grace_time = -1;
|
|
|
|
options->key_regeneration_time = -1;
|
2001-02-15 03:08:27 +00:00
|
|
|
options->permit_root_login = PERMIT_NOT_SET;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->ignore_rhosts = -1;
|
|
|
|
options->ignore_user_known_hosts = -1;
|
|
|
|
options->print_motd = -1;
|
2001-03-26 05:45:53 +00:00
|
|
|
options->print_lastlog = -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->check_mail = -1;
|
|
|
|
options->x11_forwarding = -1;
|
|
|
|
options->x11_display_offset = -1;
|
2000-06-07 09:55:44 +00:00
|
|
|
options->xauth_location = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->strict_modes = -1;
|
|
|
|
options->keepalives = -1;
|
|
|
|
options->log_facility = (SyslogFacility) - 1;
|
|
|
|
options->log_level = (LogLevel) - 1;
|
|
|
|
options->rhosts_authentication = -1;
|
|
|
|
options->rhosts_rsa_authentication = -1;
|
2001-04-12 23:34:34 +00:00
|
|
|
options->hostbased_authentication = -1;
|
|
|
|
options->hostbased_uses_name_from_packet_only = -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->rsa_authentication = -1;
|
2000-11-13 11:57:25 +00:00
|
|
|
options->pubkey_authentication = -1;
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(KRB4) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
options->kerberos_authentication = -1;
|
|
|
|
options->kerberos_or_local_passwd = -1;
|
|
|
|
options->kerberos_ticket_cleanup = -1;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(AFS) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
options->kerberos_tgt_passing = -1;
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
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;
|
2000-10-14 05:23:11 +00:00
|
|
|
options->kbd_interactive_authentication = -1;
|
2001-06-05 18:56:16 +00:00
|
|
|
options->challenge_response_authentication = -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->permit_empty_passwd = -1;
|
|
|
|
options->use_login = -1;
|
2000-10-16 01:14:42 +00:00
|
|
|
options->allow_tcp_forwarding = -1;
|
1999-11-24 13:26:21 +00:00
|
|
|
options->num_allow_users = 0;
|
|
|
|
options->num_deny_users = 0;
|
|
|
|
options->num_allow_groups = 0;
|
|
|
|
options->num_deny_groups = 0;
|
2000-04-12 10:17:38 +00:00
|
|
|
options->ciphers = NULL;
|
2001-02-15 03:01:59 +00:00
|
|
|
options->macs = NULL;
|
2000-04-12 10:17:38 +00:00
|
|
|
options->protocol = SSH_PROTO_UNKNOWN;
|
- 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->gateway_ports = -1;
|
2000-06-18 04:50:44 +00:00
|
|
|
options->num_subsystems = 0;
|
2000-08-18 03:59:06 +00:00
|
|
|
options->max_startups_begin = -1;
|
|
|
|
options->max_startups_rate = -1;
|
2000-07-11 07:31:38 +00:00
|
|
|
options->max_startups = -1;
|
2001-01-09 00:35:42 +00:00
|
|
|
options->banner = NULL;
|
2001-02-04 12:20:18 +00:00
|
|
|
options->reverse_mapping_check = -1;
|
2001-04-13 23:28:01 +00:00
|
|
|
options->client_alive_interval = -1;
|
|
|
|
options->client_alive_count_max = -1;
|
2001-06-05 20:25:05 +00:00
|
|
|
options->authorized_keys_file = NULL;
|
|
|
|
options->authorized_keys_file2 = NULL;
|
2001-04-25 12:44:14 +00:00
|
|
|
options->pam_authentication_via_kbd_int = -1;
|
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_server_options(ServerOptions *options)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-11-13 11:57:25 +00:00
|
|
|
if (options->protocol == SSH_PROTO_UNKNOWN)
|
|
|
|
options->protocol = SSH_PROTO_1|SSH_PROTO_2;
|
|
|
|
if (options->num_host_key_files == 0) {
|
|
|
|
/* fill default hostkeys for protocols */
|
|
|
|
if (options->protocol & SSH_PROTO_1)
|
2001-01-22 05:34:40 +00:00
|
|
|
options->host_key_files[options->num_host_key_files++] = _PATH_HOST_KEY_FILE;
|
2000-11-13 11:57:25 +00:00
|
|
|
if (options->protocol & SSH_PROTO_2)
|
2001-01-22 05:34:40 +00:00
|
|
|
options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE;
|
2000-11-13 11:57:25 +00:00
|
|
|
}
|
2000-01-14 04:45:46 +00:00
|
|
|
if (options->num_ports == 0)
|
|
|
|
options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
|
|
|
|
if (options->listen_addrs == NULL)
|
2001-04-12 23:39:26 +00:00
|
|
|
add_listen_addr(options, NULL, 0);
|
2000-05-01 23:23:45 +00:00
|
|
|
if (options->pid_file == NULL)
|
2001-01-22 05:34:40 +00:00
|
|
|
options->pid_file = _PATH_SSH_DAEMON_PID_FILE;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->server_key_bits == -1)
|
|
|
|
options->server_key_bits = 768;
|
|
|
|
if (options->login_grace_time == -1)
|
|
|
|
options->login_grace_time = 600;
|
|
|
|
if (options->key_regeneration_time == -1)
|
|
|
|
options->key_regeneration_time = 3600;
|
2001-02-15 03:08:27 +00:00
|
|
|
if (options->permit_root_login == PERMIT_NOT_SET)
|
|
|
|
options->permit_root_login = PERMIT_YES;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->ignore_rhosts == -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->ignore_rhosts = 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->ignore_user_known_hosts == -1)
|
|
|
|
options->ignore_user_known_hosts = 0;
|
|
|
|
if (options->check_mail == -1)
|
|
|
|
options->check_mail = 0;
|
|
|
|
if (options->print_motd == -1)
|
|
|
|
options->print_motd = 1;
|
2001-03-26 05:45:53 +00:00
|
|
|
if (options->print_lastlog == -1)
|
|
|
|
options->print_lastlog = 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->x11_forwarding == -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->x11_forwarding = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->x11_display_offset == -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->x11_display_offset = 10;
|
2001-06-09 01:48:01 +00:00
|
|
|
#ifdef _PATH_XAUTH
|
2000-06-07 09:55:44 +00:00
|
|
|
if (options->xauth_location == NULL)
|
2001-06-09 01:48:01 +00:00
|
|
|
options->xauth_location = _PATH_XAUTH;
|
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->strict_modes == -1)
|
|
|
|
options->strict_modes = 1;
|
|
|
|
if (options->keepalives == -1)
|
|
|
|
options->keepalives = 1;
|
|
|
|
if (options->log_facility == (SyslogFacility) (-1))
|
|
|
|
options->log_facility = SYSLOG_FACILITY_AUTH;
|
|
|
|
if (options->log_level == (LogLevel) (-1))
|
2001-01-19 04:26:52 +00:00
|
|
|
options->log_level = SYSLOG_LEVEL_INFO;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->rhosts_authentication == -1)
|
|
|
|
options->rhosts_authentication = 0;
|
|
|
|
if (options->rhosts_rsa_authentication == -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->rhosts_rsa_authentication = 0;
|
2001-04-12 23:34:34 +00:00
|
|
|
if (options->hostbased_authentication == -1)
|
|
|
|
options->hostbased_authentication = 0;
|
|
|
|
if (options->hostbased_uses_name_from_packet_only == -1)
|
|
|
|
options->hostbased_uses_name_from_packet_only = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->rsa_authentication == -1)
|
|
|
|
options->rsa_authentication = 1;
|
2000-11-13 11:57:25 +00:00
|
|
|
if (options->pubkey_authentication == -1)
|
|
|
|
options->pubkey_authentication = 1;
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(KRB4) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->kerberos_authentication == -1)
|
|
|
|
options->kerberos_authentication = (access(KEYFILE, R_OK) == 0);
|
|
|
|
if (options->kerberos_or_local_passwd == -1)
|
|
|
|
options->kerberos_or_local_passwd = 1;
|
|
|
|
if (options->kerberos_ticket_cleanup == -1)
|
|
|
|
options->kerberos_ticket_cleanup = 1;
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
|
|
|
#if defined(AFS) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->kerberos_tgt_passing == -1)
|
|
|
|
options->kerberos_tgt_passing = 0;
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->afs_token_passing == -1)
|
|
|
|
options->afs_token_passing = k_hasafs();
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->password_authentication == -1)
|
|
|
|
options->password_authentication = 1;
|
2000-10-14 05:23:11 +00:00
|
|
|
if (options->kbd_interactive_authentication == -1)
|
|
|
|
options->kbd_interactive_authentication = 0;
|
2001-06-05 18:56:16 +00:00
|
|
|
if (options->challenge_response_authentication == -1)
|
|
|
|
options->challenge_response_authentication = 1;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->permit_empty_passwd == -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->permit_empty_passwd = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (options->use_login == -1)
|
|
|
|
options->use_login = 0;
|
2000-10-16 01:14:42 +00:00
|
|
|
if (options->allow_tcp_forwarding == -1)
|
|
|
|
options->allow_tcp_forwarding = 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->gateway_ports == -1)
|
|
|
|
options->gateway_ports = 0;
|
2000-07-11 07:31:38 +00:00
|
|
|
if (options->max_startups == -1)
|
|
|
|
options->max_startups = 10;
|
2000-08-18 03:59:06 +00:00
|
|
|
if (options->max_startups_rate == -1)
|
|
|
|
options->max_startups_rate = 100; /* 100% */
|
|
|
|
if (options->max_startups_begin == -1)
|
|
|
|
options->max_startups_begin = options->max_startups;
|
2001-02-04 12:20:18 +00:00
|
|
|
if (options->reverse_mapping_check == -1)
|
|
|
|
options->reverse_mapping_check = 0;
|
2001-04-13 23:28:01 +00:00
|
|
|
if (options->client_alive_interval == -1)
|
|
|
|
options->client_alive_interval = 0;
|
|
|
|
if (options->client_alive_count_max == -1)
|
|
|
|
options->client_alive_count_max = 3;
|
2001-06-05 20:25:05 +00:00
|
|
|
if (options->authorized_keys_file == NULL)
|
2001-07-04 18:29:14 +00:00
|
|
|
options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
|
2001-06-05 20:25:05 +00:00
|
|
|
if (options->authorized_keys_file2 == NULL)
|
2001-07-04 18:29:14 +00:00
|
|
|
options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2;
|
2001-04-25 12:44:14 +00:00
|
|
|
if (options->pam_authentication_via_kbd_int == -1)
|
|
|
|
options->pam_authentication_via_kbd_int = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Keyword tokens. */
|
1999-11-24 13:26:21 +00:00
|
|
|
typedef enum {
|
|
|
|
sBadOption, /* == unknown option */
|
|
|
|
sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
|
|
|
|
sPermitRootLogin, sLogFacility, sLogLevel,
|
|
|
|
sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication,
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(KRB4) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(AFS) || defined(KRB5)
|
|
|
|
sKerberosTgtPassing,
|
|
|
|
#endif
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef AFS
|
2001-07-04 04:21:14 +00:00
|
|
|
sAFSTokenPassing,
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2001-01-23 03:12:10 +00:00
|
|
|
sChallengeResponseAuthentication,
|
2000-10-14 05:23:11 +00:00
|
|
|
sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
|
2001-03-26 05:45:53 +00:00
|
|
|
sPrintMotd, sPrintLastLog, sIgnoreRhosts,
|
|
|
|
sX11Forwarding, sX11DisplayOffset,
|
2001-03-05 07:42:03 +00:00
|
|
|
sStrictModes, sEmptyPasswd, sKeepAlives, sCheckMail,
|
2000-10-16 01:14:42 +00:00
|
|
|
sUseLogin, sAllowTcpForwarding,
|
|
|
|
sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
|
2001-02-15 03:01:59 +00:00
|
|
|
sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
|
2000-11-13 11:57:25 +00:00
|
|
|
sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
|
2001-04-12 23:34:34 +00:00
|
|
|
sBanner, sReverseMappingCheck, sHostbasedAuthentication,
|
2001-04-13 23:28:01 +00:00
|
|
|
sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
|
2001-06-05 20:25:05 +00:00
|
|
|
sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
|
|
|
|
sPAMAuthenticationViaKbdInt
|
1999-10-27 03:42:43 +00:00
|
|
|
} ServerOpCodes;
|
|
|
|
|
|
|
|
/* Textual representation of the tokens. */
|
1999-11-24 13:26:21 +00:00
|
|
|
static struct {
|
|
|
|
const char *name;
|
|
|
|
ServerOpCodes opcode;
|
|
|
|
} keywords[] = {
|
|
|
|
{ "port", sPort },
|
|
|
|
{ "hostkey", sHostKeyFile },
|
2000-11-13 11:57:25 +00:00
|
|
|
{ "hostdsakey", sHostKeyFile }, /* alias */
|
2001-02-05 12:42:17 +00:00
|
|
|
{ "pidfile", sPidFile },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "serverkeybits", sServerKeyBits },
|
|
|
|
{ "logingracetime", sLoginGraceTime },
|
|
|
|
{ "keyregenerationinterval", sKeyRegenerationTime },
|
|
|
|
{ "permitrootlogin", sPermitRootLogin },
|
|
|
|
{ "syslogfacility", sLogFacility },
|
|
|
|
{ "loglevel", sLogLevel },
|
|
|
|
{ "rhostsauthentication", sRhostsAuthentication },
|
|
|
|
{ "rhostsrsaauthentication", sRhostsRSAAuthentication },
|
2001-04-12 23:34:34 +00:00
|
|
|
{ "hostbasedauthentication", sHostbasedAuthentication },
|
|
|
|
{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "rsaauthentication", sRSAAuthentication },
|
2000-11-13 11:57:25 +00:00
|
|
|
{ "pubkeyauthentication", sPubkeyAuthentication },
|
|
|
|
{ "dsaauthentication", sPubkeyAuthentication }, /* alias */
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(KRB4) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "kerberosauthentication", sKerberosAuthentication },
|
|
|
|
{ "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
|
|
|
|
{ "kerberosticketcleanup", sKerberosTicketCleanup },
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(AFS) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "kerberostgtpassing", sKerberosTgtPassing },
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "afstokenpassing", sAFSTokenPassing },
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "passwordauthentication", sPasswordAuthentication },
|
2000-10-14 05:23:11 +00:00
|
|
|
{ "kbdinteractiveauthentication", sKbdInteractiveAuthentication },
|
2001-01-23 03:12:10 +00:00
|
|
|
{ "challengeresponseauthentication", sChallengeResponseAuthentication },
|
|
|
|
{ "skeyauthentication", sChallengeResponseAuthentication }, /* alias */
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "checkmail", sCheckMail },
|
|
|
|
{ "listenaddress", sListenAddress },
|
|
|
|
{ "printmotd", sPrintMotd },
|
2001-03-26 05:45:53 +00:00
|
|
|
{ "printlastlog", sPrintLastLog },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "ignorerhosts", sIgnoreRhosts },
|
|
|
|
{ "ignoreuserknownhosts", sIgnoreUserKnownHosts },
|
|
|
|
{ "x11forwarding", sX11Forwarding },
|
|
|
|
{ "x11displayoffset", sX11DisplayOffset },
|
2000-06-07 09:55:44 +00:00
|
|
|
{ "xauthlocation", sXAuthLocation },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "strictmodes", sStrictModes },
|
|
|
|
{ "permitemptypasswords", sEmptyPasswd },
|
|
|
|
{ "uselogin", sUseLogin },
|
|
|
|
{ "keepalive", sKeepAlives },
|
2000-10-16 01:14:42 +00:00
|
|
|
{ "allowtcpforwarding", sAllowTcpForwarding },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ "allowusers", sAllowUsers },
|
|
|
|
{ "denyusers", sDenyUsers },
|
|
|
|
{ "allowgroups", sAllowGroups },
|
|
|
|
{ "denygroups", sDenyGroups },
|
2000-04-12 10:17:38 +00:00
|
|
|
{ "ciphers", sCiphers },
|
2001-02-15 03:01:59 +00:00
|
|
|
{ "macs", sMacs },
|
2000-04-12 10:17:38 +00:00
|
|
|
{ "protocol", sProtocol },
|
- 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
|
|
|
{ "gatewayports", sGatewayPorts },
|
2000-06-18 04:50:44 +00:00
|
|
|
{ "subsystem", sSubsystem },
|
2000-07-11 07:31:38 +00:00
|
|
|
{ "maxstartups", sMaxStartups },
|
2001-01-09 00:35:42 +00:00
|
|
|
{ "banner", sBanner },
|
2001-02-04 12:20:18 +00:00
|
|
|
{ "reversemappingcheck", sReverseMappingCheck },
|
2001-04-13 23:28:01 +00:00
|
|
|
{ "clientaliveinterval", sClientAliveInterval },
|
|
|
|
{ "clientalivecountmax", sClientAliveCountMax },
|
2001-06-05 20:25:05 +00:00
|
|
|
{ "authorizedkeysfile", sAuthorizedKeysFile },
|
|
|
|
{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
|
2001-04-25 12:44:14 +00:00
|
|
|
{ "PAMAuthenticationViaKbdInt", sPAMAuthenticationViaKbdInt },
|
1999-11-24 13:26:21 +00:00
|
|
|
{ NULL, 0 }
|
1999-10-27 03:42:43 +00:00
|
|
|
};
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
2001-04-02 18:20:03 +00:00
|
|
|
* Returns the number of the token pointed to by cp or sBadOption.
|
1999-11-25 00:54:57 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
static ServerOpCodes
|
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
|
|
|
{
|
2000-12-22 01:43:59 +00:00
|
|
|
u_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
|
|
|
|
2001-04-16 02:13:26 +00:00
|
|
|
error("%s: line %d: Bad configuration option: %s",
|
|
|
|
filename, linenum, cp);
|
1999-11-24 13:26:21 +00:00
|
|
|
return sBadOption;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-04-12 23:39:26 +00:00
|
|
|
add_listen_addr(ServerOptions *options, char *addr, u_short port)
|
2000-01-14 04:45:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (options->num_ports == 0)
|
|
|
|
options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
|
2001-04-12 23:39:26 +00:00
|
|
|
if (port == 0)
|
2001-04-07 17:25:48 +00:00
|
|
|
for (i = 0; i < options->num_ports; i++)
|
|
|
|
add_one_listen_addr(options, addr, options->ports[i]);
|
|
|
|
else
|
2001-04-12 23:39:26 +00:00
|
|
|
add_one_listen_addr(options, addr, port);
|
2001-04-07 17:25:48 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-04-07 17:25:48 +00:00
|
|
|
add_one_listen_addr(ServerOptions *options, char *addr, u_short port)
|
|
|
|
{
|
|
|
|
struct addrinfo hints, *ai, *aitop;
|
|
|
|
char strport[NI_MAXSERV];
|
|
|
|
int gaierr;
|
|
|
|
|
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
hints.ai_family = IPv4or6;
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
hints.ai_flags = (addr == NULL) ? AI_PASSIVE : 0;
|
|
|
|
snprintf(strport, sizeof strport, "%d", port);
|
|
|
|
if ((gaierr = getaddrinfo(addr, strport, &hints, &aitop)) != 0)
|
|
|
|
fatal("bad addr or host: %s (%s)",
|
|
|
|
addr ? addr : "<NULL>",
|
|
|
|
gai_strerror(gaierr));
|
|
|
|
for (ai = aitop; ai->ai_next; ai = ai->ai_next)
|
|
|
|
;
|
|
|
|
ai->ai_next = options->listen_addrs;
|
|
|
|
options->listen_addrs = aitop;
|
2000-01-14 04:45:46 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/* Reads the server configuration file. */
|
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
read_server_config(ServerOptions *options, const char *filename)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
FILE *f;
|
|
|
|
char line[1024];
|
2001-04-07 17:25:48 +00:00
|
|
|
char *cp, **charptr, *arg, *p;
|
1999-11-24 13:26:21 +00:00
|
|
|
int linenum, *intptr, value;
|
|
|
|
int bad_options = 0;
|
|
|
|
ServerOpCodes opcode;
|
2000-06-18 04:50:44 +00:00
|
|
|
int i;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
f = fopen(filename, "r");
|
|
|
|
if (!f) {
|
|
|
|
perror(filename);
|
1999-10-27 03:42:43 +00:00
|
|
|
exit(1);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
linenum = 0;
|
|
|
|
while (fgets(line, sizeof(line), f)) {
|
|
|
|
linenum++;
|
2000-07-15 04:14:16 +00:00
|
|
|
cp = line;
|
|
|
|
arg = strdelim(&cp);
|
|
|
|
/* Ignore leading whitespace */
|
|
|
|
if (*arg == '\0')
|
|
|
|
arg = strdelim(&cp);
|
2001-01-22 05:34:40 +00:00
|
|
|
if (!arg || !*arg || *arg == '#')
|
1999-11-24 13:26:21 +00:00
|
|
|
continue;
|
2000-11-13 11:57:25 +00:00
|
|
|
intptr = NULL;
|
|
|
|
charptr = NULL;
|
2000-07-11 07:31:38 +00:00
|
|
|
opcode = parse_token(arg, filename, linenum);
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (opcode) {
|
|
|
|
case sBadOption:
|
|
|
|
bad_options++;
|
|
|
|
continue;
|
|
|
|
case sPort:
|
2000-01-14 04:45:46 +00:00
|
|
|
/* ignore ports from configfile if cmdline specifies ports */
|
|
|
|
if (options->ports_from_cmdline)
|
|
|
|
continue;
|
|
|
|
if (options->listen_addrs != NULL)
|
|
|
|
fatal("%s line %d: ports must be specified before "
|
2001-05-03 22:39:11 +00:00
|
|
|
"ListenAdress.", filename, linenum);
|
2000-01-14 04:45:46 +00:00
|
|
|
if (options->num_ports >= MAX_PORTS)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: too many ports.",
|
2000-04-16 01:18:38 +00:00
|
|
|
filename, linenum);
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!arg || *arg == '\0')
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: missing port number.",
|
2000-01-14 04:45:46 +00:00
|
|
|
filename, linenum);
|
2001-04-12 23:39:26 +00:00
|
|
|
options->ports[options->num_ports++] = a2port(arg);
|
|
|
|
if (options->ports[options->num_ports-1] == 0)
|
|
|
|
fatal("%s line %d: Badly formatted port number.",
|
|
|
|
filename, linenum);
|
2000-01-14 04:45:46 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case sServerKeyBits:
|
|
|
|
intptr = &options->server_key_bits;
|
1999-11-24 13:26:21 +00:00
|
|
|
parse_int:
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2001-04-16 02:13:26 +00:00
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: missing integer value.",
|
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
value = atoi(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sLoginGraceTime:
|
|
|
|
intptr = &options->login_grace_time;
|
2001-06-05 19:59:08 +00:00
|
|
|
parse_time:
|
|
|
|
arg = strdelim(&cp);
|
|
|
|
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;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
case sKeyRegenerationTime:
|
|
|
|
intptr = &options->key_regeneration_time;
|
2001-06-05 19:59:08 +00:00
|
|
|
goto parse_time;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
case sListenAddress:
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2001-04-07 17:25:48 +00:00
|
|
|
if (!arg || *arg == '\0' || strncmp(arg, "[]", 2) == 0)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: missing inet addr.",
|
2000-01-14 04:45:46 +00:00
|
|
|
filename, linenum);
|
2001-04-07 17:25:48 +00:00
|
|
|
if (*arg == '[') {
|
|
|
|
if ((p = strchr(arg, ']')) == NULL)
|
|
|
|
fatal("%s line %d: bad ipv6 inet addr usage.",
|
|
|
|
filename, linenum);
|
|
|
|
arg++;
|
|
|
|
memmove(p, p+1, strlen(p+1)+1);
|
|
|
|
} else if (((p = strchr(arg, ':')) == NULL) ||
|
|
|
|
(strchr(p+1, ':') != NULL)) {
|
2001-04-12 23:39:26 +00:00
|
|
|
add_listen_addr(options, arg, 0);
|
2001-04-07 17:25:48 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*p == ':') {
|
2001-04-12 23:39:26 +00:00
|
|
|
u_short port;
|
|
|
|
|
2001-04-07 17:25:48 +00:00
|
|
|
p++;
|
|
|
|
if (*p == '\0')
|
|
|
|
fatal("%s line %d: bad inet addr:port usage.",
|
|
|
|
filename, linenum);
|
|
|
|
else {
|
|
|
|
*(p-1) = '\0';
|
2001-04-12 23:39:26 +00:00
|
|
|
if ((port = a2port(p)) == 0)
|
|
|
|
fatal("%s line %d: bad port number.",
|
|
|
|
filename, linenum);
|
|
|
|
add_listen_addr(options, arg, port);
|
2001-04-07 17:25:48 +00:00
|
|
|
}
|
|
|
|
} else if (*p == '\0')
|
2001-04-12 23:39:26 +00:00
|
|
|
add_listen_addr(options, arg, 0);
|
2001-04-07 17:25:48 +00:00
|
|
|
else
|
|
|
|
fatal("%s line %d: bad inet addr usage.",
|
|
|
|
filename, linenum);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case sHostKeyFile:
|
2000-11-13 11:57:25 +00:00
|
|
|
intptr = &options->num_host_key_files;
|
2001-04-16 02:13:26 +00:00
|
|
|
if (*intptr >= MAX_HOSTKEYS)
|
|
|
|
fatal("%s line %d: too many host keys specified (max %d).",
|
2000-11-13 11:57:25 +00:00
|
|
|
filename, linenum, MAX_HOSTKEYS);
|
|
|
|
charptr = &options->host_key_files[*intptr];
|
2000-06-07 09:55:44 +00:00
|
|
|
parse_filename:
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2001-04-16 02:13:26 +00:00
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: missing file name.",
|
2000-05-01 23:23:45 +00:00
|
|
|
filename, linenum);
|
2000-11-13 11:57:25 +00:00
|
|
|
if (*charptr == NULL) {
|
2000-07-11 07:31:38 +00:00
|
|
|
*charptr = tilde_expand_filename(arg, getuid());
|
2000-11-13 11:57:25 +00:00
|
|
|
/* increase optional counter */
|
|
|
|
if (intptr != NULL)
|
|
|
|
*intptr = *intptr + 1;
|
|
|
|
}
|
2000-05-01 23:23:45 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case sPidFile:
|
|
|
|
charptr = &options->pid_file;
|
2000-06-07 09:55:44 +00:00
|
|
|
goto parse_filename;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
case sPermitRootLogin:
|
|
|
|
intptr = &options->permit_root_login;
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2001-04-16 02:13:26 +00:00
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: missing yes/"
|
2001-03-06 01:02:41 +00:00
|
|
|
"without-password/forced-commands-only/no "
|
2001-04-16 02:13:26 +00:00
|
|
|
"argument.", filename, linenum);
|
|
|
|
value = 0; /* silence compiler */
|
2000-07-11 07:31:38 +00:00
|
|
|
if (strcmp(arg, "without-password") == 0)
|
2001-02-15 03:08:27 +00:00
|
|
|
value = PERMIT_NO_PASSWD;
|
|
|
|
else if (strcmp(arg, "forced-commands-only") == 0)
|
|
|
|
value = PERMIT_FORCED_ONLY;
|
2000-07-11 07:31:38 +00:00
|
|
|
else if (strcmp(arg, "yes") == 0)
|
2001-02-15 03:08:27 +00:00
|
|
|
value = PERMIT_YES;
|
2000-07-11 07:31:38 +00:00
|
|
|
else if (strcmp(arg, "no") == 0)
|
2001-02-15 03:08:27 +00:00
|
|
|
value = PERMIT_NO;
|
2001-04-16 02:13:26 +00:00
|
|
|
else
|
|
|
|
fatal("%s line %d: Bad yes/"
|
2001-02-15 03:08:27 +00:00
|
|
|
"without-password/forced-commands-only/no "
|
2001-04-16 02:13:26 +00:00
|
|
|
"argument: %s", filename, linenum, arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sIgnoreRhosts:
|
|
|
|
intptr = &options->ignore_rhosts;
|
|
|
|
parse_flag:
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2001-04-16 02:13:26 +00:00
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: missing yes/no argument.",
|
|
|
|
filename, linenum);
|
|
|
|
value = 0; /* silence compiler */
|
2000-07-11 07:31:38 +00:00
|
|
|
if (strcmp(arg, "yes") == 0)
|
1999-11-24 13:26:21 +00:00
|
|
|
value = 1;
|
2000-07-11 07:31:38 +00:00
|
|
|
else if (strcmp(arg, "no") == 0)
|
1999-11-24 13:26:21 +00:00
|
|
|
value = 0;
|
2001-04-16 02:13:26 +00:00
|
|
|
else
|
|
|
|
fatal("%s line %d: Bad yes/no argument: %s",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*intptr == -1)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sIgnoreUserKnownHosts:
|
|
|
|
intptr = &options->ignore_user_known_hosts;
|
- 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
|
|
|
goto parse_flag;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
case sRhostsAuthentication:
|
|
|
|
intptr = &options->rhosts_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sRhostsRSAAuthentication:
|
|
|
|
intptr = &options->rhosts_rsa_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
2001-04-12 23:34:34 +00:00
|
|
|
case sHostbasedAuthentication:
|
|
|
|
intptr = &options->hostbased_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sHostbasedUsesNameFromPacketOnly:
|
|
|
|
intptr = &options->hostbased_uses_name_from_packet_only;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sRSAAuthentication:
|
|
|
|
intptr = &options->rsa_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
2000-11-13 11:57:25 +00:00
|
|
|
case sPubkeyAuthentication:
|
|
|
|
intptr = &options->pubkey_authentication;
|
- 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
|
|
|
goto parse_flag;
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(KRB4) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
case sKerberosAuthentication:
|
|
|
|
intptr = &options->kerberos_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sKerberosOrLocalPasswd:
|
|
|
|
intptr = &options->kerberos_or_local_passwd;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sKerberosTicketCleanup:
|
|
|
|
intptr = &options->kerberos_ticket_cleanup;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2001-07-04 04:21:14 +00:00
|
|
|
#if defined(AFS) || defined(KRB5)
|
1999-11-24 13:26:21 +00:00
|
|
|
case sKerberosTgtPassing:
|
|
|
|
intptr = &options->kerberos_tgt_passing;
|
|
|
|
goto parse_flag;
|
2001-07-04 04:21:14 +00:00
|
|
|
#endif
|
|
|
|
#ifdef AFS
|
1999-11-24 13:26:21 +00:00
|
|
|
case sAFSTokenPassing:
|
|
|
|
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 sPasswordAuthentication:
|
|
|
|
intptr = &options->password_authentication;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
case sKbdInteractiveAuthentication:
|
|
|
|
intptr = &options->kbd_interactive_authentication;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sCheckMail:
|
|
|
|
intptr = &options->check_mail;
|
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-01-23 03:12:10 +00:00
|
|
|
case sChallengeResponseAuthentication:
|
2001-06-05 18:56:16 +00:00
|
|
|
intptr = &options->challenge_response_authentication;
|
1999-11-24 13:26:21 +00:00
|
|
|
goto parse_flag;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sPrintMotd:
|
|
|
|
intptr = &options->print_motd;
|
|
|
|
goto parse_flag;
|
|
|
|
|
2001-03-26 05:45:53 +00:00
|
|
|
case sPrintLastLog:
|
|
|
|
intptr = &options->print_lastlog;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sX11Forwarding:
|
|
|
|
intptr = &options->x11_forwarding;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sX11DisplayOffset:
|
|
|
|
intptr = &options->x11_display_offset;
|
|
|
|
goto parse_int;
|
|
|
|
|
2000-06-07 09:55:44 +00:00
|
|
|
case sXAuthLocation:
|
|
|
|
charptr = &options->xauth_location;
|
|
|
|
goto parse_filename;
|
2001-02-05 12:42:17 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sStrictModes:
|
|
|
|
intptr = &options->strict_modes;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sKeepAlives:
|
|
|
|
intptr = &options->keepalives;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sEmptyPasswd:
|
|
|
|
intptr = &options->permit_empty_passwd;
|
|
|
|
goto parse_flag;
|
|
|
|
|
|
|
|
case sUseLogin:
|
|
|
|
intptr = &options->use_login;
|
|
|
|
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 sGatewayPorts:
|
|
|
|
intptr = &options->gateway_ports;
|
|
|
|
goto parse_flag;
|
|
|
|
|
2001-02-04 12:20:18 +00:00
|
|
|
case sReverseMappingCheck:
|
|
|
|
intptr = &options->reverse_mapping_check;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sLogFacility:
|
|
|
|
intptr = (int *) &options->log_facility;
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
value = log_facility_number(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (value == (SyslogFacility) - 1)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%.200s line %d: unsupported log facility '%s'",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg ? arg : "<NONE>");
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*intptr == -1)
|
|
|
|
*intptr = (SyslogFacility) value;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sLogLevel:
|
|
|
|
intptr = (int *) &options->log_level;
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
value = log_level_number(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (value == (LogLevel) - 1)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%.200s line %d: unsupported log level '%s'",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg ? arg : "<NONE>");
|
1999-11-24 13:26:21 +00:00
|
|
|
if (*intptr == -1)
|
|
|
|
*intptr = (LogLevel) value;
|
|
|
|
break;
|
|
|
|
|
2000-10-16 01:14:42 +00:00
|
|
|
case sAllowTcpForwarding:
|
|
|
|
intptr = &options->allow_tcp_forwarding;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
case sAllowUsers:
|
2000-07-15 04:14:16 +00:00
|
|
|
while ((arg = strdelim(&cp)) && *arg != '\0') {
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->num_allow_users >= MAX_ALLOW_USERS)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: too many allow users.",
|
2000-04-12 10:17:38 +00:00
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
options->allow_users[options->num_allow_users++] = xstrdup(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sDenyUsers:
|
2000-07-15 04:14:16 +00:00
|
|
|
while ((arg = strdelim(&cp)) && *arg != '\0') {
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->num_deny_users >= MAX_DENY_USERS)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal( "%s line %d: too many deny users.",
|
2000-04-12 10:17:38 +00:00
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
options->deny_users[options->num_deny_users++] = xstrdup(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sAllowGroups:
|
2000-07-15 04:14:16 +00:00
|
|
|
while ((arg = strdelim(&cp)) && *arg != '\0') {
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->num_allow_groups >= MAX_ALLOW_GROUPS)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: too many allow groups.",
|
2000-04-12 10:17:38 +00:00
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
options->allow_groups[options->num_allow_groups++] = xstrdup(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sDenyGroups:
|
2000-07-15 04:14:16 +00:00
|
|
|
while ((arg = strdelim(&cp)) && *arg != '\0') {
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->num_deny_groups >= MAX_DENY_GROUPS)
|
2001-03-05 07:47:23 +00:00
|
|
|
fatal("%s line %d: too many deny groups.",
|
2000-04-12 10:17:38 +00:00
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
options->deny_groups[options->num_deny_groups++] = xstrdup(arg);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2000-04-12 10:17:38 +00:00
|
|
|
case sCiphers:
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!arg || *arg == '\0')
|
2000-05-30 03:44:51 +00:00
|
|
|
fatal("%s line %d: Missing argument.", filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!ciphers_valid(arg))
|
2000-05-09 01:02:59 +00:00
|
|
|
fatal("%s line %d: Bad SSH2 cipher spec '%s'.",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg ? arg : "<NONE>");
|
2000-04-12 10:17:38 +00:00
|
|
|
if (options->ciphers == NULL)
|
2000-07-11 07:31:38 +00:00
|
|
|
options->ciphers = xstrdup(arg);
|
2000-04-12 10:17:38 +00:00
|
|
|
break;
|
|
|
|
|
2001-02-15 03:01:59 +00:00
|
|
|
case sMacs:
|
|
|
|
arg = strdelim(&cp);
|
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: Missing argument.", filename, linenum);
|
|
|
|
if (!mac_valid(arg))
|
|
|
|
fatal("%s line %d: Bad SSH2 mac spec '%s'.",
|
|
|
|
filename, linenum, arg ? arg : "<NONE>");
|
|
|
|
if (options->macs == NULL)
|
|
|
|
options->macs = xstrdup(arg);
|
|
|
|
break;
|
|
|
|
|
2000-04-12 10:17:38 +00:00
|
|
|
case sProtocol:
|
|
|
|
intptr = &options->protocol;
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!arg || *arg == '\0')
|
2000-05-30 03:44:51 +00:00
|
|
|
fatal("%s line %d: Missing argument.", filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
value = proto_spec(arg);
|
2000-04-12 10:17:38 +00:00
|
|
|
if (value == SSH_PROTO_UNKNOWN)
|
|
|
|
fatal("%s line %d: Bad protocol spec '%s'.",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg ? arg : "<NONE>");
|
2000-04-12 10:17:38 +00:00
|
|
|
if (*intptr == SSH_PROTO_UNKNOWN)
|
|
|
|
*intptr = value;
|
|
|
|
break;
|
|
|
|
|
2000-06-18 04:50:44 +00:00
|
|
|
case sSubsystem:
|
|
|
|
if(options->num_subsystems >= MAX_SUBSYSTEMS) {
|
|
|
|
fatal("%s line %d: too many subsystems defined.",
|
|
|
|
filename, linenum);
|
|
|
|
}
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!arg || *arg == '\0')
|
2000-06-18 04:50:44 +00:00
|
|
|
fatal("%s line %d: Missing subsystem name.",
|
|
|
|
filename, linenum);
|
|
|
|
for (i = 0; i < options->num_subsystems; i++)
|
2000-07-11 07:31:38 +00:00
|
|
|
if(strcmp(arg, options->subsystem_name[i]) == 0)
|
2000-06-18 04:50:44 +00:00
|
|
|
fatal("%s line %d: Subsystem '%s' already defined.",
|
2000-07-11 07:31:38 +00:00
|
|
|
filename, linenum, arg);
|
|
|
|
options->subsystem_name[options->num_subsystems] = xstrdup(arg);
|
2000-07-15 04:14:16 +00:00
|
|
|
arg = strdelim(&cp);
|
2000-07-11 07:31:38 +00:00
|
|
|
if (!arg || *arg == '\0')
|
2000-06-18 04:50:44 +00:00
|
|
|
fatal("%s line %d: Missing subsystem command.",
|
|
|
|
filename, linenum);
|
2000-07-11 07:31:38 +00:00
|
|
|
options->subsystem_command[options->num_subsystems] = xstrdup(arg);
|
2000-06-18 04:50:44 +00:00
|
|
|
options->num_subsystems++;
|
|
|
|
break;
|
|
|
|
|
2000-07-11 07:31:38 +00:00
|
|
|
case sMaxStartups:
|
2000-08-18 03:59:06 +00:00
|
|
|
arg = strdelim(&cp);
|
|
|
|
if (!arg || *arg == '\0')
|
|
|
|
fatal("%s line %d: Missing MaxStartups spec.",
|
|
|
|
filename, linenum);
|
|
|
|
if (sscanf(arg, "%d:%d:%d",
|
|
|
|
&options->max_startups_begin,
|
|
|
|
&options->max_startups_rate,
|
|
|
|
&options->max_startups) == 3) {
|
|
|
|
if (options->max_startups_begin >
|
|
|
|
options->max_startups ||
|
|
|
|
options->max_startups_rate > 100 ||
|
|
|
|
options->max_startups_rate < 1)
|
|
|
|
fatal("%s line %d: Illegal MaxStartups spec.",
|
|
|
|
filename, linenum);
|
|
|
|
break;
|
|
|
|
}
|
2000-07-11 07:31:38 +00:00
|
|
|
intptr = &options->max_startups;
|
|
|
|
goto parse_int;
|
|
|
|
|
2001-01-09 00:35:42 +00:00
|
|
|
case sBanner:
|
|
|
|
charptr = &options->banner;
|
|
|
|
goto parse_filename;
|
2001-06-05 20:25:05 +00:00
|
|
|
/*
|
|
|
|
* These options can contain %X options expanded at
|
|
|
|
* connect time, so that you can specify paths like:
|
|
|
|
*
|
|
|
|
* AuthorizedKeysFile /etc/ssh_keys/%u
|
|
|
|
*/
|
|
|
|
case sAuthorizedKeysFile:
|
|
|
|
case sAuthorizedKeysFile2:
|
|
|
|
charptr = (opcode == sAuthorizedKeysFile ) ?
|
|
|
|
&options->authorized_keys_file :
|
|
|
|
&options->authorized_keys_file2;
|
|
|
|
goto parse_filename;
|
2001-06-05 19:59:08 +00:00
|
|
|
|
2001-04-13 23:28:01 +00:00
|
|
|
case sClientAliveInterval:
|
|
|
|
intptr = &options->client_alive_interval;
|
2001-06-05 19:59:08 +00:00
|
|
|
goto parse_time;
|
|
|
|
|
2001-04-13 23:28:01 +00:00
|
|
|
case sClientAliveCountMax:
|
|
|
|
intptr = &options->client_alive_count_max;
|
|
|
|
goto parse_int;
|
2001-06-05 19:59:08 +00:00
|
|
|
|
2001-04-25 12:44:14 +00:00
|
|
|
case sPAMAuthenticationViaKbdInt:
|
|
|
|
intptr = &options->pam_authentication_via_kbd_int;
|
|
|
|
goto parse_flag;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
default:
|
2001-04-16 02:13:26 +00:00
|
|
|
fatal("%s line %d: Missing handler for opcode %s (%d)",
|
|
|
|
filename, linenum, arg, opcode);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2001-04-16 02:13:26 +00:00
|
|
|
if ((arg = strdelim(&cp)) != NULL && *arg != '\0')
|
|
|
|
fatal("%s line %d: garbage at end of line; \"%.200s\".",
|
|
|
|
filename, linenum, arg);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
fclose(f);
|
2001-04-16 02:13:26 +00:00
|
|
|
if (bad_options > 0)
|
|
|
|
fatal("%s: terminating, %d bad configuration options",
|
|
|
|
filename, bad_options);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|