- deraadt@cvs.openbsd.org 2002/05/22 23:18:25

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index 90ecbc70e7c509ee3d8923c3f5eaf5f8d1e24c9e..c4e5b5f42bf388e51103f9248d3ac808a00ded0a 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: servconf.h,v 1.57 2002/03/20 19:12:25 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * 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,6 +55,7 @@ typedef struct {
        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. */
@@ -115,21 +116,20 @@ typedef struct {
        int     max_startups_rate;
        int     max_startups;
        char   *banner;                 /* SSH-2 banner message */
-       int     reverse_mapping_check;  /* cross-check ip and dns */
+       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 
+                                        * 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;
        int     pam_authentication_via_kbd_int;
-
 }       ServerOptions;
 
 void    initialize_server_options(ServerOptions *);