merged OpenSSH 5.1p1 to trunk

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

diff --git a/openssh/servconf.h b/openssh/servconf.h
index a0bc8341943436ca01d1fff01376da64c4ad0557..898d11b60a4d2c3ce76c567b2c326a1d30c1189f 100644 (file)
--- a/openssh/servconf.h
+++ b/openssh/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.82 2008/02/13 22:38:17 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.85 2008/06/10 04:50:25 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,6 +35,7 @@
 #define        PERMIT_YES              3
 
 #define DEFAULT_AUTH_FAIL_MAX  6       /* Default for MaxAuthTries */
+#define DEFAULT_SESSIONS_MAX   10      /* Default for MaxSessions */
 
 /* Magic name for internal sftp-server */
 #define INTERNAL_SFTP_NAME     "internal-sftp"
@@ -111,6 +112,7 @@ typedef struct {
        int     use_login;      /* If true, login(1) is used */
        int     compression;    /* If true, compression is allowed */
        int     allow_tcp_forwarding;
+       int     allow_agent_forwarding;
        u_int num_allow_users;
        char   *allow_users[MAX_ALLOW_USERS];
        u_int num_deny_users;
@@ -132,6 +134,7 @@ typedef struct {
        int     max_startups_rate;
        int     max_startups;
        int     max_authtries;
+       int     max_sessions;
        char   *banner;                 /* SSH-2 banner message */
        int     use_dns;
        int     client_alive_interval;  /*
@@ -172,5 +175,6 @@ void         parse_server_config(ServerOptions *, const char *, Buffer *,
 void    parse_server_match_config(ServerOptions *, const char *, const char *,
             const char *);
 void    copy_set_server_options(ServerOptions *, ServerOptions *, int);
+void    dump_config(ServerOptions *);
 
 #endif                         /* SERVCONF_H */