http://www.sxw.org.uk/computing/patches/openssh-4.2p1-gsskex-20050926-2.patch

[gssapi-openssh.git] / openssh / servconf.h

diff --git a/openssh/servconf.h b/openssh/servconf.h
index 57c7e5fab0f38ed861d27c3e0094c3c4d9e3da44..f7e56d52105efc895ee8c1e0bd12efd051be91ec 100644 (file)
--- a/openssh/servconf.h
+++ b/openssh/servconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: servconf.h,v 1.67 2003/12/23 16:12:10 jakob Exp $     */
+/*     $OpenBSD: servconf.h,v 1.71 2004/12/23 23:11:00 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,6 +16,8 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
+#include "buffer.h"
+
 #define MAX_PORTS              256     /* Max # ports. */
 
 #define MAX_ALLOW_USERS                256     /* Max # users on allow list. */
@@ -24,6 +26,7 @@
 #define MAX_DENY_GROUPS                256     /* Max # groups on deny list. */
 #define MAX_SUBSYSTEMS         256     /* Max # subsystems. */
 #define MAX_HOSTKEYS           256     /* Max # hostkeys. */
+#define MAX_ACCEPT_ENV         256     /* Max # of env vars. */
 
 /* permit_root_login */
 #define        PERMIT_NOT_SET          -1
@@ -32,6 +35,7 @@
 #define        PERMIT_NO_PASSWD        2
 #define        PERMIT_YES              3
 
+#define DEFAULT_AUTH_FAIL_MAX  6       /* Default for MaxAuthTries */
 
 typedef struct {
        u_int num_ports;
@@ -39,6 +43,7 @@ typedef struct {
        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. */
+       int     address_family;         /* Address family used by the server. */
        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 */
@@ -107,9 +112,13 @@ typedef struct {
        char   *subsystem_name[MAX_SUBSYSTEMS];
        char   *subsystem_command[MAX_SUBSYSTEMS];
 
+       u_int num_accept_env;
+       char   *accept_env[MAX_ACCEPT_ENV];
+
        int     max_startups_begin;
        int     max_startups_rate;
        int     max_startups;
+       int     max_authtries;
        char   *banner;                 /* SSH-2 banner message */
        int     use_dns;
        int     client_alive_interval;  /*
@@ -128,9 +137,9 @@ typedef struct {
 }       ServerOptions;
 
 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);
-
+void    load_server_config(const char *, Buffer *);
+void    parse_server_config(ServerOptions *, const char *, Buffer *);
 
 #endif                         /* SERVCONF_H */