===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.h,v
retrieving revision 1.41.2.3
retrieving revision 1.42
diff -u -r1.41.2.3 -r1.42
--- src/usr.bin/ssh/servconf.h	2002/06/02 22:56:10	1.41.2.3
+++ src/usr.bin/ssh/servconf.h	2001/05/18 14:13:29	1.42
@@ -1,5 +1,3 @@
-/*	$OpenBSD: servconf.h,v 1.41.2.3 2002/06/02 22:56:10 miod Exp $	*/
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -13,6 +11,8 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+/* RCSID("$OpenBSD: servconf.h,v 1.42 2001/05/18 14:13:29 markus Exp $"); */
+
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
@@ -52,10 +52,10 @@
 						 * 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. */
@@ -73,7 +73,7 @@
 	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,11 +84,9 @@
 	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
@@ -116,25 +114,31 @@
 	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
+					 *If the client is unresponsive
+					 * for this many intervals, above
+					 * diconnect 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 */