=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.h,v retrieving revision 1.49.2.4 retrieving revision 1.50 diff -u -r1.49.2.4 -r1.50 --- src/usr.bin/ssh/servconf.h 2002/10/11 14:53:07 1.49.2.4 +++ src/usr.bin/ssh/servconf.h 2001/12/06 13:30:05 1.50 @@ -1,5 +1,3 @@ -/* $OpenBSD: servconf.h,v 1.49.2.4 2002/10/11 14:53:07 miod 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.50 2001/12/06 13:30:05 markus Exp $"); */ + #ifndef SERVCONF_H #define SERVCONF_H @@ -55,7 +55,6 @@ 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. */ @@ -97,9 +96,7 @@ int challenge_response_authentication; int permit_empty_passwd; /* If false, do not permit empty * passwords. */ - int permit_user_env; /* If true, read ~/.ssh/environment */ int use_login; /* If true, login(1) is used */ - int compression; /* If true, compression is allowed */ int allow_tcp_forwarding; u_int num_allow_users; char *allow_users[MAX_ALLOW_USERS]; @@ -118,19 +115,20 @@ int max_startups_rate; int max_startups; char *banner; /* SSH-2 banner message */ - int verify_reverse_mapping; /* cross-check ip and dns */ + int reverse_mapping_check; /* cross-check ip and dns */ int client_alive_interval; /* - * poke the client this often to - * see if it's still there + * 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 + * disconnect the session */ char *authorized_keys_file; /* File containing public keys */ char *authorized_keys_file2; + } ServerOptions; void initialize_server_options(ServerOptions *);