[buildpkg.sh.in] Last minute fix didn't make it in the .in file. :-(

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index f86cb2209d5de8695348c0f5580d6778d9b66799..36d2e5ca69ffdb42754b01e006d296b7cebc22ec 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: servconf.h,v 1.64 2003/08/22 10:56:09 markus Exp $    */
+/*     $OpenBSD: servconf.h,v 1.69 2004/05/23 23:59:53 dtucker Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -24,6 +24,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 +33,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;
@@ -58,7 +60,7 @@ typedef struct {
        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. */
+       int     tcp_keep_alive; /* If true, set SO_KEEPALIVE. */
        char   *ciphers;        /* Supported SSH2 ciphers. */
        char   *macs;           /* Supported SSH2 macs. */
        int     protocol;       /* Supported protocol versions. */
@@ -80,8 +82,8 @@ typedef struct {
                                                 * /etc/passwd */
        int     kerberos_ticket_cleanup;        /* If true, destroy ticket
                                                 * file on logout. */
-       int     kerberos_tgt_passing;   /* If true, permit Kerberos TGT
-                                        * passing. */
+       int     kerberos_get_afs_token;         /* If true, try to get AFS token if
+                                                * authenticated with Kerberos. */
        int     gss_authentication;     /* If true, permit GSSAPI authentication */
        int     gss_cleanup_creds;      /* If true, destroy cred cache on logout */
        int     password_authentication;        /* If true, permit password
@@ -107,9 +109,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;  /*