=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.h,v retrieving revision 1.22.2.5 retrieving revision 1.23 diff -u -r1.22.2.5 -r1.23 --- src/usr.bin/ssh/servconf.h 2001/03/21 18:53:02 1.22.2.5 +++ src/usr.bin/ssh/servconf.h 2000/05/31 06:36:40 1.23 @@ -1,17 +1,19 @@ /* + * + * servconf.h + * * Author: Tatu Ylonen + * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved + * + * Created: Mon Aug 21 15:35:03 1995 ylo + * * Definitions for server configuration data and for the functions reading it. * - * 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". */ -/* RCSID("$OpenBSD: servconf.h,v 1.22.2.5 2001/03/21 18:53:02 jason Exp $"); */ +/* RCSID("$Id: servconf.h,v 1.23 2000/05/31 06:36:40 markus Exp $"); */ #ifndef SERVCONF_H #define SERVCONF_H @@ -22,31 +24,21 @@ #define MAX_DENY_USERS 256 /* Max # users on deny list. */ #define MAX_ALLOW_GROUPS 256 /* Max # groups on allow list. */ #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ -#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ -#define MAX_HOSTKEYS 256 /* Max # hostkeys. */ -/* permit_root_login */ -#define PERMIT_NOT_SET -1 -#define PERMIT_NO 0 -#define PERMIT_FORCED_ONLY 1 -#define PERMIT_NO_PASSWD 2 -#define PERMIT_YES 3 - - typedef struct { - u_int num_ports; - u_int ports_from_cmdline; + unsigned int num_ports; + unsigned int ports_from_cmdline; u_short ports[MAX_PORTS]; /* Port number to listen on. */ char *listen_addr; /* Address on which the server listens. */ struct addrinfo *listen_addrs; /* Addresses on which the server listens. */ - char *host_key_files[MAX_HOSTKEYS]; /* Files containing host keys. */ - int num_host_key_files; /* Number of files for host keys. */ + char *host_key_file; /* File containing host key. */ + char *host_dsa_key_file; /* File containing dsa host key. */ char *pid_file; /* Where to put our pid */ int server_key_bits;/* Size of the server key. */ int login_grace_time; /* Disconnect if no auth in this time * (sec). */ int key_regeneration_time; /* Server key lifetime (seconds). */ - int permit_root_login; /* PERMIT_*, see above */ + int permit_root_login; /* If true, permit root login. */ int ignore_rhosts; /* Ignore .rhosts and .shosts. */ int ignore_user_known_hosts; /* Ignore ~/.ssh/known_hosts * for RhostsRsaAuth */ @@ -58,9 +50,8 @@ char *xauth_location; /* Location of xauth program */ int strict_modes; /* If true, require string home dir modes. */ int keepalives; /* If true, set SO_KEEPALIVE. */ - char *ciphers; /* Supported SSH2 ciphers. */ - char *macs; /* Supported SSH2 macs. */ - int protocol; /* Supported protocol versions. */ + char *ciphers; /* Ciphers in order of preference. */ + int protocol; /* Protocol in order of preference. */ int gateway_ports; /* If true, allow remote connects to forwarded ports. */ SyslogFacility log_facility; /* Facility for system logging. */ LogLevel log_level; /* Level for system logging. */ @@ -69,7 +60,7 @@ int rhosts_rsa_authentication; /* If true, permit rhosts RSA * authentication. */ int rsa_authentication; /* If true, permit RSA authentication. */ - int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ + int dsa_authentication; /* If true, permit DSA authentication. */ #ifdef KRB4 int kerberos_authentication; /* If true, permit Kerberos * authentication. */ @@ -88,31 +79,21 @@ #endif int password_authentication; /* If true, permit password * authentication. */ - int kbd_interactive_authentication; /* If true, permit */ - int challenge_reponse_authentication; +#ifdef SKEY + int skey_authentication; /* If true, permit s/key + * authentication. */ +#endif int permit_empty_passwd; /* If false, do not permit empty * passwords. */ int use_login; /* If true, login(1) is used */ - int allow_tcp_forwarding; - u_int num_allow_users; + unsigned int num_allow_users; char *allow_users[MAX_ALLOW_USERS]; - u_int num_deny_users; + unsigned int num_deny_users; char *deny_users[MAX_DENY_USERS]; - u_int num_allow_groups; + unsigned int num_allow_groups; char *allow_groups[MAX_ALLOW_GROUPS]; - u_int num_deny_groups; + unsigned int num_deny_groups; char *deny_groups[MAX_DENY_GROUPS]; - - u_int num_subsystems; - char *subsystem_name[MAX_SUBSYSTEMS]; - char *subsystem_command[MAX_SUBSYSTEMS]; - - int max_startups_begin; - int max_startups_rate; - int max_startups; - char *banner; /* SSH-2 banner message */ - int reverse_mapping_check; /* cross-check ip and dns */ - } ServerOptions; /* * Initializes the server options to special values that indicate that they