import openssh-5.1p1-gsskex-cjwatson-20080722.patch

1 files changed, 10 insertions, 1 deletions

diff --git a/servconf.h b/servconf.h
index 257de1c8b..bad73a510 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.80 2007/02/19 10:45:58 dtucker 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,10 @@
 #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"
 
 typedef struct {
         u_int num_ports;
@@ -100,6 +104,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;
@@ -121,6 +126,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;  /*
@@ -143,6 +149,8 @@ typedef struct {
         int     permit_tun;
 
         int     num_permitted_opens;
+
+        char   *chroot_directory;
 }       ServerOptions;
 
 void     initialize_server_options(ServerOptions *);
@@ -155,5 +163,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 */