summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/servconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-05-08 12:21:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-05-08 12:21:17 +0000
commit213a55b8eabbf7f0692cae325c37e551c983afb6 (patch)
tree1f4e55b27bd1176028684fafa7f815446b1110d7 /usr.bin/ssh/servconf.h
parent1e325f2a90e53ea6a2c04110feba6e635db362c7 (diff)
Make the maximum number of sessions run-time controllable via
a sshd_config MaxSessions knob. This is useful for disabling login/shell/subsystem access while leaving port-forwarding working (MaxSessions 0), disabling connection multiplexing (MaxSessions 1) or simply increasing the number of allows multiplexed sessions. Because some bozos are sure to configure MaxSessions in excess of the number of available file descriptors in sshd (which, at peak, might be as many as 9*MaxSessions), audit sshd to ensure that it doesn't leak fds on error paths, and make it fail gracefully on out-of-fd conditions - sending channel errors instead of than exiting with fatal(). bz#1090; MaxSessions config bits and manpage from junyer AT gmail.com ok markus@
Diffstat (limited to 'usr.bin/ssh/servconf.h')
-rw-r--r--usr.bin/ssh/servconf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h
index fbb1bcff625..b79accb4328 100644
--- a/usr.bin/ssh/servconf.h
+++ b/usr.bin/ssh/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.83 2008/05/07 05:49:37 pyr Exp $ */
+/* $OpenBSD: servconf.h,v 1.84 2008/05/08 12:21:16 djm 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"
@@ -123,6 +124,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; /*