From 1aa8ffcbfd855ffe11cd16a81af6147ec39e2016 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Tue, 3 Apr 2007 15:25:11 -0700
Subject: [PATCH] [svn] Make the code that raises fd rlimit to hard limit work.

---
 ChangeLog       |  9 +++++++++
 include/serno.h |  2 +-
 src/ircd.c      | 12 ++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 841c738b..8e7cd398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+nenolod     2007/04/03 11:45:22 UTC	(20070403-3378)
+  Log:
+  - note the I/O reworking
+  
+
+  Changes:	Modified:
+  +2 -0		trunk/NEWS (File Modified) 
+
+
 nenolod     2007/04/03 11:37:39 UTC	(20070403-3376)
   Log:
   - use mkdir -p
diff --git a/include/serno.h b/include/serno.h
index 86f7b4c8..c2611e45 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070403-3376"
+#define SERNO "20070403-3378"
diff --git a/src/ircd.c b/src/ircd.c
index 4b3f1706..dd1264f8 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: ircd.c 3354 2007-04-03 09:21:31Z nenolod $
+ *  $Id: ircd.c 3380 2007-04-03 22:25:11Z jilles $
  */
 
 #include "stdinc.h"
@@ -139,19 +139,19 @@ ircd_die_cb(const char *str)
 static void
 init_sys(void)
 {
-#if defined(RLIMIT_FD_MAX) && defined(HAVE_SYS_RLIMIT_H)
+#if defined(RLIMIT_NOFILE) && defined(HAVE_SYS_RESOURCE_H)
 	struct rlimit limit;
 
-	if(!getrlimit(RLIMIT_FD_MAX, &limit))
+	if(!getrlimit(RLIMIT_NOFILE, &limit))
 	{
 		limit.rlim_cur = limit.rlim_max;	/* make soft limit the max */
-		if(setrlimit(RLIMIT_FD_MAX, &limit) == -1)
+		if(setrlimit(RLIMIT_NOFILE, &limit) == -1)
 		{
 			fprintf(stderr, "error setting max fd's to %ld\n", (long) limit.rlim_cur);
 			exit(EXIT_FAILURE);
 		}
 	}
-#endif /* RLIMIT_FD_MAX */
+#endif /* RLIMIT_NOFILE */
 }
 
 static int
@@ -552,8 +552,8 @@ main(int argc, char *argv[])
 	}
 
 	/* Init the event subsystem */
-	libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
 	init_sys();
+	libcharybdis_init(ircd_log_cb, restart, ircd_die_cb);
 
 	fdlist_init();
 	if(!server_state_foreground)