- deraadt@cvs.openbsd.org 2002/07/06 01:00:49

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index 943c7ef566a5e20db782712f53e7cab75d241f94..c94f541d0ccfe46fb00f2c28be1813e5c98a2aa4 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: servconf.h,v 1.58 2002/06/20 23:05:55 markus 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.51 2001/12/19 07:18:56 deraadt 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. */
@@ -97,6 +98,7 @@ typedef struct {
        int     permit_empty_passwd;    /* If false, do not permit empty
                                         * passwords. */
        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];
@@ -115,7 +117,7 @@ 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
@@ -129,7 +131,6 @@ typedef struct {
        char   *authorized_keys_file;   /* File containing public keys */
        char   *authorized_keys_file2;
        int     pam_authentication_via_kbd_int;
-
 }       ServerOptions;
 
 void    initialize_server_options(ServerOptions *);