diff -uNr ircservices-5.0.24/Changes ircservices-5.0.25/Changes
--- ircservices-5.0.24/Changes	2003-11-11 16:06:32 +0900
+++ ircservices-5.0.25/Changes	2003-11-18 21:32:35 +0900
@@ -1,5 +1,19 @@
 Version 5.0
 -----------
+2003/11/18 .25	Fixed potential crashes when importing or exporting data
+		    via the command line.
+2003/11/18	Fixed various memory leaks.
+2003/11/15	Fixed bugs in the configure script when using a deprecated
+		    version of GCC.  Reported by Matthew Hodgson
+		    <arathorn@theonering.net>
+2003/11/13	Added AKILLCHAN command to operserv/akill module.
+		    Suggested by <us44ever@hotmail.com> and others.
+2003/11/13	OperServ will now issue a warning if EnableExclude is used
+		    with an IRC server type that does not support autokill
+		    exclusions (thus preventing autokills from being sent).
+2003/11/13	The program name "anope" can now be used with convert-db
+		    for Anope databases.  ("epona" will still work as well.)
+2003/11/12	Added support to convert-db for PTlink 2.22.0 and later.
 2003/11/11 .24	Fixed a warning in convert-db compilation.
 2003/11/11	Fixed bugs in convert-db causing some nickname and channel
 		    settings (timezone, language, channel and memo limits)
diff -uNr ircservices-5.0.24/actions.c ircservices-5.0.25/actions.c
--- ircservices-5.0.24/actions.c	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/actions.c	2003-11-18 21:39:58 +0900
@@ -35,6 +35,14 @@
 }
 
 /*************************************************************************/
+
+void actions_cleanup(void)
+{
+    unregister_callback(NULL, cb_set_topic);
+    unregister_callback(NULL, cb_clear_channel);
+}
+
+/*************************************************************************/
 /*************************************************************************/
 
 /* Note a bad password attempt for the given user from the given service.
diff -uNr ircservices-5.0.24/channels.c ircservices-5.0.25/channels.c
--- ircservices-5.0.24/channels.c	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/channels.c	2003-11-18 21:39:58 +0900
@@ -75,6 +75,24 @@
 
 /*************************************************************************/
 
+void channel_cleanup()
+{
+    Channel *c;
+
+    for (c = first_channel(); c; c = next_channel())
+	del_channel(c);
+    unregister_callback(NULL, cb_topic);
+    unregister_callback(NULL, cb_umode_change);
+    unregister_callback(NULL, cb_mode_change);
+    unregister_callback(NULL, cb_mode);
+    unregister_callback(NULL, cb_join_check);
+    unregister_callback(NULL, cb_join);
+    unregister_callback(NULL, cb_delete);
+    unregister_callback(NULL, cb_create);
+}
+
+/*************************************************************************/
+
 /* Return statistics.  Pointers are assumed to be valid. */
 
 void get_channel_stats(long *nrec, long *memuse)
diff -uNr ircservices-5.0.24/conffile.c ircservices-5.0.25/conffile.c
--- ircservices-5.0.24/conffile.c	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/conffile.c	2003-11-18 21:39:58 +0900
@@ -43,10 +43,12 @@
 
 	    /* Don't do anything if we're copying new values and this
 	     * directive wasn't seen, or if we're restoring saved values
-	     * and this directive hasn't had its values saved */
+	     * and this directive hasn't had its values saved (except for
+	     * function parameters) */
 	    if (action == ACTION_COPYNEW && !d->was_seen)
 		continue;
 	    if (action == ACTION_RESTORESAVED
+	     && d->params[i].type != CD_FUNC
 	     && !(d->params[i].flags & CF_SAVED))
 		continue;
 
diff -uNr ircservices-5.0.24/configure ircservices-5.0.25/configure
--- ircservices-5.0.24/configure	2003-11-05 15:46:59 +0900
+++ ircservices-5.0.25/configure	2003-11-15 15:52:32 +0900
@@ -872,10 +872,11 @@
 	    log 'gcc3/kgcc not found, aborting'
 	    exit 1
 	fi
-    elif test $vmajor -lt 3 -a $version != 2.95.3 || test $vmajor = 3 -a $vminor -lt 2 ; then
-	cat <<EOT
+    else
+	if test $vmajor -lt 3 -a $version != 2.95.3 || test $vmajor = 3 -a $vminor -lt 2 ; then
+	    cat <<EOT
 
-WARNING: Your version of GCC was detected as `$version'.  As of Services
+WARNING: Your version of GCC was detected as \`$version'.  As of Services
          5.0.23, versions of GCC earlier than 3.2, other than 2.95.3,
          have been deprecated.  This and future releases of Services 5.0
          will still work, though some error messages will lose
@@ -883,14 +884,16 @@
          all.  Please upgrade your compiler to GCC 3.2 or later.
 
 EOT
-	echo2 "Press Enter to continue: "
-	read dummy
-	WARNED_OLD_GCC=1
-    else  # version okay
-	echo "great, found gcc!"
+	    echo2 "Press Enter to continue: "
+	    read dummy
+	    WARNED_OLD_GCC=1
+	    log using \`gcc\' \(bad version: $version\)
+	else  # version okay
+	    echo "great, found gcc!"
+	    log using \`gcc\'
+	fi
 	CC=gcc
 	DEF_CC_FLAGS=`def_cc_flags $CC`
-	log using \`gcc\'
     fi
 else
     echo "gcc not found."
diff -uNr ircservices-5.0.24/data/example-modules.conf ircservices-5.0.25/data/example-modules.conf
--- ircservices-5.0.24/data/example-modules.conf	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/data/example-modules.conf	2003-11-18 21:39:56 +0900
@@ -246,12 +246,20 @@
 
     AutokillExpiry	30d
 
+    # AkillChanExpiry <time>  [RECOMMENDED]
+    #     Sets the default expiry time for autokills added by an AKILLCHAN
+    #     command.  If not defined, such autokills will not expire by
+    #     default.
+
+    AkillChanExpiry	7d
+
     # OperMaxExpiry <time>  [OPTIONAL]
     #     Sets the maximum expiry time usable by Services operators.  If
     #     not defined, Services operators can set any expiry time, just as
     #     Services administrators can.  If this is set to a value lower
-    #     than AutokillExpiry, autokills entered without an expiry time
-    #     will use this setting instead of AutokillExpiry.
+    #     than AutokillExpiry or AkillChanExpiry, autokills entered without
+    #     an expiry time will use this setting instead of the relevant
+    #     default.
 
     #OperMaxExpiry	7d
 
diff -uNr ircservices-5.0.24/defs.h ircservices-5.0.25/defs.h
--- ircservices-5.0.24/defs.h	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/defs.h	2003-11-18 21:39:58 +0900
@@ -59,6 +59,9 @@
 /* Maximum length of a configuration file line */
 #define CONFIG_LINEMAX	4096
 
+/* Size of memory-based log buffer (only used with SHOWALLOCS) */
+#define LOGMEMSIZE	65536
+
 /*************************************************************************/
 
 /* WARNING:  If you change these, your data files will be unusable! */
diff -uNr ircservices-5.0.24/docs/4.html ircservices-5.0.25/docs/4.html
--- ircservices-5.0.24/docs/4.html	2003-09-09 22:52:38 +0900
+++ ircservices-5.0.25/docs/4.html	2003-11-17 16:39:09 +0900
@@ -2569,6 +2569,36 @@
 <hr align=center width="50%">
 
 <a name="oper.exclude"></a>
+<p><b>OPER_HELP_AKILLCHAN</b> (requires the <tt>operserv/akill</tt> module)
+
+<p><dl><dt><b>Syntax:</b>
+<dd><tt><b>AKILLCHAN [KILL] [+<i>expiry</i>] <i>channel</i> <i>reason</i></b></tt>
+</dl>
+<p>
+Adds autokills for all users except IRC operators in a given <tt><i>channel</i></tt>, and optionally
+(if <tt>KILL</tt> is given) removes them from the network.  The <tt><i>reason</i></tt> will be stored with
+each autokill, and may be displayed in kill messages
+depending on how Services is configured.  <tt><i>expiry</i></tt> takes the
+same format as in the <a href="#oper.akill"><tt>AKILL ADD</tt></a> command;
+if not given, it defaults to the value given in the
+<a href="a.html#operserv/akill.AkillChanExpiry"><tt>AkillChanExpiry</tt></a>
+directive in <tt>modules.conf</tt>.
+<p>
+Autokills added by this command will have the form
+<tt>*@<i>hostname</i></tt>, for each hostname used by a client in the
+channel.  If such an autokill already exists for a hostname,
+it will not be modified; this may cause the number of
+autokills added to be less than the number of users
+affected.  Also, these autokills will automatically
+be sent to the IRC network regardless of the status of the
+<a href="a.html#operserv/akill.ImmediatelySendAutokill"><tt>ImmediatelySendAutokill</tt></a> setting.
+<p>
+Limited to <b>Services operators</b>.
+
+<p>
+<hr align=center width="50%">
+
+<a name="oper.exclude"></a>
 <p><b>EXCLUDE</b> (requires the <tt>operserv/akill</tt> module)
 
 <p><dl><dt><b>Syntax:</b>
diff -uNr ircservices-5.0.24/docs/5.html ircservices-5.0.25/docs/5.html
--- ircservices-5.0.24/docs/5.html	2003-11-11 15:48:27 +0900
+++ ircservices-5.0.25/docs/5.html	2003-11-13 00:10:42 +0900
@@ -191,13 +191,15 @@
 <tr><th><tt><i>program-name</i></tt>
     <th>Name&nbsp;of&nbsp;program
     <th>Supported&nbsp;versions
+<tr><td><tt>anope</tt>
+    <td><a href="http://www.anope.org/">Anope Services</a>
+	<font size=-1>[<tt>www.anope.org</tt>]</font>
+    <td>All versions
 <tr><td><tt>auspice</tt>
-    <td><a href="http://www.inmean.com/">Auspice Services</a>
-	<font size=-1>[<tt>www.inmean.com</tt>]</font>
+    <td>Auspice Services
     <td>2.5 and later
 <tr><td><tt>bolivia</tt>
-    <td><a href="http://ircservices.bolivia-internet.com/">Bolivia IRC Services</a>
-	<font size=-1>[<tt>ircservices.bolivia-internet.com</tt>]</font>
+    <td>Bolivia IRC Services
     <td>1.2.0
 <tr><td><tt>cygnus</tt>
     <td><a href="http://www.habber.net/services/index.php">Cygnus</a>
@@ -207,10 +209,7 @@
     <td>Daylight
     <td>12
 <tr><td><tt>epona</tt>
-    <td><a href="http://www.epona.org/">Epona IRC Services</a>
-	<font size=-1>[<tt>www.epona.org</tt>]</font>,
-	<a href="http://www.anope.org/">Anope Services</a>
-	<font size=-1>[<tt>www.anope.org</tt>]</font>
+    <td>Epona IRC Services
     <td>1.3.0 and later
 <tr><td><tt>ircs-1.2</tt>
     <td>Internet Relay Chat Services (IRCS)
@@ -240,22 +239,20 @@
 <p align=right><font size="-1"><a href="#top">Back to top</a></font>
 
 <p>Additional options are available for the following data file types:
-<dl>
-<dt><b><tt>cygnus</tt></b>
-<dd><ul>
-    <li><tt>-tzfile=<i>filename</i></tt>: Specifies an alternative time
-	zone file to use when loading nickname time zone data.
-	<tt>convert-db</tt> defaults to the deata from the
-	<tt>cygnus.zone</tt> file distributed with Cygnus 0.2.0; if you
-	have modified this file or created your own time zone list, you
-	will need to use this option to get nickname time zones converted
-	correctly.
-    <li><tt>-no-timezones</tt>: Causes all nickname time zone settings to
-	be reset to default (the time zone Services runs in).
-    <li><tt>-reset-memo-limits</tt>: Causes all nickname memo limits to be
-	reset to default; see the notes on Cygnus database conversion.
-    </ul>
-</dl>
+
+<p><b><tt>cygnus</tt></b>
+<ul>
+<li><tt>-tzfile=<i>filename</i></tt>: Specifies an alternative time zone
+	file to use when loading nickname time zone data.  <tt>convert-db</tt>
+	defaults to the deata from the <tt>cygnus.zone</tt> file distributed
+	with Cygnus 0.2.0; if you have modified this file or created your
+	own time zone list, you will need to use this option to get nickname
+	time zones converted correctly.
+<li><tt>-no-timezones</tt>: Causes all nickname time zone settings to be
+	reset to default (the time zone Services runs in).
+<li><tt>-reset-memo-limits</tt>: Causes all nickname memo limits to be reset
+	to default; see the notes on Cygnus database conversion.
+</ul>
 
 <a name=3-2></a>
 <h4>5-3-2. Notes on converting databases from particular programs</h4>
@@ -282,6 +279,27 @@
 	be lost on conversion.
 </ul>
 
+<p><b>Anope</b>
+<ul>
+<li>Services does not store the following information; it will be lost when
+	the databases are converted:
+    <ul>
+	<li>ICQ number for nicknames
+	<li>last used time for channel access entries
+    </ul>
+<li>Services does not allow multiple users to have Services super-user
+	privileges (except temporarily with the
+	<a href="4.html#oper.su"><tt>SU</tt></a> command); all users with
+	"root" privileges in Anope will be converted to Services
+	administrators.
+<li>Services does not distinguish between using the ChanServ <tt>OP</tt>,
+	<tt>VOICE</tt>, and related commands on oneself or on other users.
+<li>Services does not support the ChanServ <tt>SECUREFOUNDER</tt>,
+	<tt>SIGNKICK</tt>, or <tt>XOP</tt> settings.  (<tt>XOP</tt>-style
+	commands can be enabled for all channels by loading the
+	<tt>chanserv/access-xop</tt> module.)
+</ul>
+
 <p><b>Auspice</b>
 <ul>
 <li>The ChanServ <tt>TIMEOP</tt> feature in version 2.6 and later is not
@@ -345,8 +363,8 @@
 	</ul>
 <li>For nicknames awaiting authentication, the authentication code ("key"
 	in Cygnus terms) may be changed to conform to Services'
-	specifications.  <!FIXME: not once we change the code assigning
-	scheme>  Note that Services uses the
+	specifications.  <!--FIXME: not once we change the code assigning
+	scheme-->  Note that Services uses the
 	<a href="4.html#nick.auth"><tt>AUTH</tt></a> command, not the
 	<tt>REGISTER</tt> command, to authenticate nicknames.
 <li>Nicknames designated as CSOPs will be converted to Services operators.
@@ -430,7 +448,7 @@
 	channel news items will be discarded.
 </ul>
 
-<p><b>PTlink 2.18</b>
+<p><b>PTlink</b>
 <ul>
 <li>PTlink supports several encryption methods; passwords encrypted with a
 	method other than MD5 cannot be used with Services, and
@@ -438,8 +456,8 @@
 <li>Services does not store the following information; it will be lost when
 	the databases are converted:
     <ul>
-	<li>ICQ number, location, birthdate, and time of last identify for
-	    nicknames
+	<li>ICQ number, location, birthdate, time of last identify, and
+	    authentication code (2.22.0 and later) for nicknames
         <li>maximum number of users and time of maximum for channels
     </ul>
 </ul>
diff -uNr ircservices-5.0.24/docs/a.html ircservices-5.0.25/docs/a.html
--- ircservices-5.0.24/docs/a.html	2003-10-24 12:42:17 +0900
+++ ircservices-5.0.25/docs/a.html	2003-11-13 11:14:57 +0900
@@ -872,14 +872,25 @@
 <p>Example: <tt>AutokillExpiry	30d</tt>
 </ul>
 
+<a name="operserv/akill.AkillChanExpiry"></a>
+<p><ul><li>
+<tt><b>AkillChanExpiry</b> <i>time</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;[RECOMMENDED]
+<p>Sets the default expiry time for autokills added by an AKILLCHAN
+command.  If not defined, such autokills will not expire by
+default.
+
+<p>Example: <tt>AkillChanExpiry	7d</tt>
+</ul>
+
 <a name="operserv/akill.OperMaxExpiry"></a>
 <p><ul><li>
 <tt><b>OperMaxExpiry</b> <i>time</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;[OPTIONAL]
 <p>Sets the maximum expiry time usable by Services operators.  If
 not defined, Services operators can set any expiry time, just as
 Services administrators can.  If this is set to a value lower
-than AutokillExpiry, autokills entered without an expiry time
-will use this setting instead of AutokillExpiry.
+than AutokillExpiry or AkillChanExpiry, autokills entered without
+an expiry time will use this setting instead of the relevant
+default.
 
 <p>Example: <tt>OperMaxExpiry	7d</tt>
 </ul>
diff -uNr ircservices-5.0.24/extern.h ircservices-5.0.25/extern.h
--- ircservices-5.0.24/extern.h	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/extern.h	2003-11-18 21:39:58 +0900
@@ -17,6 +17,7 @@
 /**** actions.c ****/
 
 E int actions_init(int ac, char **av);
+E void actions_cleanup(void);
 E int bad_password(const char *service, User *u, const char *what);
 E void clear_channel(Channel *chan, int what, const void *param);
 E const char *set_clear_channel_sender(const char *newsender);
@@ -33,6 +34,7 @@
 E Channel *next_channel(void);
 
 E int channel_init(int ac, char **av);
+E void channel_cleanup(void);
 E void get_channel_stats(long *nrec, long *memuse);
 
 E Channel *chan_adduser(User *user, const char *chan, int32 modes);
@@ -136,11 +138,13 @@
 E int introduce_user(const char *user);
 E int init(int ac, char **av);
 E int reconfigure(void);
+E void cleanup(void);
 
 
 /**** log.c ****/
 
 E int open_log(void);
+E int open_memory_log(void);
 E void close_log(void);
 E int reopen_log(void);
 E int log_is_open(void);
@@ -172,7 +176,7 @@
 E int    linked;
 E int    quitting;
 E int    delayed_quit;
-E char * quitmsg;
+E char   quitmsg[BUFSIZE];
 E char   inbuf[BUFSIZE];
 E Socket *servsock;
 E int    save_data;
@@ -234,6 +238,7 @@
 
 E int split_buf(char *buf, char ***argv, int colon_special);
 E int process_init(int ac, char **av);
+E void process_cleanup(void);
 E void process(void);
 
 
@@ -250,6 +255,7 @@
 E int protocol_nickmax;
 
 E int send_init(int ac, char **av);
+E void send_cleanup(void);
 
 E void send_cmd(const char *source, const char *fmt, ...)
 	FORMAT(printf,2,3);
@@ -288,6 +294,7 @@
 E Server *next_server(void);
 
 E int server_init(int ac, char **av);
+E void server_cleanup(void);
 E void get_server_stats(long *nservers, long *memuse);
 E void do_server(const char *source, int ac, char **av);
 E void do_squit(const char *source, int ac, char **av);
@@ -312,6 +319,7 @@
 
 E void quit_user(User *user, const char *quitmsg, int is_kill);
 E int user_init(int ac, char **av);
+E void user_cleanup(void);
 E void get_user_stats(long *nusers, long *memuse);
 
 E int do_nick(const char *source, int ac, char **av);
diff -uNr ircservices-5.0.24/init.c ircservices-5.0.25/init.c
--- ircservices-5.0.24/init.c	2003-11-11 16:09:42 +0900
+++ ircservices-5.0.25/init.c	2003-11-18 21:39:58 +0900
@@ -91,7 +91,7 @@
 
 /* List of directives for ircservices.conf (main configuration file): */
 
-ConfigDirective main_directives[] = {
+static ConfigDirective main_directives[] = {
     { "BadPassLimit",     { { CD_POSINT, 0, &BadPassLimit } } },
     { "BadPassTimeout",   { { CD_TIME, 0, &BadPassTimeout } } },
     { "BadPassWarning",   { { CD_POSINT, 0, &BadPassWarning } } },
@@ -439,7 +439,7 @@
 	    config_error(filename, linenum, "Out of memory");
 	    return 0;
 	}
-    } else { /* !filename */
+    } else if (linenum == CDFUNC_SET) {
 	/* Copy new values to config variables and clear */
 	if (new_ServiceUser && new_ServiceHost) {  /* paranoia */
 	    free(ServiceUser);
@@ -451,6 +451,12 @@
 	    free(new_ServiceHost);
 	}
 	new_ServiceUser = new_ServiceHost = NULL;
+    } else if (linenum == CDFUNC_DECONFIG) {
+	/* Reset to defaults */
+	free(ServiceUser);
+	free(ServiceHost);
+	ServiceUser = NULL;
+	ServiceHost = NULL;
     }
     return 1;
 }
@@ -710,6 +716,13 @@
     int started_from_term = isatty(0) && isatty(1) && isatty(2);
 
 
+#ifdef MEMCHECKS
+    /* Initialize memory log, to keep track of allocations. */
+    open_memory_log();
+    /* Account for runtime memory. */
+    init_memory();
+#endif
+
     /* Parse command-line options; exit if an error occurs. */
     if (parse_options(ac, av, 0) < 0)
 	return -1;
@@ -797,6 +810,11 @@
     /* Initialize pseudo-random number generator. */
     srand(time(NULL) ^ getppid() ^ getpid()<<16);
 
+    /* Initialize module system.  This should be called before any
+     * callbacks are registered. */
+    if (!modules_init(ac,av))
+	return -1;
+
     /* Register our (and main.c's) callbacks. */
     cb_cmdline        = register_callback(NULL, "command line");
     cb_introduce_user = register_callback(NULL, "introduce_user");
@@ -812,10 +830,12 @@
 
     /* Call other initialization routines.  These are mainly (right now
      * only) for adding callbacks. */
-    if (!modules_init(ac,av) || !user_init(ac,av) || !channel_init(ac,av)
-     || !server_init(ac,av) || !process_init(ac,av) || !messages_init(ac,av)
-     || !actions_init(ac,av) || !send_init(ac,av))
+    if (!user_init(ac,av) || !channel_init(ac,av) || !server_init(ac,av)
+     || !process_init(ac,av) || !messages_init(ac,av)
+     || !actions_init(ac,av) || !send_init(ac,av)
+    ) {
 	return -1;
+    }
 
     /* Initialize multi-language support. */
     if (!lang_init())
@@ -833,15 +853,16 @@
     if (debug)
 	log("debug: Loaded modules");
 
-    /* Check command-line arguments in modules. */
+    /* Check command-line arguments in modules, and exit if a module directs
+     * us to. */
     i = parse_options(ac, av, 1);
     if (i != 0) {
 	if (i < 0) {
-	    modules_exit();
+	    cleanup();
 	    return -1;
 	} else {
 	    call_callback(NULL, cb_save_data);
-	    modules_exit();
+	    cleanup();
 	    exit(0);
 	}
     }
@@ -852,7 +873,7 @@
 		"No protocol module has been loaded!  Make sure to include a LoadModule\n"
 		"directive for the appropriate module in the `%s' file.\n",
 		IRCSERVICES_CONF);
-	modules_exit();
+	cleanup();
 	return -1;
     }
 
@@ -867,6 +888,11 @@
 	    perror("fork()");
 	    return -1;
 	} else if (i != 0) {
+#ifdef MEMCHECKS
+	    /* Avoid a bogus "XXX bytes leaked on exit" message for the
+	     * parent. */
+	    uninit_memory();
+#endif
 	    exit(0);
 	}
 	if (started_from_term) {
@@ -885,12 +911,6 @@
      * (when forking).
      */
 
-#ifdef MEMCHECKS
-    /* Account for runtime memory.  Do this after forking to avoid a bogus
-     * "XXX bytes leaked on exit" message when the parent exits. */
-    init_memory();
-#endif
-
     /* Write our PID to the PID file. */
     if (!write_pidfile())
 	log_perror("Warning: cannot write to PID file %s", PIDFilename);
@@ -1064,3 +1084,52 @@
 }
 
 /*************************************************************************/
+/******************************** Cleanup ********************************/
+/*************************************************************************/
+
+void cleanup(void)
+{
+    char lognamebuf[BUFSIZE], *lognamesave;
+    int i;
+
+    if (!*quitmsg)
+	strscpy(quitmsg, "Terminating, reason unknown", sizeof(quitmsg));
+    log("%s", quitmsg);
+    set_cmode(NULL, NULL);
+    unload_all_modules();
+    if (servsock) {
+	if (sock_isconn(servsock)) {
+	    send_cmd(ServerName, "SQUIT %s :%s", ServerName, quitmsg);
+	    disconn(servsock);
+	}
+	sock_free(servsock);
+    }
+    lang_cleanup();
+    send_cleanup();
+    actions_cleanup();
+    messages_cleanup();
+    process_cleanup();
+    server_cleanup();
+    channel_cleanup();
+    user_cleanup();
+    unregister_callback(NULL, cb_save_complete);
+    unregister_callback(NULL, cb_save_data);
+    unregister_callback(NULL, cb_connect);
+    unregister_callback(NULL, cb_introduce_user);
+    unregister_callback(NULL, cb_cmdline);
+    modules_cleanup();
+    /* Save a copy of LogFilename, because the log routines still need it */
+    strscpy(lognamebuf, LogFilename, sizeof(lognamebuf));
+    for (i = 0; strcmp(main_directives[i].name,"LogFilename") != 0; i++)
+	;
+    lognamesave = main_directives[i].params[0].prev.ptrval;
+    main_directives[i].params[0].prev.ptrval = lognamebuf;
+    deconfigure(main_directives);
+    free(lognamesave);
+    free(RemoteServer);
+    RemoteServer = NULL;
+    close_log();
+    LogFilename = NULL;
+}
+
+/*************************************************************************/
diff -uNr ircservices-5.0.24/lang/de.l ircservices-5.0.25/lang/de.l
--- ircservices-5.0.24/lang/de.l	2003-10-14 11:50:28 +0900
+++ ircservices-5.0.25/lang/de.l	2003-11-18 19:11:28 +0900
@@ -317,6 +317,26 @@
 NICK_X_DROPPED_LINKS
 	Chatname %s und alle damit verbundenen Chatnamen sind freigegeben worden.
 
+# DROPEMAIL and DROPEMAIL-CONFIRM responses
+NICK_DROPEMAIL_SYNTAX
+	DROPEMAIL E-Mail-Adressen-Suchmuster
+NICK_DROPEMAIL_PATTERN_TOO_LONG
+	Das Suchmuster ist zu lang. (maximal %d Zeichen)
+NICK_DROPEMAIL_NONE
+	Keine Chatnamen mit diesem Suchmuster gefunden.
+NICK_DROPEMAIL_COUNT
+	%d Chatnamen haben E-Mail-Adressen entsprechend dem Suchmuster.
+	Um diese Chatnamen zu droppen, folgendes eingeben:
+	/msg %s DROPEMAIL-CONFIRM %s
+NICK_DROPEMAIL_CONFIRM_SYNTAX
+	DROPEMAIL-CONFIRM E-Mail-Adresse
+NICK_DROPEMAIL_CONFIRM_UNKNOWN
+	Der mitgegebene Wert ist nicht bekannt. Bitte den DROPEMAIL Befehl nochmals mit diesem Suchmuster benutzen, bevor der DROPEMAIL-CONFIRM benutzt wird.
+NICK_DROPEMAIL_CONFIRM_DROPPING
+	Droppe %d Chatnamen...
+NICK_DROPEMAIL_CONFIRM_DROPPED
+	Chatnamen gedroppt.
+
 # SET responses
 NICK_SET_SYNTAX
 	SET Option Parameter
@@ -1926,6 +1946,18 @@
 OPER_AKILL_COUNT
 	Es gibt %d Einträge in der Autokill-Liste.
 
+# AKILLCHAN responses
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+Dauer] Raum Grund
+OPER_AKILLCHAN_AKILLED
+	%d neue Einträge in der AKILL-Liste.
+OPER_AKILLCHAN_KILLED
+	%d chatter entfernt.
+OPER_AKILLCHAN_AKILLED_ONE
+	1 neuer Eintrag in der AKILL-Liste.
+OPER_AKILLCHAN_KILLED_ONE
+	1 chatter entfernt.
+
 # EXCLUDE responses
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+Dauer] Maske [Grund]]
@@ -2880,22 +2912,37 @@
 	ignoriert. Keine Fehlermeldung wird angezeigt, wenn der
 	Chatname nicht angegeben wird.
 
-#NICK_HELP_AJOIN
-#	Syntax: AJOIN ADD Raum
-#	        AJOIN DEL Raum
-#	        AJOIN LIST
-#	
-#	Modifiziert die Liste der Automatisch betretenden Räume oder
-#	zeit sie an. Alle Räume von der Liste werden automatisch
-#	betreten, wenn Sie sich den %S gegenüber mit Ihrem Passwort
-#	identifizieren. Nur Räume, die mit "#" anfangen, können zur
-#	Liste hinzugefügt werden, lokale Räume nicht.
+NICK_HELP_AJOIN
+	Syntax: AJOIN ADD channel
+	        AJOIN DEL channel
+	        AJOIN LIST
+	
+	Modifiziert die Liste der Automatisch betretenden Räume oder
+	zeigt sie an. Alle Räume von der Liste werden automatisch
+	betreten, wenn Sie sich den %S gegenüber mit Ihrem Passwort
+	identifizieren. Nur Räume, die mit "#" anfangen, können zur
+	Liste hinzugefügt werden, lokale Räume nicht.
+NICK_HELP_AJOIN_END
+	Es ist zu beachten, dass der IRC-Server den zutritt zu einigen
+	Räumen der Autojoin-Liste verhindern kann. Vor allem die Räume,
+	die ein Raum-Passwort haben (Raum-Modus +k) oder die nur nach
+	einer Einladung betreten werden können (Modus +i).
+NICK_HELP_AJOIN_END_CHANSERV
+	Es ist zu beachten, dass der IRC-Server den zutritt zu einigen
+	Räumen der Autojoin-Liste verhindern kann. Vor allem die Räume,
+	die ein Raum-Passwort haben (Raum-Modus +k) oder die nur nach
+	einer Einladung betreten werden können (Modus +i).
+	Hat allerdings der Chatname Zugriff auf den Befehl "%s INVITE"
+	bei einem registrierten Raum, wird %S den Chatnamen automatisch
+	in den Raum einladen.
 
 NICK_OPER_HELP_COMMANDS
 	
 	Diese Befehle stehen nur den Services-Administratoren zur Verfügung:
 	
 	    DROPNICK   Jede Chatnamenregistrierung löschen.
+NICK_OPER_HELP_COMMANDS_DROPEMAIL
+	    DROPEMAIL  Löscht alle Chatnamen, die einem Suchmuster einer E-Mail-Adresse entsprechen.
 NICK_OPER_HELP_COMMANDS_GETPASS
 	    GETPASS    Zeigt das Passwort des gegebenen Chatnamens.
 	               (Nur, wenn die Verschlüsselung der Passworte
@@ -2930,6 +2977,26 @@
 	Chatnamen aus der %S-Datenbank gelöscht.
 	Dies steht nur den Services-Administratoren zur Verfügung.
 
+NICK_OPER_HELP_DROPEMAIL
+	Syntax: DROPEMAIL Suchmuster
+	        DROPEMAIL-CONFIRM Suchmuster
+	
+	Löscht alle Chatnamen, die eine E-Mail-Adresse haben, die dem
+	Suchmuster entsprechen. Besteht das Suchmuster nur aus
+	dem Zeichen "-", werden alle Chatnamen gelöscht, die keine
+	E-Mail-Adresse haben.
+	
+	Um versehentliches Löschen von Chatnamen mittels diesem Befehl
+	zu verhindern, muss dieser Befehl bestätigt werden.
+	Zuerst nutzt man den Befehl DROPEMAIL, danach mit dem gleichen
+	Parameter den Befehl BDROPEMAIL-CONFIRM. Der Befehl
+	DROPEMAIL-CONFIRM muss %s von der gleichen person übergeben werden
+	wie der vorherige DROPEMAIL-Befehl. Werden mehr als 4 DROPEMAIL-
+	Befehle hintereinander übergeben, wird der älteste verworfen, und
+	steht für einen DROPEMAIL-CONFIRM-Befehl nicht mehr zur verfügung.
+	
+	Diese Befehle können nur von Services Admins benutzt werden.
+
 NICK_OPER_HELP_SET
 	
 	Services-Administratoren können die Option NOEXPIRE setzen, so dass
@@ -4286,6 +4353,8 @@
 	    KILLCLONES  Killt alle Benutzer von einem Host
 OPER_HELP_COMMANDS_AKILL
 	    AKILL       Bearbeitet die Akill-Liste
+	    AKILLCHAN   Macht Einträge für die User eines Raumes in der
+	                   Akill-Liste hinzu
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     Berabeitet die Ausnahmen zu Autokill
 OPER_HELP_COMMANDS_SLINE
@@ -4468,6 +4537,25 @@
 	
 	Dieser Befehl steht nur den Services-Operatoren zur Verfügung.
 
+OPER_HELP_AKILLCHAN
+	Syntax: AKILLCHAN [KILL] [+Dauer] Raum Grund
+	
+	Erstellt Einträge in der AKILL-Liste für alle Chatter in einem
+	bestimmten Raum. IRC-Operatoren ausgeschlossen. Der optionale
+	Parameter KILL entfernt die Chatter vom System. Der angegebene
+	Grund wird in jedem AKILL-Eintrag gespeichert und u.U. als Grund
+	des Kills angegeben. Die Dauer hat die gleiche Syntax wie beim
+	AKILL ADD Befehl. Wird keine Dauer übergeben, wird der Default von
+	%s genommen.
+	
+	AKILLs, die mit diesem Befehl hinzugefügt wurden, haben die Syntax
+	*@hostname für jeden Hostnamen, der von einem Chatter im
+	Raum benutzt wurde. Ein vorhandener AKILL auf diesen Hostnamen
+	wird nicht modifiziert, daher kann die Anzahl der angegebenen AKILLs
+	niedriger ausfallen als die Anzahl der im Raum anwesenden Chatter.
+	
+	Dieser Befehl steht nur Services-Operatoren zur Verfügung.
+
 OPER_HELP_EXCLUDE
 	Syntax: EXCLUDE ADD [+Dauer] Maske Grund
 	        EXCLUDE DEL Maske
diff -uNr ircservices-5.0.24/lang/en_us.l ircservices-5.0.25/lang/en_us.l
--- ircservices-5.0.24/lang/en_us.l	2003-10-14 11:54:24 +0900
+++ ircservices-5.0.25/lang/en_us.l	2003-11-17 16:53:45 +0900
@@ -1982,6 +1982,18 @@
 OPER_AKILL_COUNT
 	There are %d host masks on the autokill list.
 
+# AKILLCHAN responses
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+expiry] channel reason
+OPER_AKILLCHAN_AKILLED
+	%d users autokilled.
+OPER_AKILLCHAN_KILLED
+	%d users killed.
+OPER_AKILLCHAN_AKILLED_ONE
+	1 user autokilled.
+OPER_AKILLCHAN_KILLED_ONE
+	1 user killed.
+
 # EXCLUDE responses
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+expiry] mask [reason]]
@@ -4406,7 +4418,8 @@
 	    CLEARCHAN   Removes all users from a channel (masskick)
 	    KILLCLONES  Kill all users that have a certain host
 OPER_HELP_COMMANDS_AKILL
-	    AKILL       Manipulate the AKILL list
+	    AKILL       Manipulate the autokill list
+	    AKILLCHAN   Autokill all users in a channel
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     Manipulate the autokill exclusion list
 OPER_HELP_COMMANDS_SLINE
@@ -4588,6 +4601,25 @@
 	
 	Limited to Services operators.
 
+OPER_HELP_AKILLCHAN
+	Syntax: AKILLCHAN [KILL] [+expiry] channel reason
+	
+	Adds autokills for all users except IRC operators in a given
+	channel, and optionally (if KILL is given) removes them from
+	the network.  The reason will be stored with each autokill,
+	and may be displayed in kill messages depending on how
+	Services is configured.  expiry takes the same format as in
+	the AKILL ADD command; if not given, it defaults to %s.
+	
+	Autokills added by this command will have the form
+	*@hostname, for each hostname used by a client in the
+	channel.  If such an autokill already exists for a hostname,
+	it will not be modified; this may cause the number of
+	autokills added to be less than the number of users
+	affected.
+	
+	Limited to Services operators.
+
 OPER_HELP_EXCLUDE
 	Syntax: EXCLUDE ADD [+expiry] mask reason
 	        EXCLUDE DEL mask
@@ -5042,4 +5074,4 @@
 # version of the master (English) language file was used to create a
 # translated file.
 
-# CVS: $Revision: 2.214 $
+# CVS: $Revision: 2.216 $
diff -uNr ircservices-5.0.24/lang/es.l ircservices-5.0.25/lang/es.l
--- ircservices-5.0.24/lang/es.l	2003-10-14 11:51:06 +0900
+++ ircservices-5.0.25/lang/es.l	2003-11-18 15:38:06 +0900
@@ -1849,33 +1849,33 @@
 	Total de prelecturas de enchufe:    %5u kB (%d%%)
 
 OPER_STATS_ALL_USER_MEM
-	Usuarios  : %6d regístros, %5d kB
+	Usuarios           : %6d regístros, %5d kB
 OPER_STATS_ALL_CHANNEL_MEM
-	Canales   : %6d regístros, %5d kB
+	Canales            : %6d regístros, %5d kB
 OPER_STATS_ALL_SERVER_MEM
-	Servidores: %6d regístros, %5d kB
+	Servidores         : %6d regístros, %5d kB
 OPER_STATS_ALL_NICKGROUPINFO_MEM
-	Grupos De Apodos: %6d regístros, %5d kB
+	Grupos De Apodos   : %6d regístros, %5d kB
 OPER_STATS_ALL_NICKINFO_MEM
-	Apodos    : %6d regístros, %5d kB
+	Apodos             : %6d regístros, %5d kB
 OPER_STATS_ALL_CHANSERV_MEM
-	ChanServ  : %6d regístros, %5d kB
+	ChanServ           : %6d regístros, %5d kB
 OPER_STATS_ALL_STATSERV_MEM
-	StatServ  : %6d regístros, %5d kB
+	StatServ           : %6d regístros, %5d kB
 OPER_STATS_ALL_NEWS_MEM
-	Notícias  : %6d regístros, %5d kB
+	Notícias        : %6d regístros, %5d kB
 OPER_STATS_ALL_AKILL_MEM
-	Autokills : %6d regístros, %5d kB
+	Auto-desconecciones: %6d regístros, %5d kB
 OPER_STATS_ALL_EXCEPTION_MEM
-	Exceptions: %6d regístros, %5d kB
+	Exceptions         : %6d regístros, %5d kB
 OPER_STATS_ALL_SGLINE_MEM
-	SGlines   : %6d regístros, %5d kB
+	SGlines            : %6d regístros, %5d kB
 OPER_STATS_ALL_SQLINE_MEM
-	SQlines   : %6d regístros, %5d kB
+	SQlines            : %6d regístros, %5d kB
 OPER_STATS_ALL_SZLINE_MEM
-	SZlines   : %6d regístros, %5d kB
+	SZlines            : %6d regístros, %5d kB
 OPER_STATS_ALL_SESSION_MEM
-	Sesiones  : %6d regístros, %5d kB
+	Sesiones           : %6d regístros, %5d kB
 
 # MODE responses
 OPER_MODE_SYNTAX
@@ -1955,21 +1955,21 @@
 OPER_TOO_MANY_AKILLS
 	La lista AKILL está llena!
 OPER_AKILL_EXISTS
-	%s ya existe en la lista de autokill.
+	%s ya existe en la lista de auto-desconección (AKILL).
 OPER_AKILL_NO_NICK
-	Nota: Las máscaras de de autokill no pueden contener apodos; asegurese que usted no ha incluido una porción con apodo en su máscara.
+	Nota: Las máscaras de auto-desconección (AKILL) no pueden contener apodos; asegurese que usted no ha incluido una porción con apodo en su máscara.
 OPER_AKILL_MASK_TOO_GENERAL
-	La máscara de de autokill es demasiado general.
+	La máscara de auto-desconección (AKILL) es demasiado general.
 OPER_AKILL_EXPIRY_LIMITED
 	Solamente es posible fijar un tiempo de expiración de %s.
 OPER_AKILL_ADDED
-	%s agregado a la lista de autokill.
+	%s agregado a la lista de auto-desconección (AKILL).
 OPER_AKILL_REMOVED
-	%s removido de la lista de autokill.
+	%s removido de la lista de auto-desconección (AKILL).
 OPER_AKILL_NOT_FOUND
-	%s no encontrado en la lista de autokill.
+	%s no encontrado en la lista de auto-desconección (AKILL).
 OPER_AKILL_LIST_HEADER
-	Lista actual de autokill:
+	Lista actual de auto-desconección (AKILL):
 # mask, reason
 OPER_AKILL_LIST_FORMAT
 	%-32s  %s
@@ -1982,7 +1982,19 @@
 	%s (por %s en %s, nunca usada; %s)
 	    %s
 OPER_AKILL_COUNT
-	Existen %d máscaras de proveedor web en la lista de autokill.
+	Existen %d máscaras de proveedor web en la lista de auto-desconección (AKILL).
+
+# AKILLCHAN responses
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+Expiración] Canal Razón
+OPER_AKILLCHAN_AKILLED
+	%d usuarios fueron auto-desconectados.
+OPER_AKILLCHAN_KILLED
+	%d usuarios fueron desconectados.
+OPER_AKILLCHAN_AKILLED_ONE
+	1 usuario fue auto-desconectado.
+OPER_AKILLCHAN_KILLED_ONE
+	1 usuario fue desconectado.
 
 # EXCLUDE responses
 OPER_EXCLUDE_SYNTAX
@@ -1994,15 +2006,15 @@
 OPER_TOO_MANY_EXCLUDES
 	La lista EXCLUDE está llena!
 OPER_EXCLUDE_EXISTS
-	%s ya existe en la lista de exclusión de autokill.
+	%s ya existe en la lista de exclusión de auto-desconección (AKILL).
 OPER_EXCLUDE_ADDED
-	%s agregado a la lista de exclusión de autokill.
+	%s agregado a la lista de exclusión de auto-desconección (AKILL).
 OPER_EXCLUDE_REMOVED
-	%s removido de la lista de exclusión de autokill.
+	%s removido de la lista de exclusión de auto-desconección (AKILL).
 OPER_EXCLUDE_NOT_FOUND
-	%s no fue encontrado en la lista de exclusión de autokill.
+	%s no fue encontrado en la lista de exclusión de auto-desconección (AKILL).
 OPER_EXCLUDE_LIST_HEADER
-	Lista actual de exclusión de autokill:
+	Lista actual de exclusión de auto-desconección (AKILL):
 # mask, reason
 OPER_EXCLUDE_LIST_FORMAT
 	%-32s  %s
@@ -2015,7 +2027,7 @@
 	%s (por %s en %s, nunca usado; %s)
 	    %s
 OPER_EXCLUDE_COUNT
-	Existen %d máscaras de proveedor web en la lista de exclusión de autokill.
+	Existen %d máscaras de proveedor web en la lista de exclusión de auto-desconección (AKILL).
 
 # SxLINE responses
 OPER_SLINE_SYNTAX
@@ -4431,9 +4443,10 @@
 	    CLEARCHAN   Remueve todos los usuarios de un canal (pateo masivo)
 	    KILLCLONES  Desconecta (kills) todos los usuarios con cierta máscara
 OPER_HELP_COMMANDS_AKILL
-	    AKILL       Manipula la lista AKILL
+	    AKILL       Manipula la lista de auto-desconeccíon (AKILL)
+	    AKILLCHAN   Auto-desconecta todos los usuarios en un canal
 OPER_HELP_COMMANDS_EXCLUDE
-	    EXCLUDE     Manipula la lista de exclusión de autokill
+	    EXCLUDE     Manipula la lista de exclusión de auto-desconección (AKILL)
 OPER_HELP_COMMANDS_SLINE
 	    SGLINE      Manipula la lista SGLINE
 	    SQLINE      Manipula la lista SQLINE
@@ -4617,20 +4630,40 @@
 	
 	Limitado a los Operadores De Servicios.
 
+OPER_HELP_AKILLCHAN
+	Syntax: AKILLCHAN [KILL] [+Expiración] Canal Razón
+	
+	Añade auto-desconecciones para todos los usuarios excepto para los operadores de
+	IRC en el canal especificado, y opcionalmente (si KILL es especificado)
+	los remueve de la red.  La Razón será recordada en cada auto-desconección,
+	y puede ser mostrada en los mensajes de desconección dependiendo de como esten
+	configurados los Servicios.  Expiración toma el mismo formato como en el
+	comando AKILL ADD; Si no es especificado, lo fija por %s.
+	
+	Auto-desconecciones añadidas con este comando tendrán el formato
+	*@Máscara, para cada máscara usada por un cliente en el
+	canal.  Si dicha auto-desconección ya existe para una máscara,
+	esta no será modificada; esto puede causar que el número de
+	auto-desconecciones añadidas sea menor que el número de usuarios
+	afectados.
+	
+	Limitado a los Operadores De Servicios.
+
 OPER_HELP_EXCLUDE
 	Sintaxis: EXCLUDE ADD [+Expiración] Máscara Razón
-	        EXCLUDE DEL Máscara
-	        EXCLUDE LIST [Máscara] [NOEXPIRE]
-	        EXCLUDE VIEW [Máscara] [NOEXPIRE]
-	        EXCLUDE COUNT
+	          EXCLUDE DEL Máscara
+	          EXCLUDE LIST [Máscara] [NOEXPIRE]
+	          EXCLUDE VIEW [Máscara] [NOEXPIRE]
+	          EXCLUDE COUNT
 	
 	Permite a los Operadores de servicios manipular la lista de exclusión de
-	autokill.  Cuando un usuario que concuerda con una máscara de exclusión
-	de autokill se connecta a la red, Los servicios no impondrán un KILL
-	para dicho usuario inclusive si el usuario de otra forma concordara con
-	una máscara de autokill.  Esto es útil si usted tiene máscaras de autokill
-	muy generales, y aún desea que ciertos dominios especificos o usuarios que
-	conduerdan con esas máscaras le sea posible conectarse a la red.
+	auto-desconección (AKILL).  Cuando un usuario que concuerda con una máscara
+	de exclusión de auto-desconección se connecta a la red, Los servicios no
+	impondrán un KILL para dicho usuario inclusive si el usuario de otra forma
+	concordara con una máscara de auto-desconección (AKILL) .  Esto es útil si
+	usted tiene máscaras de auto-desconección muy generales, y aún desea que
+	ciertos dominios especificos o usuarios que conduerdan con esas máscaras
+	le sea posible conectarse a la red.
 	
 	Los subcomandos ADD, DEL, LIST, VIEW, y COUNT funcionan en la misma manera
 	en que lo hacen los subcomandos con respecto al comando AKILL; vea la
diff -uNr ircservices-5.0.24/lang/hu.l ircservices-5.0.25/lang/hu.l
--- ircservices-5.0.24/lang/hu.l	2003-10-14 11:51:28 +0900
+++ ircservices-5.0.25/lang/hu.l	2003-11-18 15:40:02 +0900
@@ -1993,6 +1993,18 @@
 OPER_AKILL_COUNT
 	%d darab hostmaszk szerepel az autokill listán.
 
+# AKILLCHAN válaszok
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+elévülés] csatorna indok
+OPER_AKILLCHAN_AKILLED
+	%d felhasználó autokillelve.
+OPER_AKILLCHAN_KILLED
+	%d felhasználó killelve.
+OPER_AKILLCHAN_AKILLED_ONE
+	1 felhasználó autokillelve.
+OPER_AKILLCHAN_KILLED_ONE
+	1 felhasználó killelve.
+
 # EXCLUDE válaszok
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+elévülés] mask [indok]]
@@ -4354,9 +4366,10 @@
 	    KICK        Kirúgja a felhasználót a megadott szobából
 	    CLEARMODES  Töröl egyes módokat a csatornáról
 	    CLEARCHAN   Minden felhasználót kirúg a csatornáról (masskick)
-	    KILLCLONES  Killel minden felhasználót a megadott hostról.
+	    KILLCLONES  Killel minden felhasználót a megadott hostról
 OPER_HELP_COMMANDS_AKILL
-	    AKILL       Karbantartja az AKILL listát
+	    AKILL       Módosítja az autokill listát
+	    AKILLCHAN   Autokillel minden felhasználót a szobából
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     Karbantartja az autokill kizárólistát
 OPER_HELP_COMMANDS_SLINE
@@ -4545,6 +4558,27 @@
 	
 	Korlázotva Services operátoroknak.
 
+OPER_HELP_AKILLCHAN
+	Syntax: AKILLCHAN [KILL] [+elévülés] csatorna indok
+	
+	Hozzáad egy autokillt, mely minden felhasználóra vonatkozik,
+	kivéve az IRC operátorokra a megadott csatornán,
+	opcionálisan (ha a KILL meg van adva) eltávolítja oket a
+	hálózatból.  Az indok tárolva lesz minden autokill mellett,
+	és meg fog jelenni a killelési üzenetben a Services
+	konfigurációjától függõen.  elévülést ugyanabban a
+	formátumban kell megadni, mint az AKILL ADD parancsnál; ha
+	nincs megadva, akkor az alapértéke: %s.
+	
+	Az Autokilleknél, melyeket ezzel a paranccsal adsz hozzá,
+	*@hostname formában lesz minden hosztnév, melyet használ
+	valaki a csatornán.  Ha már egy autokill szerepel az adott
+	hosztnévre akkor az nem lesz módosítva; ennek okán lehet,
+	hogy kevesebb autokill kerül hozzáadásra, mint ahány user a
+	szobában érintett.
+	
+	Limitálva Services operátoroknak.
+
 OPER_HELP_EXCLUDE
 	Syntax: EXCLUDE ADD [+lejárat] maszk indok
 	        EXCLUDE DEL maszk
diff -uNr ircservices-5.0.24/lang/index ircservices-5.0.25/lang/index
--- ircservices-5.0.24/lang/index	2003-10-17 16:04:11 +0900
+++ ircservices-5.0.25/lang/index	2003-11-17 17:04:51 +0900
@@ -764,6 +764,11 @@
 OPER_AKILL_VIEW_FORMAT
 OPER_AKILL_VIEW_UNUSED_FORMAT
 OPER_AKILL_COUNT
+OPER_AKILLCHAN_SYNTAX
+OPER_AKILLCHAN_AKILLED
+OPER_AKILLCHAN_KILLED
+OPER_AKILLCHAN_AKILLED_ONE
+OPER_AKILLCHAN_KILLED_ONE
 OPER_EXCLUDE_SYNTAX
 OPER_EXCLUDE_ADD_SYNTAX
 OPER_EXCLUDE_DEL_SYNTAX
@@ -1167,6 +1172,7 @@
 OPER_HELP_AKILL
 OPER_HELP_AKILL_OPERMAXEXPIRY
 OPER_HELP_AKILL_END
+OPER_HELP_AKILLCHAN
 OPER_HELP_EXCLUDE
 OPER_HELP_SGLINE
 OPER_HELP_SQLINE
diff -uNr ircservices-5.0.24/lang/ja_euc.l ircservices-5.0.25/lang/ja_euc.l
--- ircservices-5.0.24/lang/ja_euc.l	2003-10-14 11:52:53 +0900
+++ ircservices-5.0.25/lang/ja_euc.l	2003-11-17 16:52:55 +0900
@@ -1867,11 +1867,11 @@
 
 # OPER±þÅú
 OPER_OPER_SYNTAX
-	OPER {ADD | DEL | LIST} [nick]
+	OPER {ADD | DEL | LIST} [¥Ë¥Ã¥¯]
 OPER_OPER_ADD_SYNTAX
-	OPER ADD nick
+	OPER ADD ¥Ë¥Ã¥¯
 OPER_OPER_DEL_SYNTAX
-	OPER DEL nick
+	OPER DEL ¥Ë¥Ã¥¯
 OPER_OPER_NO_NICKSERV
 	NickServ¤¬Æ°ºî¤·¤Æ¤¤¤Ê¤¤¤¿¤á¡¢OPER¥³¥Þ¥ó¥É¤Ï»È¤¨¤Þ¤»¤ó¡£
 OPER_OPER_EXISTS
@@ -1934,6 +1934,18 @@
 OPER_AKILL_COUNT
 	¼«Æ°ÀÚÃǥꥹ¥È¤Ë¤Ï%d¸Ä¤Î¥Þ¥¹¥¯¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 
+# AKILLCHAN±þÅú
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+Í­¸ú´ü¸Â] ¥Á¥ã¥ó¥Í¥ë Íýͳ
+OPER_AKILLCHAN_AKILLED
+	%d¥æ¡¼¥¶¤ò¼«Æ°ÀÚÃǥꥹ¥È¤ËÄɲä·¤Þ¤·¤¿¡£
+OPER_AKILLCHAN_KILLED
+	%d¥æ¡¼¥¶¤òÀÚÃǤ·¤Þ¤·¤¿¡£
+OPER_AKILLCHAN_AKILLED_ONE
+	1¥æ¡¼¥¶¤ò¼«Æ°ÀÚÃǥꥹ¥È¤ËÄɲä·¤Þ¤·¤¿¡£
+OPER_AKILLCHAN_KILLED_ONE
+	1¥æ¡¼¥¶¤òÀÚÃǤ·¤Þ¤·¤¿¡£
+
 # EXCLUDE±þÅú
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+Í­¸ú´ü¸Â] ¥Þ¥¹¥¯ [Íýͳ]]
@@ -4160,6 +4172,7 @@
 	    KILLCLONES  Ʊ¤¸¥Û¥¹¥È¤«¤éÀܳ¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤òÁ´¤ÆÀÚÃǤ¹¤ë
 OPER_HELP_COMMANDS_AKILL
 	    AKILL       ¼«Æ°ÀÚÃǥꥹ¥È¤òÊÔ½¸¤¹¤ë
+	    AKILLCHAN   ¥Á¥ã¥ó¥Í¥ë¤ÎÁ´¥æ¡¼¥¶¤ò¼«Æ°ÀÚÃǥꥹ¥È¤ËÄɲ乤ë
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     ¼«Æ°ÀÚÃǽü³°¥ê¥¹¥È¤òÊÔ½¸¤¹¤ë
 OPER_HELP_COMMANDS_SLINE
@@ -4322,6 +4335,23 @@
 	
 	¤³¤Î¥³¥Þ¥ó¥É¤Î»ÈÍѤÏServices¥ª¥Ú¥ì¡¼¥¿¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 
+OPER_HELP_AKILLCHAN
+	ÍÑË¡¡§AKILLCHAN [KILL] [+Í­¸ú´ü¸Â] ¥Á¥ã¥ó¥Í¥ë Íýͳ
+	
+	»ØÄꤵ¤ì¤¿¥Á¥ã¥ó¥Í¥ë¤Ë»²²Ã¤·¤Æ¤¤¤ë¡¢IRC¥ª¥Ú¥ì¡¼¥¿¤ò½ü¤¯Á´¥æ
+	¡¼¥¶¤ò¡¢¼«Æ°ÀÚÃǥꥹ¥È¤ËÄɲä·¡¢KILL¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¶¯À©ÀÚÃÇ
+	¤·¤Þ¤¹¡£Íýͳ¤Ï³Æ¼«Æ°ÀÚÃÇ¥Þ¥¹¥¯¤È°ì½ï¤ËÊݸ¤µ¤ì¡¢Services¤ÎÀß
+	Äê¤Ë¤è¤Ã¤Æ¤ÏÀÚÃÇ¥á¥Ã¥»¡¼¥¸¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£Í­¸ú´ü¸Â¤ÏAKILL
+	ADD¥³¥Þ¥ó¥É¤ÈƱÍͤ˻ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¡¢»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï%s
+	¤È¤Ê¤ê¤Þ¤¹¡£
+	
+	¤³¤Î¥³¥Þ¥ó¥É¤ÇÄɲ䵤ì¤ë¼«Æ°ÀÚÃÇ¥Þ¥¹¥¯¤Ï¡Ö*@¥Û¥¹¥È̾¡×·Á¼°¤Ç
+	À¸À®¤µ¤ì¤Þ¤¹¡£¤¹¤Ç¤ËƱ°ì¤Î¥Þ¥¹¥¯¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤ÎÅÐÏ¿Æâ
+	ÍƤòÊѹ¹¤·¤Þ¤»¤ó¤Î¤Ç¡¢¼ÂºÝ¤ËÄɲ䵤ì¤ë¥Þ¥¹¥¯¤Î¿ô¤Ï¡¢¥Á¥ã¥ó¥Í
+	¥ë¤Î¥æ¡¼¥¶¿ô¤è¤ê¾¯¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
+	
+	¤³¤Î¥³¥Þ¥ó¥É¤Î»ÈÍѤÏServices¥ª¥Ú¥ì¡¼¥¿¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+
 OPER_HELP_EXCLUDE
 	ÍÑË¡¡§EXCLUDE ADD [+Í­¸ú´ü¸Â] ¥Þ¥¹¥¯ Íýͳ
 	¡¡¡¡¡¡EXCLUDE DEL ¥Þ¥¹¥¯
diff -uNr ircservices-5.0.24/lang/ja_sjis.l ircservices-5.0.25/lang/ja_sjis.l
--- ircservices-5.0.24/lang/ja_sjis.l	2003-10-17 16:05:44 +0900
+++ ircservices-5.0.25/lang/ja_sjis.l	2003-11-18 15:48:24 +0900
@@ -1867,11 +1867,11 @@
 
 # OPER‰ž“š
 OPER_OPER_SYNTAX
-	OPER {ADD | DEL | LIST} [nick]
+	OPER {ADD | DEL | LIST} [ƒjƒbƒN]
 OPER_OPER_ADD_SYNTAX
-	OPER ADD nick
+	OPER ADD ƒjƒbƒN
 OPER_OPER_DEL_SYNTAX
-	OPER DEL nick
+	OPER DEL ƒjƒbƒN
 OPER_OPER_NO_NICKSERV
 	NickServ‚ª“®�삵‚Ä‚¢‚È‚¢‚½‚ß�AOPERƒRƒ}ƒ“ƒh‚ÍŽg‚¦‚Ü‚¹‚ñ�B
 OPER_OPER_EXISTS
@@ -1934,6 +1934,18 @@
 OPER_AKILL_COUNT
 	Ž©“®�Ø’fƒŠƒXƒg‚É‚Í%dŒÂ‚̃}ƒXƒN‚ª“o˜^‚³‚ê‚Ä‚¢‚Ü‚·�B
 
+# AKILLCHAN‰ž“š
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+—LŒøŠúŒÀ] ƒ`ƒƒƒ“ƒlƒ‹ —�—R
+OPER_AKILLCHAN_AKILLED
+	%dƒ†�[ƒU‚ðŽ©“®�Ø’fƒŠƒXƒg‚ɒljÁ‚µ‚Ü‚µ‚½�B
+OPER_AKILLCHAN_KILLED
+	%dƒ†�[ƒU‚ð�Ø’f‚µ‚Ü‚µ‚½�B
+OPER_AKILLCHAN_AKILLED_ONE
+	1ƒ†�[ƒU‚ðŽ©“®�Ø’fƒŠƒXƒg‚ɒljÁ‚µ‚Ü‚µ‚½�B
+OPER_AKILLCHAN_KILLED_ONE
+	1ƒ†�[ƒU‚ð�Ø’f‚µ‚Ü‚µ‚½�B
+
 # EXCLUDE‰ž“š
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+—LŒøŠúŒÀ] ƒ}ƒXƒN [—�—R]]
@@ -4160,6 +4172,7 @@
 	    KILLCLONES  “¯‚¶ƒzƒXƒg‚©‚ç�Ú‘±‚µ‚Ä‚¢‚郆�[ƒU‚ð‘S‚Ä�Ø’f‚·‚é
 OPER_HELP_COMMANDS_AKILL
 	    AKILL       Ž©“®�Ø’fƒŠƒXƒg‚ð•Ò�W‚·‚é
+	    AKILLCHAN   ƒ`ƒƒƒ“ƒlƒ‹‚Ì‘Sƒ†�[ƒU‚ðŽ©“®�Ø’fƒŠƒXƒg‚ɒljÁ‚·‚é
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     Ž©“®�Ø’f�œŠOƒŠƒXƒg‚ð•Ò�W‚·‚é
 OPER_HELP_COMMANDS_SLINE
@@ -4322,6 +4335,23 @@
 	
 	‚±‚̃Rƒ}ƒ“ƒh‚ÌŽg—p‚ÍServicesƒIƒyƒŒ�[ƒ^‚É�§ŒÀ‚³‚ê‚Ä‚¢‚Ü‚·�B
 
+OPER_HELP_AKILLCHAN
+	—p–@�FAKILLCHAN [KILL] [+—LŒøŠúŒÀ] ƒ`ƒƒƒ“ƒlƒ‹ —�—R
+	
+	Žw’肳‚ꂽƒ`ƒƒƒ“ƒlƒ‹‚ÉŽQ‰Á‚µ‚Ä‚¢‚é�AIRCƒIƒyƒŒ�[ƒ^‚ð�œ‚­‘Sƒ†
+	�[ƒU‚ð�AŽ©“®�Ø’fƒŠƒXƒg‚ɒljÁ‚µ�AKILL‚ðŽw’肵‚½�ê�‡‚Í‹­�§�Ø’f
+	‚µ‚Ü‚·�B—�—R‚ÍŠeŽ©“®�Ø’fƒ}ƒXƒN‚ƈê��‚É•Û‘¶‚³‚ê�AServices‚Ì�Ý
+	’è‚É‚æ‚Á‚Ä‚Í�Ø’fƒ�ƒbƒZ�[ƒW‚É•\Ž¦‚³‚ê‚Ü‚·�B—LŒøŠúŒÀ‚ÍAKILL
+	ADDƒRƒ}ƒ“ƒh‚Æ“¯—l‚ÉŽw’è‚·‚邱‚Æ‚ª‚Å‚«�AŽw’肵‚È‚¢�ê�‡‚Í%s
+	‚Æ‚È‚è‚Ü‚·�B
+	
+	‚±‚̃Rƒ}ƒ“ƒh‚ŒljÁ‚³‚ê‚鎩“®�Ø’fƒ}ƒXƒN‚Í�u*@ƒzƒXƒg–¼�vŒ`Ž®‚Å
+	�¶�¬‚³‚ê‚Ü‚·�B‚·‚Å‚É“¯ˆê‚̃}ƒXƒN‚ª‘¶�Ý‚·‚é�ê�‡‚Í�A‚»‚Ì“o˜^“à
+	—e‚ð•Ï�X‚µ‚Ü‚¹‚ñ‚Ì‚Å�AŽÀ�ۂɒljÁ‚³‚ê‚éƒ}ƒXƒN‚Ì�”‚Í�Aƒ`ƒƒƒ“ƒl
+	ƒ‹‚̃†�[ƒU�”‚æ‚è�­‚È‚¢‚±‚Æ‚à‚ ‚è‚Ü‚·�B
+	
+	‚±‚̃Rƒ}ƒ“ƒh‚ÌŽg—p‚ÍServicesƒIƒyƒŒ�[ƒ^‚É�§ŒÀ‚³‚ê‚Ä‚¢‚Ü‚·�B
+
 OPER_HELP_EXCLUDE
 	—p–@�FEXCLUDE ADD [+—LŒøŠúŒÀ] ƒ}ƒXƒN —�—R
 	�@�@�@EXCLUDE DEL ƒ}ƒXƒN
diff -uNr ircservices-5.0.24/lang/langcomp.c ircservices-5.0.25/lang/langcomp.c
--- ircservices-5.0.24/lang/langcomp.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/lang/langcomp.c	2003-11-18 21:39:58 +0900
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #undef getline
 
 /* CR/LF values--used instead of '\r' and '\n' to avoid platform-dependent
@@ -134,14 +135,16 @@
 
 /*************************************************************************/
 
-/* Write a 32-bit value to a file in big-endian order. */
+/* Write a 32-bit value to a file in big-endian order.  Returns 0 on
+ * success, -1 on error.
+ */
 
-static int fput32(int val, FILE *f)
+static int fput32(long val, FILE *f)
 {
-    if (fputc(val>>24, f) < 0 ||
-        fputc(val>>16, f) < 0 ||
-        fputc(val>> 8, f) < 0 ||
-        fputc(val    , f) < 0
+    if (fputc(val>>24, f) == EOF ||
+        fputc(val>>16, f) == EOF ||
+        fputc(val>> 8, f) == EOF ||
+        fputc(val    , f) == EOF
     ) {
 	return -1;
     } else {
@@ -160,8 +163,8 @@
     int retval = 0;
     int curstring = -2, i;
     char *line;
-    int pos;
     int maxerr = 50;	/* Max errors before we bail out */
+    long pos, totalsize;
 
     if (ac >= 2 && strcmp(av[1], "-w") == 0) {
 	warn = 1;
@@ -238,31 +241,57 @@
 	if (maxerr == 0)
 	    fprintf(stderr, "%s:%d: Too many errors!\n", filename, linenum);
 	fclose(out);
-	remove(outfile);
+	unlink(outfile);
 	return retval;
     }
 
-    fput32(numstrings, out);
-    pos = numstrings * 8 + 4;
-    for (i = 0; i < numstrings; i++) {
-	int len = strings[i] && *strings[i] ? strlen(strings[i])-1 : 0;
-	fput32(pos, out);
-	fput32(len, out);
-	pos += len;
-    }
+    totalsize = 0;
     for (i = 0; i < numstrings; i++) {
 	if (strings[i]) {
 	    if (*strings[i])
-		strings[i][strlen(strings[i])-1] = 0;	/* kill last \n */
+		strings[i][strlen(strings[i])-1] = 0;  /* kill last \n */
 	    if (*strings[i])
-		fputs(strings[i], out);
+		totalsize += strlen(strings[i]) + 1;
 	} else if (warn) {
 	    fprintf(stderr, "%s: String `%s' missing\n", filename,
 			stringnames[i]);
 	}
     }
 
-    fclose(out);
+    if (fput32(numstrings, out) < 0 || fput32(totalsize, out) < 0) {
+	perror("fwrite()");
+	retval = 1;
+    }
+    for (i = 0; i < numstrings && retval == 0; i++) {
+	if (strings[i] && *strings[i]) {
+	    if (fwrite(strings[i], strlen(strings[i])+1, 1, out) != 1) {
+		perror("fwrite()");
+		retval = 1;
+	    }
+	}
+    }
+    pos = 0;
+    for (i = 0; i < numstrings && retval == 0; i++) {
+	if (strings[i] && *strings[i]) {
+	    if (fput32(pos, out) < 0) {
+		perror("fwrite()");
+		retval = 1;
+	    }
+	    pos += strlen(strings[i]) + 1;
+	} else {
+	    if (fput32(-1, out) < 0) {
+		perror("fwrite()");
+		retval = 1;
+	    }
+	}
+    }
+
+    if (fclose(out) == EOF && retval == 0) {
+	perror("fclose()");
+	retval = 1;
+    }
+    if (retval)
+	unlink(outfile);
     return retval;
 }
 
diff -uNr ircservices-5.0.24/lang/langstrs.h ircservices-5.0.25/lang/langstrs.h
--- ircservices-5.0.24/lang/langstrs.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/lang/langstrs.h	2003-11-18 21:39:58 +0900
@@ -764,436 +764,442 @@
 #define OPER_AKILL_VIEW_FORMAT           763
 #define OPER_AKILL_VIEW_UNUSED_FORMAT    764
 #define OPER_AKILL_COUNT                 765
-#define OPER_EXCLUDE_SYNTAX              766
-#define OPER_EXCLUDE_ADD_SYNTAX          767
-#define OPER_EXCLUDE_DEL_SYNTAX          768
-#define OPER_TOO_MANY_EXCLUDES           769
-#define OPER_EXCLUDE_EXISTS              770
-#define OPER_EXCLUDE_ADDED               771
-#define OPER_EXCLUDE_REMOVED             772
-#define OPER_EXCLUDE_NOT_FOUND           773
-#define OPER_EXCLUDE_LIST_HEADER         774
-#define OPER_EXCLUDE_LIST_FORMAT         775
-#define OPER_EXCLUDE_VIEW_FORMAT         776
-#define OPER_EXCLUDE_VIEW_UNUSED_FORMAT  777
-#define OPER_EXCLUDE_COUNT               778
-#define OPER_SLINE_SYNTAX                779
-#define OPER_SLINE_ADD_SYNTAX            780
-#define OPER_SLINE_DEL_SYNTAX            781
-#define OPER_TOO_MANY_SLINES             782
-#define OPER_SLINE_EXISTS                783
-#define OPER_SLINE_ADDED                 784
-#define OPER_SLINE_REMOVED               785
-#define OPER_SLINE_NOT_FOUND             786
-#define OPER_SLINE_LIST_HEADER           787
-#define OPER_SLINE_LIST_FORMAT           788
-#define OPER_SLINE_VIEW_FORMAT           789
-#define OPER_SLINE_VIEW_UNUSED_FORMAT    790
-#define OPER_SLINE_COUNT                 791
-#define OPER_SZLINE_NOT_AVAIL            792
-#define OPER_SU_SYNTAX                   793
-#define OPER_SU_NO_PASSWORD              794
-#define OPER_SU_SUCCEEDED                795
-#define OPER_SU_FAILED                   796
-#define OPER_SET_SYNTAX                  797
-#define OPER_SET_IGNORE_ON               798
-#define OPER_SET_IGNORE_OFF              799
-#define OPER_SET_IGNORE_ERROR            800
-#define OPER_SET_READONLY_ON             801
-#define OPER_SET_READONLY_OFF            802
-#define OPER_SET_READONLY_ERROR          803
-#define OPER_SET_DEBUG_ON                804
-#define OPER_SET_DEBUG_OFF               805
-#define OPER_SET_DEBUG_LEVEL             806
-#define OPER_SET_DEBUG_ERROR             807
-#define OPER_SET_SUPASS_FAILED           808
-#define OPER_SET_SUPASS_OK               809
-#define OPER_SET_SUPASS_NONE             810
-#define OPER_SET_UNKNOWN_OPTION          811
-#define OPER_JUPE_SYNTAX                 812
-#define OPER_JUPE_INVALID_NAME           813
-#define OPER_JUPE_ALREADY_JUPED          814
-#define OPER_RAW_SYNTAX                  815
-#define OPER_UPDATE_SYNTAX               816
-#define OPER_UPDATE_FORCE_FAILED         817
-#define OPER_UPDATING                    818
-#define OPER_UPDATE_COMPLETE             819
-#define OPER_UPDATE_FAILED               820
-#define OPER_REHASHING                   821
-#define OPER_REHASHED                    822
-#define OPER_REHASH_ERROR                823
-#define OPER_IGNORE_LIST                 824
-#define OPER_IGNORE_LIST_EMPTY           825
-#define OPER_KILLCLONES_SYNTAX           826
-#define OPER_KILLCLONES_UNKNOWN_NICK     827
-#define OPER_KILLCLONES_KILLED           828
-#define OPER_KILLCLONES_KILLED_AKILL     829
-#define OPER_EXCEPTION_SYNTAX            830
-#define OPER_EXCEPTION_ADD_SYNTAX        831
-#define OPER_EXCEPTION_DEL_SYNTAX        832
-#define OPER_EXCEPTION_MOVE_SYNTAX       833
-#define OPER_EXCEPTION_ALREADY_PRESENT   834
-#define OPER_EXCEPTION_TOO_MANY          835
-#define OPER_EXCEPTION_ADDED             836
-#define OPER_EXCEPTION_MOVED             837
-#define OPER_EXCEPTION_NO_SUCH_ENTRY     838
-#define OPER_EXCEPTION_NOT_FOUND         839
-#define OPER_EXCEPTION_NO_MATCH          840
-#define OPER_EXCEPTION_EMPTY             841
-#define OPER_EXCEPTION_DELETED           842
-#define OPER_EXCEPTION_DELETED_ONE       843
-#define OPER_EXCEPTION_DELETED_SEVERAL   844
-#define OPER_EXCEPTION_LIST_HEADER       845
-#define OPER_EXCEPTION_LIST_COLHEAD      846
-#define OPER_EXCEPTION_LIST_FORMAT       847
-#define OPER_EXCEPTION_VIEW_FORMAT       848
-#define OPER_EXCEPTION_INVALID_LIMIT     849
-#define OPER_EXCEPTION_INVALID_HOSTMASK  850
-#define OPER_SESSION_SYNTAX              851
-#define OPER_SESSION_LIST_SYNTAX         852
-#define OPER_SESSION_VIEW_SYNTAX         853
-#define OPER_SESSION_INVALID_THRESHOLD   854
-#define OPER_SESSION_NOT_FOUND           855
-#define OPER_SESSION_LIST_HEADER         856
-#define OPER_SESSION_LIST_COLHEAD        857
-#define OPER_SESSION_LIST_FORMAT         858
-#define OPER_SESSION_VIEW_FORMAT         859
-#define NEWS_LOGON_TEXT                  860
-#define NEWS_OPER_TEXT                   861
-#define NEWS_LOGON_SYNTAX                862
-#define NEWS_LOGON_LIST_HEADER           863
-#define NEWS_LOGON_LIST_ENTRY            864
-#define NEWS_LOGON_LIST_NONE             865
-#define NEWS_LOGON_ADD_SYNTAX            866
-#define NEWS_LOGON_ADD_FULL              867
-#define NEWS_LOGON_ADDED                 868
-#define NEWS_LOGON_DEL_SYNTAX            869
-#define NEWS_LOGON_DEL_NOT_FOUND         870
-#define NEWS_LOGON_DELETED               871
-#define NEWS_LOGON_DEL_NONE              872
-#define NEWS_LOGON_DELETED_ALL           873
-#define NEWS_OPER_SYNTAX                 874
-#define NEWS_OPER_LIST_HEADER            875
-#define NEWS_OPER_LIST_ENTRY             876
-#define NEWS_OPER_LIST_NONE              877
-#define NEWS_OPER_ADD_SYNTAX             878
-#define NEWS_OPER_ADD_FULL               879
-#define NEWS_OPER_ADDED                  880
-#define NEWS_OPER_DEL_SYNTAX             881
-#define NEWS_OPER_DEL_NOT_FOUND          882
-#define NEWS_OPER_DELETED                883
-#define NEWS_OPER_DEL_NONE               884
-#define NEWS_OPER_DELETED_ALL            885
-#define NEWS_HELP_LOGON                  886
-#define NEWS_HELP_OPER                   887
-#define STAT_SERVERS_REMOVE_SERV_FIRST   888
-#define STAT_SERVERS_SERVER_EXISTS       889
-#define STAT_SERVERS_SYNTAX              890
-#define STAT_SERVERS_STATS_TOTAL         891
-#define STAT_SERVERS_STATS_ON_OFFLINE    892
-#define STAT_SERVERS_LASTQUIT_WAS        893
-#define STAT_SERVERS_LIST_HEADER         894
-#define STAT_SERVERS_LIST_FORMAT         895
-#define STAT_SERVERS_LIST_RESULTS        896
-#define STAT_SERVERS_VIEW_HEADER_ONLINE  897
-#define STAT_SERVERS_VIEW_HEADER_OFFLINE 898
-#define STAT_SERVERS_VIEW_LASTJOIN       899
-#define STAT_SERVERS_VIEW_LASTQUIT       900
-#define STAT_SERVERS_VIEW_QUITMSG        901
-#define STAT_SERVERS_VIEW_USERS_OPERS    902
-#define STAT_SERVERS_VIEW_RESULTS        903
-#define STAT_SERVERS_DELETE_SYNTAX       904
-#define STAT_SERVERS_DELETE_DONE         905
-#define STAT_SERVERS_COPY_SYNTAX         906
-#define STAT_SERVERS_COPY_DONE           907
-#define STAT_SERVERS_RENAME_SYNTAX       908
-#define STAT_SERVERS_RENAME_DONE         909
-#define STAT_USERS_SYNTAX                910
-#define STAT_USERS_TOTUSERS              911
-#define STAT_USERS_TOTOPERS              912
-#define STAT_USERS_SERVUSERS             913
-#define STAT_USERS_SERVOPERS             914
-#define NICK_HELP                        915
-#define NICK_HELP_EXPIRES                916
-#define NICK_HELP_WARNING                917
-#define NICK_HELP_COMMANDS               918
-#define NICK_HELP_COMMANDS_AUTH          919
-#define NICK_HELP_COMMANDS_IDENTIFY      920
-#define NICK_HELP_COMMANDS_SENDPASS      921
-#define NICK_HELP_COMMANDS_DROP          922
-#define NICK_HELP_COMMANDS_LINK          923
-#define NICK_HELP_COMMANDS_OLDLINK       924
-#define NICK_HELP_COMMANDS_ACCESS        925
-#define NICK_HELP_COMMANDS_AJOIN         926
-#define NICK_HELP_COMMANDS_SET           927
-#define NICK_HELP_COMMANDS_LIST          928
-#define NICK_HELP_COMMANDS_LISTCHANS     929
-#define NICK_HELP_REGISTER               930
-#define NICK_HELP_REGISTER_EMAIL         931
-#define NICK_HELP_REGISTER_EMAIL_REQ     932
-#define NICK_HELP_REGISTER_EMAIL_AUTH    933
-#define NICK_HELP_REGISTER_END           934
-#define NICK_HELP_AUTH                   935
-#define NICK_HELP_SENDAUTH               936
-#define NICK_HELP_SENDPASS               937
-#define NICK_HELP_IDENTIFY               938
-#define NICK_HELP_DROP                   939
-#define NICK_HELP_DROP_LINK              940
-#define NICK_HELP_DROP_END               941
-#define NICK_HELP_OLD_LINK               942
-#define NICK_HELP_LINK                   943
-#define NICK_HELP_OLD_UNLINK             944
-#define NICK_HELP_UNLINK                 945
-#define NICK_HELP_LISTLINKS              946
-#define NICK_HELP_ACCESS                 947
-#define NICK_HELP_SET                    948
-#define NICK_HELP_SET_OPTION_MAINNICK    949
-#define NICK_HELP_SET_END                950
-#define NICK_HELP_SET_PASSWORD           951
-#define NICK_HELP_SET_LANGUAGE           952
-#define NICK_HELP_SET_URL                953
-#define NICK_HELP_SET_EMAIL              954
-#define NICK_HELP_SET_INFO               955
-#define NICK_HELP_SET_KILL               956
-#define NICK_HELP_SET_SECURE             957
-#define NICK_HELP_SET_PRIVATE            958
-#define NICK_HELP_SET_HIDE               959
-#define NICK_HELP_SET_TIMEZONE           960
-#define NICK_HELP_SET_MAINNICK           961
-#define NICK_HELP_UNSET                  962
-#define NICK_HELP_UNSET_REQ_EMAIL        963
-#define NICK_HELP_RECOVER                964
-#define NICK_HELP_RELEASE                965
-#define NICK_HELP_GHOST                  966
-#define NICK_HELP_INFO                   967
-#define NICK_HELP_INFO_AUTH              968
-#define NICK_HELP_LISTCHANS              969
-#define NICK_HELP_LIST                   970
-#define NICK_HELP_LIST_OPERSONLY         971
-#define NICK_HELP_LISTEMAIL              972
-#define NICK_HELP_STATUS                 973
-#define NICK_HELP_AJOIN                  974
-#define NICK_HELP_AJOIN_END              975
-#define NICK_HELP_AJOIN_END_CHANSERV     976
-#define NICK_OPER_HELP_COMMANDS          977
-#define NICK_OPER_HELP_COMMANDS_DROPEMAIL 978
-#define NICK_OPER_HELP_COMMANDS_GETPASS  979
-#define NICK_OPER_HELP_COMMANDS_FORBID   980
-#define NICK_OPER_HELP_COMMANDS_LISTLINKS 981
-#define NICK_OPER_HELP_COMMANDS_SETAUTH  982
-#define NICK_OPER_HELP_COMMANDS_END      983
-#define NICK_OPER_HELP_DROPNICK          984
-#define NICK_OPER_HELP_DROPEMAIL         985
-#define NICK_OPER_HELP_SET               986
-#define NICK_OPER_HELP_SET_NOEXPIRE      987
-#define NICK_OPER_HELP_UNSET             988
-#define NICK_OPER_HELP_OLD_UNLINK        989
-#define NICK_OPER_HELP_UNLINK            990
-#define NICK_OPER_HELP_OLD_LISTLINKS     991
-#define NICK_OPER_HELP_LISTLINKS         992
-#define NICK_OPER_HELP_ACCESS            993
-#define NICK_OPER_HELP_INFO              994
-#define NICK_OPER_HELP_LISTCHANS         995
-#define NICK_OPER_HELP_LIST              996
-#define NICK_OPER_HELP_LIST_AUTH         997
-#define NICK_OPER_HELP_LISTEMAIL         998
-#define NICK_OPER_HELP_LISTEMAIL_AUTH    999
-#define NICK_OPER_HELP_GETPASS           1000
-#define NICK_OPER_HELP_FORBID            1001
-#define NICK_OPER_HELP_SUSPEND           1002
-#define NICK_OPER_HELP_UNSUSPEND         1003
-#define NICK_OPER_HELP_AJOIN             1004
-#define NICK_OPER_HELP_SETAUTH           1005
-#define NICK_OPER_HELP_GETAUTH           1006
-#define NICK_OPER_HELP_CLEARAUTH         1007
-#define CHAN_HELP_REQSOP_LEVXOP          1008
-#define CHAN_HELP_REQSOP_LEV             1009
-#define CHAN_HELP_REQSOP_XOP             1010
-#define CHAN_HELP_REQAOP_LEVXOP          1011
-#define CHAN_HELP_REQAOP_LEV             1012
-#define CHAN_HELP_REQAOP_XOP             1013
-#define CHAN_HELP_REQHOP_LEVXOP          1014
-#define CHAN_HELP_REQHOP_LEV             1015
-#define CHAN_HELP_REQHOP_XOP             1016
-#define CHAN_HELP_REQVOP_LEVXOP          1017
-#define CHAN_HELP_REQVOP_LEV             1018
-#define CHAN_HELP_REQVOP_XOP             1019
-#define CHAN_HELP                        1020
-#define CHAN_HELP_EXPIRES                1021
-#define CHAN_HELP_COMMANDS               1022
-#define CHAN_HELP_COMMANDS_SENDPASS      1023
-#define CHAN_HELP_COMMANDS_DROP          1024
-#define CHAN_HELP_COMMANDS_LIST          1025
-#define CHAN_HELP_COMMANDS_AKICK         1026
-#define CHAN_HELP_COMMANDS_LEVELS        1027
-#define CHAN_HELP_COMMANDS_XOP           1028
-#define CHAN_HELP_COMMANDS_HOP           1029
-#define CHAN_HELP_COMMANDS_OPVOICE       1030
-#define CHAN_HELP_COMMANDS_HALFOP        1031
-#define CHAN_HELP_COMMANDS_PROTECT       1032
-#define CHAN_HELP_COMMANDS_INVITE        1033
-#define CHAN_HELP_REGISTER               1034
-#define CHAN_HELP_REGISTER_ADMINONLY     1035
-#define CHAN_HELP_SENDPASS               1036
-#define CHAN_HELP_IDENTIFY               1037
-#define CHAN_HELP_DROP                   1038
-#define CHAN_HELP_SET                    1039
-#define CHAN_HELP_SET_FOUNDER            1040
-#define CHAN_HELP_SET_SUCCESSOR          1041
-#define CHAN_HELP_SET_PASSWORD           1042
-#define CHAN_HELP_SET_DESC               1043
-#define CHAN_HELP_SET_URL                1044
-#define CHAN_HELP_SET_EMAIL              1045
-#define CHAN_HELP_SET_ENTRYMSG           1046
-#define CHAN_HELP_SET_KEEPTOPIC          1047
-#define CHAN_HELP_SET_TOPICLOCK          1048
-#define CHAN_HELP_SET_MLOCK              1049
-#define CHAN_HELP_SET_HIDE               1050
-#define CHAN_HELP_SET_PRIVATE            1051
-#define CHAN_HELP_SET_RESTRICTED         1052
-#define CHAN_HELP_SET_SECURE             1053
-#define CHAN_HELP_SET_SECUREOPS          1054
-#define CHAN_HELP_SET_LEAVEOPS           1055
-#define CHAN_HELP_SET_OPNOTICE           1056
-#define CHAN_HELP_SET_ENFORCE            1057
-#define CHAN_HELP_UNSET                  1058
-#define CHAN_HELP_SOP                    1059
-#define CHAN_HELP_SOP_MID1               1060
-#define CHAN_HELP_SOP_MID1_CHANPROT      1061
-#define CHAN_HELP_SOP_MID2               1062
-#define CHAN_HELP_SOP_MID2_HALFOP        1063
-#define CHAN_HELP_SOP_END                1064
-#define CHAN_HELP_AOP                    1065
-#define CHAN_HELP_AOP_MID                1066
-#define CHAN_HELP_AOP_MID_HALFOP         1067
-#define CHAN_HELP_AOP_END                1068
-#define CHAN_HELP_HOP                    1069
-#define CHAN_HELP_VOP                    1070
-#define CHAN_HELP_ACCESS                 1071
-#define CHAN_HELP_ACCESS_XOP             1072
-#define CHAN_HELP_ACCESS_XOP_HALFOP      1073
-#define CHAN_HELP_ACCESS_LEVELS          1074
-#define CHAN_HELP_ACCESS_LEVELS_HALFOP   1075
-#define CHAN_HELP_ACCESS_LEVELS_END      1076
-#define CHAN_HELP_LEVELS                 1077
-#define CHAN_HELP_LEVELS_XOP             1078
-#define CHAN_HELP_LEVELS_XOP_HOP         1079
-#define CHAN_HELP_LEVELS_END             1080
-#define CHAN_HELP_LEVELS_DESC            1081
-#define CHAN_HELP_AKICK                  1082
-#define CHAN_HELP_INFO                   1083
-#define CHAN_HELP_LIST                   1084
-#define CHAN_HELP_LIST_OPERSONLY         1085
-#define CHAN_HELP_OP                     1086
-#define CHAN_HELP_DEOP                   1087
-#define CHAN_HELP_VOICE                  1088
-#define CHAN_HELP_DEVOICE                1089
-#define CHAN_HELP_HALFOP                 1090
-#define CHAN_HELP_DEHALFOP               1091
-#define CHAN_HELP_PROTECT                1092
-#define CHAN_HELP_DEPROTECT              1093
-#define CHAN_HELP_INVITE                 1094
-#define CHAN_HELP_UNBAN                  1095
-#define CHAN_HELP_KICK                   1096
-#define CHAN_HELP_KICK_PROTECTED         1097
-#define CHAN_HELP_TOPIC                  1098
-#define CHAN_HELP_CLEAR                  1099
-#define CHAN_HELP_CLEAR_EXCEPTIONS       1100
-#define CHAN_HELP_CLEAR_MID              1101
-#define CHAN_HELP_CLEAR_HALFOPS          1102
-#define CHAN_HELP_CLEAR_END              1103
-#define CHAN_HELP_STATUS                 1104
-#define CHAN_OPER_HELP_COMMANDS          1105
-#define CHAN_OPER_HELP_COMMANDS_GETPASS  1106
-#define CHAN_OPER_HELP_COMMANDS_FORBID   1107
-#define CHAN_OPER_HELP_COMMANDS_END      1108
-#define CHAN_OPER_HELP_DROP              1109
-#define CHAN_OPER_HELP_SET               1110
-#define CHAN_OPER_HELP_SET_NOEXPIRE      1111
-#define CHAN_OPER_HELP_UNSET             1112
-#define CHAN_OPER_HELP_INFO              1113
-#define CHAN_OPER_HELP_LIST              1114
-#define CHAN_OPER_HELP_GETPASS           1115
-#define CHAN_OPER_HELP_FORBID            1116
-#define CHAN_OPER_HELP_SUSPEND           1117
-#define CHAN_OPER_HELP_UNSUSPEND         1118
-#define MEMO_HELP                        1119
-#define MEMO_HELP_EXPIRES                1120
-#define MEMO_HELP_END_LEVELS             1121
-#define MEMO_HELP_END_XOP                1122
-#define MEMO_HELP_COMMANDS               1123
-#define MEMO_HELP_COMMANDS_FORWARD       1124
-#define MEMO_HELP_COMMANDS_SAVE          1125
-#define MEMO_HELP_COMMANDS_DEL           1126
-#define MEMO_HELP_COMMANDS_IGNORE        1127
-#define MEMO_HELP_SEND                   1128
-#define MEMO_HELP_LIST                   1129
-#define MEMO_HELP_LIST_EXPIRE            1130
-#define MEMO_HELP_READ                   1131
-#define MEMO_HELP_SAVE                   1132
-#define MEMO_HELP_DEL                    1133
-#define MEMO_HELP_SET                    1134
-#define MEMO_HELP_SET_OPTION_FORWARD     1135
-#define MEMO_HELP_SET_END                1136
-#define MEMO_HELP_SET_NOTIFY             1137
-#define MEMO_HELP_SET_LIMIT              1138
-#define MEMO_HELP_INFO                   1139
-#define MEMO_OPER_HELP_COMMANDS          1140
-#define MEMO_OPER_HELP_SET_LIMIT         1141
-#define MEMO_OPER_HELP_INFO              1142
-#define MEMO_HELP_FORWARD                1143
-#define MEMO_HELP_SET_FORWARD            1144
-#define MEMO_HELP_IGNORE                 1145
-#define OPER_HELP                        1146
-#define OPER_HELP_COMMANDS               1147
-#define OPER_HELP_COMMANDS_SERVOPER      1148
-#define OPER_HELP_COMMANDS_AKILL         1149
-#define OPER_HELP_COMMANDS_EXCLUDE       1150
-#define OPER_HELP_COMMANDS_SLINE         1151
-#define OPER_HELP_COMMANDS_SESSION       1152
-#define OPER_HELP_COMMANDS_NEWS          1153
-#define OPER_HELP_COMMANDS_SERVADMIN     1154
-#define OPER_HELP_COMMANDS_SERVROOT      1155
-#define OPER_HELP_COMMANDS_RAW           1156
-#define OPER_HELP_GLOBAL                 1157
-#define OPER_HELP_STATS                  1158
-#define OPER_HELP_SERVERMAP              1159
-#define OPER_HELP_OPER                   1160
-#define OPER_HELP_ADMIN                  1161
-#define OPER_HELP_MODE                   1162
-#define OPER_HELP_CLEARMODES             1163
-#define OPER_HELP_CLEARCHAN              1164
-#define OPER_HELP_KICK                   1165
-#define OPER_HELP_AKILL                  1166
-#define OPER_HELP_AKILL_OPERMAXEXPIRY    1167
-#define OPER_HELP_AKILL_END              1168
-#define OPER_HELP_EXCLUDE                1169
-#define OPER_HELP_SGLINE                 1170
-#define OPER_HELP_SQLINE                 1171
-#define OPER_HELP_SQLINE_KILL            1172
-#define OPER_HELP_SQLINE_NOKILL          1173
-#define OPER_HELP_SQLINE_IGNOREOPERS     1174
-#define OPER_HELP_SQLINE_END             1175
-#define OPER_HELP_SZLINE                 1176
-#define OPER_HELP_EXCEPTION              1177
-#define OPER_HELP_SESSION                1178
-#define OPER_HELP_SU                     1179
-#define OPER_HELP_SET                    1180
-#define OPER_HELP_SET_READONLY           1181
-#define OPER_HELP_SET_DEBUG              1182
-#define OPER_HELP_SET_SUPASS             1183
-#define OPER_HELP_JUPE                   1184
-#define OPER_HELP_RAW                    1185
-#define OPER_HELP_UPDATE                 1186
-#define OPER_HELP_QUIT                   1187
-#define OPER_HELP_SHUTDOWN               1188
-#define OPER_HELP_RESTART                1189
-#define OPER_HELP_REHASH                 1190
-#define OPER_HELP_KILLCLONES             1191
-#define STAT_HELP                        1192
-#define STAT_HELP_COMMANDS               1193
-#define STAT_HELP_SERVERS                1194
-#define STAT_HELP_USERS                  1195
-#define STAT_OPER_HELP_SERVERS           1196
+#define OPER_AKILLCHAN_SYNTAX            766
+#define OPER_AKILLCHAN_AKILLED           767
+#define OPER_AKILLCHAN_KILLED            768
+#define OPER_AKILLCHAN_AKILLED_ONE       769
+#define OPER_AKILLCHAN_KILLED_ONE        770
+#define OPER_EXCLUDE_SYNTAX              771
+#define OPER_EXCLUDE_ADD_SYNTAX          772
+#define OPER_EXCLUDE_DEL_SYNTAX          773
+#define OPER_TOO_MANY_EXCLUDES           774
+#define OPER_EXCLUDE_EXISTS              775
+#define OPER_EXCLUDE_ADDED               776
+#define OPER_EXCLUDE_REMOVED             777
+#define OPER_EXCLUDE_NOT_FOUND           778
+#define OPER_EXCLUDE_LIST_HEADER         779
+#define OPER_EXCLUDE_LIST_FORMAT         780
+#define OPER_EXCLUDE_VIEW_FORMAT         781
+#define OPER_EXCLUDE_VIEW_UNUSED_FORMAT  782
+#define OPER_EXCLUDE_COUNT               783
+#define OPER_SLINE_SYNTAX                784
+#define OPER_SLINE_ADD_SYNTAX            785
+#define OPER_SLINE_DEL_SYNTAX            786
+#define OPER_TOO_MANY_SLINES             787
+#define OPER_SLINE_EXISTS                788
+#define OPER_SLINE_ADDED                 789
+#define OPER_SLINE_REMOVED               790
+#define OPER_SLINE_NOT_FOUND             791
+#define OPER_SLINE_LIST_HEADER           792
+#define OPER_SLINE_LIST_FORMAT           793
+#define OPER_SLINE_VIEW_FORMAT           794
+#define OPER_SLINE_VIEW_UNUSED_FORMAT    795
+#define OPER_SLINE_COUNT                 796
+#define OPER_SZLINE_NOT_AVAIL            797
+#define OPER_SU_SYNTAX                   798
+#define OPER_SU_NO_PASSWORD              799
+#define OPER_SU_SUCCEEDED                800
+#define OPER_SU_FAILED                   801
+#define OPER_SET_SYNTAX                  802
+#define OPER_SET_IGNORE_ON               803
+#define OPER_SET_IGNORE_OFF              804
+#define OPER_SET_IGNORE_ERROR            805
+#define OPER_SET_READONLY_ON             806
+#define OPER_SET_READONLY_OFF            807
+#define OPER_SET_READONLY_ERROR          808
+#define OPER_SET_DEBUG_ON                809
+#define OPER_SET_DEBUG_OFF               810
+#define OPER_SET_DEBUG_LEVEL             811
+#define OPER_SET_DEBUG_ERROR             812
+#define OPER_SET_SUPASS_FAILED           813
+#define OPER_SET_SUPASS_OK               814
+#define OPER_SET_SUPASS_NONE             815
+#define OPER_SET_UNKNOWN_OPTION          816
+#define OPER_JUPE_SYNTAX                 817
+#define OPER_JUPE_INVALID_NAME           818
+#define OPER_JUPE_ALREADY_JUPED          819
+#define OPER_RAW_SYNTAX                  820
+#define OPER_UPDATE_SYNTAX               821
+#define OPER_UPDATE_FORCE_FAILED         822
+#define OPER_UPDATING                    823
+#define OPER_UPDATE_COMPLETE             824
+#define OPER_UPDATE_FAILED               825
+#define OPER_REHASHING                   826
+#define OPER_REHASHED                    827
+#define OPER_REHASH_ERROR                828
+#define OPER_IGNORE_LIST                 829
+#define OPER_IGNORE_LIST_EMPTY           830
+#define OPER_KILLCLONES_SYNTAX           831
+#define OPER_KILLCLONES_UNKNOWN_NICK     832
+#define OPER_KILLCLONES_KILLED           833
+#define OPER_KILLCLONES_KILLED_AKILL     834
+#define OPER_EXCEPTION_SYNTAX            835
+#define OPER_EXCEPTION_ADD_SYNTAX        836
+#define OPER_EXCEPTION_DEL_SYNTAX        837
+#define OPER_EXCEPTION_MOVE_SYNTAX       838
+#define OPER_EXCEPTION_ALREADY_PRESENT   839
+#define OPER_EXCEPTION_TOO_MANY          840
+#define OPER_EXCEPTION_ADDED             841
+#define OPER_EXCEPTION_MOVED             842
+#define OPER_EXCEPTION_NO_SUCH_ENTRY     843
+#define OPER_EXCEPTION_NOT_FOUND         844
+#define OPER_EXCEPTION_NO_MATCH          845
+#define OPER_EXCEPTION_EMPTY             846
+#define OPER_EXCEPTION_DELETED           847
+#define OPER_EXCEPTION_DELETED_ONE       848
+#define OPER_EXCEPTION_DELETED_SEVERAL   849
+#define OPER_EXCEPTION_LIST_HEADER       850
+#define OPER_EXCEPTION_LIST_COLHEAD      851
+#define OPER_EXCEPTION_LIST_FORMAT       852
+#define OPER_EXCEPTION_VIEW_FORMAT       853
+#define OPER_EXCEPTION_INVALID_LIMIT     854
+#define OPER_EXCEPTION_INVALID_HOSTMASK  855
+#define OPER_SESSION_SYNTAX              856
+#define OPER_SESSION_LIST_SYNTAX         857
+#define OPER_SESSION_VIEW_SYNTAX         858
+#define OPER_SESSION_INVALID_THRESHOLD   859
+#define OPER_SESSION_NOT_FOUND           860
+#define OPER_SESSION_LIST_HEADER         861
+#define OPER_SESSION_LIST_COLHEAD        862
+#define OPER_SESSION_LIST_FORMAT         863
+#define OPER_SESSION_VIEW_FORMAT         864
+#define NEWS_LOGON_TEXT                  865
+#define NEWS_OPER_TEXT                   866
+#define NEWS_LOGON_SYNTAX                867
+#define NEWS_LOGON_LIST_HEADER           868
+#define NEWS_LOGON_LIST_ENTRY            869
+#define NEWS_LOGON_LIST_NONE             870
+#define NEWS_LOGON_ADD_SYNTAX            871
+#define NEWS_LOGON_ADD_FULL              872
+#define NEWS_LOGON_ADDED                 873
+#define NEWS_LOGON_DEL_SYNTAX            874
+#define NEWS_LOGON_DEL_NOT_FOUND         875
+#define NEWS_LOGON_DELETED               876
+#define NEWS_LOGON_DEL_NONE              877
+#define NEWS_LOGON_DELETED_ALL           878
+#define NEWS_OPER_SYNTAX                 879
+#define NEWS_OPER_LIST_HEADER            880
+#define NEWS_OPER_LIST_ENTRY             881
+#define NEWS_OPER_LIST_NONE              882
+#define NEWS_OPER_ADD_SYNTAX             883
+#define NEWS_OPER_ADD_FULL               884
+#define NEWS_OPER_ADDED                  885
+#define NEWS_OPER_DEL_SYNTAX             886
+#define NEWS_OPER_DEL_NOT_FOUND          887
+#define NEWS_OPER_DELETED                888
+#define NEWS_OPER_DEL_NONE               889
+#define NEWS_OPER_DELETED_ALL            890
+#define NEWS_HELP_LOGON                  891
+#define NEWS_HELP_OPER                   892
+#define STAT_SERVERS_REMOVE_SERV_FIRST   893
+#define STAT_SERVERS_SERVER_EXISTS       894
+#define STAT_SERVERS_SYNTAX              895
+#define STAT_SERVERS_STATS_TOTAL         896
+#define STAT_SERVERS_STATS_ON_OFFLINE    897
+#define STAT_SERVERS_LASTQUIT_WAS        898
+#define STAT_SERVERS_LIST_HEADER         899
+#define STAT_SERVERS_LIST_FORMAT         900
+#define STAT_SERVERS_LIST_RESULTS        901
+#define STAT_SERVERS_VIEW_HEADER_ONLINE  902
+#define STAT_SERVERS_VIEW_HEADER_OFFLINE 903
+#define STAT_SERVERS_VIEW_LASTJOIN       904
+#define STAT_SERVERS_VIEW_LASTQUIT       905
+#define STAT_SERVERS_VIEW_QUITMSG        906
+#define STAT_SERVERS_VIEW_USERS_OPERS    907
+#define STAT_SERVERS_VIEW_RESULTS        908
+#define STAT_SERVERS_DELETE_SYNTAX       909
+#define STAT_SERVERS_DELETE_DONE         910
+#define STAT_SERVERS_COPY_SYNTAX         911
+#define STAT_SERVERS_COPY_DONE           912
+#define STAT_SERVERS_RENAME_SYNTAX       913
+#define STAT_SERVERS_RENAME_DONE         914
+#define STAT_USERS_SYNTAX                915
+#define STAT_USERS_TOTUSERS              916
+#define STAT_USERS_TOTOPERS              917
+#define STAT_USERS_SERVUSERS             918
+#define STAT_USERS_SERVOPERS             919
+#define NICK_HELP                        920
+#define NICK_HELP_EXPIRES                921
+#define NICK_HELP_WARNING                922
+#define NICK_HELP_COMMANDS               923
+#define NICK_HELP_COMMANDS_AUTH          924
+#define NICK_HELP_COMMANDS_IDENTIFY      925
+#define NICK_HELP_COMMANDS_SENDPASS      926
+#define NICK_HELP_COMMANDS_DROP          927
+#define NICK_HELP_COMMANDS_LINK          928
+#define NICK_HELP_COMMANDS_OLDLINK       929
+#define NICK_HELP_COMMANDS_ACCESS        930
+#define NICK_HELP_COMMANDS_AJOIN         931
+#define NICK_HELP_COMMANDS_SET           932
+#define NICK_HELP_COMMANDS_LIST          933
+#define NICK_HELP_COMMANDS_LISTCHANS     934
+#define NICK_HELP_REGISTER               935
+#define NICK_HELP_REGISTER_EMAIL         936
+#define NICK_HELP_REGISTER_EMAIL_REQ     937
+#define NICK_HELP_REGISTER_EMAIL_AUTH    938
+#define NICK_HELP_REGISTER_END           939
+#define NICK_HELP_AUTH                   940
+#define NICK_HELP_SENDAUTH               941
+#define NICK_HELP_SENDPASS               942
+#define NICK_HELP_IDENTIFY               943
+#define NICK_HELP_DROP                   944
+#define NICK_HELP_DROP_LINK              945
+#define NICK_HELP_DROP_END               946
+#define NICK_HELP_OLD_LINK               947
+#define NICK_HELP_LINK                   948
+#define NICK_HELP_OLD_UNLINK             949
+#define NICK_HELP_UNLINK                 950
+#define NICK_HELP_LISTLINKS              951
+#define NICK_HELP_ACCESS                 952
+#define NICK_HELP_SET                    953
+#define NICK_HELP_SET_OPTION_MAINNICK    954
+#define NICK_HELP_SET_END                955
+#define NICK_HELP_SET_PASSWORD           956
+#define NICK_HELP_SET_LANGUAGE           957
+#define NICK_HELP_SET_URL                958
+#define NICK_HELP_SET_EMAIL              959
+#define NICK_HELP_SET_INFO               960
+#define NICK_HELP_SET_KILL               961
+#define NICK_HELP_SET_SECURE             962
+#define NICK_HELP_SET_PRIVATE            963
+#define NICK_HELP_SET_HIDE               964
+#define NICK_HELP_SET_TIMEZONE           965
+#define NICK_HELP_SET_MAINNICK           966
+#define NICK_HELP_UNSET                  967
+#define NICK_HELP_UNSET_REQ_EMAIL        968
+#define NICK_HELP_RECOVER                969
+#define NICK_HELP_RELEASE                970
+#define NICK_HELP_GHOST                  971
+#define NICK_HELP_INFO                   972
+#define NICK_HELP_INFO_AUTH              973
+#define NICK_HELP_LISTCHANS              974
+#define NICK_HELP_LIST                   975
+#define NICK_HELP_LIST_OPERSONLY         976
+#define NICK_HELP_LISTEMAIL              977
+#define NICK_HELP_STATUS                 978
+#define NICK_HELP_AJOIN                  979
+#define NICK_HELP_AJOIN_END              980
+#define NICK_HELP_AJOIN_END_CHANSERV     981
+#define NICK_OPER_HELP_COMMANDS          982
+#define NICK_OPER_HELP_COMMANDS_DROPEMAIL 983
+#define NICK_OPER_HELP_COMMANDS_GETPASS  984
+#define NICK_OPER_HELP_COMMANDS_FORBID   985
+#define NICK_OPER_HELP_COMMANDS_LISTLINKS 986
+#define NICK_OPER_HELP_COMMANDS_SETAUTH  987
+#define NICK_OPER_HELP_COMMANDS_END      988
+#define NICK_OPER_HELP_DROPNICK          989
+#define NICK_OPER_HELP_DROPEMAIL         990
+#define NICK_OPER_HELP_SET               991
+#define NICK_OPER_HELP_SET_NOEXPIRE      992
+#define NICK_OPER_HELP_UNSET             993
+#define NICK_OPER_HELP_OLD_UNLINK        994
+#define NICK_OPER_HELP_UNLINK            995
+#define NICK_OPER_HELP_OLD_LISTLINKS     996
+#define NICK_OPER_HELP_LISTLINKS         997
+#define NICK_OPER_HELP_ACCESS            998
+#define NICK_OPER_HELP_INFO              999
+#define NICK_OPER_HELP_LISTCHANS         1000
+#define NICK_OPER_HELP_LIST              1001
+#define NICK_OPER_HELP_LIST_AUTH         1002
+#define NICK_OPER_HELP_LISTEMAIL         1003
+#define NICK_OPER_HELP_LISTEMAIL_AUTH    1004
+#define NICK_OPER_HELP_GETPASS           1005
+#define NICK_OPER_HELP_FORBID            1006
+#define NICK_OPER_HELP_SUSPEND           1007
+#define NICK_OPER_HELP_UNSUSPEND         1008
+#define NICK_OPER_HELP_AJOIN             1009
+#define NICK_OPER_HELP_SETAUTH           1010
+#define NICK_OPER_HELP_GETAUTH           1011
+#define NICK_OPER_HELP_CLEARAUTH         1012
+#define CHAN_HELP_REQSOP_LEVXOP          1013
+#define CHAN_HELP_REQSOP_LEV             1014
+#define CHAN_HELP_REQSOP_XOP             1015
+#define CHAN_HELP_REQAOP_LEVXOP          1016
+#define CHAN_HELP_REQAOP_LEV             1017
+#define CHAN_HELP_REQAOP_XOP             1018
+#define CHAN_HELP_REQHOP_LEVXOP          1019
+#define CHAN_HELP_REQHOP_LEV             1020
+#define CHAN_HELP_REQHOP_XOP             1021
+#define CHAN_HELP_REQVOP_LEVXOP          1022
+#define CHAN_HELP_REQVOP_LEV             1023
+#define CHAN_HELP_REQVOP_XOP             1024
+#define CHAN_HELP                        1025
+#define CHAN_HELP_EXPIRES                1026
+#define CHAN_HELP_COMMANDS               1027
+#define CHAN_HELP_COMMANDS_SENDPASS      1028
+#define CHAN_HELP_COMMANDS_DROP          1029
+#define CHAN_HELP_COMMANDS_LIST          1030
+#define CHAN_HELP_COMMANDS_AKICK         1031
+#define CHAN_HELP_COMMANDS_LEVELS        1032
+#define CHAN_HELP_COMMANDS_XOP           1033
+#define CHAN_HELP_COMMANDS_HOP           1034
+#define CHAN_HELP_COMMANDS_OPVOICE       1035
+#define CHAN_HELP_COMMANDS_HALFOP        1036
+#define CHAN_HELP_COMMANDS_PROTECT       1037
+#define CHAN_HELP_COMMANDS_INVITE        1038
+#define CHAN_HELP_REGISTER               1039
+#define CHAN_HELP_REGISTER_ADMINONLY     1040
+#define CHAN_HELP_SENDPASS               1041
+#define CHAN_HELP_IDENTIFY               1042
+#define CHAN_HELP_DROP                   1043
+#define CHAN_HELP_SET                    1044
+#define CHAN_HELP_SET_FOUNDER            1045
+#define CHAN_HELP_SET_SUCCESSOR          1046
+#define CHAN_HELP_SET_PASSWORD           1047
+#define CHAN_HELP_SET_DESC               1048
+#define CHAN_HELP_SET_URL                1049
+#define CHAN_HELP_SET_EMAIL              1050
+#define CHAN_HELP_SET_ENTRYMSG           1051
+#define CHAN_HELP_SET_KEEPTOPIC          1052
+#define CHAN_HELP_SET_TOPICLOCK          1053
+#define CHAN_HELP_SET_MLOCK              1054
+#define CHAN_HELP_SET_HIDE               1055
+#define CHAN_HELP_SET_PRIVATE            1056
+#define CHAN_HELP_SET_RESTRICTED         1057
+#define CHAN_HELP_SET_SECURE             1058
+#define CHAN_HELP_SET_SECUREOPS          1059
+#define CHAN_HELP_SET_LEAVEOPS           1060
+#define CHAN_HELP_SET_OPNOTICE           1061
+#define CHAN_HELP_SET_ENFORCE            1062
+#define CHAN_HELP_UNSET                  1063
+#define CHAN_HELP_SOP                    1064
+#define CHAN_HELP_SOP_MID1               1065
+#define CHAN_HELP_SOP_MID1_CHANPROT      1066
+#define CHAN_HELP_SOP_MID2               1067
+#define CHAN_HELP_SOP_MID2_HALFOP        1068
+#define CHAN_HELP_SOP_END                1069
+#define CHAN_HELP_AOP                    1070
+#define CHAN_HELP_AOP_MID                1071
+#define CHAN_HELP_AOP_MID_HALFOP         1072
+#define CHAN_HELP_AOP_END                1073
+#define CHAN_HELP_HOP                    1074
+#define CHAN_HELP_VOP                    1075
+#define CHAN_HELP_ACCESS                 1076
+#define CHAN_HELP_ACCESS_XOP             1077
+#define CHAN_HELP_ACCESS_XOP_HALFOP      1078
+#define CHAN_HELP_ACCESS_LEVELS          1079
+#define CHAN_HELP_ACCESS_LEVELS_HALFOP   1080
+#define CHAN_HELP_ACCESS_LEVELS_END      1081
+#define CHAN_HELP_LEVELS                 1082
+#define CHAN_HELP_LEVELS_XOP             1083
+#define CHAN_HELP_LEVELS_XOP_HOP         1084
+#define CHAN_HELP_LEVELS_END             1085
+#define CHAN_HELP_LEVELS_DESC            1086
+#define CHAN_HELP_AKICK                  1087
+#define CHAN_HELP_INFO                   1088
+#define CHAN_HELP_LIST                   1089
+#define CHAN_HELP_LIST_OPERSONLY         1090
+#define CHAN_HELP_OP                     1091
+#define CHAN_HELP_DEOP                   1092
+#define CHAN_HELP_VOICE                  1093
+#define CHAN_HELP_DEVOICE                1094
+#define CHAN_HELP_HALFOP                 1095
+#define CHAN_HELP_DEHALFOP               1096
+#define CHAN_HELP_PROTECT                1097
+#define CHAN_HELP_DEPROTECT              1098
+#define CHAN_HELP_INVITE                 1099
+#define CHAN_HELP_UNBAN                  1100
+#define CHAN_HELP_KICK                   1101
+#define CHAN_HELP_KICK_PROTECTED         1102
+#define CHAN_HELP_TOPIC                  1103
+#define CHAN_HELP_CLEAR                  1104
+#define CHAN_HELP_CLEAR_EXCEPTIONS       1105
+#define CHAN_HELP_CLEAR_MID              1106
+#define CHAN_HELP_CLEAR_HALFOPS          1107
+#define CHAN_HELP_CLEAR_END              1108
+#define CHAN_HELP_STATUS                 1109
+#define CHAN_OPER_HELP_COMMANDS          1110
+#define CHAN_OPER_HELP_COMMANDS_GETPASS  1111
+#define CHAN_OPER_HELP_COMMANDS_FORBID   1112
+#define CHAN_OPER_HELP_COMMANDS_END      1113
+#define CHAN_OPER_HELP_DROP              1114
+#define CHAN_OPER_HELP_SET               1115
+#define CHAN_OPER_HELP_SET_NOEXPIRE      1116
+#define CHAN_OPER_HELP_UNSET             1117
+#define CHAN_OPER_HELP_INFO              1118
+#define CHAN_OPER_HELP_LIST              1119
+#define CHAN_OPER_HELP_GETPASS           1120
+#define CHAN_OPER_HELP_FORBID            1121
+#define CHAN_OPER_HELP_SUSPEND           1122
+#define CHAN_OPER_HELP_UNSUSPEND         1123
+#define MEMO_HELP                        1124
+#define MEMO_HELP_EXPIRES                1125
+#define MEMO_HELP_END_LEVELS             1126
+#define MEMO_HELP_END_XOP                1127
+#define MEMO_HELP_COMMANDS               1128
+#define MEMO_HELP_COMMANDS_FORWARD       1129
+#define MEMO_HELP_COMMANDS_SAVE          1130
+#define MEMO_HELP_COMMANDS_DEL           1131
+#define MEMO_HELP_COMMANDS_IGNORE        1132
+#define MEMO_HELP_SEND                   1133
+#define MEMO_HELP_LIST                   1134
+#define MEMO_HELP_LIST_EXPIRE            1135
+#define MEMO_HELP_READ                   1136
+#define MEMO_HELP_SAVE                   1137
+#define MEMO_HELP_DEL                    1138
+#define MEMO_HELP_SET                    1139
+#define MEMO_HELP_SET_OPTION_FORWARD     1140
+#define MEMO_HELP_SET_END                1141
+#define MEMO_HELP_SET_NOTIFY             1142
+#define MEMO_HELP_SET_LIMIT              1143
+#define MEMO_HELP_INFO                   1144
+#define MEMO_OPER_HELP_COMMANDS          1145
+#define MEMO_OPER_HELP_SET_LIMIT         1146
+#define MEMO_OPER_HELP_INFO              1147
+#define MEMO_HELP_FORWARD                1148
+#define MEMO_HELP_SET_FORWARD            1149
+#define MEMO_HELP_IGNORE                 1150
+#define OPER_HELP                        1151
+#define OPER_HELP_COMMANDS               1152
+#define OPER_HELP_COMMANDS_SERVOPER      1153
+#define OPER_HELP_COMMANDS_AKILL         1154
+#define OPER_HELP_COMMANDS_EXCLUDE       1155
+#define OPER_HELP_COMMANDS_SLINE         1156
+#define OPER_HELP_COMMANDS_SESSION       1157
+#define OPER_HELP_COMMANDS_NEWS          1158
+#define OPER_HELP_COMMANDS_SERVADMIN     1159
+#define OPER_HELP_COMMANDS_SERVROOT      1160
+#define OPER_HELP_COMMANDS_RAW           1161
+#define OPER_HELP_GLOBAL                 1162
+#define OPER_HELP_STATS                  1163
+#define OPER_HELP_SERVERMAP              1164
+#define OPER_HELP_OPER                   1165
+#define OPER_HELP_ADMIN                  1166
+#define OPER_HELP_MODE                   1167
+#define OPER_HELP_CLEARMODES             1168
+#define OPER_HELP_CLEARCHAN              1169
+#define OPER_HELP_KICK                   1170
+#define OPER_HELP_AKILL                  1171
+#define OPER_HELP_AKILL_OPERMAXEXPIRY    1172
+#define OPER_HELP_AKILL_END              1173
+#define OPER_HELP_AKILLCHAN              1174
+#define OPER_HELP_EXCLUDE                1175
+#define OPER_HELP_SGLINE                 1176
+#define OPER_HELP_SQLINE                 1177
+#define OPER_HELP_SQLINE_KILL            1178
+#define OPER_HELP_SQLINE_NOKILL          1179
+#define OPER_HELP_SQLINE_IGNOREOPERS     1180
+#define OPER_HELP_SQLINE_END             1181
+#define OPER_HELP_SZLINE                 1182
+#define OPER_HELP_EXCEPTION              1183
+#define OPER_HELP_SESSION                1184
+#define OPER_HELP_SU                     1185
+#define OPER_HELP_SET                    1186
+#define OPER_HELP_SET_READONLY           1187
+#define OPER_HELP_SET_DEBUG              1188
+#define OPER_HELP_SET_SUPASS             1189
+#define OPER_HELP_JUPE                   1190
+#define OPER_HELP_RAW                    1191
+#define OPER_HELP_UPDATE                 1192
+#define OPER_HELP_QUIT                   1193
+#define OPER_HELP_SHUTDOWN               1194
+#define OPER_HELP_RESTART                1195
+#define OPER_HELP_REHASH                 1196
+#define OPER_HELP_KILLCLONES             1197
+#define STAT_HELP                        1198
+#define STAT_HELP_COMMANDS               1199
+#define STAT_HELP_SERVERS                1200
+#define STAT_HELP_USERS                  1201
+#define STAT_OPER_HELP_SERVERS           1202
 
-#define NUM_STRINGS 1197
+#define NUM_STRINGS 1203
diff -uNr ircservices-5.0.24/lang/nl.l ircservices-5.0.25/lang/nl.l
--- ircservices-5.0.24/lang/nl.l	2003-10-14 11:53:34 +0900
+++ ircservices-5.0.25/lang/nl.l	2003-11-18 15:06:58 +0900
@@ -2034,6 +2034,18 @@
 OPER_AKILL_COUNT
 	Er staan %d host maskers op de autokill lijst.
 
+# AKILLCHAN responses
+OPER_AKILLCHAN_SYNTAX
+	AKILLCHAN [KILL] [+vervaltijd] kamer rede
+OPER_AKILLCHAN_AKILLED
+	%d gebruikers verwijderd met autokill.
+OPER_AKILLCHAN_KILLED
+	%d gebruikers verwijderd.
+OPER_AKILLCHAN_AKILLED_ONE
+	1 gebruiker verwijderd met autokill.
+OPER_AKILLCHAN_KILLED_ONE
+	1 gebruiker verwijderd.
+
 # EXCLUDE responses
 OPER_EXCLUDE_SYNTAX
 	EXCLUDE {ADD | DEL | LIST | VIEW | COUNT} [[+vervaltijd] masker [rede]]
@@ -4502,7 +4514,8 @@
 	                   (masskick)
 	    KILLCLONES  Kill alle gebruikers met een bepaalde host
 OPER_HELP_COMMANDS_AKILL
-	    AKILL       Bewerk de AKILL lijst
+	    AKILL       Bewerk de autokill lijst
+	    AKILLCHAN   Verwijder alle gebruikers in een kamer d.m.v. autokill
 OPER_HELP_COMMANDS_EXCLUDE
 	    EXCLUDE     Bewerk de autokill uitzonderingen lijst
 OPER_HELP_COMMANDS_SLINE
@@ -4698,6 +4711,26 @@
 	
 	Beperkt tot Services Operators.
 
+OPER_HELP_AKILLCHAN
+	Syntax: AKILLCHAN [KILL] [+vervaltijd] kamer rede
+	
+	Voegt autokills toe voor alle gebruikers behalve IRC
+	operators in een gegeven kamer, en verwijdert ze (wanneer
+	KILL is gegeven) van het netwerk.  De rede wordt opgeslagen
+	bij elke autokill, en wordt getoond in kill berichten
+	afhankelijk van hoe Services geconfigureerd is.  vervaltijd
+	vereist dezelfde syntax als het AKILL ADD commando; wanneer
+	deze niet gegeven wordt is ze %s.
+	
+	Autokills die met dit commando worden toegevoegd hebben de
+	vorm *@host masker, voor elk host masker dat gebruikt wordt
+	door een client in de kamer.  Wanneer een dergelijke
+	autokill al bestaat voor een host masker, zal deze niet
+	veranderd worden; hierdoor kan het aantal autokills lager
+	zijn dan het aantal gebruikers waarop deze effect hebben.
+	
+	Beperkt tot Services operators.
+
 OPER_HELP_EXCLUDE
 	Syntax: EXCLUDE ADD [+vervaltijd] masker rede
 	        EXCLUDE DEL masker
diff -uNr ircservices-5.0.24/language.c ircservices-5.0.25/language.c
--- ircservices-5.0.24/language.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/language.c	2003-11-18 21:39:58 +0900
@@ -86,11 +86,12 @@
 {
     char buf[256];
     FILE *f;
-    int num, i;
+    int32 num, size, i;
+    char *data = NULL;
 
     if (debug) {
 	log("debug: Loading language %d from file `languages/%s'",
-		index, filename);
+	    index, filename);
     }
     snprintf(buf, sizeof(buf), "languages/%s", filename);
     if (!(f = fopen(buf, "r"))) {
@@ -98,43 +99,36 @@
 	return;
     } else if (read_int32(&num, f) < 0) {
 	log("Failed to read number of strings for language %d (%s)",
-		index, filename);
+	    index, filename);
+	return;
+    } else if (read_int32(&size, f) < 0) {
+	log("Failed to read data size for language %d (%s)",
+	    index, filename);
 	return;
     } else if (num != NUM_STRINGS) {
 	log("Warning: Bad number of strings (%d, wanted %d) "
 	    "for language %d (%s)", num, NUM_STRINGS, index, filename);
     }
-    langtexts[index] = scalloc(sizeof(char *), NUM_STRINGS);
+    langtexts[index] = scalloc(sizeof(char *), NUM_STRINGS+1);
     if (num > NUM_STRINGS)
 	num = NUM_STRINGS;
+    langtexts[index][NUM_STRINGS] = data = smalloc(size);
+    if (fread(data, size, 1, f) != 1) {
+	log("Failed to read language data for language %d (%s)",
+	    index, filename);
+	goto fail;
+    }
     for (i = 0; i < num; i++) {
-	int32 pos, len;
-	fseek(f, i*8+4, SEEK_SET);
-	if (read_int32(&pos, f) < 0 || read_int32(&len, f) < 0) {
+	int32 pos;
+	if (read_int32(&pos, f) < 0) {
 	    log("Failed to read entry %d in language %d (%s) TOC",
-			i, index, filename);
+		i, index, filename);
 	    goto fail;
 	}
-	if (len == 0) {
+	if (pos == -1) {
 	    langtexts[index][i] = NULL;
-	} else if (len >= 65536) {
-	    log("Entry %d in language %d (%s) is too long (over 64k)--"
-		"corrupt TOC?", i, index, filename);
-	    goto fail;
-	} else if (len < 0) {
-	    log("Entry %d in language %d (%s) has negative length--"
-		"corrupt TOC?", i, index, filename);
-	    goto fail;
 	} else {
-	    langtexts[index][i] = smalloc(len+1);
-	    fseek(f, pos, SEEK_SET);
-	    if (fread(langtexts[index][i], 1, len, f) != len) {
-		log("Failed to read string %d in language %d (%s)",
-			i, index, filename);
-		free(langtexts[index][i]);
-		goto fail;
-	    }
-	    langtexts[index][i][len] = 0;
+	    langtexts[index][i] = data + pos;
 	}
     }
     fclose(f);
@@ -142,8 +136,7 @@
     return;
 
   fail:
-    while (--i >= 0)
-	free(langtexts[index][i]);
+    free(data);
     free(langtexts[index]);
     langtexts[index] = NULL;
     return;
@@ -200,6 +193,31 @@
 }
 
 /*************************************************************************/
+
+/* Clean up language data. */
+
+void lang_cleanup(void)
+{
+    int i;
+
+    /* First clear out any languages borrowing from the default language */
+    for (i = 0; i < NUM_LANGS; i++) {
+	if (i != DEF_LANGUAGE && langtexts[i] == langtexts[DEF_LANGUAGE])
+	    langtexts[DEF_LANGUAGE] = NULL;
+    }
+
+    /* Now free everything left */
+    for (i = 0; i < NUM_LANGS; i++) {
+	if (langtexts[i]) {
+	    free(langtexts[i][NUM_STRINGS]);
+	    free(langtexts[i]);
+	    langtexts[i] = NULL;
+	}
+    }
+    free(langmap);
+}
+
+/*************************************************************************/
 /*************************************************************************/
 
 /* Return true if the given language is loaded, false otherwise. */
diff -uNr ircservices-5.0.24/language.h ircservices-5.0.25/language.h
--- ircservices-5.0.24/language.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/language.h	2003-11-18 21:39:58 +0900
@@ -52,6 +52,7 @@
 extern int langlist[NUM_LANGS+1];
 
 extern int lang_init(void);
+extern void lang_cleanup(void);
 
 extern int have_language(int language);
 extern const char *getstring(const NickGroupInfo *ngi, int index);
diff -uNr ircservices-5.0.24/log.c ircservices-5.0.25/log.c
--- ircservices-5.0.24/log.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/log.c	2003-11-18 21:39:58 +0900
@@ -9,10 +9,15 @@
 
 #include "services.h"
 
+/* Currently open log file */
 static FILE *logfile;
 static char current_filename[PATH_MAX+1];
 
-/* Are we in fatal() or fatal_perror()?  (Use this to avoid infinite
+/* Memory log buffer (see open_memory_log()) */
+static char logmem[LOGMEMSIZE];
+static char *logmemptr = NULL;
+
+/* Are we in fatal() or fatal_perror()?  (This is used to avoid infinite
  * recursion if wallops() does a fatal().) */
 static int in_fatal = 0;
 
@@ -90,21 +95,27 @@
 
 /* Local routines to write text to the log file and/or stderr as needed. */
 
-static void logputs(const char *str)
-{
-    if (logfile) {
-	check_log_rotate();
-	fputs(str, logfile);
-    }
-    if (nofork)
-	fputs(str, stderr);
-}
-
 static void vlogprintf(const char *fmt, va_list args)
 {
     if (logfile) {
 	check_log_rotate();
 	vfprintf(logfile, fmt, args);
+    } else if (logmemptr) {
+	char tmpbuf[BUFSIZE];
+	int len = vsnprintf(tmpbuf, sizeof(tmpbuf), fmt, args);
+	if (len > LOGMEMSIZE - (logmemptr-logmem)) {
+	    int oldlen = len;
+	    len = LOGMEMSIZE - (logmemptr-logmem);
+	    if (tmpbuf[oldlen-1] == '\n') {
+		tmpbuf[len-1] = '\n';  /* always end with a newline */
+	    } else {
+		len--;
+	    }
+	}
+	if (len > 0) {
+	    memcpy(logmemptr, tmpbuf, len);
+	    logmemptr += len;
+	}
     }
     if (nofork)
 	vfprintf(stderr, fmt, args);
@@ -119,6 +130,11 @@
     va_end(args);
 }
 
+static void logputs(const char *str)
+{
+    logprintf("%s", str);
+}
+
 /*************************************************************************/
 
 /* Local routine to write the time of day to the log. */
@@ -162,21 +178,59 @@
 	return 1;
     strscpy(current_filename, gen_log_filename(), sizeof(current_filename));
     logfile = fopen(current_filename, "a");
-    if (logfile)
+    if (logfile) {
 	setbuf(logfile, NULL);
+	if (logmemptr) {
+	    int res, errno_save;
+	    if (logmemptr > logmem) {
+		res = fwrite(logmem, logmemptr-logmem, 1, logfile);
+		errno_save = errno;
+	    } else {
+		res = 1;  /* i.e. no error */
+#ifdef CLEAN_COMPILE
+		errno_save = 0;  /* warning killer for dumb compilers */
+#endif
+	    }
+	    logmemptr = NULL;
+	    if (res != 1) {
+		/* make sure this is AFTER the memory log has been closed! */
+		errno = errno_save;
+		log_perror("open_log(): error writing memory log");
+	    }
+	}
+    }
     return logfile!=NULL ? 1 : 0;
 }
 
 /*************************************************************************/
 
+/* Open a virtual log file in memory.  The contents of the memory log file
+ * will be written to a physical log file when open_log() is called and
+ * executes successfully.  If a physical log file is already open, does
+ * nothing.  Always succeeds (and returns nonzero).
+ */
+
+int open_memory_log(void)
+{
+    if (logfile || logmemptr)
+	return 1;
+    logmemptr = logmem;
+    return 1;
+}
+
+/*************************************************************************/
+
 /* Close the log file. */
 
 void close_log(void)
 {
-    if (!logfile)
-	return;
-    fclose(logfile);
-    logfile = NULL;
+    if (logmemptr) {
+	logmemptr = NULL;
+    }
+    if (logfile) {
+	fclose(logfile);
+	logfile = NULL;
+    }
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/main.c ircservices-5.0.25/main.c
--- ircservices-5.0.24/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/main.c	2003-11-18 21:39:58 +0900
@@ -43,7 +43,7 @@
 int delayed_quit = 0;
 
 /* Contains a message as to why services is terminating */
-char *quitmsg = NULL;
+char quitmsg[BUFSIZE] = "";
 
 /* Input buffer - global, so we can dump it if something goes wrong */
 char inbuf[BUFSIZE];
@@ -98,12 +98,8 @@
 	int errno_save = errno;
 	const char *msg = (param==DISCONN_REMOTE ? "Read error from server"
 			   : "Connection to server failed");
-	quitmsg = malloc(BUFSIZE);
-	if (quitmsg) {
-	    snprintf(quitmsg, BUFSIZE, "%s: %s", msg, strerror(errno_save));
-	} else {
-	    quitmsg = (char *)msg;
-	}
+	snprintf(quitmsg, sizeof(quitmsg),
+		 "%s: %s", msg, strerror(errno_save));
 	if (param == DISCONN_REMOTE) {
 	    /* If we were already connected, make sure any changed data is
 	     * updated before we terminate. */
@@ -274,13 +270,9 @@
 
     /* Check for restart instead of exit */
     if (delayed_quit == 2) {
-	log("Restarting");
-	modules_exit();
-	if (!quitmsg)
-	    quitmsg = (char *)"Restarting";
-	send_cmd(ServerName, "SQUIT %s :%s", ServerName, quitmsg);
-	disconn(servsock);
-	close_log();
+	if (!*quitmsg)
+	    strscpy(quitmsg, "Restarting", sizeof(quitmsg));
+	cleanup();
 	execve(SERVICES_BIN, av, envp);
 	if (!readonly) {
 	    int errno_save = errno;
@@ -293,13 +285,7 @@
     }
 
     /* Disconnect and exit */
-    if (!quitmsg)
-	quitmsg = (char *)"Terminating, reason unknown";
-    log("%s", quitmsg);
-    modules_exit();
-    if (sock_isconn(servsock))
-	send_cmd(ServerName, "SQUIT %s :%s", ServerName, quitmsg);
-    disconn(servsock);
+    cleanup();
     return 0;
 }
 
diff -uNr ircservices-5.0.24/memory.c ircservices-5.0.25/memory.c
--- ircservices-5.0.24/memory.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/memory.c	2003-11-18 21:39:58 +0900
@@ -1,4 +1,5 @@
 /* Memory management routines.
+ * Leak checking based on code by Kelmar (2001/1/13)
  *
  * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
@@ -13,47 +14,116 @@
 /*************************************************************************/
 /*************************************************************************/
 
-/*
- * To enable memory leak checks add the MEMCHECKS define to the
- * config.h or the command line when compiling.
- *					-- Kelmar (2001-01-13)
- */
-
-/*
- * WARNING: Defining SHOWALLOCS will bloat your log files VERY quickly!
- * Use at your own risk!
- *					-- Kelmar (2001-01-16)
+/* smalloc, scalloc, srealloc, sstrdup:
+ *	Versions of the memory allocation functions which will cause the
+ *	program to terminate with an "Out of memory" error if the memory
+ *	cannot be allocated.  (Hence, the return value from these functions
+ *	is never NULL, except for smalloc()/scalloc() called with a size of
+ *      zero.)
  */
 
-#ifdef SHOWALLOCS
-int showallocs = 1;	/* Actually log allocations? */
+#ifdef MEMCHECKS
+# define FILELINE , char *file, int line
+# define xmalloc(a)    MCmalloc(a,file,line)
+# define xsmalloc(a)   smalloc(a,file,line)
+# define xcalloc(a,b)  MCcalloc(a,b,file,line)
+# define xrealloc(a,b) MCrealloc(a,b,file,line)
+# define xfree(a)      MCfree(a,file,line)
+#else
+# define FILELINE /*nothing*/
+# define xmalloc(a)    malloc(a)
+# define xsmalloc(a)   smalloc(a)
+# define xcalloc(a,b)  calloc(a,b)
+# define xrealloc(a,b) realloc(a,b)
+# define xfree(a)      free(a)
 #endif
 
 /*************************************************************************/
 
+void *smalloc(long size FILELINE)
+{
+    void *buf;
+
+    if (size == 0)
+	return NULL;
+    buf = xmalloc(size);
+    if (buf == NULL)
+	raise(SIGUSR1);
+    return buf;
+}
+
+/*************************************************************************/
+
+void *scalloc(long elsize, long els FILELINE)
+{
+    void *buf;
+
+    if (elsize == 0 || els == 0)
+	return NULL;
+    buf = xcalloc(elsize, els);
+    if (buf == NULL)
+	raise(SIGUSR1);
+    return buf;
+}
+
+/*************************************************************************/
+
+void *srealloc(void *oldptr, long newsize FILELINE)
+{
+    void *buf;
+
+    if (newsize == 0) {
+	xfree(oldptr);
+	return NULL;
+    }
+    buf = xrealloc(oldptr, newsize);
+    if (buf == NULL)
+	raise(SIGUSR1);
+    return buf;
+}
+
+/*************************************************************************/
+
+char *sstrdup(const char *s FILELINE)
+{
+    char *t = xsmalloc(strlen(s) + 1);
+    strcpy(t, s);  /* safe, obviously */
+    return t;
+}
+
+/*************************************************************************/
+/************ Everything from here down is MEMCHECKS-related. ************/
+/*************************************************************************/
+
 #ifdef MEMCHECKS
+
+/*************************************************************************/
+
+static long allocated = 0;	/* Amount of memory currently allocated */
+static long runtime = 0;	/* `allocated' value at init_memory() time */
+
+#ifdef SHOWALLOCS
+int showallocs = 1;		/* Actually log allocations? */
+#endif
+
 typedef struct _smemblock {
-    long size;		/* Size of this block */
-    int32 sig;		/* Signature word: 0x5AFEC0DE */
-    void *data;		/* Start of the user's data */
+    long size;			/* Size of this block */
+    int32 sig;			/* Signature word: 0x5AFEC0DE */
+    void *data;			/* Start of the user's data */
 } MemBlock;
 # define SIGNATURE	0x5AFEC0DE
 # define FREE_SIGNATURE	0xDEADBEEF	/* Used for freed memory */
-#endif /* MEMCHECKS */
 
 /*************************************************************************/
 /*************************************************************************/
 
-#ifdef MEMCHECKS
-static long runtime = 0;
-static long allocated = 0;
+/* Leak-checking initialization and exit code. */
 
 static void show_leaks(void)
 {
-    if ((allocated - runtime) > 0) {
+    if (runtime >= 0 && (allocated - runtime) > 0) {
 	log("SAFEMEM: There were %ld bytes leaked on exit!",
 	    (allocated - runtime));
-	allocated = 0;
     } else {
 	log("SAFEMEM: No memory leaks detected.");
     }
@@ -62,161 +132,134 @@
 void init_memory(void)
 {
     runtime = allocated;
-    log("init_memory(): runtime = %ld\n", runtime);
+    log("init_memory(): runtime = %ld", runtime);
     atexit(show_leaks);
 }
-#endif /* MEMCHECKS */
+
+/* Used to avoid memory-leak message from the parent process */
+void uninit_memory(void)
+{
+    runtime = -1;
+}
 
 /*************************************************************************/
 
-/* smalloc, scalloc, srealloc, (sfree), sstrdup:
- *	Versions of the memory allocation functions which will cause the
- *	program to terminate with an "Out of memory" error if the memory
- *	cannot be allocated.  (Hence, the return value from these functions
- *	is never NULL unless called with a size of zero.)  sfree() is used
- *	only with MEMCHECKS enabled.
- */
+/* Substitutes for malloc() and friends.  memory.h redefines malloc(), etc.
+ * to these functions if MEMCHECKS is defined. */
 
 /*************************************************************************/
 
-void *smalloc(long size)
+void *MCmalloc(long size, const char *file, int line)
 {
-#ifdef MEMCHECKS
     MemBlock *mb;
-#else
-    void *buf;
-#endif
 
     if (size == 0)
 	return NULL;
-
-#ifdef MEMCHECKS
-
     mb = malloc(size + sizeof(MemBlock));
-    if (mb == NULL)
-	raise(SIGUSR1);
-    mb->size = size;
-    mb->sig = SIGNATURE;
-    mb->data = (void *)((char *)(mb) + sizeof(MemBlock));
-    allocated += size;
+    if (mb) {
+	mb->size = size;
+	mb->sig = SIGNATURE;
+	mb->data = (void *)((char *)(mb) + sizeof(MemBlock));
+	allocated += size;
 # ifdef SHOWALLOCS
-    if (showallocs)
-	log("smalloc(): Allocated %ld bytes at %p", size, mb->data);
+	if (showallocs)
+	    log("smalloc(): Allocated %ld bytes at %p (%s:%d)",
+		size, mb->data, file, line);
 # endif
-    return mb->data;
-
-#else /* !MEMCHECKS */
-
-    buf = malloc(size);
-    if (buf == NULL)
-	raise(SIGUSR1);
-    return buf;
-
-#endif /* MEMCHECKS */
+	return mb->data;
+    } else {
+# ifdef SHOWALLOCS
+	if (showallocs)
+	    log("mcalloc(): Unable to allocate %ld bytes (%s:%d)",
+		size, file, line);
+# endif
+	return NULL;
+    }
 }
 
 /*************************************************************************/
 
-void *scalloc(long elsize, long els)
+void *MCcalloc(long elsize, long els, const char *file, int line)
 {
-#ifdef MEMCHECKS
     MemBlock *mb;
-#else
-    void *buf;
-#endif
 
     if (elsize == 0 || els == 0)
 	return NULL;
-
-#ifdef MEMCHECKS
-
     mb = malloc(elsize * els + sizeof(MemBlock));
-    if (mb == NULL)
-	raise(SIGUSR1);
-    mb->size = elsize * els;
-    mb->sig = SIGNATURE;
-    mb->data = (void *)((char *)(mb) + sizeof(MemBlock));
-    memset(mb->data, 0, elsize * els);
-    allocated += mb->size;
+    if (mb) {
+	mb->size = elsize * els;
+	mb->sig = SIGNATURE;
+	mb->data = (void *)((char *)(mb) + sizeof(MemBlock));
+	memset(mb->data, 0, elsize * els);
+	allocated += mb->size;
 # ifdef SHOWALLOCS
-    if (showallocs)
-	log("scalloc(): Allocated %ld bytes at %p", els*elsize, mb->data);
+	if (showallocs)
+	    log("scalloc(): Allocated %ld bytes at %p (%s:%d)",
+		els*elsize, mb->data, file, line);
 # endif
-    return mb->data;
-
-#else /* !MEMCHECKS */
-
-    buf = calloc(elsize, els);
-    if (buf == NULL)
-	raise(SIGUSR1);
-    return buf;
-
-#endif /* MEMCHECKS */
+	return mb->data;
+    } else {
+# ifdef SHOWALLOCS
+	if (showallocs)
+	    log("scalloc(): Unable to allocate %ld bytes (%s:%d)",
+		els*elsize, file, line);
+# endif
+	return NULL;
+    }
 }
 
 /*************************************************************************/
 
-void *srealloc(void *oldptr, long newsize)
+void *MCrealloc(void *oldptr, long newsize, const char *file, int line)
 {
-#ifdef MEMCHECKS
     MemBlock *newb, *oldb;
     long oldsize;
 # ifdef SHOWALLOCS
     void *olddata;
 # endif
-#else
-    void *buf;
-#endif /* MEMCHECKS */
 
     if (newsize == 0) {
-#ifdef MEMCHECKS
-	sfree(oldptr);
-#else
-	free(oldptr);
-#endif
+	MCfree(oldptr, file, line);
 	return NULL;
     }
-
-#ifdef MEMCHECKS
-
     if (oldptr == NULL)
-	return smalloc(newsize);
+	return MCmalloc(newsize, file, line);
     oldb = (MemBlock *)((char *)(oldptr) - sizeof(MemBlock));
     if (oldb->sig != SIGNATURE)
-	fatal("Attempt to realloc() block on an invalid pointer!");
+	fatal("Attempt to realloc() an invalid pointer (%p) (%s:%d)",
+	      oldptr, file, line);
 # ifdef SHOWALLOCS
     olddata = oldb->data;
 # endif
     oldsize = oldb->size;
     newb = realloc(oldb, newsize + sizeof(MemBlock));
-    if (newb == NULL)
-	raise(SIGUSR1);
-    newb->size = newsize;
-    newb->sig = SIGNATURE;
-    newb->data = (void *)((char *)(newb) + sizeof(MemBlock));
-    /* Adjust our tracker acordingly */
-    allocated += (newsize - oldsize);
+    if (newb) {
+	newb->size = newsize;
+	newb->sig = SIGNATURE;
+	newb->data = (void *)((char *)(newb) + sizeof(MemBlock));
+	/* Adjust our tracker acordingly */
+	allocated += (newsize - oldsize);
 # ifdef SHOWALLOCS
-    if (showallocs)
-	log("srealloc(): Adjusted %ld bytes (%p) to %ld bytes (%p)",
-	    oldsize, olddata, newsize, newb->data);
+	if (showallocs) {
+	    log("srealloc(): Adjusted %ld bytes (%p) to %ld bytes (%p)"
+		" (%s:%d)", oldsize, olddata, newsize, newb->data, file, line);
+	}
 # endif
-    return newb->data;
-
-#else /* !MEMCHECKS */
-
-    buf = realloc(oldptr, newsize);
-    if (buf == NULL)
-	raise(SIGUSR1);
-    return buf;
-
-#endif /* MEMCHECKS */
+	return newb->data;
+    } else {
+# ifdef SHOWALLOCS
+	if (showallocs) {
+	    log("srealloc(): Unable to adjust %ld bytes (%p) to %ld bytes"
+		" (%s:%d)", oldsize, olddata, newsize, file, line);
+	}
+# endif
+	return NULL;
+    }
 }
 
 /*************************************************************************/
 
-#ifdef MEMCHECKS
-void sfree(void *ptr)
+void MCfree(void *ptr, const char *file, int line)
 {
     MemBlock *mb;
 
@@ -224,24 +267,27 @@
 	return;
     mb = (MemBlock *)((char *)(ptr) - sizeof(MemBlock));
     if (mb->sig != SIGNATURE)
-	fatal("Attempt to sfree() an invalid pointer! (%p)", ptr);
+	fatal("Attempt to free() an invalid pointer (%p) (%s:%d)",
+	      ptr, file, line);
     allocated -= mb->size;
 # ifdef SHOWALLOCS
     if (showallocs)
-	log("sfree(): Released %ld bytes at %p", mb->size, mb->data);
+	log("sfree(): Released %ld bytes at %p (%s:%d)",
+	    mb->size, mb->data, file, line);
 # endif
     mb->sig = FREE_SIGNATURE;
     free(mb);
 }
-#endif /* MEMCHECKS */
 
 /*************************************************************************/
 
-char *sstrdup(const char *s)
+char *MCstrdup(const char *s, const char *file, int line)
 {
-    char *t = smalloc(strlen(s) + 1);
+    char *t = MCmalloc(strlen(s) + 1, file, line);
     strcpy(t, s);  /* safe, obviously */
     return t;
 }
 
 /*************************************************************************/
+
+#endif  /* MEMCHECKS */
diff -uNr ircservices-5.0.24/memory.h ircservices-5.0.25/memory.h
--- ircservices-5.0.24/memory.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/memory.h	2003-11-18 21:39:58 +0900
@@ -4,18 +4,27 @@
 /*************************************************************************/
 
 #ifdef MEMCHECKS
+# define FILELINE , char *file, int line
+#else
+# define FILELINE /*nothing*/
+#endif
+extern void *smalloc(long size FILELINE);
+extern void *scalloc(long elsize, long els FILELINE);
+extern void *srealloc(void *oldptr, long newsize FILELINE);
+extern char *sstrdup(const char *s FILELINE);
+#undef FILELINE
+
+#ifdef MEMCHECKS
 # ifdef SHOWALLOCS
 extern int showallocs;
 # endif
 extern void init_memory(void);
-#endif /* MEMCHECKS */
-
-extern void *smalloc(long size);
-extern void *scalloc(long elsize, long els);
-extern void *srealloc(void *oldptr, long newsize);
-extern char *sstrdup(const char *s);
-#ifdef MEMCHECKS
-extern void sfree(void *ptr);
+extern void uninit_memory(void);
+extern void *MCmalloc(long size, const char *file, int line);
+extern void *MCcalloc(long elsize, long els, const char *file, int line);
+extern void *MCrealloc(void *oldptr, long newsize, const char *file, int line);
+extern void MCfree(void *ptr, const char *file, int line);
+extern char *MCstrdup(const char *s, const char *file, int line);
 #endif
 
 /*************************************************************************/
@@ -25,16 +34,21 @@
 # undef malloc
 # undef calloc
 # undef realloc
-# undef strdup
 # undef free
+# undef strdup
 
-# define malloc smalloc
-# define calloc scalloc
-# define realloc srealloc
-# define strdup sstrdup
-# define free sfree
+# define malloc(size)        MCmalloc(size,__FILE__,__LINE__)
+# define calloc(elsize,els)  MCcalloc(elsize,els,__FILE__,__LINE__)
+# define realloc(ptr,size)   MCrealloc(ptr,size,__FILE__,__LINE__)
+# define free(ptr)           MCfree(ptr,__FILE__,__LINE__)
+# define strdup(str)         MCstrdup(str,__FILE__,__LINE__)
+
+# define smalloc(size)       smalloc(size,__FILE__,__LINE__)
+# define scalloc(elsize,els) scalloc(elsize,els,__FILE__,__LINE__)
+# define srealloc(ptr,size)  srealloc(ptr,size,__FILE__,__LINE__)
+# define sstrdup(str)        sstrdup(str,__FILE__,__LINE__)
 
-#endif /* MEMCHECKS && !NO_MEMREDEF */
+#endif  /* MEMCHECKS && !NO_MEMREDEF */
 
 /*************************************************************************/
 
diff -uNr ircservices-5.0.24/messages.c ircservices-5.0.25/messages.c
--- ircservices-5.0.24/messages.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/messages.c	2003-11-18 21:39:58 +0900
@@ -484,7 +484,7 @@
 }
 
 /*************************************************************************/
-/**************************** Initialization *****************************/
+/************************ Initialization/cleanup *************************/
 /*************************************************************************/
 
 int messages_init(int ac, char **av)
@@ -503,3 +503,12 @@
 }
 
 /*************************************************************************/
+
+void messages_cleanup(void)
+{
+    unregister_callback(NULL, cb_whois);
+    unregister_callback(NULL, cb_privmsg);
+    unregister_messages(base_messages);
+}
+
+/*************************************************************************/
diff -uNr ircservices-5.0.24/messages.h ircservices-5.0.25/messages.h
--- ircservices-5.0.24/messages.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/messages.h	2003-11-18 21:39:58 +0900
@@ -21,5 +21,6 @@
 extern int unregister_messages(Message *table);
 extern Message *find_message(const char *name);
 extern int messages_init(int ac, char **av);
+extern void messages_cleanup(void);
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/misc.c ircservices-5.0.25/misc.c
--- ircservices-5.0.24/misc.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/misc.c	2003-11-18 21:39:58 +0900
@@ -207,7 +207,8 @@
 /*************************************************************************/
 
 /* strtok_remaining:  Return the result of strtok(NULL, "") with any
- *                    leading or trailing whitespace discarded.
+ *                    leading or trailing whitespace discarded.  If nothing
+ *                    but whitespace is left, return NULL.
  */
 
 char *strtok_remaining(void)
@@ -219,6 +220,8 @@
 	t = s + strlen(s)-1;
 	while (t >= s && isspace(*t))
 	    *t-- = 0;
+	if (!*s)
+	    return NULL;
     }
     return s;
 }
diff -uNr ircservices-5.0.24/modules/chanserv/main.c ircservices-5.0.25/modules/chanserv/main.c
--- ircservices-5.0.24/modules/chanserv/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/chanserv/main.c	2003-11-18 21:39:59 +0900
@@ -1518,7 +1518,7 @@
 
     chan = strtok(NULL, " ");
     if (chan && *chan == '+') {
-	expiry = chan;
+	expiry = chan+1;
 	chan = strtok(NULL, " ");
     } else {
 	expiry = NULL;
diff -uNr ircservices-5.0.24/modules/database/version4.c ircservices-5.0.25/modules/database/version4.c
--- ircservices-5.0.24/modules/database/version4.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/database/version4.c	2003-11-18 21:39:59 +0900
@@ -34,6 +34,12 @@
 
 static Module *module;
 static Module *module_operserv;
+static Module *module_operserv_akill;
+static Module *module_operserv_news;
+static Module *module_operserv_sline;
+static Module *module_nickserv;
+static Module *module_chanserv;
+static Module *module_statserv;
 
 /*************************************************************************/
 
@@ -339,6 +345,9 @@
 	ni = &dummy_ni;
 	memset(ni, 0, sizeof(*ni));
     }
+    free(nick);
+    nick = NULL;
+    free(ni->last_realmask);  /* copied from last_usermask */
     SAFE(read_string(&ni->last_realmask, f));
     if (ver >= 19)
 	SAFE(read_int32(&ni->id_stamp, f));
@@ -745,6 +754,13 @@
 
 int close_nick_db(const char *dbname)
 {
+    NickInfo *ni;
+    NickGroupInfo *ngi;
+
+    for (ni = first_nickinfo(); ni; ni = next_nickinfo())
+	del_nickinfo(ni);
+    for (ngi = first_nickgroupinfo(); ngi; ngi = next_nickgroupinfo())
+	del_nickgroupinfo(ngi);
     return 0;
 }
 
@@ -1016,6 +1032,8 @@
 	ci = &dummy_ci;
 	memset(ci, 0, sizeof(*ci));
     }
+    free(name);
+    name = NULL;
     SAFE(read_int16(&ci->memos.memomax, f));
     if (ver >= 14) {
 	if (ver >= 23) {
@@ -1341,6 +1359,10 @@
 
 int close_channel_db(const char *dbname)
 {
+    ChannelInfo *ci;
+
+    for (ci = first_channelinfo(); ci; ci = next_channelinfo())
+	del_channelinfo(ci);
     return 0;
 }
 
@@ -1520,6 +1542,12 @@
 
 int close_operserv_db(const char *dbname)
 {
+    free(services_admins);
+    services_admins = NULL;
+    services_admins_count = 0;
+    free(services_opers);
+    services_opers = NULL;
+    services_opers_count = 0;
     return 0;
 }
 
@@ -1693,6 +1721,13 @@
 
 int close_news_db(const char *dbname)
 {
+    int i;
+
+    ARRAY_FOREACH (i, newslist)
+	free(newslist[i].text);
+    free(newslist);
+    newslist = NULL;
+    newslist_count = 0;
     return 0;
 }
 
@@ -1928,6 +1963,21 @@
 }
 
 /*************************************************************************/
+
+static void free_all_maskdata(uint8 type)
+{
+    int i;
+
+    for (i = 0; i < masklist_count[type]; i++) {
+	free(masklist[type][i].mask);
+	free(masklist[type][i].reason);
+    }
+    free(masklist[type]);
+    masklist[type] = NULL;
+    masklist_count[type] = 0;
+}
+
+/*************************************************************************/
 /********************** Autokill database handling ***********************/
 /*************************************************************************/
 
@@ -1981,6 +2031,8 @@
 
 int close_akill_db(const char *dbname)
 {
+    free_all_maskdata(MD_AKILL);
+    free_all_maskdata(MD_EXCLUSION);
     return 0;
 }
 
@@ -2111,6 +2163,7 @@
 
 int close_exception_db(const char *dbname)
 {
+    free_all_maskdata(MD_EXCEPTION);
     return 0;
 }
 
@@ -2169,6 +2222,9 @@
 
 int close_sline_db(const char *dbname)
 {
+    free_all_maskdata(MD_SGLINE);
+    free_all_maskdata(MD_SQLINE);
+    free_all_maskdata(MD_SZLINE);
     return 0;
 }
 
@@ -2211,6 +2267,8 @@
 
     SAFE(read_string(&servername, f));
     ss = new_serverstats(servername);
+    free(servername);
+    servername = NULL;
     SAFE(read_int32(&tmp32, f));
     ss->t_join = tmp32;
     SAFE(read_int32(&tmp32, f));  /* t_quit */
@@ -2235,12 +2293,16 @@
     char *servername;
 
     SAFE(read_string(&servername, f));
+    if (!servername)
+	goto fail;
     ss = get_serverstats(servername);
     if (!ss) {
 	module_log("Extension data found for nonexisting server `%s'",
 		   servername);
+	free(servername);
 	return 0;
     }
+    free(servername);
     SAFE(read_time(&ss->t_join, f));
     return 1;
 
@@ -2384,7 +2446,7 @@
 int close_statserv_db(const char *dbname)
 {
     ServerStats *ss;
- 
+
     for (ss = first_serverstats(); ss; ss = next_serverstats())
 	del_serverstats(ss);
     return 0;
@@ -2606,6 +2668,18 @@
 	module_operserv = mod;
 	if (!add_callback(mod, "STATS ALL", do_stats_all))
 	    module_log("Unable to register OperServ STATS ALL callback");
+    } else if (strcmp(modname, "operserv/akill") == 0) {
+	module_operserv_akill = mod;
+    } else if (strcmp(modname, "operserv/news") == 0) {
+	module_operserv_news = mod;
+    } else if (strcmp(modname, "operserv/sline") == 0) {
+	module_operserv_sline = mod;
+    } else if (strcmp(modname, "nickserv/main") == 0) {
+	module_nickserv = mod;
+    } else if (strcmp(modname, "chanserv/main") == 0) {
+	module_chanserv = mod;
+    } else if (strcmp(modname, "statserv/main") == 0) {
+	module_statserv = mod;
     }
     return 0;
 }
@@ -2614,8 +2688,28 @@
 
 static int do_unload_module(Module *mod)
 {
-    if (mod == module_operserv)
+    if (mod == module_operserv) {
+	close_operserv_db(NULL);
 	module_operserv = NULL;
+    } else if (mod == module_operserv_akill) {
+	close_akill_db(NULL);
+	module_operserv_akill = NULL;
+    } else if (mod == module_operserv_news) {
+	close_news_db(NULL);
+	module_operserv_news = NULL;
+    } else if (mod == module_operserv_news) {
+	close_sline_db(NULL);
+	module_operserv_sline = NULL;
+    } else if (mod == module_nickserv) {
+	close_nick_db(NULL);
+	module_nickserv = NULL;
+    } else if (mod == module_chanserv) {
+	close_channel_db(NULL);
+	module_chanserv = NULL;
+    } else if (mod == module_statserv) {
+	close_statserv_db(NULL);
+	module_statserv = NULL;
+    }
     return 0;
 }
 
diff -uNr ircservices-5.0.24/modules/httpd/main.c ircservices-5.0.25/modules/httpd/main.c
--- ircservices-5.0.24/modules/httpd/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/httpd/main.c	2003-11-18 21:39:59 +0900
@@ -939,6 +939,8 @@
     free(ListenTo);
     ListenTo = NULL;
     ListenTo_count = 0;
+    free(listen_sockets);
+    listen_sockets = NULL;
 
     unregister_callback(module, cb_request);
     unregister_callback(module, cb_auth);
diff -uNr ircservices-5.0.24/modules/misc/xml-import.c ircservices-5.0.25/modules/misc/xml-import.c
--- ircservices-5.0.24/modules/misc/xml-import.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/misc/xml-import.c	2003-11-18 21:39:59 +0900
@@ -506,6 +506,9 @@
  * Note that all returned strings are stored in static buffers which are
  * overwritten at each call, and all returned strings except *text_ret will
  * be silently truncated at 255 characters.
+ *
+ * If `tag_ret' is NULL, the function frees its static buffers and returns
+ * 0.
  */
 
 static int read_tag(char **tag_ret, char **attr_ret, char **attrval_ret,
@@ -513,10 +516,18 @@
 {
     static char tag[256], attr[256], attrval[256];
     static char *text = NULL;
-    static int textlen, textsize;
+    static int textlen = 0, textsize = 0;
     int is_closing = 0;  /* Is this a closing tag? */
     int c, i;
 
+    /* Special case: free buffers */
+    if (!tag_ret) {
+	free(text);
+	text = NULL;
+	textlen = textsize = 0;
+	return 0;
+    }
+
     /* Find beginning of tag */
     if (text_ret && textlen_ret) {
 	textlen = 0;
@@ -1857,6 +1868,7 @@
 	    modes |= flag;
 	s++;
     }
+    free(ti->text);
     return &modes;
 }
 
@@ -2472,6 +2484,9 @@
 	return 0;
     }
 
+    /* Free read_tag() data */
+    (void) read_tag(NULL, NULL, NULL, NULL, NULL);
+
     /* Merge data into our database and free it */
     merge_data(flags);
     free_data();
diff -uNr ircservices-5.0.24/modules/nickserv/main.c ircservices-5.0.25/modules/nickserv/main.c
--- ircservices-5.0.24/modules/nickserv/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/nickserv/main.c	2003-11-18 21:39:59 +0900
@@ -1440,7 +1440,7 @@
 
     nick = strtok(NULL, " ");
     if (nick && *nick == '+') {
-	expiry = nick;
+	expiry = nick+1;
 	nick = strtok(NULL, " ");
     } else {
 	expiry = NULL;
diff -uNr ircservices-5.0.24/modules/nickserv/util.c ircservices-5.0.25/modules/nickserv/util.c
--- ircservices-5.0.24/modules/nickserv/util.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/nickserv/util.c	2003-11-18 21:39:59 +0900
@@ -103,6 +103,7 @@
 
     free(ngi->url);
     free(ngi->email);
+    free(ngi->info);
     if (ngi->suspendinfo) {
 	free(ngi->suspendinfo->reason);
 	free(ngi->suspendinfo);
@@ -111,6 +112,9 @@
     ARRAY_FOREACH (i, ngi->access)
 	free(ngi->access[i]);
     free(ngi->access);
+    ARRAY_FOREACH (i, ngi->ajoin)
+	free(ngi->ajoin[i]);
+    free(ngi->ajoin);
     free(ngi->channels);
     ARRAY_FOREACH (i, ngi->memos.memos)
 	free(ngi->memos.memos[i].text);
diff -uNr ircservices-5.0.24/modules/operserv/akill.c ircservices-5.0.25/modules/operserv/akill.c
--- ircservices-5.0.24/modules/operserv/akill.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/operserv/akill.c	2003-11-18 21:39:59 +0900
@@ -32,6 +32,7 @@
 static char * AutokillReason;
 static int    ImmediatelySendAutokill;
 static time_t AutokillExpiry;
+static time_t AkillChanExpiry;
 static time_t OperMaxExpiry;
 static int    WallOSAkill;
 static int    WallAutokillExpire;
@@ -44,10 +45,12 @@
 static int db_opened = 0;
 
 static void do_akill(User *u);
+static void do_akillchan(User *u);
 static void do_exclude(User *u);
 
 static Command cmds[] = {
     {"AKILL",     do_akill,     is_services_oper, OPER_HELP_AKILL,     -1,-1},
+    {"AKILLCHAN", do_akillchan, is_services_oper, OPER_HELP_AKILLCHAN, -1,-1},
     {"EXCLUDE",   do_exclude,   is_services_oper, OPER_HELP_EXCLUDE,   -1,-1},
     { NULL }
 };
@@ -71,10 +74,22 @@
 static void send_akill(const MaskData *akill)
 {
     char *username, *host;
+    static int warned_exclude = 0;
 
     /* Don't send autokills if EnableExclude but no ircd support */
-    if (EnableExclude && !(protocol_features & PF_AKILL_EXCL))
+    if (EnableExclude && !(protocol_features & PF_AKILL_EXCL)) {
+	if (!warned_exclude) {
+	    wallops(s_OperServ, "Warning: Autokill exclusions are enabled,"
+		    " but this IRC server does not support autokill"
+		    " exclusions; autokills will not be sent to servers.");
+	    module_log("EnableExclude on server type without exclusions--"
+		       "autokill sending disabled");
+	    warned_exclude = 1;
+	}
 	return;
+    } else {
+	warned_exclude = 0;
+    }
 
     username = sstrdup(akill->mask);
     host = strchr(username, '@');
@@ -336,6 +351,98 @@
 /*************************************************************************/
 /*************************************************************************/
 
+/* Handle an OperServ AKILLCHAN command. */
+
+/*************************************************************************/
+
+static void do_akillchan(User *u)
+{
+    char *channel, *expiry_str, *reason, *s;
+    int kill;  /* kill users in the channel? */
+    int32 expiry;
+    Channel *c;
+    struct c_userlist *cu, *cu2;
+    int count;
+    int old_immed;  /* saved value of ImmediatelySendAutokill */
+
+    kill = 0;
+    expiry_str = NULL;
+
+    s = strtok(NULL, " ");
+    if (s && stricmp(s,"KILL") == 0) {
+	kill = 1;
+	s = strtok(NULL, " ");
+    }
+    if (s && *s == '+') {
+	expiry_str = s+1;
+	s = strtok(NULL, " ");
+    }
+    if (!s || *s != '#') {
+	syntax_error(s_OperServ, u, "AKILLCHAN", OPER_AKILLCHAN_SYNTAX);
+	return;
+    }
+    channel = s;
+    reason = strtok_remaining();
+    if (!reason) {
+	syntax_error(s_OperServ, u, "AKILLCHAN", OPER_AKILLCHAN_SYNTAX);
+	return;
+    }
+
+    if (!(c = get_channel(channel))) {
+	notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, channel);
+	return;
+    }
+    if (expiry_str) {
+	expiry = dotime(expiry_str);
+    } else {
+	if (!is_services_admin(u) && OperMaxExpiry
+	 && (!AkillChanExpiry || OperMaxExpiry < AkillChanExpiry)
+	) {
+	    expiry = OperMaxExpiry;
+	} else {
+	    expiry = AkillChanExpiry;
+	}
+    }
+    if (expiry)
+	expiry += time(NULL);
+
+    count = 0;
+    old_immed = ImmediatelySendAutokill;
+    ImmediatelySendAutokill = 1;
+    LIST_FOREACH_SAFE (cu, c->users, cu2) {
+	char buf[BUFSIZE];
+	if (is_oper(cu->user))
+	    continue;
+	/* Killing the user before adding the autokill opens a small hole
+	 * in that the user may be able to reconnect before the new
+	 * autokill reaches the server, but under normal conditions the
+	 * actual chance of this is vanishingly small.  On the other hand,
+	 * the chance of people complaining about "user not found" errors
+	 * from ircds that kill users on autokill if we do the autokill
+	 * first is significantly greater... */
+	if (kill)
+	    kill_user(s_OperServ, cu->user->nick, reason);
+	snprintf(buf, sizeof(buf), "*@%s", cu->user->host);
+	if (!get_maskdata(MD_AKILL, buf))
+	    create_akill(buf, reason, u->nick, expiry);
+	count++;
+    }
+    ImmediatelySendAutokill = old_immed;
+
+    if (count == 1) {
+	notice_lang(s_OperServ, u,
+		    kill ? OPER_AKILLCHAN_KILLED_ONE
+			 : OPER_AKILLCHAN_AKILLED_ONE);
+    } else {
+	notice_lang(s_OperServ, u,
+		    kill ? OPER_AKILLCHAN_KILLED : OPER_AKILLCHAN_AKILLED,
+		    count);
+    }
+}
+
+/*************************************************************************/
+/*************************************************************************/
+
 /* Handle an OperServ EXCLUDE command. */
 
 /*************************************************************************/
@@ -480,6 +587,7 @@
 const int32 module_version = MODULE_VERSION_CODE;
 
 ConfigDirective module_config[] = {
+    { "AkillChanExpiry",  { { CD_TIME, 0, &AkillChanExpiry } } },
     { "AutokillDB",       { { CD_STRING, CF_DIRREQ, &AutokillDBName } } },
     { "AutokillExpiry",   { { CD_TIME, 0, &AutokillExpiry } } },
     { "AutokillReason",   { { CD_STRING, CF_DIRREQ, &AutokillReason } } },
diff -uNr ircservices-5.0.24/modules/operserv/main.c ircservices-5.0.25/modules/operserv/main.c
--- ircservices-5.0.24/modules/operserv/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/operserv/main.c	2003-11-18 21:39:59 +0900
@@ -1206,11 +1206,8 @@
 
 static void do_os_quit(User *u)
 {
-    quitmsg = malloc(28 + strlen(u->nick));
-    if (!quitmsg)
-	quitmsg = (char *)"QUIT command received, but out of memory!";
-    else
-	sprintf(quitmsg, "QUIT command received from %s", u->nick);
+    snprintf(quitmsg, sizeof(quitmsg),
+	     "QUIT command received from %s", u->nick);
     quitting = 1;
 }
 
@@ -1218,11 +1215,8 @@
 
 static void do_shutdown(User *u)
 {
-    quitmsg = malloc(32 + strlen(u->nick));
-    if (!quitmsg)
-	quitmsg = (char *)"SHUTDOWN command received, but out of memory!";
-    else
-	sprintf(quitmsg, "SHUTDOWN command received from %s", u->nick);
+    snprintf(quitmsg, sizeof(quitmsg),
+	    "SHUTDOWN command received from %s", u->nick);
     save_data = 1;
     delayed_quit = 1;
 }
@@ -1231,11 +1225,8 @@
 
 static void do_restart(User *u)
 {
-    quitmsg = malloc(31 + strlen(u->nick));
-    if (!quitmsg)
-	quitmsg = (char *)"RESTART command received, but out of memory!";
-    else
-	sprintf(quitmsg, "RESTART command received from %s", u->nick);
+    snprintf(quitmsg, sizeof(quitmsg),
+	     "RESTART command received from %s", u->nick);
     save_data = 1;
     delayed_quit = 2;
 }
@@ -1831,6 +1822,7 @@
     unregister_callback(module, cb_set);
     unregister_callback(module, cb_help_cmds);
     unregister_callback(module, cb_help);
+    unregister_callback(module, cb_expire_md);
     unregister_callback(module, cb_command);
 
     unregister_commands(module, cmds);
diff -uNr ircservices-5.0.24/modules/operserv/maskdata.c ircservices-5.0.25/modules/operserv/maskdata.c
--- ircservices-5.0.24/modules/operserv/maskdata.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/operserv/maskdata.c	2003-11-18 21:39:59 +0900
@@ -40,7 +40,7 @@
     expiry = NULL;
     s = strtok_remaining();
     if (stricmp(cmd,"ADD") == 0 && s && *s == '+') {
-	expiry = strtok(s, " ");
+	expiry = strtok(s+1, " ");
 	s = strtok_remaining();
     }
     if (s && *s == '"') {
diff -uNr ircservices-5.0.24/modules/operserv/sessions.c ircservices-5.0.25/modules/operserv/sessions.c
--- ircservices-5.0.24/modules/operserv/sessions.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/operserv/sessions.c	2003-11-18 21:39:59 +0900
@@ -360,7 +360,7 @@
 
     mask = strtok(NULL, " ");
     if (mask && *mask == '+') {
-	expiry = mask;
+	expiry = mask+1;
 	mask = strtok(NULL, " ");
     } else {
 	expiry = NULL;
diff -uNr ircservices-5.0.24/modules/protocol/ptlink.c ircservices-5.0.25/modules/protocol/ptlink.c
--- ircservices-5.0.24/modules/protocol/ptlink.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/protocol/ptlink.c	2003-11-18 21:40:00 +0900
@@ -203,7 +203,8 @@
 		   got_QS   ? "" : " QS",
 		   got_EX   ? "" : " EX");
 	send_error("Need PTS4/QS/EX capabilities");
-	quitmsg = (char *)"Remote server doesn't support all of PTS4/QS/EX";
+	strscpy(quitmsg, "Remote server doesn't support all of PTS4/QS/EX",
+		sizeof(quitmsg));
 	quitting = 1;
     }
 }
@@ -217,7 +218,9 @@
     } else {
 	if (atoi(av[1]) > 6 || atoi(av[0]) < 6) {
 	    send_error("Need protocol version 6 support");
-	    quitmsg = (char *)"Remote server doesn't support protocol version 6";
+	    strscpy(quitmsg,
+		    "Remote server doesn't support protocol version 6",
+		    sizeof(quitmsg));
 	    quitting = 1;
 	}
     }
diff -uNr ircservices-5.0.24/modules/protocol/trircd.c ircservices-5.0.25/modules/protocol/trircd.c
--- ircservices-5.0.24/modules/protocol/trircd.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/protocol/trircd.c	2003-11-18 21:40:00 +0900
@@ -320,17 +320,19 @@
     }
     if (!got_trircd5) {
 	send_error("Only trircd 5.1 and later are supported");
-	quitmsg = (char *)"Remote server version is not 5.1 or later";
+	strscpy(quitmsg, "Remote server version is not 5.1 or later",
+		sizeof(quitmsg));
 	quitting = 1;
     }
     if (!got_dtone) {
         send_error("Need DT1 protocol");
-        quitmsg = (char *)"Remote server doesn't support DT1";
+        strscpy(quitmsg, "Remote server doesn't support DT1", sizeof(quitmsg));
         quitting = 1;  
     }
     if (!got_dtone) {
         send_error("Need NICKIP protocol");
-        quitmsg = (char *)"Remote server doesn't support NICKIP";
+        strscpy(quitmsg, "Remote server doesn't support NICKIP",
+		sizeof(quitmsg));
         quitting = 1;  
     }
 }
diff -uNr ircservices-5.0.24/modules/protocol/unreal.c ircservices-5.0.25/modules/protocol/unreal.c
--- ircservices-5.0.24/modules/protocol/unreal.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/protocol/unreal.c	2003-11-18 21:40:00 +0900
@@ -45,7 +45,7 @@
 /* Frequency to send TSCTL SVSTIME at (0 = startup only) */
 static time_t SVSTIMEFrequency = 0;
 /* Timeout for sending SVSTIME */
-static Timeout *to_svstime;
+static Timeout *to_svstime = NULL;
 
 
 /* The following flag sets are set by init_modes().  We could have done
@@ -330,7 +330,8 @@
     /* Make sure we got a NICKv2 from the remote server; if not, abort. */
     if (!got_nickv2) {
 	send_error("Need NICKv2 protocol");
-	quitmsg = (char *)"Remote server doesn't support NICKv2";
+	strscpy(quitmsg, "Remote server doesn't support NICKv2",
+		sizeof(quitmsg));
 	quitting = 1;
     }
 }
@@ -526,6 +527,7 @@
     { "CHGHOST",   m_chghost },
     { "CHGIDENT",  m_chgident },
     { "CHGNAME",   m_chgname },
+    { "EOS",       NULL },
     { "GLOBOPS",   NULL },
     { "GNOTICE",   NULL },
     { "GOPER",     NULL },
@@ -708,6 +710,7 @@
     { "BR", "SVSJOIN" },
     { "BS", "BOTSERV" },
     { "BT", "SVSPART" },
+    { "ES", "EOS" },
 
     /* Fencepost */
     { NULL }
@@ -1501,6 +1504,11 @@
      * before exiting, to avoid invalid function pointers being called
      * (e.g. for the unload module callback). */
 
+    if (to_svstime) {
+	del_timeout(to_svstime);
+	to_svstime = NULL;
+    }
+
     exit_token();
     exit_svsnick();
     exit_sjoin();
diff -uNr ircservices-5.0.24/modules/statserv/main.c ircservices-5.0.25/modules/statserv/main.c
--- ircservices-5.0.24/modules/statserv/main.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules/statserv/main.c	2003-11-18 21:40:00 +0900
@@ -666,6 +666,9 @@
     unregister_callback(module, cb_help);
     unregister_callback(module, cb_command);
 
+    unregister_commands(module, cmds);
+    del_commandlist(module);
+
     return 1;
 }
 
diff -uNr ircservices-5.0.24/modules.c ircservices-5.0.25/modules.c
--- ircservices-5.0.24/modules.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules.c	2003-11-18 21:39:58 +0900
@@ -110,7 +110,30 @@
     return 1;
 }
 
-void modules_exit(void)
+/*************************************************************************/
+
+void modules_cleanup(void)
+{
+    int i;
+
+    unload_all_modules();
+    unregister_callback(NULL, cb_reconfigure);
+    unregister_callback(NULL, cb_unload_module);
+    unregister_callback(NULL, cb_load_module);
+    ARRAY_FOREACH(i, coremodule.callbacks) {
+	if (coremodule.callbacks[i].name) {
+	    log("modules: Core forgot to unregister callback `%s'",
+		coremodule.callbacks[i].name);
+	    free(coremodule.callbacks[i].name);
+	    free(coremodule.callbacks[i].funcs);
+	}
+    }
+    free(coremodule.callbacks);
+}
+
+/*************************************************************************/
+
+void unload_all_modules(void)
 {
     Module *mod, *mod2;
 
@@ -435,6 +458,7 @@
     exit_module = get_module_symbol(module, "exit_module");
     if (exit_module && !exit_module(module))
 	return 0;
+    LIST_REMOVE(module, modulelist);
     call_callback_1(NULL, cb_unload_module, module);
     deconfigure(module->modconfig);
     LIST_FOREACH (tmp, modulelist) {
@@ -447,7 +471,15 @@
 	    }
 	}
     }
-    LIST_REMOVE(module, modulelist);
+    ARRAY_FOREACH(i, module->callbacks) {
+	if (module->callbacks[i].name) {
+	    log("modules: Module `%s' forgot to unregister callback `%s'",
+		module->name, module->callbacks[i].name);
+	    free(module->callbacks[i].name);
+	    free(module->callbacks[i].funcs);
+	}
+    }
+    free(module->callbacks);
     free((char *)module->name);
     free((char *)module->path);
     my_dlclose(module->dllhandle);
diff -uNr ircservices-5.0.24/modules.h ircservices-5.0.25/modules.h
--- ircservices-5.0.24/modules.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/modules.h	2003-11-18 21:39:58 +0900
@@ -46,7 +46,8 @@
 /* Initialization and cleanup: */
 
 extern int modules_init(int ac, char **av);
-extern void modules_exit(void);
+extern void modules_cleanup(void);
+extern void unload_all_modules(void);
 
 /*************************************************************************/
 
diff -uNr ircservices-5.0.24/process.c ircservices-5.0.25/process.c
--- ircservices-5.0.24/process.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/process.c	2003-11-18 21:39:58 +0900
@@ -26,23 +26,24 @@
  *             RFC.  Destroys the buffer by side effect.
  */
 
+static char **sbargv = NULL;
+
 int split_buf(char *buf, char ***argv_ptr, int colon_special)
 {
     static int argvsize = 8;
-    static char **argv = NULL;
     int argc;
     char *s;
 
-    if (!argv)
-	argv = smalloc(sizeof(char *) * argvsize);
+    if (!sbargv)
+	sbargv = smalloc(sizeof(char *) * argvsize);
     argc = 0;
     while (*buf) {
 	if (argc == argvsize) {
 	    argvsize += 8;
-	    argv = srealloc(argv, sizeof(char *) * argvsize);
+	    sbargv = srealloc(sbargv, sizeof(char *) * argvsize);
 	}
 	if (*buf == ':' && colon_special) {
-	    argv[argc++] = buf+1;
+	    sbargv[argc++] = buf+1;
 	    *buf = 0;
 	} else {
 	    s = strpbrk(buf, " ");
@@ -53,11 +54,11 @@
 	    } else {
 		s = buf + strlen(buf);
 	    }
-	    argv[argc++] = buf;
+	    sbargv[argc++] = buf;
 	    buf = s;
 	}
     }
-    *argv_ptr = argv;
+    *argv_ptr = sbargv;
     return argc;
 }
 
@@ -76,6 +77,15 @@
 
 /*************************************************************************/
 
+void process_cleanup(void)
+{
+    unregister_callback(NULL, cb_recvmsg);
+    free(sbargv);
+    sbargv = NULL;
+}
+
+/*************************************************************************/
+
 /* process:  Main processing routine.  Takes the string in inbuf (global
  *           variable) and does something appropriate with it. */
 
diff -uNr ircservices-5.0.24/send.c ircservices-5.0.25/send.c
--- ircservices-5.0.24/send.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/send.c	2003-11-18 21:39:58 +0900
@@ -111,10 +111,21 @@
 }
 
 /*************************************************************************/
+
+/* Cleanup. */
+
+void send_cleanup(void)
+{
+    remove_callback(NULL, "load module", do_load_module);
+}
+
+/*************************************************************************/
 /*************************************************************************/
 
 /* Send a command to the server.  The two forms here are like
- * printf()/vprintf() and friends. */
+ * printf()/vprintf() and friends.  If not connected to a remote server,
+ * these functions do nothing.
+ */
 
 void send_cmd(const char *source, const char *fmt, ...)
 {
@@ -129,6 +140,8 @@
 {
     char buf[BUFSIZE];
 
+    if (!servsock)
+	return;
     vsnprintf(buf, sizeof(buf), fmt, args);
     if (source) {
 	if (sock_isconn(servsock))
diff -uNr ircservices-5.0.24/servers.c ircservices-5.0.25/servers.c
--- ircservices-5.0.24/servers.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/servers.c	2003-11-18 21:39:58 +0900
@@ -45,6 +45,7 @@
     return server;
 }
 
+
 /* Remove and free a Server structure. */
 
 static void delete_server(Server *server)
@@ -56,6 +57,55 @@
 }
 
 /*************************************************************************/
+
+/* Remove the given server.  This takes care of recursively removing child
+ * servers, handling NOQUIT, calling the server delete callback, and
+ * actually deleting the server data.
+ */
+
+static void recursive_squit(Server *parent, const char *reason);
+
+static void squit_server(Server *server, const char *reason)
+{
+    User *user, *nextuser;
+
+    recursive_squit(server, reason);
+    if (protocol_features & PF_NOQUIT) {
+#define next snext
+#define prev sprev
+	LIST_FOREACH_SAFE (user, server->userlist, nextuser)
+	    quit_user(user, reason, 0);
+#undef next
+#undef prev
+    }
+    if (!server->fake)
+	call_callback_2(NULL, cb_delete, server, reason);
+    delete_server(server);
+}
+
+
+/* "SQUIT" all servers who are linked to us via the specified server by
+ * deleting them from the server list. The parent server is not deleted,
+ * so this must be done by the calling function.
+ */
+
+static void recursive_squit(Server *parent, const char *reason)
+{
+    Server *server, *nextserver;
+
+    server = parent->child;
+    if (debug >= 2)
+	log("debug: recursive_squit, parent: %s", parent->name);
+    while (server) {
+	nextserver = server->sibling;
+	if (debug >= 2)
+	    log("debug: recursive_squit, child: %s", server->name);
+	squit_server(server, reason);
+	server = nextserver;
+    }
+}
+
+/*************************************************************************/
 /**************************** External Functions *************************/
 /*************************************************************************/
 
@@ -115,54 +165,6 @@
 
 /*************************************************************************/
 
-/* Remove the given server.  This takes care of recursively removing child
- * servers, handling NOQUIT, calling the server delete callback, and
- * actually deleting the server data.
- */
-
-static void recursive_squit(Server *parent, const char *reason);
-
-static void squit_server(Server *server, const char *reason)
-{
-    User *user, *nextuser;
-
-    recursive_squit(server, reason);
-    if (protocol_features & PF_NOQUIT) {
-#define next snext
-#define prev sprev
-	LIST_FOREACH_SAFE (user, server->userlist, nextuser)
-	    quit_user(user, reason, 0);
-#undef next
-#undef prev
-    }
-    if (!server->fake)
-	call_callback_2(NULL, cb_delete, server, reason);
-    delete_server(server);
-}
-
-/*************************************************************************/
-
-/* "SQUIT" all servers who are linked to us via the specified server by
- * deleting them from the server list. The parent server is not deleted,
- * so this must be done by the calling function.
- */
-
-static void recursive_squit(Server *parent, const char *reason)
-{
-    Server *server, *nextserver;
-
-    server = parent->child;
-    if (debug >= 2)
-	log("debug: recursive_squit, parent: %s", parent->name);
-    while (server) {
-	nextserver = server->sibling;
-	if (debug >= 2)
-	    log("debug: recursive_squit, child: %s", server->name);
-	squit_server(server, reason);
-	server = nextserver;
-    }
-}
-
 /* Handle a server SQUIT command.
  * 	av[0] = server's name
  * 	av[1] = quit message
@@ -222,6 +224,22 @@
 
 /*************************************************************************/
 
+/* Remove all servers; this recursively takes out all users and channels,
+ * as well.
+ */
+
+void server_cleanup(void)
+{
+    uint32 pf = protocol_features;
+    protocol_features |= PF_NOQUIT;
+    squit_server(root_server, "server_cleanup");
+    protocol_features = pf;
+    unregister_callback(NULL, cb_delete);
+    unregister_callback(NULL, cb_create);
+}
+
+/*************************************************************************/
+
 /* Return information on memory use. Assumes pointers are valid. */
 
 void get_server_stats(long *nservers, long *memuse)
diff -uNr ircservices-5.0.24/signals.c ircservices-5.0.25/signals.c
--- ircservices-5.0.24/signals.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/signals.c	2003-11-18 21:39:58 +0900
@@ -47,7 +47,7 @@
     signal(SIGTERM, SIG_IGN);
     signal(SIGHUP, SIG_IGN);
     log("Received SIGTERM, exiting.");
-    quitmsg = (char *)"Shutting down on SIGTERM";
+    strscpy(quitmsg, "Shutting down on SIGTERM", sizeof(quitmsg));
     siglongjmp(*panic_ptr, 1);
 }
 
@@ -109,14 +109,16 @@
     }
 
     /* Pick an appropriate quit message */
-    if (signum == SIGUSR1 || !(quitmsg = malloc(BUFSIZE))) {
-	quitmsg = (char *)"Out of memory!";
+    if (signum == SIGUSR1) {
+	strscpy(quitmsg, "Out of memory!", sizeof(quitmsg));
 	quitting = 1;
     } else {
 #if HAVE_STRSIGNAL
-	snprintf(quitmsg, BUFSIZE, "Services terminating: %s", strsignal(signum));
+	snprintf(quitmsg, sizeof(quitmsg),
+		 "Services terminating: %s", strsignal(signum));
 #else
-	snprintf(quitmsg, BUFSIZE, "Services terminating on signal %d", signum);
+	snprintf(quitmsg, sizeof(quitmsg),
+		 "Services terminating on signal %d", signum);
 #endif
 	quitting = 1;
     }
diff -uNr ircservices-5.0.24/sockets.c ircservices-5.0.25/sockets.c
--- ircservices-5.0.24/sockets.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/sockets.c	2003-11-18 21:39:58 +0900
@@ -67,15 +67,15 @@
 /* Array of all opened sockets, dynamically allocated */
 static Socket **sockets = NULL;
 
+/* Highest FD number in use plus 1; also length of sockets[] array */
+static int max_fd;
+
 /* Set of all connected socket FDs */
 static fd_set sock_fds;
 
 /* Set of all FDs that need data written (or are connecting) */
 static fd_set write_fds;
 
-/* Highest FD number in use plus 1; also length of sockets[] array */
-static int max_fd;
-
 /* Total memory used by socket buffers */
 static uint32 total_bufsize;
 
@@ -94,6 +94,7 @@
 static int reclaim_buffer_space(void);
 static int buffered_write(Socket *s, const char *buf, int len);
 static int do_disconn(Socket *s, void *code);
+static void sock_closefd(Socket *s);
 
 /*************************************************************************/
 /*************************** Global routines *****************************/
@@ -143,6 +144,11 @@
 
 void sock_free(Socket *s)
 {
+    if (!s) {
+	log("sockets: sock_free() with NULL socket!");
+	errno = EINVAL;
+	return;
+    }
     if (s->flags & (SF_CONNECTING | SF_CONNECTED)) {
 	s->flags |= SF_DELETEME;
 	do_disconn(s, DISCONN_LOCAL);
@@ -164,6 +170,11 @@
 
 void sock_setcb(Socket *s, int which, SocketCallback func)
 {
+    if (!s) {
+	log("sockets: sock_setcb() with NULL socket!");
+	errno = EINVAL;
+	return;
+    }
     switch (which) {
       case SCB_CONNECT:		s->cb_connect  = func; break;
       case SCB_DISCONNECT:	s->cb_disconn  = func; break;
@@ -184,6 +195,11 @@
 
 int sock_isconn(const Socket *s)
 {
+    if (!s) {
+	log("sockets: sock_isconn() with NULL socket!");
+	errno = EINVAL;
+	return 0;
+    }
     return s->flags & (SF_CONNECTING|SF_CONNECTED) ? 1 : 0;
 }
 
@@ -199,6 +215,10 @@
 int sock_remote(const Socket *s, struct sockaddr *sa, int *lenptr)
 {
     if (!s || !sa || !lenptr || !(s->flags & SF_CONNECTED)) {
+	if (!s || !sa || !lenptr) {
+	    log("sockets: sock_remote() with NULL %s!",
+		!s ? "socket" : !sa ? "sockaddr" : "lenptr");
+	}
 	errno = EINVAL;
 	return -1;
     }
@@ -247,7 +267,7 @@
 
 /*************************************************************************/
 
-/* Return amount of data in read buffer. */
+/* Return amount of data in read buffer.  Assumes socket is valid. */
 
 inline uint32 read_buffer_len(const Socket *s)
 {
@@ -260,7 +280,7 @@
 
 /*************************************************************************/
 
-/* Return amount of data in write buffer. */
+/* Return amount of data in write buffer.  Assumes socket is valid. */
 
 inline uint32 write_buffer_len(const Socket *s)
 {
@@ -279,6 +299,11 @@
 
 void sock_rwstat(const Socket *s, uint32 *readkb_ret, uint32 *writekb_ret)
 {
+    if (!s) {
+	log("sockets: sock_rwstat() with NULL socket!");
+	errno = EINVAL;
+	return;
+    }
     if (readkb_ret)
 	*readkb_ret = s->total_read;
     if (writekb_ret)
@@ -648,7 +673,11 @@
 
 int disconn(Socket *s)
 {
-    /* do_disconn() does paranoia check for us */
+    if (!s) {
+	log("sockets: disconn() with NULL socket!");
+	errno = EINVAL;
+	return -1;
+    }
     return do_disconn(s, DISCONN_LOCAL);
 }
 
@@ -782,10 +811,7 @@
 	errno = EINVAL;
 	return -1;
     }
-    close(s->fd);
-    FD_CLR(s->fd, &sock_fds);
-    sockets[s->fd] = NULL;
-    s->fd = -1;
+    sock_closefd(s);
     s->flags &= ~SF_LISTENER;
     return 0;
 }
@@ -858,7 +884,7 @@
 /*************************************************************************/
 
 /* Read a character from a socket, like fgetc().  Returns EOF if no data
- * is available in the socket buffer.
+ * is available in the socket buffer.  Assumes the socket is valid.
  */
 
 int sgetc(Socket *s)
@@ -1409,11 +1435,7 @@
 	s->cb_disconn(s, code);
     }
     shutdown(s->fd, 2);
-    close(s->fd);
-    FD_CLR(s->fd, &sock_fds);
-    FD_CLR(s->fd, &write_fds);
-    sockets[s->fd] = NULL;
-    s->fd = -1;
+    sock_closefd(s);
     s->flags &= ~(SF_CONNECTING | SF_CONNECTED | SF_DISCONN_CB);
     if (s->flags & (SF_SELFCREATED | SF_DELETEME)) {
 	if (s->flags & SF_CALLBACK)
@@ -1427,3 +1449,27 @@
 }
 
 /*************************************************************************/
+
+/* Close a socket's file descriptor, and clear it from all associated
+ * structures (s->fd, sockets[], sock_fds, write_fds).
+ */
+
+static void sock_closefd(Socket *s)
+{
+    int i;
+
+    close(s->fd);
+    FD_CLR(s->fd, &sock_fds);
+    FD_CLR(s->fd, &write_fds);
+    sockets[s->fd] = NULL;
+    s->fd = -1;
+    i = max_fd;
+    while (i > 0 && !sockets[i-1])
+	i--;
+    if (i < max_fd) {
+	sockets = srealloc(sockets, sizeof(*sockets) * i);
+	max_fd = i;
+    }
+}
+
+/*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-cygnus.c ircservices-5.0.25/tools/convert-cygnus.c
--- ircservices-5.0.24/tools/convert-cygnus.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-cygnus.c	2003-11-18 21:39:58 +0900
@@ -1444,8 +1444,6 @@
     if (verbose)
 	fprintf(stderr, "Loading rootserv.db...\n");
     cyg_load_root(sourcedir);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-db.c ircservices-5.0.25/tools/convert-db.c
--- ircservices-5.0.24/tools/convert-db.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-db.c	2003-11-18 21:39:58 +0900
@@ -32,6 +32,7 @@
 /* NULL-terminated list of supported database types. */
 
 static DBTypeInfo *dbtypes[] = {
+    &dbtype_anope,
     &dbtype_auspice,
     &dbtype_bolivia,
     &dbtype_cygnus,
@@ -591,14 +592,22 @@
     /* Actually load the databases.  If an error occurs, load() will abort the
      * program for us */
     load(sourcedir, verbose, newac, newav);
+    if (verbose)
+	fprintf(stderr, "Data files successfully loaded.\n");
 
     /* Do sanity checks. */
+    if (verbose)
+	fprintf(stderr, "Checking data integrity...\n");
     sanity_checks();
 
     /* Write the database to standard output in XML format */
+    if (verbose)
+	fprintf(stderr, "Writing converted data...\n");
     xml_export((xml_writefunc_t)fprintf, stdout);
 
     /* Success */
+    if (verbose)
+	fprintf(stderr, "Done.\n");
     return 0;
 }
 
diff -uNr ircservices-5.0.24/tools/convert-db.h ircservices-5.0.25/tools/convert-db.h
--- ircservices-5.0.24/tools/convert-db.h	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-db.h	2003-11-18 21:39:58 +0900
@@ -15,6 +15,7 @@
 /* Common includes. */
 
 #include "services.h"
+#include "language.h"
 #include "encrypt.h"
 #include "modules/database/fileutil.h"
 #include "modules/nickserv/nickserv.h"
@@ -47,6 +48,7 @@
 } DBTypeInfo;
 
 extern DBTypeInfo
+    dbtype_anope,
     dbtype_auspice,
     dbtype_bolivia,
     dbtype_cygnus,
diff -uNr ircservices-5.0.24/tools/convert-epona.c ircservices-5.0.25/tools/convert-epona.c
--- ircservices-5.0.24/tools/convert-epona.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-epona.c	2003-11-18 21:39:58 +0900
@@ -73,11 +73,25 @@
 		ngi->flags |= NF_KILL_QUICK;
 	    if (tmp32 & 0x00000800)
 		ngi->flags |= NF_KILL_IMMED;
-	    if (tmp32 & 0x00002000)		/* NI_SERVICES_ADMIN */
+	    if (tmp32 & 0x0000A000)		/* NI_SERVICES_{ADMIN,ROOT} */
 		ngi->os_priv = NP_SERVADMIN;
 	    else if (tmp32 & 0x00001000)	/* NI_SERVICES_OPER */
 		ngi->os_priv = NP_SERVOPER;
-	    SAFE(read_int16(&ngi->language, f));
+	    SAFE(read_int16(&tmp16, f));
+	    switch (tmp16) {
+		case  0: ngi->language = LANG_EN_US;   break;
+		case  2: ngi->language = LANG_JA_EUC;  break;
+		case  3: ngi->language = LANG_JA_SJIS; break;
+		case  4: ngi->language = LANG_ES;      break;
+		case  5: ngi->language = LANG_PT;      break;
+		case  6: ngi->language = LANG_FR;      break;
+		case  7: ngi->language = LANG_TR;      break;
+		case  8: ngi->language = LANG_IT;      break;
+		case  9: ngi->language = LANG_DE;      break;
+		case 10: /* Catalan */                 break;
+		case 11: /* Greek */                   break;
+		case 12: ngi->language = LANG_NL;      break;
+	    }
 	    SAFE(read_int16(&ngi->access_count, f));
 	    if (ngi->access_count) {
 		char **access;
@@ -297,6 +311,15 @@
 		ci->flags |= CI_MEMO_HARDMAX;
 	    if (tmp32 & 0x00000800)
 		ci->flags |= CI_OPNOTICE;
+	    if (tmp32 & 0x00010000) {
+		ci->suspendinfo = smalloc(sizeof(*ci->suspendinfo));
+		strscpy(ci->suspendinfo->who, "<unknown>",
+			sizeof(ci->suspendinfo->who));
+		ci->suspendinfo->reason =
+		    "Unknown, imported from Anope Services";
+		ci->suspendinfo->suspended = time(NULL);
+		ci->suspendinfo->expires = 0;
+	    }
 	    SAFE(read_string(&s, f));		/* forbidby */
 	    SAFE(read_string(&s, f));		/* forbidreason */
 	    SAFE(read_int16(&tmp16, f));	/* bantype */
@@ -641,8 +664,6 @@
     if (verbose)
 	fprintf(stderr, "Loading news.db...\n");
     epona_load_news(sourcedir);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
@@ -654,4 +675,11 @@
     load_epona
 };
 
+
+DBTypeInfo dbtype_anope = {
+    "anope",
+    check_epona,
+    load_epona
+};
+
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-magick.c ircservices-5.0.25/tools/convert-magick.c
--- ircservices-5.0.24/tools/convert-magick.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-magick.c	2003-11-18 21:39:58 +0900
@@ -611,8 +611,6 @@
     if (verbose)
 	fprintf(stderr, "Loading message.db...\n");
     m14_load_message(sourcedir, 5);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
@@ -666,8 +664,6 @@
     if (verbose)
 	fprintf(stderr, "Loading message.db...\n");
     m14_load_message(sourcedir, 6);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-ptlink.c ircservices-5.0.25/tools/convert-ptlink.c
--- ircservices-5.0.24/tools/convert-ptlink.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-ptlink.c	2003-11-18 21:39:58 +0900
@@ -1,4 +1,4 @@
-/* Conversion routines for PTlink 2.18.x databases.
+/* Conversion routines for PTlink >= 2.13.x databases.
  *
  * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
@@ -8,7 +8,6 @@
  */
 
 #include "convert-db.h"
-#include "language.h"
 
 #if NICKMAX < 32
 # error NICKMAX too small (must be >=32)
@@ -31,7 +30,7 @@
     char filename[PATH_MAX+1];
     dbFILE *f;
     int i, j, c;
-    int16 tmp16;
+    int16 tmp16, ver;
     int32 tmp32, total, count;
     NickInfo *ni;
     NickGroupInfo *ngi;
@@ -42,8 +41,8 @@
     if (!(f = open_db(filename, "r", 0)))
 	return;
     SAFE(read_int8(&ch, f));
-    SAFE(read_int16(&tmp16, f));
-    if (ch != -1 || tmp16 != 6) {
+    SAFE(read_int16(&ver, f));
+    if (ch != -1 || ver < 6 || ver > 10) {
 	fprintf(stderr, "Wrong version number on %s\n", filename);
 	exit(1);
     }
@@ -51,13 +50,25 @@
     SAFE(read_int32(&total, f));
     count = 0;
     for (i = 0; i < 256; i++) {
-	while ((c = getc_db(f)) == 1) {
-	    char nickbuf[32], passbuf[32];
+	while (ver>=10 ? 1 : (c = getc_db(f)) == 1) {
+	    char nickbuf[32], passbuf[32], authbuf[16];
+	    if (ver >= 9) {
+		int res = read_int32(&tmp32, f);  /* suid */
+		if (res < 0) {
+		    if (ver >= 10)  /* v10: no more int8 markers */
+			break;
+		    else
+			SAFE(res);
+		}
+	    }
 	    SAFE(read_buffer(nickbuf, f));
 	    ni = makenick(nickbuf, &ngi);
 	    SAFE(read_buffer(passbuf, f));
 	    memcpy(ngi->pass, passbuf, sizeof(passbuf));
+	    if (ver >= 7)
+		SAFE(read_buffer(authbuf, f));
 	    SAFE(read_string(&ngi->url, f));
+	    SAFE(read_string(&s, f));  /* temporary, unauthed E-mail */
 	    SAFE(read_string(&ngi->email, f));
 	    SAFE(read_string(&s, f));  /* icq_number */
 	    SAFE(read_string(&s, f));  /* location */
@@ -73,6 +84,7 @@
 	    SAFE(read_int32(&tmp32, f));  /* last_identify */
 	    SAFE(read_int32(&tmp32, f));
 	    ni->last_seen = tmp32;
+	    SAFE(read_int32(&tmp32, f));  /* last_email_request */
 	    SAFE(read_int32(&tmp32, f));  /* birth_date */
 	    SAFE(read_int16(&tmp16, f));  /* status */
 	    if (tmp16 & 0x0002) {
@@ -179,16 +191,16 @@
 		SAFE(read_int16(&tmp16, f));  /* channelmax */
 		SAFE(read_int16(&tmp16, f));
 		switch (tmp16) {
-		  case 0:  ngi->language = LANG_EN_US;   break;
-		  case 1:  ngi->language = LANG_PT;      break;
-		  case 2:  ngi->language = LANG_TR;      break;
-		  case 3:  ngi->language = LANG_DE;      break;
-		  case 4:  ngi->language = LANG_IT;      break;
+		    case 0:  ngi->language = LANG_EN_US;   break;
+		    case 1:  ngi->language = LANG_PT;      break;
+		    case 2:  ngi->language = LANG_TR;      break;
+		    case 3:  ngi->language = LANG_DE;      break;
+		    case 4:  ngi->language = LANG_IT;      break;
 		}
 	    }
 	    count++;
 	} /* while (getc_db(f) == 1) */
-	if (c != 0) {
+	if (ver < 10 && c != 0) {
 	    fprintf(stderr, "%s is corrupt, aborting.\n", f->filename);
 	    exit(1);
 	}
@@ -274,20 +286,23 @@
     ChannelInfo *ci;
     NickInfo *ni;
     signed char ch;
-    int16 tmp16, mlock_on, mlock_off;
-    int32 tmp32;
+    int16 tmp16, ver;
+    int32 tmp32, mlock_on, mlock_off;
     char *on, *off;
 
     snprintf(filename, sizeof(filename), "%s/chan.db", sourcedir);
     if (!(f = open_db(filename, "r", 0)))
 	return;
     SAFE(read_int8(&ch, f));
-    SAFE(read_int16(&tmp16, f));
-    if (ch != -1 || tmp16 != 7) {
+    SAFE(read_int16(&ver, f));
+    if (ch != -1 || ver < 7 || ver > 9) {
 	fprintf(stderr, "Wrong version number on %s\n", filename);
 	exit(1);
     }
 
+    if (ver >= 9)
+	SAFE(read_int32(&tmp32, f));  /* some DayStats thing */
+
     for (i = 0; i < 256; i++) {
 	char *s;
 
@@ -425,8 +440,15 @@
 		}
 	    }
 
-	    SAFE(read_int16(&mlock_on, f));
-	    SAFE(read_int16(&mlock_off, f));
+	    if (ver < 8) {
+		SAFE(read_int16(&tmp16, f));
+		mlock_on = (int32)tmp16 & 0xFFFF;
+		SAFE(read_int16(&tmp16, f));
+		mlock_off = (int32)tmp16 & 0xFFFF;
+	    } else {
+		SAFE(read_int32(&mlock_on, f));
+		SAFE(read_int32(&mlock_off, f));
+	    }
 	    ci->mlock_on = on = scalloc(64, 1);
 	    ci->mlock_off = off = scalloc(64, 1);
 	    for (j = 0; ptlink_cmodes[j].flag != 0; j++) {
@@ -618,8 +640,6 @@
     if (verbose)
 	fprintf(stderr, "Loading news.db...\n");
     ptlink_load_news(sourcedir);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-sirv.c ircservices-5.0.25/tools/convert-sirv.c
--- ircservices-5.0.24/tools/convert-sirv.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-sirv.c	2003-11-18 21:39:59 +0900
@@ -1063,8 +1063,6 @@
     if (verbose)
 	fprintf(stderr, "Loading trigger.db...\n");
     sirv_load_trigger(sourcedir, TYPE_AUSPICE);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
@@ -1110,8 +1108,6 @@
     if (verbose)
 	fprintf(stderr, "Loading zline.db...\n");
     bolivia_load_zline(sourcedir);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
@@ -1172,8 +1168,6 @@
     if (verbose)
 	fprintf(stderr, "Loading trigger.db...\n");
     sirv_load_trigger(sourcedir, TYPE_SIRV);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-trircd.c ircservices-5.0.25/tools/convert-trircd.c
--- ircservices-5.0.24/tools/convert-trircd.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-trircd.c	2003-11-18 21:39:59 +0900
@@ -814,8 +814,6 @@
     if (verbose)
 	fprintf(stderr, "Loading szline.db...\n");
     trircd_load_sline(sourcedir, 'z');
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/tools/convert-ver8.c ircservices-5.0.25/tools/convert-ver8.c
--- ircservices-5.0.24/tools/convert-ver8.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/tools/convert-ver8.c	2003-11-18 21:39:59 +0900
@@ -136,7 +136,17 @@
 		}
 		SAFE(read_int16(&tmp16, f));  /* channelcount */
 		SAFE(read_int16(&tmp16, f));  /* channelmax */
-		SAFE(read_int16(&ngi->language, f));
+		SAFE(read_int16(&tmp16, f));
+		switch (tmp16) {
+		    case  0: ngi->language = LANG_EN_US;   break;
+		    case  2: ngi->language = LANG_JA_EUC;  break;
+		    case  3: ngi->language = LANG_JA_SJIS; break;
+		    case  4: ngi->language = LANG_ES;      break;
+		    case  5: ngi->language = LANG_PT;      break;
+		    case  6: ngi->language = LANG_FR;      break;
+		    case  7: ngi->language = LANG_TR;      break;
+		    case  8: ngi->language = LANG_IT;      break;
+		}
 	    }
 	} /* while (getc_db(f) == 1) */
 	if (c != 0) {
@@ -645,8 +655,6 @@
     if (verbose)
 	fprintf(stderr, "Loading news.db...\n");
     ver8_load_news(sourcedir, TYPE_DAYLIGHT);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
@@ -681,8 +689,6 @@
     if (verbose)
 	fprintf(stderr, "Loading gline.db...\n");
     ircs_load_gline(sourcedir);
-    if (verbose)
-	fprintf(stderr, "Data files successfully loaded.\n");
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.24/users.c ircservices-5.0.25/users.c
--- ircservices-5.0.24/users.c	2003-11-11 16:09:43 +0900
+++ ircservices-5.0.25/users.c	2003-11-18 21:39:58 +0900
@@ -61,6 +61,25 @@
 }
 
 /*************************************************************************/
+
+void user_cleanup(void)
+{
+    User *u;
+
+    for (u = first_user(); u; u = next_user())
+	del_user(u);
+    unregister_callback(NULL, cb_chan_kick);
+    unregister_callback(NULL, cb_chan_part);
+    unregister_callback(NULL, cb_mode);
+    unregister_callback(NULL, cb_delete);
+    unregister_callback(NULL, cb_nickchange2);
+    unregister_callback(NULL, cb_nickchange1);
+    unregister_callback(NULL, cb_servicestamp_change);
+    unregister_callback(NULL, cb_create);
+    unregister_callback(NULL, cb_check);
+}
+
+/*************************************************************************/
 /************************* User list management **************************/
 /*************************************************************************/
 
diff -uNr ircservices-5.0.24/version.sh ircservices-5.0.25/version.sh
--- ircservices-5.0.24/version.sh	2003-11-11 16:06:26 +0900
+++ ircservices-5.0.25/version.sh	2003-11-18 21:32:54 +0900
@@ -6,7 +6,7 @@
 # $PROGRAM is the string returned as the first part of a /VERSION reply,
 # and must not contain spaces.  It is not used anywhere else.
 PROGRAM=ircservices
-VERSION=5.0.24
+VERSION=5.0.25
 
 # Increment Services build number
 if [ -f version.c ] ; then