=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.h,v retrieving revision 1.30.2.6 retrieving revision 1.31 diff -u -r1.30.2.6 -r1.31 --- src/usr.bin/ssh/servconf.h 2002/03/08 17:04:43 1.30.2.6 +++ src/usr.bin/ssh/servconf.h 2000/11/12 19:50:38 1.31 @@ -1,5 +1,3 @@ -/* $OpenBSD: servconf.h,v 1.30.2.6 2002/03/08 17:04:43 brad Exp $ */ - /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -13,6 +11,8 @@ * called by a name other than "ssh" or "Secure Shell". */ +/* RCSID("$OpenBSD: servconf.h,v 1.31 2000/11/12 19:50:38 markus Exp $"); */ + #ifndef SERVCONF_H #define SERVCONF_H @@ -25,17 +25,9 @@ #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. */ @@ -46,22 +38,20 @@ 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 */ int print_motd; /* If true, print /etc/motd. */ - int print_lastlog; /* If true, print lastlog */ + int check_mail; /* If true, check for new mail. */ int x11_forwarding; /* If true, permit inet (spoofing) X11 fwd. */ int x11_display_offset; /* What DISPLAY number to start * searching at */ - int x11_use_localhost; /* If true, use localhost for fake X11 server. */ 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,11 +59,9 @@ * authentication. */ int rhosts_rsa_authentication; /* If true, permit rhosts RSA * authentication. */ - int hostbased_authentication; /* If true, permit ssh2 hostbased auth */ - int hostbased_uses_name_from_packet_only; /* experimental */ int rsa_authentication; /* If true, permit RSA authentication. */ int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ -#if defined(KRB4) || defined(KRB5) +#ifdef KRB4 int kerberos_authentication; /* If true, permit Kerberos * authentication. */ int kerberos_or_local_passwd; /* If true, permit kerberos @@ -84,58 +72,53 @@ int kerberos_ticket_cleanup; /* If true, destroy ticket * file on logout. */ #endif -#if defined(AFS) || defined(KRB5) - int kerberos_tgt_passing; /* If true, permit Kerberos TGT - * passing. */ -#endif #ifdef AFS + int kerberos_tgt_passing; /* If true, permit Kerberos tgt + * passing. */ int afs_token_passing; /* If true, permit AFS token passing. */ #endif int password_authentication; /* If true, permit password * authentication. */ int kbd_interactive_authentication; /* If true, permit */ - int challenge_response_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; + unsigned 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 verify_reverse_mapping; /* cross-check ip and dns */ - int client_alive_interval; /* - * poke the client this often to - * see if it's still there - */ - int client_alive_count_max; /* - * If the client is unresponsive - * for this many intervals above, - * disconnect the session - */ - char *authorized_keys_file; /* File containing public keys */ - char *authorized_keys_file2; - } ServerOptions; +/* + * Initializes the server options to special values that indicate that they + * have not yet been set. + */ +void initialize_server_options(ServerOptions * options); -void initialize_server_options(ServerOptions *); -void read_server_config(ServerOptions *, const char *); -void fill_default_server_options(ServerOptions *); -int process_server_config_line(ServerOptions *, char *, const char *, int); +/* + * Reads the server configuration file. This only sets the values for those + * options that have the special value indicating they have not been set. + */ +void read_server_config(ServerOptions * options, const char *filename); +/* Sets values for those values that have not yet been set. */ +void fill_default_server_options(ServerOptions * options); #endif /* SERVCONF_H */