From 23836ead45fb873e6a5b2cc7643afa64c229df47 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Wed, 4 Apr 2007 17:12:55 -0700
Subject: [PATCH] [svn] By default, leave MAX_BUFFER fds free for log files,
 server connections, ident lookups, exceed_limit clients, etc. Mention this in
 example.conf and reference.conf.

---
 ChangeLog          | 9 +++++++++
 doc/example.conf   | 8 +++++---
 doc/reference.conf | 6 ++++--
 include/serno.h    | 2 +-
 src/s_conf.c       | 4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 420a639..fac9209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/04/03 22:45:04 UTC	(20070403-3384)
+  Log:
+  --with-maxclients configure option is gone
+  
+
+  Changes:	Modified:
+  +0 -11	trunk/INSTALL (File Modified) 
+
+
 jilles      2007/04/03 22:25:11 UTC	(20070403-3380)
   Log:
   Make the code that raises fd rlimit to hard limit work.
diff --git a/doc/example.conf b/doc/example.conf
index 07d4c09..983fa87 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3257 2007-03-13 16:09:28Z jilles $
+ * $Id: example.conf 3390 2007-04-05 00:12:55Z jilles $
  *
  * See reference.conf for more information.
  */
@@ -43,8 +43,10 @@ serverinfo {
 	/* for IPv6 */
 	#vhost6 = "3ffe:80e8:546::2";
 
-	/* max_clients: This should be set to the amount of connections
-	 * the server can handle.
+	/* max_clients: This should be set to the maximum amount of clients
+	 * that the server should support. Note that you should leave some
+	 * file descriptors free for log files, server connections, ident
+	 * lookups (if enabled), exceed_limit clients, etc.
 	 */
 	max_clients = 1024;
 };
diff --git a/doc/reference.conf b/doc/reference.conf
index e213281..06ec89e 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3257 2007-03-13 16:09:28Z jilles $
+ * $Id: reference.conf 3390 2007-04-05 00:12:55Z jilles $
  */
 
 /* IMPORTANT NOTES:
@@ -120,7 +120,9 @@ serverinfo {
 	#vhost6 = "3ffe:80e8:546::2";
 
 	/* max_clients: this should be set to the maximum amount of clients
-	 * that the server should support.
+	 * that the server should support. Note that you should leave some
+	 * file descriptors free for log files, server connections, ident
+	 * lookups (if enabled), exceed_limit clients, etc.
 	 */
 	max_clients = 1024;
 };
diff --git a/include/serno.h b/include/serno.h
index cdff891..1bb6b9f 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070403-3380"
+#define SERNO "20070403-3384"
diff --git a/src/s_conf.c b/src/s_conf.c
index 5f393ce..19c1593 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.c 3368 2007-04-03 10:11:06Z nenolod $
+ *  $Id: s_conf.c 3390 2007-04-05 00:12:55Z jilles $
  */
 
 #include "stdinc.h"
@@ -851,7 +851,7 @@ set_default_conf(void)
 	ConfigFileEntry.reject_ban_time = 300;  
 	ConfigFileEntry.reject_duration = 120;
 
-	ServerInfo.max_clients = comm_get_maxconnections();
+	ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES