- (stevesk) OpenBSD CVS updates:

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index e227ba13e35ac795efc521b6004f9e282372feda..3ecf6a00d52fa17dfae3154938158ba664ba47e7 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,33 +1,39 @@
 /*
- * 
- * servconf.h
- * 
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
- * Created: Mon Aug 21 15:35:03 1995 ylo
- * 
  * Definitions for server configuration data and for the functions reading it.
- * 
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$Id$"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.31 2000/11/12 19:50:38 markus Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
+#define MAX_PORTS              256     /* Max # ports. */
+
 #define MAX_ALLOW_USERS                256     /* Max # users on allow list. */
 #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. */
+#define MAX_HOSTKEYS           256     /* Max # hostkeys. */
 
 typedef struct {
-       int     port;           /* Port number to listen on. */
-       struct in_addr listen_addr;     /* Address on which the server
-                                        * listens. */
-       char   *host_key_file;  /* File containing host key. */
+       unsigned int num_ports;
+       unsigned int ports_from_cmdline;
+       u_short ports[MAX_PORTS];       /* Port number to listen on. */
+       char   *listen_addr;            /* Address on which the server listens. */
+       struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
+       char   *host_key_files[MAX_HOSTKEYS];   /* Files containing host keys. */
+       int     num_host_key_files;     /* Number of files for host keys. */
+       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). */
@@ -41,8 +47,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
@@ -50,6 +60,7 @@ typedef struct {
        int     rhosts_rsa_authentication;      /* If true, permit rhosts RSA
                                                 * authentication. */
        int     rsa_authentication;     /* If true, permit RSA authentication. */
+       int     pubkey_authentication;  /* If true, permit ssh2 pubkey authentication. */
 #ifdef KRB4
        int     kerberos_authentication;        /* If true, permit Kerberos
                                                 * authentication. */
@@ -68,6 +79,7 @@ typedef struct {
 #endif
        int     password_authentication;        /* If true, permit password
                                                 * authentication. */
+       int     kbd_interactive_authentication; /* If true, permit */
 #ifdef SKEY
        int     skey_authentication;    /* If true, permit s/key
                                         * authentication. */
@@ -75,6 +87,7 @@ typedef struct {
        int     permit_empty_passwd;    /* If false, do not permit empty
                                         * passwords. */
        int     use_login;      /* If true, login(1) is used */
+       int     allow_tcp_forwarding;
        unsigned int num_allow_users;
        char   *allow_users[MAX_ALLOW_USERS];
        unsigned int num_deny_users;
@@ -83,13 +96,26 @@ 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];
+
+       int     max_startups_begin;
+       int     max_startups_rate;
+       int     max_startups;
+
 }       ServerOptions;
-/* Initializes the server options to special values that indicate that they
-   have not yet been set. */
+/*
+ * Initializes the server options to special values that indicate that they
+ * have not yet been set.
+ */
 void    initialize_server_options(ServerOptions * options);
 
-/* Reads the server configuration file.  This only sets the values for those
-   options that have the special value indicating they have not been set. */
+/*
+ * 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. */