Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-01-23 16:03:25 UTC
Modified files:
ChangeLog doc/example.conf include/client.h ircd/ircd.c
Log message:
Fix typos and kqueue() engine.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.539 ircu2.10/ChangeLog:1.540
--- ircu2.10/ChangeLog:1.539 Sun Jan 23 06:28:55 2005
+++ ircu2.10/ChangeLog Sun Jan 23 08:03:13 2005
@@ -1,5 +1,15 @@
2005-01-23 Michael Poole <[EMAIL PROTECTED]>
+ * doc/example.conf (Kill): Fix typo in realname Kill block
+
+ * include/client.h (infousermodes): Fix typo in comment.
+
+ * ircd/ircd.c (parse_command_line): -k implies BOOT_TTY.
+ (main): Move daemon_init() before event_init() to work around BSD
+ lameness.
+
+2005-01-23 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/test/Makefile.in: Add missing "install" target. Make
compatible with BSD make (which has no $^ and no $(CPPFLAGS) in
its default .c.o rule).
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.42 ircu2.10/doc/example.conf:1.43
--- ircu2.10/doc/example.conf:1.42 Sat Jan 15 07:23:03 2005
+++ ircu2.10/doc/example.conf Sun Jan 23 08:03:14 2005
@@ -500,7 +500,7 @@
# The realname field lets you ban by realname...
Kill
{
- host = "*sub7*";
+ realname = "*sub7*";
reason = "You are infected with a Trojan";
};
Index: ircu2.10/include/client.h
diff -u ircu2.10/include/client.h:1.43 ircu2.10/include/client.h:1.44
--- ircu2.10/include/client.h:1.43 Sat Dec 18 10:07:15 2004
+++ ircu2.10/include/client.h Sun Jan 23 08:03:15 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Structures and functions for handling local clients.
- * @version $Id: client.h,v 1.43 2004/12/18 18:07:15 entrope Exp $
+ * @version $Id: client.h,v 1.44 2005/01/23 16:03:15 entrope Exp $
*/
#ifndef INCLUDED_client_h
#define INCLUDED_client_h
@@ -89,7 +89,7 @@
/** Clear a flag in a flagset. */
#define FlagClr(set,flag) ((set)->bits[FLAGSET_INDEX(flag)] &=
~FLAGSET_MASK(flag))
-/** String containig valid user modes, in no particular order. */
+/** String containing valid user modes, in no particular order. */
#define infousermodes "dioswkgx"
/** Operator privileges. */
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.79 ircu2.10/ircd/ircd.c:1.80
--- ircu2.10/ircd/ircd.c:1.79 Mon Jan 3 16:44:08 2005
+++ ircu2.10/ircd/ircd.c Sun Jan 23 08:03:15 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.79 2005/01/04 00:44:08 entrope Exp $
+ * @version $Id: ircd.c,v 1.80 2005/01/23 16:03:15 entrope Exp $
*/
#include "config.h"
@@ -464,7 +464,7 @@
*/
while ((opt = getopt(argc, argv, options)) != EOF)
switch (opt) {
- case 'k': thisServer.bootopt |= BOOT_CHKCONF; break;
+ case 'k': thisServer.bootopt |= BOOT_CHKCONF | BOOT_TTY; break;
case 'n':
case 't': thisServer.bootopt |= BOOT_TTY; break;
case 'd': dpath = optarg; break;
@@ -639,6 +639,11 @@
close_connections(!(thisServer.bootopt & (BOOT_DEBUG | BOOT_TTY |
BOOT_CHKCONF)));
+ /* daemon_init() must be before event_init() because kqueue() FDs
+ * are, perversely, not inherited across fork().
+ */
+ daemon_init(thisServer.bootopt & BOOT_TTY);
+
event_init(MAXCONNECTIONS);
setup_signals();
@@ -677,7 +682,6 @@
}
debug_init(thisServer.bootopt & BOOT_TTY);
- daemon_init(thisServer.bootopt & BOOT_TTY);
if (check_pid()) {
Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork"));
exit(2);
----------------------- End of diff -----------------------
