- (djm) Misc NeXT fixes from Ben Lindstrom <mouring@pconline.com>

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index 8ba3c26d0ae4f97bfca52a7a580e58fcdea2e917..c698bc74eac296b12dd3e48c197df1fd5387c1a0 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -13,7 +13,7 @@
  *
  */
 
-/* RCSID("$Id$"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.25 2000/06/20 01:39:44 markus Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -24,6 +24,7 @@
 #define MAX_DENY_USERS         256     /* Max # users on deny list. */
 #define MAX_ALLOW_GROUPS       256     /* Max # groups on allow list. */
 #define MAX_DENY_GROUPS                256     /* Max # groups on deny list. */
+#define MAX_SUBSYSTEMS         256     /* Max # subsystems. */
 
 typedef struct {
        unsigned int num_ports;
@@ -32,7 +33,8 @@ typedef struct {
        char   *listen_addr;            /* Address on which the server listens. */
        struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
        char   *host_key_file;  /* File containing host key. */
-       char   *dsa_key_file;   /* File containing dsa host key. */
+       char   *host_dsa_key_file;      /* File containing dsa host key. */
+       char   *pid_file;       /* Where to put our pid */
        int     server_key_bits;/* Size of the server key. */
        int     login_grace_time;       /* Disconnect if no auth in this time
                                         * (sec). */
@@ -46,10 +48,12 @@ typedef struct {
        int     x11_forwarding; /* If true, permit inet (spoofing) X11 fwd. */
        int     x11_display_offset;     /* What DISPLAY number to start
                                         * searching at */
+       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;        /* 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. */
        int     rhosts_authentication;  /* If true, permit rhosts
@@ -57,6 +61,7 @@ typedef struct {
        int     rhosts_rsa_authentication;      /* If true, permit rhosts RSA
                                                 * authentication. */
        int     rsa_authentication;     /* If true, permit RSA authentication. */
+       int     dsa_authentication;     /* If true, permit DSA authentication. */
 #ifdef KRB4
        int     kerberos_authentication;        /* If true, permit Kerberos
                                                 * authentication. */
@@ -90,6 +95,10 @@ typedef struct {
        char   *allow_groups[MAX_ALLOW_GROUPS];
        unsigned int num_deny_groups;
        char   *deny_groups[MAX_DENY_GROUPS];
+
+       unsigned int num_subsystems;
+       char   *subsystem_name[MAX_SUBSYSTEMS];
+       char   *subsystem_command[MAX_SUBSYSTEMS];
 }       ServerOptions;
 /*
  * Initializes the server options to special values that indicate that they