diff -uNr ircservices-5.0.6/Changes ircservices-5.0.7/Changes
--- ircservices-5.0.6/Changes	2002-11-25 13:38:36.000000000 +0900
+++ ircservices-5.0.7/Changes	2003-01-30 23:51:52.000000000 +0900
@@ -1,5 +1,34 @@
 Version 5.0
 -----------
+2002/01/30 .7	Fixed crash when opening a corrupt StatServ database.
+		    Reported by Rob van Eijk <rob4@home.nl>
+2002/01/30	Added robustness in clearing mode +r from users after
+		    nickname changes.
+2002/01/30	Users now properly get mode +r upon successful AUTH after
+		    registering a nick.  Reported by <RealCFC@chatfirst.com>
+2003/01/23	SZlines are now properly added on startup when using
+		    Unreal.  Reported by Aragon Gouveia <aragon@phat.za.net>
+2003/01/23	Save database changes if the uplink server disconnects us.
+		    Reported by Aragon Gouveia <aragon@phat.za.net>
+2003/01/22	OperServ KILLCLONES no longer adds a new autokill if an
+		    existing autokill matches the clones' user@host mask.
+		    Reported by Alexander Janssens <alex@cyga.net>
+2003/01/07	Experimental PTlink IRC server support added.
+2003/01/06	Fixed bug causing -remote command-line option to not be
+		    recognized.
+2003/01/06	Fixed Unreal support (Unreal does not support dynamic
+		    autokill exceptions).  Reported by <ron885@bloodheart.com>
+2003/01/06	The wallops warning for repeated bad passwords on a channel
+		    now includes the nickname of the user who sent the last
+		    bad password.  Suggested by <cyberdems@wwirc.za.org>
+2003/01/02	Incorporated fixes for Chunky Monkey IRCD support from
+		    Chris Plant <chris@monkeyircd.org>
+2003/01/01	Fixed bug causing "AKILL has expired" messages to be sent
+		    multiple times.  Reported by <prince@zirc.org>
+2002/12/13	Clarified that "transfer rights" in section 6-3 of the
+		    manual refers only to rights under copyright law.
+2002/12/03	Added documentation on mail modules to section 3 of the
+		    manual.  Reported by Neal Kirby <Nealster02@hotmail.com>
 2002/11/25 .6	Fixed bug causing ChanServ commands to stop working on some
 		    channels.  Reported by <MrBOFH@lomag.net> and others.
 2002/11/23	Added documentation on how to compile modules into Services
@@ -302,7 +331,7 @@
 		    variables are set up correctly.
 2002/05/09	Improved dynamic module usability check in configure script
 		    to handle OpenBSD correctly.  Suggested by Chris Plant
-		    (chris@monkeyircd.org)
+		    <chris@monkeyircd.org>
 2002/05/08	Changed init.c to avoid a compilation warning under GCC 3.
 		    Reported by Craig McLure <frostycoolslug@hotmail.com>
 2002/05/07	StatServ SERVERS DELETE and other root-only commands now
diff -uNr ircservices-5.0.6/KnownBugs ircservices-5.0.7/KnownBugs
--- ircservices-5.0.6/KnownBugs	2002-10-31 13:18:15.000000000 +0900
+++ ircservices-5.0.7/KnownBugs	2003-01-07 15:45:56.000000000 +0900
@@ -1,6 +1,16 @@
 Known bugs:
 -----------
 
+Services appears to incorrectly detect "mode bouncing" (i.e. the IRC server
+reversing Services' mode changes) in some cases.  When this occurs,
+commands like KICK and TOPIC as well as auto-ops and mode locking will no
+longer work on that channel.  If this problem occurs, appropriate messages
+will be written to the log file; the problem can be worked around by either
+clearing the channel (removing all users from the channel) or restarting
+Services.  Adding the "NoBouncyModes" directive in ircservices.conf will
+prevent this problem from occurring, but will cause mode floods if you have
+an incorrectly configured server on your network.
+
 When kicking users from forbidden channels (or other cases when a user
 tries to join an empty channel and is kicked), Services will generate log
 messages about "MODE +b for unknown channel".  These are harmless and can
@@ -20,14 +30,6 @@
 it as annoying.  Services attempts to detect and correct this, but it may
 still occur in some cases.
 
-Services appears to incorrectly detect "mode bouncing" (i.e. the IRC server
-reversing Services' mode changes) in some cases.  When this occurs,
-commands like KICK and TOPIC as well as auto-ops and mode locking will no
-longer work on that channel.  If this problem occurs, appropriate messages
-will be written to the log file; the problem can be worked around by either
-clearing the channel (removing all users from the channel) or restarting
-Services.
-
 When setting NickServ options for other users as a Services admin, NickServ
 will incorrectly respond with "Your <option name> has been changed" or the
 like.  (The target nickname's settings are correctly modified, while your
diff -uNr ircservices-5.0.6/Makefile ircservices-5.0.7/Makefile
--- ircservices-5.0.6/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for Services.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/TODO ircservices-5.0.7/TODO
--- ircservices-5.0.6/TODO	2002-11-21 00:41:27.000000000 +0900
+++ ircservices-5.0.7/TODO	2003-01-23 16:31:01.000000000 +0900
@@ -1,5 +1,7 @@
 Things to probably do:
 
+CS	Clearer message when CLEAR used with bad "what" parameter
+	    [Craig McLure <Craig@chatspike.net>]
 **	Allow switching encryption methods for databases (i.e. none->MD5)
 	    [Rayford Pomeroy <rayfordp@mhonline.net>]
 OS	Allow multiple parameters for KILLCLONES
@@ -40,6 +42,14 @@
 
 Things to think about:
 
+CS	VERBOSE option: like OPNOTICE but for everything (ACCESS etc.)
+	    [Martin <martin@e-tech.us>]
+MS	Remove discrepancy between nick and channel memo handling with
+		non-SECURE nicks (can't read the former without IDENTIFY,
+		but can read the latter)?
+	    [<pteryx@adelphia.net>]
+**	Allow limiting usable languages (e.g. only allow EN/PT)
+	    [Mauritz Antunes <mauritz@brasnet.org>]
 NS	Use highest access level of all identified nicks for user's acclev
 	    [Alexander Janssens <alex@cyga.net>]
 CS	Option to kill/autokill users who join a forbidden channel
@@ -112,5 +122,12 @@
 
 Things NOT to do:
 
-CS	Channel/conffile setting to make ChanServ join channels
-	    This has been discussed many, many times; see the FAQ (Z.6).
+CS	Channel/conffile setting to make ChanServ join channels ("BotServ")
+	    This has been discussed many, many times, and will not be
+	    reconsidered; see question Z.6 in the FAQ.
+NS/CS	Allow SENDPASS without mail authorization (FAQ D.3)
+NS	Allow DROP or SET EMAIL if registered with a wrong E-mail address
+	    This would allow users to send mailbombs using Services.  If a
+	    wrong address is given in a REGISTER or SET EMAIL command, a
+	    Services administrator will need to manually intervene and
+	    either reset the address or drop the nick.
diff -uNr ircservices-5.0.6/actions.c ircservices-5.0.7/actions.c
--- ircservices-5.0.6/actions.c	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/actions.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Various routines to perform simple actions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -269,13 +269,15 @@
 void set_cmode(const char *sender, Channel *channel, ...)
 {
     va_list args;
-    const char *modes;
+    const char *modes, *modes_orig;
     struct modedata *md;
     int which = -1, add;
     int i;
     char c, *s;
 
 
+    /* If `sender' is NULL, flush out pending modes for the channel (for
+     * all channels if `channel' is also NULL) and return. */
     if (!sender) {
 	for (i = 0; i < MERGE_CHANMODES_MAX; i++) {
 	    if (modedata[i].used && (!channel || modedata[i].channel==channel))
@@ -284,8 +286,14 @@
 	return;
     }
 
+    /* Get the mode string from the argument list; save the original value
+     * for error messages. */
     va_start(args, channel);
-    modes = va_arg(args, const char *);
+    modes = modes_orig = va_arg(args, const char *);
+
+    /* See if we already have pending modes for the channel; if so, reuse
+     * that entry (if the entry is for a different sender, flush out the
+     * pending modes first).
     for (i = 0; i < MERGE_CHANMODES_MAX; i++) {
 	if (modedata[i].used != 0 && modedata[i].channel == channel) {
 	    if (irc_stricmp(modedata[i].sender, sender) != 0)
@@ -294,6 +302,8 @@
 	    break;
 	}
     }
+    /* If there are no pending modes for the channel, look for an empty
+     * slot in the array. */
     if (which < 0) {
 	for (i = 0; i < MERGE_CHANMODES_MAX; i++) {
 	    if (modedata[i].used == 0) {
@@ -302,6 +312,8 @@
 	    }
 	}
     }
+    /* If no slots are free, we'll have to purge one.  Find the oldest,
+     * send its modes out, then clear and reuse it. */
     if (which < 0) {
 	int oldest = 0;
 	time_t oldest_time = modedata[0].used;
@@ -314,24 +326,38 @@
 	flush_cmode(&modedata[oldest]);
 	which = oldest;
     }
+
+    /* Save a pointer to the entry, then set up sender and channel. */
     md = &modedata[which];
     strscpy(md->sender, sender, NICKMAX);
     md->channel = channel;
 
-    add = -1;
+    /* Loop through and process all modes in the mode string. */
+    add = -2;  /* -2 means we haven't warned about a missing leading +/- yet */
     while ((c = *modes++) != 0) {
 	int32 flag;
 	int params, is_chanuser;
 
+	/* + and - are handled specially. */
 	if (c == '+') {
 	    add = 1;
 	    continue;
 	} else if (c == '-') {
 	    add = 0;
 	    continue;
-	} else if (add < 0) {
+	}
+	/* If we see any other character without first seeing a + or -,
+	 * note a bug in the logfile and move along. */
+	if (add < 0) {
+	    if (add == -2) {
+		log("set_cmode(): BUG: mode string `%s' needs leading +/-",
+		    modes_orig);
+		add = -1;
+	    }
 	    continue;
 	}
+
+	/* Find the flag value and parameter count for the character. */
 	is_chanuser = 0;
 	flag = mode_char_to_flag(c, MODE_CHANNEL);
 	params = mode_char_to_params(c, MODE_CHANNEL);
@@ -344,6 +370,7 @@
 		continue;
 	    }
 	}
+
 	if (params) {  /* Mode with parameters */
 	    char parambuf[BUFSIZE];  /* for putting the parameters in */
 	    int i, len = 0;
diff -uNr ircservices-5.0.6/channels.c ircservices-5.0.7/channels.c
--- ircservices-5.0.6/channels.c	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/channels.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Channel-handling routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/channels.h ircservices-5.0.7/channels.h
--- ircservices-5.0.6/channels.h	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/channels.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Online channel data structure.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/commands.c ircservices-5.0.7/commands.c
--- ircservices-5.0.6/commands.c	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/commands.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines for looking up commands in a *Serv command list.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/commands.h ircservices-5.0.7/commands.h
--- ircservices-5.0.6/commands.h	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/commands.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/compat.c ircservices-5.0.7/compat.c
--- ircservices-5.0.6/compat.c	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/compat.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Compatibility routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/conffile.c ircservices-5.0.7/conffile.c
--- ircservices-5.0.6/conffile.c	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/conffile.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Configuration file handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/conffile.h ircservices-5.0.7/conffile.h
--- ircservices-5.0.6/conffile.h	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/conffile.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,7 +1,7 @@
 /* Structures, constants, and external declarations for configuration file
  * handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/configure ircservices-5.0.7/configure
--- ircservices-5.0.6/configure	2002-11-21 11:10:24.000000000 +0900
+++ ircservices-5.0.7/configure	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -389,6 +389,10 @@
 
   *** Controlling installation ***
 
+  Note that the script will not create any directories specified with these
+  options; if the directorires do not exist when "make install" is executed,
+  the installation will fail.
+
         -bindest DIR         Specify directory for program file installation
         -datdest DIR         Specify directory for data file installation
         -prefix DIR          Specify GNU-style installation prefix (program
@@ -786,7 +790,7 @@
 See question B.1 in the FAQ for details.
 
 EOT
-	    log 'kgcc not found, aborting'
+	    log 'gcc3/kgcc not found, aborting'
 	    exit 1
 	fi
     else
diff -uNr ircservices-5.0.6/data/Makefile ircservices-5.0.7/data/Makefile
--- ircservices-5.0.6/data/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/data/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for data directory.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/data/example-ircservices.conf ircservices-5.0.7/data/example-ircservices.conf
--- ircservices-5.0.6/data/example-ircservices.conf	2002-11-27 01:33:40.000000000 +0900
+++ ircservices-5.0.7/data/example-ircservices.conf	2003-01-31 00:14:12.000000000 +0900
@@ -483,12 +483,15 @@
 #         protocol/bahamut      DALnet Bahamut server, versions 1.4.25+
 #         protocol/dalnet       DALnet server, version 4.4.13 and earlier
 #         protocol/dreamforge   DALnet Dreamforge server (version 4.4.15+)
-#         protocol/monkey       Chunky Monkey IRCD 1.0 and later
+#         protocol/monkey       Chunky Monkey IRCD, version 1.0 and later
+#      [*]protocol/ptlink       PTlink IRC server, version 6.0 and later
 #         protocol/rfc1459      RFC1459-compliant servers
 #         protocol/trircd       Trircd server, version 4.0 and later
 #         protocol/ts8              RFC1459 with TS8 extensions
 #         protocol/undernet-p9  Undernet server, version 2.9.x only
-#         protocol/unreal       Unreal server, version 3.1.x
+#         protocol/unreal       Unreal server, version 3.1.0 and later
+#     Modules marked with [*] are still in an experimental stage and may
+#     not be stable.
 
 #LoadModule protocol/(insert protocol name here)
 
diff -uNr ircservices-5.0.6/data/example-modules.conf ircservices-5.0.7/data/example-modules.conf
--- ircservices-5.0.6/data/example-modules.conf	2002-11-27 01:33:40.000000000 +0900
+++ ircservices-5.0.7/data/example-modules.conf	2003-01-31 00:14:12.000000000 +0900
@@ -14,8 +14,8 @@
 Module protocol/(insert protocol name here)
 
     # NetworkDomain domain  [RECOMMENDED]
-    #     Protocols: bahamut, dalnet, dreamforge, monkey, rfc1459, trircd,
-    #                ts8, undernet-p9
+    #     Protocols: bahamut, dalnet, dreamforge, monkey, ptlink, rfc1459,
+    #                trircd, ts8, undernet-p9
     #
     #     Specifies the common domain, if any, shared by all servers on
     #     your IRC network; this is required for global notices to function
diff -uNr ircservices-5.0.6/defs.h ircservices-5.0.7/defs.h
--- ircservices-5.0.6/defs.h	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/defs.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Basic constants, macros and prototypes.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/docs/2.html ircservices-5.0.7/docs/2.html
--- ircservices-5.0.6/docs/2.html	2002-09-29 21:29:10.000000000 +0900
+++ ircservices-5.0.7/docs/2.html	2003-01-16 12:22:07.000000000 +0900
@@ -80,7 +80,8 @@
 <table border=1>
 <tr><th>IRC server (IRCD) name<th>Services module
 <tr><td><a href="http://bahamut.dal.net/">Bahamut</a>
-	<font size=-1>[<tt>bahamut.dal.net</tt>]</font> 1.4.25 and above
+	<font size=-1>[<tt>bahamut.dal.net</tt>]</font> 1.4.25 through 1.4.33
+	<br><b>Note:</b> versions 1.4.34 and above are <i>not</i> supported.
     <td align=center><tt>bahamut</tt>
 <tr><td>Chunky Monkey IRCD 1.0 and above
     <td align=center><tt>monkey</tt>
@@ -152,8 +153,8 @@
 <ul><li><tt>-ignore-cache</tt> (ignore the results of any previous
 	configuration)
     <li><tt>-prefix <i>pathname</i></tt> (set default installation location)
-    <li><tt>-no-dir-check</tt> (skip check for presence of installation
-	directories)
+	<br><i>(Note: installation directories are not automatically created
+	when this option is used)</i>
     <li><tt>-use-static-modules</tt> (compile using statically-linked
 	modules, even if dynamic linking is available)
 </ul>
@@ -297,7 +298,8 @@
 <tr><td><tt>modules.conf</tt>
     <td><tt>ListenTo <i>address</i>:<i>port</i></tt>
     <td><tt>httpd/main</tt> module:  Sets the ports which the Services HTTP
-	server will listen to.  See the documentation for details.
+	server will listen to.  See <a href="3.html#6">section 3-6</a> for
+	details.
 </table>
 <br><b>Table 2-2.</b>  Commonly used configuration directives
 </div>
diff -uNr ircservices-5.0.6/docs/3.html ircservices-5.0.7/docs/3.html
--- ircservices-5.0.6/docs/3.html	2002-09-29 21:37:27.000000000 +0900
+++ ircservices-5.0.7/docs/3.html	2002-12-03 13:48:18.000000000 +0900
@@ -38,6 +38,7 @@
 <br>&nbsp;&nbsp;&nbsp;&nbsp;3-6-2. <a href="#6-2">Authorization modules</a>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;3-6-3. <a href="#6-3">Content modules</a>
 <br>3-7. <a href="#7">Password encryption</a>
+<br>3-8. <a href="#8">E-mail sending</a>
 
 <p align=right><font size=-1><a href=index.html>Table of Contents</a></font>
 
@@ -285,6 +286,8 @@
 registered nickname, the owner must send the code back to Services first,
 thus verifying that the E-mail address the owner provided is in fact valid.
 This functionality is provided by the <tt>nickserv/mail-auth</tt> module.
+Note that this module requires a mail module (<a href="#8">section 3-8</a>)
+to be loaded in order to function.
 
 <p>When this module is in use, registration of a nickname proceeds as
 follows:</p>
@@ -452,6 +455,8 @@
 	load if E-mail authorization (<a href="#1-3">section 3-1-3</a>) is
 	not in use, to prevent users from sending mail to arbitrary
 	addresses.
+     <p>Note that this module requires a mail module (<a href="#8">section
+	3-8</a>) to be loaded in order to function.
 </ul>
 
 <p align=right><font size="-1"><a href="#top">Back to top</a></font>
@@ -1124,7 +1129,9 @@
 their nicknames, and will convert each memo to the user into an E-mail
 message sent to the E-mail address registered with the nickname.  (To
 prevent spamming, this module requires that nickname E-mail authorization
-be active; see <a href="#1-3">section 3-1-3</a> for details.)
+be active; see <a href="#1-3">section 3-1-3</a> for details.)  Note that
+this module requires a mail module (<a href="#8">section 3-8</a>) to be
+loaded in order to function.
 
 <p>When this module is loaded, users can use the
 <a href="4.html#memo.set_forward"><tt>SET FORWARD</tt></a> command to
@@ -1995,6 +2002,78 @@
 <!------------------------------------------------------------------------>
 <p><hr>
 
+<a name=8></a>
+<h3>E-mail sending</h3>
+
+<p>Services has the ability to send E-mail to users outside of the IRC
+protocol.  This ability is used, for example, by the NickServ E-mail
+authorization (<a href="#1-3">section 3-1-3</a>) and <tt>SENDPASS</tt>
+(<a href="#1-5">section 3-1-5</a>) modules.  E-mail functionality is split
+into two parts: a main module, which provides an interface for other
+modules to use, and method modules, which actually implement the E-mail
+functions at the system level.
+
+<p>The main module, <tt>mail/main</tt>, provides a method-independent
+interface for sending mail, and this module is used by other modules which
+need to send mail.  (If you do not load this module, then other modules
+which depend on it may print errors such as "<tt>unable to resolve symbol
+`sendmail'</tt>" and cause Services to abort.  Remember that order of
+module loading is important--you must load this module before any that use
+it!)
+
+<p>The main mail module has two configuration settings in
+<tt>modules.conf</tt>,
+<a href="a.html#mail/main.FromAddress"><tt>FromAddress</tt></a> and
+<a href="a.html#mail/main.FromName"><tt>FromName</tt></a>, which indicate
+the E-mail address and name to be used in the "From" line of E-mail
+messages.
+
+<p>The method modules provide the interface between the main module and the
+operating system.  Currently, two method modules are available:
+
+<p><ul><li><b><tt>mail/sendmail</tt></b>:  Uses the Sendmail program found
+on many Unix systems to send e-mail.  The module may also work with other
+mail software that provides a <tt>sendmail</tt> executable program. 
+However, this method is subject to delays by the <tt>sendmail</tt> program,
+during which Services will not be able to respond to any messages; some
+<tt>sendmail</tt> programs also do not let you set the "From" address to
+anything but your real address and name, which may not be desirable in some
+cases.  Thus, it is recommended that the <tt>mail/smtp</tt> module (below)
+be used when possible.
+
+<p>The configuration setting
+<a href="a.html#mail/sendmail.SendmailPath"><tt>SendmailPath</tt></a> (in
+<tt>modules.conf</tt>) should be set to the pathname of your
+<tt>sendmail</tt> program.  Typical locations are <tt>/usr/lib/sendmail</tt>
+or <tt>/usr/sbin/sendmail</tt>; if you do not know the proper setting for
+your system, ask your system administrator.
+
+<p><li><b><tt>mail/smtp</tt></b>:  Uses the SMTP protocol to send E-mail
+through an SMTP relay server.  The server to use is specified by the
+<a href="a.html#mail/smtp.RelayHost"><tt>RelayHost</tt></a> configuration
+directive (in <tt>modules.conf</tt>); if possible, this should be set to
+either the same machine Services is running on or another server on the
+same local network, to reduce delays in sending mail.  (Services does not
+perform actual delivery of mail; that is left to the relay server.)  The
+server name to use when connecting to the remote server is set by the
+<a href="a.html#mail/smtp.SMTPName"><tt>SMTPName</tt></a> directive; this
+should usually be the same as the hostname of the machine on which
+Services runs.
+
+<p>To avoid potential denial-of-service ("DoS") attacks, Services limits
+the number of simultaneous SMTP connections to the value given for
+<a href="a.html#mail/smtp.MaxSockets"><tt>MaxSockets</tt></a>.  The default
+value of 100 should be more than enough for most networks, but if you see a
+lot of "insufficient resources" messages when trying to send mail, try
+increasing this value.
+
+</ul>
+
+<p align=right><font size="-1"><a href="#top">Back to top</a></font>
+
+<!------------------------------------------------------------------------>
+<p><hr>
+
 <p align=right><font size=-1><a href=index.html>Table of Contents</a> |
 <a href=2.html>Previous section: Installing and using Services</a> |
 <a href="#top">Top</a> |
diff -uNr ircservices-5.0.6/docs/4.html ircservices-5.0.7/docs/4.html
--- ircservices-5.0.6/docs/4.html	2002-09-29 21:39:55.000000000 +0900
+++ ircservices-5.0.7/docs/4.html	2003-01-06 09:15:12.000000000 +0900
@@ -1348,8 +1348,8 @@
 <p>
 Enables or disables the <b>op-notice</b> option for a channel.
 When <b>op-notice</b> is set, ChanServ will send a notice to the
-channel whenever the <a href="#chan.op"><b>OP</b></a> or <a href="#chan.deop"><b>DEOP</b></a> commands are used for a user
-in the channel.
+channel whenever the <a href="#chan.op"><b>OP</b></a>, <a href="#chan.voice"><b>VOICE</b></a>, or related commands are used
+for a user in the channel.
 
 <p>
 <hr align=center width="50%">
diff -uNr ircservices-5.0.6/docs/6.html ircservices-5.0.7/docs/6.html
--- ircservices-5.0.6/docs/6.html	2002-11-24 15:29:27.000000000 +0900
+++ ircservices-5.0.7/docs/6.html	2003-01-23 14:06:24.000000000 +0900
@@ -630,7 +630,7 @@
 (as determined by <tt>valid_email()</tt>).  The function should return 0 on
 success, -1 on failure.
 
-<a name=-1-6></a>
+<a name=1-6></a>
 <h4>6-1-6. Compilation and installation</h4>
 
 <p>In order to compile and install a new module, you should do the
@@ -797,6 +797,15 @@
 	error processing the option, or 3 if no error occurred but Services
 	should terminate successfully.
 
+<p><dt><a name="2-1-connect"></a>
+<tt><b>connect</b></tt>
+<br>Parameters: none
+    <dd>Called when a connection to the remote server is established.
+	Modules that want to send data to the remote server on startup
+	should use this callback; attempting to send data to the server
+	before the connection is established will cause the data to be
+	lost.  The callback routine should always return 0.
+
 <p><dt><a name="2-1-expire"></a>
 <tt><b>expire</b></tt>
 <br>Parameters: none
@@ -1487,15 +1496,17 @@
 <a name=3></a>
 <h3>6-3. Submitting additions or changes to Services</h3>
 
-<p>If you would like to submit a module you have written for inclusion in
-the standard Services distribution, or you have made a modification to
-Services itself (or a standard module) that you feel would be useful to
-others and would like it included in Services, please observe the following
-guidelines:
+<p>As a rule, suggestions for improvement are generally preferred to
+submissions of source code, for reasons discussed in
+<a href="faq.html#Z8">FAQ Z.8</a>.  However, if you would like to submit a
+module you have written for inclusion in the standard Services
+distribution, or you have made a modification to Services itself (or a
+standard module) that you feel would be useful to others and would like it
+included in Services, please observe the following guidelines:
 
 <p><ul>
 <li>Your code <i>must</i> follow the <a href="#4">coding guidelines</a>
-	given below.
+	given below (section 6-4).
 <li>Your code should be reasonably well error-checked and robust.  For
 	example, the return value of any function call which can return an
 	error should be checked, and appropriate action taken if an error
@@ -1519,13 +1530,13 @@
 <p>Furthermore, any submissions of modules, code, documentation, or any
 other information (collectively "information") become the sole property of
 the <a href=7.html>author of IRC Services</a>, and by submitting such
-information, you agree to transfer any and all rights you may have in said
-information to said author.  If you do not agree to the above, or you are
-not permitted (by law, contract, or otherwise) to transfer all of your
-rights in the information to the author(s) of IRC Services, then you may
-not submit the information.  (If you cannot comply with this paragraph but
-would still like to submit something, please contact the author to discuss
-your situation.)
+information, you agree to transfer any and all rights under copyright law
+you may have in said information to said author.  If you do not agree to
+the above, or you are not permitted (by law, contract, or otherwise) to
+transfer all of your rights in the information to the author(s) of IRC
+Services, then you may not submit the information.  (If you cannot comply
+with this paragraph but would still like to submit something, please
+contact the author to discuss your situation.)
 
 <p align=right><font size="-1"><a href="#top">Back to top</a></font>
 
@@ -1608,11 +1619,13 @@
 	line containing the opening brace.  Examples:
 	<br><blockquote>
 	    <tt>if (flag) {
+	    <br>&nbsp;&nbsp;&nbsp;&nbsp;/* indented code goes here */
 	    <br>&nbsp;&nbsp;&nbsp;&nbsp;</tt>. . .<tt>
 	    <br>}</tt>
 	<br>
 	<br><tt>int function(int param1, char *param2)
 	    <br>{
+	    <br>&nbsp;&nbsp;&nbsp;&nbsp;/* indented code goes here */
 	    <br>&nbsp;&nbsp;&nbsp;&nbsp;</tt>. . .<tt>
 	    <br>}</tt>
 	</blockquote>
@@ -1773,8 +1786,8 @@
 	names, names should generally consist of one or more full words.
 	For local variables, short names and abbreviations are permitted
 	as long as it is clear what the variables are used for.  In
-	general, one-character local variable names should not be used
-	other than the following:
+	general, one-letter local variable names should not be used other
+	than the following:
 	<ul>
 	<li><tt>c</tt>: character
 	<li><tt>f</tt>: file pointer (<tt>FILE *</tt>)
diff -uNr ircservices-5.0.6/docs/a.html ircservices-5.0.7/docs/a.html
--- ircservices-5.0.6/docs/a.html	2002-10-17 23:15:27.000000000 +0900
+++ ircservices-5.0.7/docs/a.html	2003-01-07 17:12:27.000000000 +0900
@@ -586,8 +586,8 @@
 <a name="protocol/(insert_protocol_name_here).NetworkDomain"></a>
 <p><ul><li>
 <tt><b>NetworkDomain</b> domain</tt>&nbsp;&nbsp;&nbsp;&nbsp;[RECOMMENDED]
-<p>Protocols: bahamut, dalnet, dreamforge, monkey, rfc1459, trircd,
-           ts8, undernet-p9
+<p>Protocols: bahamut, dalnet, dreamforge, monkey, ptlink, rfc1459,
+           trircd, ts8, undernet-p9
 
 <p>Specifies the common domain, if any, shared by all servers on
 your IRC network; this is required for global notices to function
diff -uNr ircservices-5.0.6/docs/faq.html ircservices-5.0.7/docs/faq.html
--- ircservices-5.0.6/docs/faq.html	2002-10-22 14:51:39.000000000 +0900
+++ ircservices-5.0.7/docs/faq.html	2003-01-23 18:03:31.000000000 +0900
@@ -75,25 +75,35 @@
 	<tt>PRIVMSG</tt> (<tt>/msg</tt>) instead of <tt>NOTICE</tt>?</a>
 <br><a href="#C8">C.8. Can I make ChanServ send channel modes all at once
 	instead of one at a time?</a>
+<br><a href="#C9">C.9. I sometimes get errors in the log file about "user
+	record not found", "non-existent nick", or "unknown channel".  What
+	are these?</a>
 
 <h3>D. NickServ features</h3>
 <a href="#D1">D.1. Some people get nick collided when their nickname is
 	changed to <tt>Guest###</tt>.</a>
-<a href="#D2">D.2. Trying to use <tt>REGISTER</tt> or <tt>SET EMAIL</tt>
+<br><a href="#D2">D.2. Trying to use <tt>REGISTER</tt> or <tt>SET EMAIL</tt>
 	resulted in an "address is unauthorized" message, but the user
 	hasn't registered any nicknames before.</a>
+<br><a href="#D3">D.3. Why can't I use the <tt>SENDPASS</tt> module
+	(<tt>nickserv/sendpass</tt>) without the mail-authorization module
+	(<tt>nickserv/mail-auth</tt>)?</a>
 
 <h3>E. ChanServ features</h3>
-<a href="#E1">E.1. Services ignored the <tt>SET SUCCESSOR</tt> setting and
+<a href="#E1">E.1. How do I make ChanServ join/stay in a channel?</a>
+<br><a href="#E2">E.2. Services ignored the <tt>SET SUCCESSOR</tt> setting and
 	deleted a channel when the founder expired.</a>
-<br><a href="#E2">E.2. When ChanServ sets the topic for a channel, it always
+<br><a href="#E3">E.3. When ChanServ sets the topic for a channel, it always
 	appends "<tt>(<i>nickname</i>)</tt>" to the end.  How do I make it
 	not do that?</a>
-<br><a href="#E3">E.3. The <tt>ACCESS</tt> command is confusing to some
+<br><a href="#E4">E.4. The <tt>ACCESS</tt> command is confusing to some
 	users.  Can you add a channel option to select between the
 	<tt>ACCESS</tt> and <tt>XOP</tt> commands?</a>
-<br><a href="#E4">E.4. Why can't you force users to register E-mail
+<br><a href="#E5">E.5. Why can't you force users to register E-mail
 	addresses with channels like you can with nicknames?</a>
+<br><a href="#E6">E.6. If I use <tt>SET MLOCK</tt> on a channel to set a
+	key, then anyone who enters the channel when empty can see it!  How
+	do I avoid this?</a>
 
 <h3>F. OperServ features</h3>
 <a href="#F1">F.1. Using the OperServ <tt>JUPE</tt> command results in server
@@ -115,7 +125,7 @@
 	then Services stopped working!</a>
 <br><a href="#F8">F.8. On Unreal, every time I use the <tt>/gline</tt>
 	command, Services cancels the G:line.</a>
-<br><a hreF="#F9">F.9. Services doesn't add <tt>AKILL</tt>s/G:lines for
+<br><a href="#F9">F.9. Services doesn't add <tt>AKILL</tt>s/G:lines for
 	users matching autokill masks.</a>
 
 <h3>Z. Bug reporting and feature requests</h3>
@@ -471,6 +481,25 @@
 	configuration file.)
 </dl>
 
+<a name=C9></a>
+<p><dl><dt><b>C.9. I sometimes get errors in the log file about "user
+	record not found", "non-existent nick", or "unknown channel".  What
+	are these?</b>
+<dd><p>
+	These messages can appear when Services disconnects a user from the
+	network or removes (kicks) a user from a channel, and are the
+	result of time lag inherent in all networked systems.  For example,
+	if an autokilled user connects to the network and immediately sends
+	a <tt>/join</tt> command to join a channel, the user's server may
+	receive the <tt>/join</tt> before it receives the disconnection
+	message from Services.  Services will then receive the <tt>/join</tt>
+	for what it thinks is a user who no longer exists, and reports that
+	in the log.
+	<p>
+	These messages do not indicate a bug or other problem, and can be
+	safely ignored.
+</b>
+
 <!------------------------------------------------------------------------>
 <p><hr>
 
@@ -514,6 +543,38 @@
 	have the problem address associated with them.
 </dl>
 
+<a name=D3></a>
+<p><dl><dt><b>D.3. Why can't I use the <tt>SENDPASS</tt> module
+	(<tt>nickserv/sendpass</tt>) without the mail-authorization module
+	(<tt>nickserv/mail-auth</tt>)?</b>
+<dd>
+	Because allowing users to send mail (using <tt>SENDPASS</tt>)
+	without first confirming that the address is actually valid can
+	allow malicious users to send spam via Services.  Consider the
+	following example:
+	<p>
+	<ul>
+	<li>Attacker connects to the IRC network with a random
+	    nickname.
+	<li>Attacker registers the nickname with victim's E-mail
+	    address.
+	<li>Attacker sends a <tt>SENDPASS</tt> command for the nick,
+	    causing an E-mail message to be sent to the victim.
+	<li>Attacker drops the nick (to avoid the <tt>SENDPASS</tt>
+	    delay check).
+	<li>Attacker disconnects from the IRC network (to avoid the
+	    <tt>REGISTER</tt> delay check).
+	</ul>
+	<p>
+	This would allow the attacker to flood the victim's mailbox with
+	potentially dozens of messages a second.  Even if an IRC operator
+	noticed the unusual activity quickly and autokilled the attacker,
+	the victim could still be left with hundreds or thousands of junk
+	messages.  It is to avoid this potential situation that the
+	<tt>SENDPASS</tt> module has been designed not to function unless
+	the mail-authorization module is loaded.
+</dl>
+
 <!------------------------------------------------------------------------>
 <p><hr>
 
@@ -521,7 +582,15 @@
 <h3 align=center>E. ChanServ features:</h3>
 
 <a name=E1></a>
-<p><dl><dt><b>E.1. Services ignored the <tt>SET SUCCESSOR</tt> setting and
+<p><dl><dt><b>E.1. How do I make ChanServ join/stay in a channel?</b>
+<dd><p>
+	You don't.  Use a bot instead.  (See questions
+	<a href="#Z5">Z.5</a> and <a href="#Z6">Z.6</a> for detailed
+	discussion of why Services does not have this functionality.)
+</dl>
+
+<a name=E2></a>
+<p><dl><dt><b>E.2. Services ignored the <tt>SET SUCCESSOR</tt> setting and
 	deleted a channel when the founder expired.</b>
 <dd><p>
 	Normally, this is because the successor had too many channels
@@ -538,8 +607,8 @@
 	using the bug-reporting procedure below (<a href="#Z3">question
 	Z.3</a>).
 </dl>
-<a name=E2></a>
-<p><dl><dt><b>E.2. When ChanServ sets the topic for a channel, it always
+<a name=E3></a>
+<p><dl><dt><b>E.3. When ChanServ sets the topic for a channel, it always
 	appends "<tt>(<i>nickname</i>)</tt>" to the end.  How do I make it
 	not do that?</b>
 <dd><p>
@@ -550,8 +619,8 @@
 	There is no way to disable it for the first user, unless you modify
 	the IRC server itself.
 </dl>
-<a name=E3></a>
-<p><dl><dt><b>E.3. The <tt>ACCESS</tt> command is confusing to some
+<a name=E4></a>
+<p><dl><dt><b>E.4. The <tt>ACCESS</tt> command is confusing to some
 	users.  Can you add a channel option to select between the
 	<tt>ACCESS</tt> and <tt>XOP</tt> commands?</b>
 <dd><p>
@@ -562,8 +631,8 @@
 	<tt>ircservices.conf</tt>, but this will prevent even users who
 	understand the <tt>ACCESS</tt> command from using it.)
 </dl>
-<a name=E4></a>
-<p><dl><dt><b>E.4. Why can't you force users to register E-mail
+<a name=E5></a>
+<p><dl><dt><b>E.5. Why can't you force users to register E-mail
 	addresses with channels like you can with nicknames?</b>
 <dd><p>
 	Such functionality is unneeded, because ChanServ requires users to
@@ -574,6 +643,16 @@
 	channel.
 </dl>
 
+<a name=E6></a>
+<p><dl><dt><b>E.6. If I use <tt>SET MLOCK</tt> on a channel to set a
+	key, then anyone who enters the channel when empty can see it!  How
+	do I avoid this?</b>
+<dd><p>
+	Set the <tt>RESTRICTED</tt> option for the channel, as described in
+	<a href="4.html#chan.set_mlock">the help for <tt>SET MLOCK</tt></a>,
+	or use a bot to keep the channel open.
+</dl>
+
 <!------------------------------------------------------------------------>
 <p><hr>
 
@@ -761,9 +840,13 @@
 	First, check the <a href="1.html#3">Services home page</a> and make
 	sure you have the most recent version of Services; if not, upgrade
 	to the most recent version before reporting your bug, because it
-	may have already been fixed.
+	may have already been fixed.  Also check the setup of your IRC
+	network and Services; for example, make certain you have the proper
+	IRC protocol module loaded.  The Services log file
+	(<tt>ircservices.log</tt> by default) may contain information that
+	will help you locate the problem.
 	<p>
-	If you already have the most recent version, or upgrading does not
+	If you already have the most recent version or upgrading does not
 	fix the problem, contact the <a href="1.html#4">mailing list</a>
 	and report it.  Make certain you include as many details as
 	possible, even things which seem obvious to you--because they may
diff -uNr ircservices-5.0.6/encrypt.c ircservices-5.0.7/encrypt.c
--- ircservices-5.0.6/encrypt.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/encrypt.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for high-level encryption routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/encrypt.h ircservices-5.0.7/encrypt.h
--- ircservices-5.0.6/encrypt.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/encrypt.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for high-level encryption routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/extern.h ircservices-5.0.7/extern.h
--- ircservices-5.0.6/extern.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/extern.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Prototypes and external variable declarations.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -178,6 +178,7 @@
 E int    save_data;
 E time_t start_time;
 E int    openlog_failed, openlog_errno;
+E int    cb_connect;
 E int    cb_expire;
 E int    cb_save_data;
 
diff -uNr ircservices-5.0.6/hash.h ircservices-5.0.7/hash.h
--- ircservices-5.0.6/hash.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/hash.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Declarations for hash tables.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/ignore.c ircservices-5.0.7/ignore.c
--- ircservices-5.0.6/ignore.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/ignore.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Ignore handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/ignore.h ircservices-5.0.7/ignore.h
--- ircservices-5.0.6/ignore.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/ignore.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Structures and declarations for ignore code.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/init.c ircservices-5.0.7/init.c
--- ircservices-5.0.6/init.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/init.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Initalization and related routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -537,7 +537,7 @@
     int i;
     char *s, *t;
 
-    if (!call_modules)
+    if (!call_modules)  /* only initialize it once */
 	debug = 0;
 
     for (i = 1; i < ac; i++) {
@@ -552,7 +552,7 @@
 		    }
 		    services_dir = s+4;
 		}
-	    } else if (strcmp(s, "remote") == 0 && (!s[6] || s[6] == '=')) {
+	    } else if (strncmp(s, "remote", 6) == 0 && (!s[6] || s[6]=='=')) {
 		if (!call_modules) {
 		    if (!s[6]) {
 			fprintf(stderr, "-remote requires hostname[:port]\n");
@@ -575,7 +575,7 @@
 			fprintf(stderr, "Out of memory\n");
 			exit(-1);
 		    }
-		    if (t)
+		    if (t)  /* put the colon back for next time around */
 			*t = ':';
 		}
 	    } else if (strncmp(s, "log", 3) == 0 && (!s[3] || s[3] == '=')) {
@@ -793,12 +793,13 @@
     srand(time(NULL) ^ getppid() ^ getpid()<<16);
 
     /* Register our (and main.c's) callbacks. */
-    cb_cmdline = register_callback(NULL, "command line");
+    cb_cmdline   = register_callback(NULL, "command line");
     cb_introduce_user = register_callback(NULL, "introduce_user");
-    cb_expire = register_callback(NULL, "expire");
+    cb_connect   = register_callback(NULL, "connect");
+    cb_expire    = register_callback(NULL, "expire");
     cb_save_data = register_callback(NULL, "save data");
-    if (cb_cmdline < 0 || cb_introduce_user < 0 || cb_expire < 0
-     || cb_save_data < 0) {
+    if (cb_cmdline < 0 || cb_introduce_user < 0 || cb_connect < 0
+     || cb_expire < 0 || cb_save_data < 0) {
 	log("init(): Unable to register callbacks");
 	return -1;
     }
diff -uNr ircservices-5.0.6/lang/de.l ircservices-5.0.7/lang/de.l
--- ircservices-5.0.6/lang/de.l	2002-11-26 01:18:26.000000000 +0900
+++ ircservices-5.0.7/lang/de.l	2003-01-22 23:36:41.000000000 +0900
@@ -1,6 +1,6 @@
 # Emacs: -*- mode: fundamental; coding: binary; -*-
 
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -3467,9 +3467,10 @@
 CHAN_HELP_SET_OPNOTICE
 	Syntax: SET Raum OPNOTICE {ON | OFF}
 	
-	Aktiviert/deaktiviert die OP-Notice-Option. Wenn aktiv, wird
-	%S immer eine Notice zum Raum schicken, wenn die Befehle OP und
-	DEOP benutzt werden.
+	Schaltet die op-notice Funktion für einen Raum ein oder aus.
+	Wenn op-notice eingeschaltet ist, schickt %S eine Notiz in
+	den Raum sobald die Befehle OP, VOICE, oder ähnliche
+	Befehele auf einen Chatnamen in dem Raum angewandt werden.
 
 CHAN_HELP_SET_ENFORCE
 	Syntax: SET Raum ENFORCE {ON | OFF}
diff -uNr ircservices-5.0.6/lang/en_us.l ircservices-5.0.7/lang/en_us.l
--- ircservices-5.0.6/lang/en_us.l	2002-11-21 10:56:06.000000000 +0900
+++ ircservices-5.0.7/lang/en_us.l	2003-01-22 23:45:12.000000000 +0900
@@ -2,7 +2,7 @@
 
 # United States English language file.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -3530,8 +3530,8 @@
 	
 	Enables or disables the op-notice option for a channel.
 	When op-notice is set, %S will send a notice to the
-	channel whenever the OP or DEOP commands are used for a user
-	in the channel.
+	channel whenever the OP, VOICE, or related commands are used
+	for a user in the channel.
 
 CHAN_HELP_SET_ENFORCE
 	Syntax: SET channel ENFORCE {ON | OFF}
@@ -4959,4 +4959,4 @@
 # version of the master (English) language file was used to create a
 # translated file.
 
-# CVS: $Revision: 2.185 $
+# CVS: $Revision: 2.187 $
diff -uNr ircservices-5.0.6/lang/es.l ircservices-5.0.7/lang/es.l
--- ircservices-5.0.6/lang/es.l	2002-11-21 20:07:11.000000000 +0900
+++ ircservices-5.0.7/lang/es.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Spanish language file.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -3537,9 +3537,10 @@
 	Sintaxis: SET Canal OPNOTICE {ON | OFF}
 	
 	Habilita o deshabilita la opción Nota de OPs para un canal.
-	Cuando OPNOTICE es activada (ON), %S enviará una nota al
-	canal siempre que los comandos OP o DEOP sean usados por
-	un usuario en el canal.
+	Cuando OPNOTICE es activada (ON), %S enviará una nota
+	al canal siempre que los comandos OP, VOICE, o cualquier
+	otro comando relacionado a estos sea utilizado para un usuario
+	en el canal.
 
 CHAN_HELP_SET_ENFORCE
 	Sintaxis: SET Canal ENFORCE {ON | OFF}
diff -uNr ircservices-5.0.6/lang/fr.l ircservices-5.0.7/lang/fr.l
--- ircservices-5.0.6/lang/fr.l	2002-10-20 22:12:58.000000000 +0900
+++ ircservices-5.0.7/lang/fr.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # French language file.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -495,6 +495,8 @@
 	Le masque %s est déjà présent dans votre liste d'accès.
 NICK_ACCESS_REACHED_LIMIT
 	Désolé, vous pouvez avoir seulement %d entrées d'accès pour un surnom.
+NICK_ACCESS_NO_NICKS
+	Attention: Les masques d'accès des surnoms ne peuvent pas inclure de surnoms.  >S.V.P. vérifiez et assurez-vous que vous avez entré le masque usager@hôte correctement.
 NICK_ACCESS_ADDED
 	%s a été ajouté à votre liste d'accès.
 NICK_ACCESS_NOT_FOUND
diff -uNr ircservices-5.0.6/lang/hu.l ircservices-5.0.7/lang/hu.l
--- ircservices-5.0.6/lang/hu.l	2002-11-24 14:22:14.000000000 +0900
+++ ircservices-5.0.7/lang/hu.l	2003-01-22 23:36:41.000000000 +0900
@@ -1,6 +1,6 @@
 # Emacs: -*- mode: fundamental; coding: binary; -*-
 
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -3470,9 +3470,11 @@
 CHAN_HELP_SET_OPNOTICE
 	Syntax: SET csatorna OPNOTICE {ON | OFF}
 	
-	Be/kikapcsolja az op-notice opciót a csatornánl.
-	Amikor az op-notice be van kapcsolva, a %S notice-t küld
-	a csatornára amikor az OP vagy DEOP parancsot használja valaki.
+	Be/kikapcsolja az op-notice opciót a csatornán.
+	Amikor az op-notice be van kapcsolva, a %S megjegyzest
+	fog kuldeni a csatornara, amikor a felhasznalok hasznaljak
+	az OP, VOICE, vagy a hozzajuk kapcsolodo parancsokat a
+	csatornan.
 
 CHAN_HELP_SET_ENFORCE
 	Syntax: SET csatorna ENFORCE {ON | OFF}
diff -uNr ircservices-5.0.6/lang/it.l ircservices-5.0.7/lang/it.l
--- ircservices-5.0.6/lang/it.l	2002-10-02 16:09:12.000000000 +0900
+++ ircservices-5.0.7/lang/it.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Italian language file.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/lang/ja_euc.l ircservices-5.0.7/lang/ja_euc.l
--- ircservices-5.0.6/lang/ja_euc.l	2002-11-24 14:25:26.000000000 +0900
+++ ircservices-5.0.7/lang/ja_euc.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Japanese language file (EUC encoding) / ÆüËܸì¤Î¥á¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/lang/ja_sjis.l ircservices-5.0.7/lang/ja_sjis.l
--- ircservices-5.0.6/lang/ja_sjis.l	2002-11-27 00:43:49.000000000 +0900
+++ ircservices-5.0.7/lang/ja_sjis.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Japanese language file (SJIS encoding) / “ú–{Œê‚̃�ƒbƒZ�[ƒWƒtƒ@ƒCƒ‹
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/lang/langcomp.c ircservices-5.0.7/lang/langcomp.c
--- ircservices-5.0.6/lang/langcomp.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/lang/langcomp.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Compiler for language definition files.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/lang/nl.l ircservices-5.0.7/lang/nl.l
--- ircservices-5.0.6/lang/nl.l	2002-11-22 16:10:16.000000000 +0900
+++ ircservices-5.0.7/lang/nl.l	2003-01-22 23:36:41.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Dutch language file.
 #
-# IRC Services is copyright (c) 1996-2001 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -184,10 +184,7 @@
 	Dubbele aanhalingstekens (") ontbreken.
 
 BAD_EMAIL
-	E-mail adres dient gegeven te worden in de vorm
-	gebruikersnaam@hostnaam.  Kleur, vetgedrukte,
-	onderstreepte, omgekeerde tekst of één van deze karakters:
-	 , : ; | \ " ( ) < > kunnen niet gebruikt worden.
+	E-mail adres dient gegeven te worden in de vorm gebruikersnaam@hostnaam.  Kleur, vetgedrukte, onderstreepte, omgekeerde tekst of één van deze karakters: , : ; | \ " ( ) < > kunnen niet gebruikt worden.
 BAD_URL
 	Pagina's dienen in de volgende vorm gegeven te worden:
 	http://hostnaam[:poort]/... (of ftp://, enz.).
@@ -201,8 +198,7 @@
 SENDMAIL_NO_RESOURCES
 	Het systeem is momenteel te druk om e-mail te versturen; probeer het later nog eens.
 READ_ONLY_MODE
-	Opmerking: Services staan in alleen-lezen modus.
-	Veranderingen worden niet opgeslagen!
+	Opmerking: Services staan in alleen-lezen modus. Veranderingen worden niet opgeslagen!
 PASSWORD_INCORRECT
 	Wachtwoord onjuist.
 PASSWORD_WARNING
@@ -220,17 +216,14 @@
 	Geen permissie.
 
 MORE_OBSCURE_PASSWORD
-	Probeer het nogmaals met een ingewikkelder wachtwoord.
-	Wachtwoorden dienen minimaal 5 karakters te zijn en moeten
-	niet makkelijk te raden zijn (b.v. naam of bijnaam).
+	Probeer het nogmaals met een ingewikkelder wachtwoord. Wachtwoorden dienen minimaal 5 karakters te zijn en moeten niet makkelijk te raden zijn (b.v. naam of bijnaam).
 PASSWORD_TRUNCATED
 	Opmerking:  Uw wachtwoord is verkleind tot %d karakters.
 
 NICK_NOT_REGISTERED
 	Uw bijnaam is niet geregistreerd.
 NICK_NOT_REGISTERED_HELP
-	Uw bijnaam is niet geregistreerd.  Typ /msg %s HELP voor
-	informatie over het registreren van bijnamen.
+	Uw bijnaam is niet geregistreerd.  Typ /msg %s HELP voor informatie over het registreren van bijnamen.
 NICK_TOO_LONG
 	Bijnamen mogen niet langer dan %d karakters zijn.
 NICK_INVALID
@@ -244,17 +237,13 @@
 NICK_X_FORBIDDEN
 	Bijnaam %s mag niet geregistreerd of gebruikt worden.
 NICK_X_SUSPENDED
-	Bijnaam %s is buiten werking en mag niet gebruikt of
-	geidentificeerd worden.
+	Bijnaam %s is buiten werking en mag niet gebruikt of geidentificeerd worden.
 NICK_X_SUSPENDED_MEMOS
 	Bijnaam %s is buiten werking en mag geen memo's ontvangen.
 NICK_IDENTIFY_REQUIRED
-	Wachtwoord verificatie vereist voor dit commando.
-	Probeer het nogmaals na het typen van /msg %s
-	IDENTIFY wachtwoord.
+	Wachtwoord verificatie vereist voor dit commando. Probeer het nogmaals na het typen van /msg %s IDENTIFY wachtwoord.
 NICK_PLEASE_AUTH
-	Uw bijnaam is nog niet geautoriseerd.  Autoriseer uw bijnaam d.m.v.
-	de autorisatie-code in de E-mail gestuurd naar : %s
+	Uw bijnaam is nog niet geautoriseerd.  Autoriseer uw bijnaam d.m.v. de autorisatie-code in de E-mail gestuurd naar : %s
 
 NICK_X_NOT_ON_CHAN_X
 	Bijnaam %s is momenteel niet in kamer %s.
@@ -268,14 +257,11 @@
 CHAN_X_FORBIDDEN
 	Kamer %s mag niet geregistreerd of gebruikt worden.
 CHAN_X_SUSPENDED
-	Kamer %s is buiten werking en mag niet gebruikt of
-	geidentificeerd worden.
+	Kamer %s is buiten werking en mag niet gebruikt of geidentificeerd worden.
 CHAN_X_SUSPENDED_MEMOS
 	Kamer %s is buiten gebruik en mag geen memo's ontvangen.
 CHAN_IDENTIFY_REQUIRED
-	Wachtwoord verificatie vereist voor dit commando.
-	Probeer het nogmaals na het typen van /msg %s
-	IDENTIFY %s wachtwoord.
+	Wachtwoord verificatie vereist voor dit commando. Probeer het nogmaals na het typen van /msg %s IDENTIFY %s wachtwoord.
 
 SERV_X_NOT_FOUND
 	Server %s niet gevonden.
@@ -295,41 +281,27 @@
 
 # Automatic messages
 NICK_IS_REGISTERED
-	Deze bijnaam is van iemand anders. Kies een andere.
-	(Als dit uw bijnaam is, typ /msg %s IDENTIFY
-	wachtwoord.)
+	Deze bijnaam is van iemand anders. Kies een andere. (Als dit uw bijnaam is, typ /msg %s IDENTIFY wachtwoord.)
 NICK_IS_SECURE
-	Deze bijnaam is geregistreerd en beschermd. typ
-	/msg %s IDENTIFY wachtwoord. Als dit uw bijnaam
-	is, anders dient u een andere bijnaam te kiezen.
+	Deze bijnaam is geregistreerd en beschermd. typ /msg %s IDENTIFY wachtwoord. Als dit uw bijnaam is, anders dient u een andere bijnaam te kiezen.
 NICK_MAY_NOT_BE_USED
 	Deze bijnaam mag niet gebruikt worden. Kies een andere.
 DISCONNECT_IN_1_MINUTE
-	Als u niet verandert binnen één minuut, wordt uw verbinding
-	verbroken.
+	Als u niet verandert binnen één minuut, wordt uw verbinding verbroken.
 DISCONNECT_IN_20_SECONDS
-	Als u niet verandert binnen 20 seconden, wordt uw verbinding
-	verbroken.
+	Als u niet verandert binnen 20 seconden, wordt uw verbinding verbroken.
 DISCONNECT_NOW
-	Deze bijnaam is geregistreerd: U kunt deze niet gebruiken.
-	Kies een andere bijnaam voordat u opnieuw verbinding maakt.
+	Deze bijnaam is geregistreerd: U kunt deze niet gebruiken. Kies een andere bijnaam voordat u opnieuw verbinding maakt.
 FORCENICKCHANGE_IN_1_MINUTE
-	Als u niet binnen één minuut verandert zal ik uw bijnaam
-	wijzigen.
+	Als u niet binnen één minuut verandert zal ik uw bijnaam wijzigen.
 FORCENICKCHANGE_IN_20_SECONDS
-	Als u niet binnen 20 seconden verandert zal ik uw bijnaam
-	wijzigen.
+	Als u niet binnen 20 seconden verandert zal ik uw bijnaam wijzigen.
 FORCENICKCHANGE_NOW
-	Deze bijnaam is geregistreerd: U kunt deze niet gebruiken.
-	Uw bijnaam wordt nu veranderd naar %s.
+	Deze bijnaam is geregistreerd: U kunt deze niet gebruiken. Uw bijnaam wordt nu veranderd naar %s.
 NICK_EXPIRES_SOON
-	Opmerking: De registratie van uw bijnaam vervalt over
-	%s.  Als u de bijnaam %s wil blijven gebruiken,
-	identificeer dan d.m.v.: /msg %s IDENTIFY wachtwoord
+	Opmerking: De registratie van uw bijnaam vervalt over %s.  Als u de bijnaam %s wil blijven gebruiken, identificeer dan d.m.v.: /msg %s IDENTIFY wachtwoord
 NICK_EXPIRED
-	Opmerking: De registratie van uw bijnaam is vervallen.
-	Registreer uw bijnaam opnieuw als u deze wilt blijven
-	gebruiken.
+	Opmerking: De registratie van uw bijnaam is vervallen. Registreer uw bijnaam opnieuw als u deze wilt blijven gebruiken.
 
 # REGISTER responses
 NICK_REGISTER_SYNTAX
@@ -360,28 +332,23 @@
 NICK_IDENTIFY_FAILED
 	Sorry, identificatie niet geslaagd.
 NICK_IDENTIFY_EMAIL_MISSING
-	U dient een E-mail adres in te stellen voor uw bijnaam voor u deze
-	verder kunt gebruiken. Stel er nu een in met het commando:
-	/msg %s SET EMAIL adres
+	U dient een E-mail adres in te stellen voor uw bijnaam voor u deze verder kunt gebruiken. Stel er nu een in met het commando: /msg %s SET EMAIL adres
 NICK_IDENTIFY_SUCCEEDED
 	Wachtwoord geaccepteerd - U bent nu herkend.
 
 # DROP responses
 NICK_DROP_SYNTAX
-	DROP
+	DROP wachtwoord
 NICK_DROP_WARNING
-	Waarschuwing: Het DROP commando maakt registratie van al uw gelinkte
-	bijnamen ongedaan!
+	Waarschuwing: Het DROP commando maakt registratie van al uw gelinkte bijnamen ongedaan!
 NICK_DROP_DISABLED
-	Sorry, bijnaam registratie ongedaan maken is tijdelijk
-	uitgeschakeld.
+	Sorry, bijnaam registratie ongedaan maken is tijdelijk uitgeschakeld.
 NICK_DROP_FAILED
 	Sorry, bijnaam registratie ongedaan maken niet geslaagd.
 NICK_DROPPED
 	Uw bijnaam registratie is geannuleerd.
 NICK_DROPPED_LINKS
-	Registratie van uw bijnaam en alle gekoppelde bijnamen is ongedaan
-	gemaakt.
+	Registratie van uw bijnaam en alle gekoppelde bijnamen is ongedaan gemaakt.
 
 # DROPNICK responses
 NICK_DROPNICK_SYNTAX
@@ -389,8 +356,7 @@
 NICK_X_DROPPED
 	Registratie van bijnaam %s is geannuleerd.
 NICK_X_DROPPED_LINKS
-	Registratie van bijnaam %s en alle gekoppelde bijnamen is ongedaan
-	gemaakt.
+	Registratie van bijnaam %s en alle gekoppelde bijnamen is ongedaan gemaakt.
 
 # SET responses
 NICK_SET_SYNTAX
@@ -398,8 +364,7 @@
 NICK_SET_OPER_SYNTAX
 	SET [bijnaam] optie parameters
 NICK_SET_DISABLED
-	Sorry, veranderen van bijnaam opties is tijdelijk
-	uitgeschakeld.
+	Sorry, veranderen van bijnaam opties is tijdelijk uitgeschakeld.
 NICK_SET_UNKNOWN_OPTION
 	Onbekende SET optie %s.
 NICK_SET_UNKNOWN_OPTION_OR_BAD_NICK
@@ -417,8 +382,7 @@
 NICK_SET_LANGUAGE_SYNTAX
 	SET LANGUAGE nummer
 NICK_SET_LANGUAGE_UNKNOWN
-	Onbekend taal-nummer %d.  Typ /msg %s HELP SET
-	LANGUAGE voor een lijst van talen.
+	Onbekend taal-nummer %d.  Typ /msg %s HELP SET LANGUAGE voor een lijst van talen.
 NICK_SET_LANGUAGE_CHANGED
 	Taal veranderd naar %s.
 
@@ -479,17 +443,13 @@
 NICK_SET_HIDE_EMAIL_OFF
 	Uw E-mail adres wordt nu getoond in %s INFO weergave.
 NICK_SET_HIDE_MASK_ON
-	Uw laatst gebruikte gebruiker@host masker wordt nu verborgen
-	in %s INFO weergave.
+	Uw laatst gebruikte gebruiker@host masker wordt nu verborgen in %s INFO weergave.
 NICK_SET_HIDE_MASK_OFF
-	Uw laatst gebruikte gebruiker@host masker wordt nu getoond
-	in %s INFO weergave.
+	Uw laatst gebruikte gebruiker@host masker wordt nu getoond in %s INFO weergave.
 NICK_SET_HIDE_QUIT_ON
-	Uw laatste vertrek-boodschap wordt nu verborgen in %s INFO
-	weergave.
+	Uw laatste vertrek-boodschap wordt nu verborgen in %s INFO weergave.
 NICK_SET_HIDE_QUIT_OFF
-	Uw laatste vertrek-boodschap wordt nu getoond in %s INFO
-	weergave.
+	Uw laatste vertrek-boodschap wordt nu getoond in %s INFO weergave.
 
 
 # SET TIMEZONE responses
@@ -2621,7 +2581,7 @@
 	commando.
 
 NICK_HELP_DROP
-	Syntax: DROP
+	Syntax: DROP wachtwoord
 	
 	Verwijdert uw bijnaam uit de %S database.  Een bijnaam
 	die verwijderd is kan door iedereen geregistreerd worden.
@@ -3649,8 +3609,8 @@
 	
 	Zet de operator-alarm optie van een kamer aan of uit.
 	Wanneer operator-alarm aan staat, geeft %S een melding aan de
-	kamer wanneer de OP of DEOP commando's gebruikt worden
-	voor iemand in de kamer.
+	kamer wanneer de OP, VOICE, of soortgelijke commando's
+	gebruikt worden voor iemand in de kamer.
 
 CHAN_HELP_SET_ENFORCE
 	Syntax: SET kamer ENFORCE {ON | OFF}
diff -uNr ircservices-5.0.6/lang/pt.l ircservices-5.0.7/lang/pt.l
--- ircservices-5.0.6/lang/pt.l	2002-10-02 16:10:33.000000000 +0900
+++ ircservices-5.0.7/lang/pt.l	2003-01-22 23:36:42.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Arquivo do idioma Portugues (do Brasil).
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/lang/tr.l ircservices-5.0.7/lang/tr.l
--- ircservices-5.0.6/lang/tr.l	2002-11-21 20:50:09.000000000 +0900
+++ ircservices-5.0.7/lang/tr.l	2003-01-22 23:36:42.000000000 +0900
@@ -2,7 +2,7 @@
 
 # Turkish language file.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -3389,10 +3389,11 @@
 CHAN_HELP_SET_OPNOTICE
 	Kullanimi: SET kanal OPNOTICE {ON | OFF}
 	
-	Kanalin op-notice özelligini acar/kapar.
-	Acikken, %S OP/DEOP komutlari kullanildiginda, kanala bir
-	notice gönderecektir.
-	
+	Kanal icin op-notice opsiyonunu acar ya da kapar. Bu opsiyon
+	acikken, %S kanala bir notice gönderecektir. Bu metinde OP
+	ya da VOICE ve benzeri komutlarin bir kullanici icin
+	kullanildiklari belirtilir.
+
 CHAN_HELP_SET_ENFORCE
 	Kullanimi: SET channel ENFORCE {ON | OFF}
 	
diff -uNr ircservices-5.0.6/language.c ircservices-5.0.7/language.c
--- ircservices-5.0.6/language.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/language.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Multi-language support.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/language.h ircservices-5.0.7/language.h
--- ircservices-5.0.6/language.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/language.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for multi-language support.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/list-array.h ircservices-5.0.7/list-array.h
--- ircservices-5.0.6/list-array.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/list-array.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,7 +1,7 @@
 /* Macros to handle insertion, deletion, iteration, and searching for
  * linked lists and arrays.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/log.c ircservices-5.0.7/log.c
--- ircservices-5.0.6/log.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/log.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Logging routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/main.c ircservices-5.0.7/main.c
--- ircservices-5.0.6/main.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/main.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,5 +1,5 @@
 /* Services -- main source file.
- * Copyright (c) 1996-2002 Andrew Church <achurch@achurch.org>
+ * Copyright (c) 1996-2003 Andrew Church <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,8 @@
 int openlog_failed, openlog_errno;
 
 /* Module callbacks (global so init.c can set them): */
-int cb_expire = -1;
+int cb_connect   = -1;
+int cb_expire    = -1;
 int cb_save_data = -1;
 
 
@@ -96,7 +97,19 @@
 	} else {
 	    quitmsg = (char *)msg;
 	}
-	quitting = 1;
+	if (param == DISCONN_REMOTE) {
+	    /* If we were already connected, make sure any changed data is
+	     * updated before we terminate. */
+	    delayed_quit = 1;
+	    save_data = 1;
+	} else {
+	    /* The connection was never made in the first place, so we
+	     * discard any changes (such as expirations) made on the
+	     * assumption that either a configuration problem or other
+	     * external problem exists.  Such changes will be saved the
+	     * next time Services successfully connects to a server. */
+	    quitting = 1;
+	}
     }
     sock_setcb(s, SCB_READLINE, NULL);
 }
@@ -134,6 +147,9 @@
     /* Bring in our pseudo-clients */
     introduce_user(NULL);
 
+    /* Let modules do their startup stuff */
+    call_callback(NULL, cb_connect);
+
     /* Process the line we read in above */
     process();
 }
diff -uNr ircservices-5.0.6/memory.c ircservices-5.0.7/memory.c
--- ircservices-5.0.6/memory.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/memory.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Memory management routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/messages.c ircservices-5.0.7/messages.c
--- ircservices-5.0.6/messages.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/messages.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Definitions of IRC message functions and list of messages.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/messages.h ircservices-5.0.7/messages.h
--- ircservices-5.0.6/messages.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/messages.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Declarations of IRC message structures, variables, and functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/misc.c ircservices-5.0.7/misc.c
--- ircservices-5.0.6/misc.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/misc.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Miscellaneous routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modes.c ircservices-5.0.7/modes.c
--- ircservices-5.0.6/modes.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modes.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines for handling mode flags and strings.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -58,7 +58,8 @@
 /*************************************************************************/
 
 /* Initialize flag tables and flag sets from mode tables.  Must be called
- * before any other mode_* function.
+ * before any other mode_* function, and should be called again if the mode
+ * tables are modified.
  */
 
 void mode_setup(void)
diff -uNr ircservices-5.0.6/modes.h ircservices-5.0.7/modes.h
--- ircservices-5.0.6/modes.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modes.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Mode flag definitions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/Makefile ircservices-5.0.7/modules/Makefile
--- ircservices-5.0.6/modules/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Master makefile for modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/Makerules ircservices-5.0.7/modules/Makerules
--- ircservices-5.0.6/modules/Makerules	2002-10-24 11:22:38.000000000 +0900
+++ ircservices-5.0.7/modules/Makerules	2003-01-22 23:36:40.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile rules for modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/Makefile ircservices-5.0.7/modules/chanserv/Makefile
--- ircservices-5.0.6/modules/chanserv/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for ChanServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/access-levels.c ircservices-5.0.7/modules/chanserv/access-levels.c
--- ircservices-5.0.6/modules/chanserv/access-levels.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/access-levels.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Access list and level modification handling for ChanServ.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/access-xop.c ircservices-5.0.7/modules/chanserv/access-xop.c
--- ircservices-5.0.6/modules/chanserv/access-xop.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/access-xop.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* SOP/AOP/VOP handling for ChanServ.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/access.c ircservices-5.0.7/modules/chanserv/access.c
--- ircservices-5.0.6/modules/chanserv/access.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/access.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Base routines for ChanServ access level handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/access.h ircservices-5.0.7/modules/chanserv/access.h
--- ircservices-5.0.6/modules/chanserv/access.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/access.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for ChanServ access level data.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/autokick.c ircservices-5.0.7/modules/chanserv/autokick.c
--- ircservices-5.0.6/modules/chanserv/autokick.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/autokick.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Autokick list handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/chanserv.h ircservices-5.0.7/modules/chanserv/chanserv.h
--- ircservices-5.0.6/modules/chanserv/chanserv.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/chanserv.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* ChanServ-related structures.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/check.c ircservices-5.0.7/modules/chanserv/check.c
--- ircservices-5.0.6/modules/chanserv/check.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/check.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines to check validity of JOINs and mode changes.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/cs-local.h ircservices-5.0.7/modules/chanserv/cs-local.h
--- ircservices-5.0.6/modules/chanserv/cs-local.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/cs-local.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for data local to the ChanServ module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/main.c ircservices-5.0.7/modules/chanserv/main.c
--- ircservices-5.0.6/modules/chanserv/main.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/main.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main ChanServ module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/sendpass.c ircservices-5.0.7/modules/chanserv/sendpass.c
--- ircservices-5.0.6/modules/chanserv/sendpass.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/sendpass.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* ChanServ SENDPASS module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/set.c ircservices-5.0.7/modules/chanserv/set.c
--- ircservices-5.0.6/modules/chanserv/set.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/set.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* SET command handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/chanserv/util.c ircservices-5.0.7/modules/chanserv/util.c
--- ircservices-5.0.6/modules/chanserv/util.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/chanserv/util.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* ChanServ internal utility routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -347,7 +347,8 @@
     ci->bad_passwords++;
     if (BadPassWarning && ci->bad_passwords == BadPassWarning) {
 	wallops(s_ChanServ, "\2Warning:\2 Repeated bad password attempts"
-	                    " for channel %s", ci->name);
+	                    " for channel %s (last attempt by user %s)",
+		ci->name, u->nick);
     }
 }
 
diff -uNr ircservices-5.0.6/modules/database/Makefile ircservices-5.0.7/modules/database/Makefile
--- ircservices-5.0.6/modules/database/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/database/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for database modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/extsyms.c ircservices-5.0.7/modules/database/extsyms.c
--- ircservices-5.0.6/modules/database/extsyms.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/database/extsyms.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Interface to external module (*Serv) symbols for database modules.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/extsyms.h ircservices-5.0.7/modules/database/extsyms.h
--- ircservices-5.0.6/modules/database/extsyms.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/database/extsyms.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Header for extsyms.c.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/fileutil.c ircservices-5.0.7/modules/database/fileutil.c
--- ircservices-5.0.6/modules/database/fileutil.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/database/fileutil.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Database file handling routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/fileutil.h ircservices-5.0.7/modules/database/fileutil.h
--- ircservices-5.0.6/modules/database/fileutil.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/database/fileutil.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Database file descriptor structure and file handling routine prototypes.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/standard.c ircservices-5.0.7/modules/database/standard.c
--- ircservices-5.0.6/modules/database/standard.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules/database/standard.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines to load/save Services databases in standard format.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/database/version4.c ircservices-5.0.7/modules/database/version4.c
--- ircservices-5.0.6/modules/database/version4.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/database/version4.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,7 +1,7 @@
 /* Routines to load/save Services databases in the (hopefully one day
  * obsolete) format used by version 4.x.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -1425,7 +1425,7 @@
     return 1;
 
   fail:
-    restore_db(f);
+    close_db(f);
     module_log("Read error on %s", dbname);
     return 0;
 }
@@ -1621,7 +1621,7 @@
     return 1;
 
   fail:
-    restore_db(f);
+    close_db(f);
     module_log("Read error on %s", dbname);
     return 0;
 }
@@ -1841,7 +1841,7 @@
     return 1;
 
   fail:
-    restore_db(f);
+    close_db(f);
     module_log("Read error on %s", dbname);
     return 0;
 }
@@ -1937,8 +1937,8 @@
     return 0;
 
   fail:
+    restore_db(f);
     module_log("Read error on %s", f->filename);
-    close_db(f);
     return 0;
 }
 
@@ -2168,7 +2168,6 @@
     return ss;
 
   fail:
-    restore_db(f);
     module_log("Read error on %s", f->filename);
     return NULL;
 }
@@ -2185,15 +2184,14 @@
     if (!ss) {
 	module_log("Extension data found for nonexisting server `%s'",
 		   servername);
-	goto fail;
+	return 0;
     }
     SAFE(read_time(&ss->t_join, f));
     return 1;
 
   fail:
-    restore_db(f);
     module_log("Read error on %s", f->filename);
-    return 0;
+    return NULL;
 }
 
 /*************************************************************************/
@@ -2247,7 +2245,7 @@
     return !failed || forceload;
 
   fail:
-    restore_db(f);
+    close_db(f);
     module_log("Read error on %s", dbname);
     return 0;
 }
diff -uNr ircservices-5.0.6/modules/encryption/Makefile ircservices-5.0.7/modules/encryption/Makefile
--- ircservices-5.0.6/modules/encryption/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/encryption/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for encryption modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/encryption/md5.c ircservices-5.0.7/modules/encryption/md5.c
--- ircservices-5.0.6/modules/encryption/md5.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/encryption/md5.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Module for encryption using MD5.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/Makefile ircservices-5.0.7/modules/httpd/Makefile
--- ircservices-5.0.6/modules/httpd/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for httpd modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/auth-ip.c ircservices-5.0.7/modules/httpd/auth-ip.c
--- ircservices-5.0.6/modules/httpd/auth-ip.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/auth-ip.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* IP address authorization module for HTTP server.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/auth-password.c ircservices-5.0.7/modules/httpd/auth-password.c
--- ircservices-5.0.6/modules/httpd/auth-password.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/auth-password.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Password authorization module for HTTP server.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/dbaccess.c ircservices-5.0.7/modules/httpd/dbaccess.c
--- ircservices-5.0.6/modules/httpd/dbaccess.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/dbaccess.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Database access module for HTTP server.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/debug.c ircservices-5.0.7/modules/httpd/debug.c
--- ircservices-5.0.6/modules/httpd/debug.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/debug.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Debug page module for HTTP server.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/http.h ircservices-5.0.7/modules/httpd/http.h
--- ircservices-5.0.6/modules/httpd/http.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/http.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* HTTP-related definitions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/main.c ircservices-5.0.7/modules/httpd/main.c
--- ircservices-5.0.6/modules/httpd/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/main.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main HTTP server module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/redirect.c ircservices-5.0.7/modules/httpd/redirect.c
--- ircservices-5.0.6/modules/httpd/redirect.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/redirect.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Nick/channel URL redirect module for HTTP server.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/top-page.c ircservices-5.0.7/modules/httpd/top-page.c
--- ircservices-5.0.6/modules/httpd/top-page.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/top-page.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Top-page (http://services.example.net/) handler.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/httpd/util.c ircservices-5.0.7/modules/httpd/util.c
--- ircservices-5.0.6/modules/httpd/util.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/httpd/util.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* HTTP server common utility routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/Makefile ircservices-5.0.7/modules/mail/Makefile
--- ircservices-5.0.6/modules/mail/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/mail/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for protocol modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/mail-local.h ircservices-5.0.7/modules/mail/mail-local.h
--- ircservices-5.0.6/modules/mail/mail-local.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/mail/mail-local.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Internal mail system declarations.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/mail.h ircservices-5.0.7/modules/mail/mail.h
--- ircservices-5.0.6/modules/mail/mail.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/mail/mail.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Declarations for public mail routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/main.c ircservices-5.0.7/modules/mail/main.c
--- ircservices-5.0.6/modules/mail/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/mail/main.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Core mail-sending module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/sendmail.c ircservices-5.0.7/modules/mail/sendmail.c
--- ircservices-5.0.6/modules/mail/sendmail.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/mail/sendmail.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Module to send mail using a "sendmail" program.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/mail/smtp.c ircservices-5.0.7/modules/mail/smtp.c
--- ircservices-5.0.6/modules/mail/smtp.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/mail/smtp.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Module to send mail using the SMTP protocol.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/memoserv/Makefile ircservices-5.0.7/modules/memoserv/Makefile
--- ircservices-5.0.6/modules/memoserv/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/memoserv/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for MemoServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/memoserv/forward.c ircservices-5.0.7/modules/memoserv/forward.c
--- ircservices-5.0.6/modules/memoserv/forward.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/memoserv/forward.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* MemoServ forwarding module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/memoserv/ignore.c ircservices-5.0.7/modules/memoserv/ignore.c
--- ircservices-5.0.6/modules/memoserv/ignore.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/memoserv/ignore.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* MemoServ IGNORE module.
  * Written by Yusuf Iskenderoglu <uhc0@stud.uni-karlsruhe.de>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/memoserv/main.c ircservices-5.0.7/modules/memoserv/main.c
--- ircservices-5.0.6/modules/memoserv/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/memoserv/main.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* MemoServ functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/memoserv/memoserv.h ircservices-5.0.7/modules/memoserv/memoserv.h
--- ircservices-5.0.6/modules/memoserv/memoserv.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/memoserv/memoserv.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* MemoServ-related structures.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/Makefile ircservices-5.0.7/modules/misc/Makefile
--- ircservices-5.0.6/modules/misc/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/misc/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for HelpServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/devnull.c ircservices-5.0.7/modules/misc/devnull.c
--- ircservices-5.0.6/modules/misc/devnull.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/misc/devnull.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* DevNull module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/helpserv.c ircservices-5.0.7/modules/misc/helpserv.c
--- ircservices-5.0.6/modules/misc/helpserv.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/misc/helpserv.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* HelpServ functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/xml-export.c ircservices-5.0.7/modules/misc/xml-export.c
--- ircservices-5.0.6/modules/misc/xml-export.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/misc/xml-export.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines to export Services databases in XML format.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/xml-import.c ircservices-5.0.7/modules/misc/xml-import.c
--- ircservices-5.0.6/modules/misc/xml-import.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/misc/xml-import.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* Routines to import Services databases from an XML file.  Note that empty
  * tags (of the form "<tag/>") are not supported.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/misc/xml.h ircservices-5.0.7/modules/misc/xml.h
--- ircservices-5.0.6/modules/misc/xml.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/misc/xml.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Header for XML import/export modules.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/Makefile ircservices-5.0.7/modules/nickserv/Makefile
--- ircservices-5.0.6/modules/nickserv/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for NickServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/access.c ircservices-5.0.7/modules/nickserv/access.c
--- ircservices-5.0.6/modules/nickserv/access.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/access.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Nickname access list module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/autojoin.c ircservices-5.0.7/modules/nickserv/autojoin.c
--- ircservices-5.0.6/modules/nickserv/autojoin.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/autojoin.c	2003-01-31 00:14:14.000000000 +0900
@@ -2,7 +2,7 @@
  * Written by Yusuf Iskenderoglu <uhc0@stud.uni-karlsruhe.de>
  * Idea taken from PTlink Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/collide.c ircservices-5.0.7/modules/nickserv/collide.c
--- ircservices-5.0.6/modules/nickserv/collide.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/collide.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines related to nickname colliding.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/link.c ircservices-5.0.7/modules/nickserv/link.c
--- ircservices-5.0.6/modules/nickserv/link.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/link.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Nickname linking module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/mail-auth.c ircservices-5.0.7/modules/nickserv/mail-auth.c
--- ircservices-5.0.6/modules/nickserv/mail-auth.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/mail-auth.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Nickname mail address authorization module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/main.c ircservices-5.0.7/modules/nickserv/main.c
--- ircservices-5.0.6/modules/nickserv/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/main.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main NickServ module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -252,7 +252,7 @@
 	    send_cmd(s_NickServ, "SVSMODE %s :+%s", user->nick,
 		     mode_flags_to_string(usermode_reg, MODE_USER));
 	    user->mode |= usermode_reg;
-	} else if (user->mode & usermode_reg) {
+	} else {
 	    send_cmd(s_NickServ, "SVSMODE %s :-%s", user->nick,
 		     mode_flags_to_string(usermode_reg, MODE_USER));
 	    user->mode &= ~usermode_reg;
@@ -595,9 +595,6 @@
     } else if (call_callback_2(module, cb_id_check, u, pass) <= 0) {
 	int old_authstat = ni->authstat;
 	set_identified(u, ni, ngi);
-	if (usermode_reg)
-	    send_cmd(s_NickServ, "SVSMODE %s :+%s", u->nick,
-		     mode_flags_to_string(usermode_reg, MODE_USER));
 	module_log("%s!%s@%s identified for nick %s",
 		   u->nick, u->username, u->host, u->nick);
 	notice_lang(s_NickServ, u, NICK_IDENTIFY_SUCCEEDED);
diff -uNr ircservices-5.0.6/modules/nickserv/nickserv.h ircservices-5.0.7/modules/nickserv/nickserv.h
--- ircservices-5.0.6/modules/nickserv/nickserv.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/nickserv.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* NickServ-related structures.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/ns-local.h ircservices-5.0.7/modules/nickserv/ns-local.h
--- ircservices-5.0.6/modules/nickserv/ns-local.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/ns-local.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for data local to the NickServ module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/oldlink.c ircservices-5.0.7/modules/nickserv/oldlink.c
--- ircservices-5.0.6/modules/nickserv/oldlink.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/oldlink.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Nickname linking module (4.x compatibility version).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/sendpass.c ircservices-5.0.7/modules/nickserv/sendpass.c
--- ircservices-5.0.6/modules/nickserv/sendpass.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/sendpass.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* NickServ SENDPASS module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/set.c ircservices-5.0.7/modules/nickserv/set.c
--- ircservices-5.0.6/modules/nickserv/set.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/set.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines to handle the NickServ SET command.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/nickserv/util.c ircservices-5.0.7/modules/nickserv/util.c
--- ircservices-5.0.6/modules/nickserv/util.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/nickserv/util.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* NickServ utility routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -466,6 +466,10 @@
 	ARRAY_EXTEND(ngi->id_users);
 	ngi->id_users[ngi->id_users_count-1] = u;
     }
+    if (usermode_reg) {
+	send_cmd(s_NickServ, "SVSMODE %s :+%s", u->nick,
+		 mode_flags_to_string(usermode_reg, MODE_USER));
+    }
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.6/modules/operserv/Makefile ircservices-5.0.7/modules/operserv/Makefile
--- ircservices-5.0.6/modules/operserv/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for OperServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/akill.c ircservices-5.0.7/modules/operserv/akill.c
--- ircservices-5.0.6/modules/operserv/akill.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/akill.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Autokill list module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -426,6 +426,22 @@
 /******************************* Callbacks *******************************/
 /*************************************************************************/
 
+/* Callback on connection to uplink server. */
+
+static int do_connect(void)
+{
+    if (ImmediatelySendAutokill) {
+	MaskData *akill;
+	for (akill = first_maskdata(MD_AKILL); akill;
+	     akill = next_maskdata(MD_AKILL)
+	) {
+	    send_akill(akill);
+	}
+    }
+}
+
+/*************************************************************************/
+
 /* Callback for autokill expiration. */
 
 static int do_expire_maskdata(uint32 type, MaskData *md)
@@ -434,6 +450,7 @@
 	if (WallAutokillExpire)
 	    wallops(s_OperServ, "AKILL on %s has expired", md->mask);
 	cancel_akill(md->mask);
+	return 1;
     }
     return 0;
 }
@@ -547,6 +564,7 @@
     }
 
     if (!add_callback(NULL, "reconfigure", do_reconfigure)
+     || !add_callback(NULL, "connect", do_connect)
      || !add_callback(NULL, "user check", check_akill)
      || !add_callback(NULL, "save data", do_save_data)
      || !add_callback(module_operserv, "expire maskdata", do_expire_maskdata)
@@ -560,15 +578,6 @@
     open_akill_db(AutokillDBName);
     db_opened = 1;
 
-    if (ImmediatelySendAutokill) {
-	MaskData *akill;
-	for (akill = first_maskdata(MD_AKILL); akill;
-	     akill = next_maskdata(MD_AKILL)
-	) {
-	    send_akill(akill);
-	}
-    }
-
     return 1;
 }
 
@@ -585,6 +594,7 @@
 
     remove_callback(NULL, "save data", do_save_data);
     remove_callback(NULL, "user check", check_akill);
+    remove_callback(NULL, "connect", do_connect);
     remove_callback(NULL, "reconfigure", do_reconfigure);
 
     unregister_callback(module, cb_cancel_exclude);
diff -uNr ircservices-5.0.6/modules/operserv/akill.h ircservices-5.0.7/modules/operserv/akill.h
--- ircservices-5.0.6/modules/operserv/akill.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/akill.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Header for autokill stuff.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/main.c ircservices-5.0.7/modules/operserv/main.c
--- ircservices-5.0.6/modules/operserv/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/main.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main OperServ module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -1272,12 +1272,23 @@
 		   count, clonemask);
 
 	if (KillClonesAutokill && p_create_akill) {
-	    const char akillreason[] = "Temporary KILLCLONES akill.";
-	    p_create_akill(clonemask+2, akillreason, u->nick,
-			   time(NULL) + KillClonesAutokillExpire);
-	    wallops(s_OperServ, getstring(NULL,OPER_KILLCLONES_KILLED_AKILL),
-		    u->nick, clonemask, count, clonemask+2);
+	    /* Add autokill if it doesn't exist.  Use get_matching_maskdata()
+	     * so that we find both exact matches and more general masks. */
+	    if (!get_matching_maskdata(MD_AKILL, clonemask+2)) {
+		/* No mask fits these clones, so add a new one. */
+		const char akillreason[] = "Temporary KILLCLONES akill.";
+		p_create_akill(clonemask+2, akillreason, u->nick,
+			       time(NULL) + KillClonesAutokillExpire);
+		wallops(s_OperServ,
+			getstring(NULL,OPER_KILLCLONES_KILLED_AKILL),
+			u->nick, clonemask, count, clonemask+2);
+	    } else {
+		/* There's already a matching mask, so don't add a new one. */
+		wallops(s_OperServ, getstring(NULL,OPER_KILLCLONES_KILLED),
+			u->nick, clonemask, count);
+	    }
 	} else {
+	    /* Autokill option not set or module not available. */
 	    wallops(s_OperServ, getstring(NULL,OPER_KILLCLONES_KILLED),
 		    u->nick, clonemask, count);
 	}
diff -uNr ircservices-5.0.6/modules/operserv/maskdata.c ircservices-5.0.7/modules/operserv/maskdata.c
--- ircservices-5.0.6/modules/operserv/maskdata.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/maskdata.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Miscellaneous MaskData-related functionality.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/maskdata.h ircservices-5.0.7/modules/operserv/maskdata.h
--- ircservices-5.0.6/modules/operserv/maskdata.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/maskdata.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Header for common mask data structure.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/news.c ircservices-5.0.7/modules/operserv/news.c
--- ircservices-5.0.6/modules/operserv/news.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/news.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* News module.
  * Based on code by Andrew Kempe (TheShadow) <andrewk@isdial.net>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/news.h ircservices-5.0.7/modules/operserv/news.h
--- ircservices-5.0.6/modules/operserv/news.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/news.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* News data structures and constants.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/operserv.h ircservices-5.0.7/modules/operserv/operserv.h
--- ircservices-5.0.6/modules/operserv/operserv.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/operserv.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Include file for OperServ.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/sessions.c ircservices-5.0.7/modules/operserv/sessions.c
--- ircservices-5.0.6/modules/operserv/sessions.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/sessions.c	2003-01-31 00:14:14.000000000 +0900
@@ -2,7 +2,7 @@
  * Based on code copyright (c) 1999-2000 Andrew Kempe (TheShadow)
  *     E-mail: <andrewk@isdial.net>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/sessions.h ircservices-5.0.7/modules/operserv/sessions.h
--- ircservices-5.0.6/modules/operserv/sessions.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/sessions.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Session exception interface.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/operserv/sline.c ircservices-5.0.7/modules/operserv/sline.c
--- ircservices-5.0.6/modules/operserv/sline.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/sline.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* S-line module.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -387,6 +387,26 @@
 /******************************* Callbacks *******************************/
 /*************************************************************************/
 
+/* Callback on connection to uplink server. */
+
+static int do_connect(void)
+{
+    if (ImmediatelySendSline) {
+	MaskData *sline;
+	static uint8 types[] = {MD_SGLINE, MD_SQLINE, MD_SZLINE};
+	int i;
+	for (i = 0; i < lenof(types); i++) {
+	    for (sline = first_maskdata(types[i]); sline;
+		 sline = next_maskdata(types[i])
+	    ) {
+		send_sline(types[i], sline);
+	    }
+	}
+    }
+}
+
+/*************************************************************************/
+
 /* Callback for S-line expiration. */
 
 static int do_expire_maskdata(uint32 type, MaskData *md)
@@ -485,6 +505,7 @@
 
     if (!add_callback(NULL, "load module", do_load_module)
      || !add_callback(NULL, "unload module", do_unload_module)
+     || !add_callback(NULL, "connect", do_connect)
      || !add_callback(NULL, "user check", check_sline)
      || !add_callback(NULL, "user nickchange (after)", check_sqline_nickchange)
      || !add_callback(NULL, "save data", do_save_data)
@@ -498,19 +519,6 @@
     open_sline_db(SlineDBName);
     db_opened = 1;
 
-    if (ImmediatelySendSline) {
-	MaskData *sline;
-	static uint8 types[] = {MD_SGLINE, MD_SQLINE, MD_SZLINE};
-	int i;
-	for (i = 0; i < lenof(types); i++) {
-	    for (sline = first_maskdata(types[i]); sline;
-		 sline = next_maskdata(types[i])
-	    ) {
-		send_sline(types[i], sline);
-	    }
-	}
-    }
-
     return 1;
 }
 
@@ -531,6 +539,7 @@
     remove_callback(NULL, "save data", do_save_data);
     remove_callback(NULL, "user nickchange (after)", check_sqline_nickchange);
     remove_callback(NULL, "user check", check_sline);
+    remove_callback(NULL, "connect", do_connect);
     remove_callback(NULL, "unload module", do_unload_module);
     remove_callback(NULL, "load module", do_load_module);
 
diff -uNr ircservices-5.0.6/modules/operserv/sline.h ircservices-5.0.7/modules/operserv/sline.h
--- ircservices-5.0.6/modules/operserv/sline.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/operserv/sline.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* S-line data structure and interface.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/Makefile ircservices-5.0.7/modules/protocol/Makefile
--- ircservices-5.0.6/modules/protocol/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for protocol modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
@@ -10,11 +10,12 @@
 
 include ../../Makefile.inc
 
-MODULES = bahamut.so dalnet.so dreamforge.so monkey.so rfc1459.so \
-	  trircd.so ts8.so undernet-p9.so unreal.so
+MODULES = bahamut.so dalnet.so dreamforge.so monkey.so ptlink.so \
+	  rfc1459.so trircd.so ts8.so undernet-p9.so unreal.so
 OBJECTS-bahamut.so = banexcept.o sjoin.o svsnick.o
 OBJECTS-dreamforge.so = svsnick.o
 OBJECTS-monkey.so = halfop.o sjoin.o
+OBJECTS-ptlink.so = banexcept.o sjoin.o svsnick.o
 OBJECTS-trircd.so = banexcept.o chanprot.o halfop.o sjoin.o svsnick.o \
 		    token.o
 OBJECTS-unreal.so = banexcept.o chanprot.o halfop.o svsnick.o token.o
@@ -33,6 +34,11 @@
 	$(TOPDIR)/messages.h $(TOPDIR)/language.h \
 	$(TOPDIR)/modules/operserv/operserv.h \
 	$(TOPDIR)/modules/nickserv/nickserv.h
+INCLUDES-ptlink.o = banexcept.h sjoin.h svsnick.h \
+	$(TOPDIR)/messages.h $(TOPDIR)/language.h $(TOPDIR)/version.h \
+	$(TOPDIR)/modules/operserv/operserv.h \
+	$(TOPDIR)/modules/nickserv/nickserv.h \
+	$(TOPDIR)/modules/chanserv/chanserv.h
 INCLUDES-trircd.o = banexcept.h chanprot.h halfop.h sjoin.h svsnick.h \
 	token.h $(TOPDIR)/messages.h $(TOPDIR)/language.h \
 	$(TOPDIR)/modules/operserv/operserv.h \
diff -uNr ircservices-5.0.6/modules/protocol/bahamut.c ircservices-5.0.7/modules/protocol/bahamut.c
--- ircservices-5.0.6/modules/protocol/bahamut.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/bahamut.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Bahamut protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -65,6 +65,8 @@
 				/* Only opers can join channel */
     /* Note: Flags in this range are used by Unreal */
     {'M', {0x02000000,0,0}},	/* Moderated to unregged nicks */
+    {'e', {0x80000000,1,1,0,MI_MULTIPLE}},
+				/* Ban exceptions */
 };
 
 static const struct modedata_init new_chanusermodes[] = {
@@ -247,7 +249,7 @@
 			 const char *server, const char *name,
 			 const char *modes)
 {
-    /* NICK <nick> <hops> <TS> <umode> <user> <host> <server> <svsid>
+    /* NICK <nick> <hops> <TS> <umode> <user> <host> <server> <svsid> <ip>
      *      :<ircname> */
     send_cmd(NULL, "NICK %s 1 %ld +%s %s %s %s 0 0 :%s", nick,
 	     (long)time(NULL), modes, user, host, server, name);
diff -uNr ircservices-5.0.6/modules/protocol/banexcept.c ircservices-5.0.7/modules/protocol/banexcept.c
--- ircservices-5.0.6/modules/protocol/banexcept.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/banexcept.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Ban exception related functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/banexcept.h ircservices-5.0.7/modules/protocol/banexcept.h
--- ircservices-5.0.6/modules/protocol/banexcept.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/banexcept.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* banexcept.c header file.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/chanprot.c ircservices-5.0.7/modules/protocol/chanprot.c
--- ircservices-5.0.6/modules/protocol/chanprot.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/chanprot.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Channel protect/founder (+a/+q) related functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/chanprot.h ircservices-5.0.7/modules/protocol/chanprot.h
--- ircservices-5.0.6/modules/protocol/chanprot.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/chanprot.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* chanprot.c header file.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/dalnet.c ircservices-5.0.7/modules/protocol/dalnet.c
--- ircservices-5.0.6/modules/protocol/dalnet.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/dalnet.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* DALnet (4.4.13-) protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/dreamforge.c ircservices-5.0.7/modules/protocol/dreamforge.c
--- ircservices-5.0.6/modules/protocol/dreamforge.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/dreamforge.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Dreamforge protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/halfop.c ircservices-5.0.7/modules/protocol/halfop.c
--- ircservices-5.0.6/modules/protocol/halfop.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/halfop.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Halfop (+h) related functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/halfop.h ircservices-5.0.7/modules/protocol/halfop.h
--- ircservices-5.0.6/modules/protocol/halfop.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/halfop.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* halfop.c header file.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/monkey.c ircservices-5.0.7/modules/protocol/monkey.c
--- ircservices-5.0.6/modules/protocol/monkey.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/monkey.c	2003-01-31 00:14:14.000000000 +0900
@@ -4,7 +4,7 @@
  * It is maintained by Chris Plant
  *     E-mail: <chris@monkeyircd.org>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -130,7 +130,7 @@
     int i;
 
     for (i = 0; i < ac; i++) {
-	if (stricmp(av[i], "NOQUIT") == 0)
+	if (stricmp(av[i], "TS4") == 0)
 	    protocol_features |= PF_NOQUIT;
     }
 }
@@ -227,10 +227,11 @@
 
 static void do_send_server(void)
 {
+    sleep(5); /* Hack, give monkeyircd time to resolve properly */
     send_cmd(NULL, "PASS %s :TS", RemotePassword);
-    send_cmd(NULL, "CAPAB TS3 SSJOIN NICKIP NOQUIT");
+    send_cmd(NULL, "CAPAB :TS4");
     send_cmd(NULL, "SERVER %s 1 :%s", ServerName, ServerDesc);
-    send_cmd(NULL, "SVINFO 3 3 0 :%ld", (long)time(NULL));
+    send_cmd(NULL, "SVINFO 4 4 0 :%ld", (long)time(NULL));
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.6/modules/protocol/ptlink.c ircservices-5.0.7/modules/protocol/ptlink.c
--- ircservices-5.0.6/modules/protocol/ptlink.c	1970-01-01 09:00:00.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/ptlink.c	2003-01-31 00:14:14.000000000 +0900
@@ -0,0 +1,717 @@
+/* PTlink protocol module for IRC Services.
+ *
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
+ *     E-mail: <achurch@achurch.org>
+ * Parts written by Andrew Kempe and others.
+ * This program is free but copyrighted software; see the file COPYING for
+ * details.
+ */
+
+#include "services.h"
+#include "modules.h"
+#include "conffile.h"
+#include "language.h"
+#include "messages.h"
+#include "version.h"
+#include "modules/operserv/operserv.h"
+#include "modules/nickserv/nickserv.h"
+#include "modules/chanserv/chanserv.h"
+
+#include "banexcept.h"
+#include "sjoin.h"
+#include "svsnick.h"
+
+/*************************************************************************/
+
+/* "Nick" to use to indicate Services-set GLINEs */
+#define GLINE_WHO	"<ircservices>"
+
+static Module *module;
+static Module *module_operserv;
+
+static char *NetworkDomain = NULL;
+
+static int32 usermode_admin = 0;	/* +aANT */
+static int32 usermode_hiding = 0;	/* +S */
+static int32 chanmode_admins_only = 0;	/* +A */
+
+/*************************************************************************/
+/***************** Local interface to external routines ******************/
+/*************************************************************************/
+
+static typeof(is_services_admin) *p_is_services_admin = NULL;
+
+static int local_is_services_admin(User *u)
+{
+    return p_is_services_admin && (*p_is_services_admin)(u);
+}
+#define is_services_admin local_is_services_admin
+
+/*************************************************************************/
+/************************** User/channel modes ***************************/
+/*************************************************************************/
+
+struct modedata_init {
+    uint8 mode;
+    ModeData data;
+};
+
+#define MI_ADMIN	0x01000000  /* Usermode given to admins */
+#define MI_HIDING	0x02000000  /* Usermode for hiding users */
+#define MI_ADMINS_ONLY	0x01000000  /* Chanmode for admin-only channels */
+
+static const struct modedata_init new_usermodes[] = {
+    {'g', {0x00000008}},	/* Receive globops */
+    {'h', {0x00000010}},	/* Helpop */
+    {'r', {0x00000020,0,0,0,MI_REGISTERED}},
+				/* Registered nick */
+    {'a', {0x00000040}},	/* Services admin */
+    {'A', {0x00000080}},	/* Server admin */
+    {'N', {0x00000100,0,0,0,MI_ADMIN}},
+				/* Network admin */
+    {'T', {0x00000200,0,0,0,MI_ADMIN}},
+				/* Technical admin */
+    /* Flags in this range are used by Unreal */
+    {'S', {0x00002000,0,0,0,MI_HIDING}},
+				/* Stealth mode (hides joins etc) */
+    {'B', {0x00004000}},	/* Is a bot ("deaf" in Unreal) */
+    {'R', {0x00008000}},	/* Allow PRIVMSGs from +r clients only */
+    {'p', {0x00010000}},	/* Private (don't show channels in /whois) */
+    {'v', {0x00020000}},	/* Don't allow DCCs */
+};
+
+static const struct modedata_init new_chanmodes[] = {
+    {'R', {0x00000100,0,0}},	/* Only identified users can join */
+    {'r', {0x00000200,0,0,0,MI_REGISTERED}},
+				/* Set for all registered channels */
+    {'c', {0x00000400,0,0}},	/* No ANSI colors in channel */
+    {'O', {0x00000800,0,0,0,MI_OPERS_ONLY}},
+				/* Only opers can join channel */
+    {'A', {0x00001000,0,0,0,MI_OPERS_ONLY|MI_ADMINS_ONLY}},
+				/* Only admins can join channel */
+    /* Flags in this range are used by Unreal */
+    {'c', {0x00100000,0,0}},	/* Strip colors */
+    /* Flags in this range are used by Unreal */
+    {'d', {0x00800000,0,0}},	/* No flooding */
+    /* Flags in this range are used by Unreal and Bahamut */
+    {'S', {0x04000000,0,0}},	/* No spam */
+    {'q', {0x08000000,0,0}},	/* No quits */
+    {'K', {0x10000000,0,0}},	/* Send knock message on failed join */
+    {'e', {0x80000000,1,1,0,MI_MULTIPLE}},
+				/* Ban exceptions */
+};
+
+static const struct modedata_init new_chanusermodes[] = {
+    {'a', {0x00000010,1,1,'.',MI_CHANOWNER}},
+					/* Channel owner */
+};
+
+static void init_modes(void)
+{
+    int i;
+
+    for (i = 0; i < lenof(new_usermodes); i++) {
+	usermodes[new_usermodes[i].mode] = new_usermodes[i].data;
+	if (new_usermodes[i].data.info & MI_ADMIN)
+	    usermode_admin |= new_usermodes[i].data.flag;
+	if (new_usermodes[i].data.info & MI_HIDING)
+	    usermode_hiding |= new_usermodes[i].data.flag;
+    }
+    for (i = 0; i < lenof(new_chanmodes); i++) {
+	chanmodes[new_chanmodes[i].mode] = new_chanmodes[i].data;
+	if (new_chanmodes[i].data.info & MI_ADMINS_ONLY)
+	    chanmode_admins_only |= new_chanmodes[i].data.flag;
+    }
+    for (i = 0; i < lenof(new_chanusermodes); i++)
+	chanusermodes[new_chanusermodes[i].mode] = new_chanusermodes[i].data;
+
+    mode_setup();
+};
+
+/*************************************************************************/
+/************************* IRC message receiving *************************/
+/*************************************************************************/
+
+static void m_nick(char *source, int ac, char **av)
+{
+    char *newmodes, ipbuf[16], *s;
+    char **newav[10];
+    uint32 ip;
+
+    if (*source) {
+	/* Old user changing nicks. */
+	if (ac != 2) {
+	    if (debug)
+		module_log("debug: NICK message: wrong number of parameters"
+			   " (%d) for source `%s'", ac, source);
+	} else {
+	    do_nick(source, ac, av);
+	}
+	return;
+    }
+
+    /* New user. */
+
+    if (ac != 9) {
+	if (debug)
+	    module_log("debug: NICK message: wrong number of parameters (%d)"
+		       " for new user", ac);
+	return;
+    }
+
+    /* Set up parameters for do_nick() */
+    newav[0] = av[0];	/* Nick */
+    newav[1] = av[1];	/* Hop count */
+    newav[2] = av[2];	/* Timestamp */
+    newav[3] = av[4];	/* Username */
+    newav[4] = av[5];	/* Hostname */
+    newav[5] = av[7];	/* Server */
+    newav[6] = av[8];	/* Real name */
+    av[7] = av[6];	/* Services stamp */
+    av[6] = av[8];	/* IP address */
+    av[8] = av[9];	/* User area (fake hostname) */
+
+    if (do_nick(source, ac, newav)) {
+	/* We succeeded, so set modes */
+	newav[1] = av[3];
+	do_umode(av[0], 2, newav);
+    }
+}
+
+/*************************************************************************/
+
+static void m_capab(char *source, int ac, char **av)
+{
+    char *s;
+    int got_PTS4 = 0;
+    int got_QS   = 0;
+    int got_EX   = 0;
+
+    if (ac < 1) {
+	module_log("received CAPAB with no parameters--broken ircd?");
+    } else {
+	for (s = strtok(av[0]," "); s; s = strtok(NULL," ")) {
+	    if (stricmp(s, "PTS4") == 0)
+		got_PTS4 = 1;
+	    else if (stricmp(s, "QS") == 0)
+		got_QS = 1;
+	    else if (stricmp(s, "EX") == 0)
+		got_EX = 1;
+	}
+    }
+    if (!got_PTS4 || !got_QS || !got_EX) {
+	module_log("CAPAB: capabilities missing:%s%s%s",
+		   got_PTS4 ? "" : " PTS4",
+		   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";
+	quitting = 1;
+    }
+}
+
+/*************************************************************************/
+
+static void m_svinfo(char *source, int ac, char **av)
+{
+    if (ac < 2) {
+	module_log("received SVINFO with <2 parameters--broken ircd?");
+    } 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";
+	    quitting = 1;
+	}
+    }
+}
+
+/*************************************************************************/
+
+static void m_sjoin(char *source, int ac, char **av)
+{
+    if (ac < 4) {
+	module_log("SJOIN: expected >=4 params, got %d (broken ircd?)", ac);
+	return;
+    }
+    do_sjoin(source, ac, av);
+}
+
+/*************************************************************************/
+
+static void m_newmask(char *source, int ac, char **av)
+{
+    char *newuser, *newhost;
+    User *u;
+
+    if (ac < 1) {
+	module_log("NEWUSER: parameters missing--broken ircd?", source);
+	return;
+    }
+    if (!(u = get_user(source))) {
+	module_log("got NEWUSER from nonexistent user %s", source);
+	return;
+    }
+    newuser = av[0];
+    newhost = strchr(newuser, '@');
+    if (newhost)
+	*newhost++ = 0;
+    else
+	newhost = "";
+    free(u->username);
+    u->username = sstrdup(newuser);
+    free(u->host);
+    u->host = sstrdup(newhost);
+}
+
+/*************************************************************************/
+
+/* GLINE/SGLINE/SQLINE handling: cancel any Services-set lines from remote
+ * servers (see comments in unreal.c/m_tkl() for details).
+ */
+
+static void m_gline(char *source, int ac, char **av)
+{
+    if (ac < 3 || strcmp(av[2], GLINE_WHO) != 0)
+	return;
+    send_cmd(ServerName, "UNGLINE :%s", av[0]);
+}
+
+static void m_sgline(char *source, int ac, char **av)
+{
+    int masklen;
+    if (ac < 3)
+	return;
+    masklen = atoi(av[1]);
+    if (masklen < strlen(av[2]))
+	av[2][masklen] = 0;
+    send_cmd(ServerName, "UNSGLINE :%s", av[2]);
+}
+
+static void m_sqline(char *source, int ac, char **av)
+{
+    if (ac < 1)
+	return;
+    send_cmd(ServerName, "UNSQLINE :%s", av[0]);
+}
+
+/*************************************************************************/
+
+static Message ptlink_messages[] = {
+    { "CAPAB",     m_capab },
+    { "GLINE",     m_gline },
+    { "GLOBOPS",   NULL },
+    { "GNOTICE",   NULL },
+    { "GOPER",     NULL },
+    { "NEWMASK",   m_newmask },
+    { "NICK",      m_nick },
+    { "SILENCE",   NULL },
+    { "SJOIN",     m_sjoin },
+    { "SGLINE",    m_sgline },
+    { "SQLINE",    m_sqline },
+    { "SVINFO",    m_svinfo },
+    { "SVLINE",    NULL },
+    { "UNGLINE",   NULL },
+    { "UNSGLINE",  NULL },
+    { "UNSQLINE",  NULL },
+    { "UNSVLINE",  NULL },
+    { "UNZOMBIE",  NULL },
+    { "ZOMBIE",    NULL },
+    { NULL }
+};
+
+/*************************************************************************/
+/************************** IRC message sending **************************/
+/*************************************************************************/
+
+/* Send a NICK command for a new user. */
+
+static void do_send_nick(const char *nick, const char *user, const char *host,
+			 const char *server, const char *name,
+			 const char *modes)
+{
+    /* NICK <nick> <hops> <TS> <umode> <user> <host> <fakehost> <server>
+     *      :<ircname> */
+    send_cmd(NULL, "NICK %s 1 %ld +%s %s %s %s %s 0 :%s", nick,
+	     (long)time(NULL), modes, user, host, host, server, name);
+}
+
+/*************************************************************************/
+
+/* Send a NICK command to change an existing user's nick. */
+
+static void do_send_nickchange(const char *nick, const char *newnick)
+{
+    send_cmd(nick, "NICK %s %ld", newnick, (long)time(NULL));
+}
+
+/*************************************************************************/
+
+/* Send a command to change a user's "real name". */
+
+static void do_send_namechange(const char *nick, const char *newname)
+{
+    /* Not supported by this protocol. */
+}
+
+/*************************************************************************/
+
+/* Send a SERVER command, and anything else needed at the beginning of the
+ * connection.
+ */
+
+static void do_send_server(void)
+{
+    send_cmd(NULL, "PASS %s :TS", RemotePassword);
+    send_cmd(NULL, "CAPAB :PTS4 QS EX");
+    send_cmd(NULL, "SERVER %s 1 ircservices-%s :%s", ServerName,
+	     version_number, ServerDesc);
+    send_cmd(NULL, "SVINFO 6 6");
+    send_cmd(NULL, "SVSINFO %ld %d", (long)start_time, maxusercnt);
+}
+
+/*************************************************************************/
+
+/* Send a SERVER command for a remote (juped) server. */
+
+static void do_send_server_remote(const char *server, const char *reason)
+{
+    send_cmd(NULL, "SERVER %s 2 :%s", server, reason);
+}
+
+/*************************************************************************/
+
+/* Send a WALLOPS (really a GLOBOPS). */
+
+static void do_wallops(const char *source, const char *fmt, ...)
+{
+    va_list args;
+    char buf[BUFSIZE];
+
+    va_start(args, fmt);
+    vsnprintf(buf, sizeof(buf), fmt, args);
+    va_end(args);
+    send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf);
+}
+
+/*************************************************************************/
+
+/* Send a NOTICE to all users on the network. */
+
+static void do_notice_all(const char *source, const char *fmt, ...)
+{
+    va_list args;
+    char msgbuf[BUFSIZE];
+
+    va_start(args, fmt);
+    vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
+    va_end(args);
+    if (NetworkDomain) {
+	send_cmd(source, "NOTICE $*.%s :%s", NetworkDomain, msgbuf);
+    } else {
+	/* Go through all common top-level domains.  If you have others,
+	 * add them here. */
+	send_cmd(source, "NOTICE $*.com :%s", msgbuf);
+	send_cmd(source, "NOTICE $*.net :%s", msgbuf);
+	send_cmd(source, "NOTICE $*.org :%s", msgbuf);
+	send_cmd(source, "NOTICE $*.edu :%s", msgbuf);
+    }
+}
+
+/*************************************************************************/
+
+/* Send a command which modifies channel status. */
+
+static void do_send_channel_cmd(const char *source, const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    vsend_cmd(ServerName, fmt, args);
+    va_end(args);
+}
+
+/*************************************************************************/
+/******************************* Callbacks *******************************/
+/*************************************************************************/
+
+static int do_user_mode(User *user, int modechar, int add, char **av)
+{
+    switch (modechar) {
+      case 'o':
+	if (add) {
+	    user->mode |= UMODE_o;
+	    if (add && user_identified(user) && is_services_admin(user))
+		send_cmd(ServerName, "SVSMODE %s +a", user->nick);
+	    user->mode &= ~UMODE_o;
+	}
+	return 0;
+
+      case 'r':
+	if (user_identified(user)) {
+	    if (!add)
+		send_cmd(ServerName, "SVSMODE %s +r", user->nick);
+	} else {
+	    if (add)
+		send_cmd(ServerName, "SVSMODE %s -r", user->nick);
+	}
+	return 1;
+
+      case 'a':
+	if (is_oper(user)) {
+	    if (is_services_admin(user)) {
+		if (!add)
+		    send_cmd(ServerName, "SVSMODE %s +a", user->nick);
+	    } else {
+		if (add)
+		    send_cmd(ServerName, "SVSMODE %s -a", user->nick);
+	    }
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+/*************************************************************************/
+
+static int do_nick_identified(User *u, int old_status)
+{
+    if (is_oper(u) && is_services_admin(u))
+	send_cmd(ServerName, "SVSMODE %s +a", u->nick);
+    return 0;
+}
+
+/*************************************************************************/
+
+static int do_set_topic(Channel *c, const char *topic, const char *setter,
+			time_t t)
+{
+    if (setter)
+	return 0;
+    c->topic_time = t;
+    send_cmd(ServerName, "TOPIC %s %s %ld :%s", c->name, c->topic_setter,
+	     (long)c->topic_time, c->topic ? c->topic : "");
+    return 1;
+}
+
+/*************************************************************************/
+
+static int do_check_chan_user_modes(const char *source, User *user,
+				    Channel *c, int32 modes)
+{
+    /* Don't do anything to hiding users */
+    return ((user->mode & usermode_hiding) ? 1 : 0);
+}
+
+/*************************************************************************/
+
+static int do_check_kick(User *user, ChannelInfo *ci, char **mask_ret,
+			 const char **reason_ret)
+{
+    /* Don't let plain opers into +A (admin only) channels */
+    if ((ci->mlock_on & chanmode_admins_only)
+     && !(user->mode & usermode_admin)
+    ) {
+	*mask_ret = create_mask(user, 1);
+	*reason_ret = getstring(user->ngi, CHAN_NOT_ALLOWED_TO_JOIN);
+	return 1;
+    }
+    return 0;
+}
+
+/*************************************************************************/
+
+static int do_send_akill(const char *username, const char *host,
+			 time_t expires, const char *who, const char *reason)
+{
+    time_t now = time(NULL);
+
+    send_cmd(ServerName, "GLINE %s@%s %ld %s :%s", username, host,
+	     (long)((expires && expires > now) ? expires - now : 0),
+	     GLINE_WHO, reason);
+    return 1;
+}
+
+/*************************************************************************/
+
+static int do_cancel_akill(const char *username, const char *host)
+{
+    send_cmd(ServerName, "UNGLINE %s@%s", username, host);
+    return 1;
+}
+
+/*************************************************************************/
+
+static int do_send_sgline(const char *mask, time_t expires, const char *who,
+			  const char *reason)
+{
+    send_cmd(ServerName, "SGLINE %d :%s:%s", strlen(mask), mask, reason);
+    return 1;
+}
+
+static int do_send_sqline(const char *mask, time_t expires, const char *who,
+			  const char *reason)
+{
+    send_cmd(ServerName, "SQLINE %s :%s", mask, reason);
+    return 1;
+}
+
+/*************************************************************************/
+
+static int do_cancel_sgline(const char *mask)
+{
+    send_cmd(ServerName, "UNSGLINE :%s", mask);
+    return 1;
+}
+
+static int do_cancel_sqline(const char *mask)
+{
+    send_cmd(ServerName, "UNSQLINE %s", mask);
+    return 1;
+}
+
+/*************************************************************************/
+/***************************** Module stuff ******************************/
+/*************************************************************************/
+
+const int32 module_version = MODULE_VERSION_CODE;
+
+ConfigDirective module_config[] = {
+    { "NetworkDomain", { { CD_STRING, 0, &NetworkDomain } } },
+    SJOIN_CONFIG,
+    { NULL }
+};
+
+/*************************************************************************/
+
+static int do_load_module(Module *mod, const char *modname)
+{
+    if (strcmp(modname, "operserv/main") == 0) {
+	module_operserv = mod;
+	p_is_services_admin = get_module_symbol(mod, "is_services_admin");
+	if (!p_is_services_admin) {
+	    module_log("warning: unable to look up symbol `is_services_admin'"
+		       " in module `operserv/main'");
+	}
+    } else if (strcmp(modname, "operserv/akill") == 0) {
+	if (!add_callback(mod, "send_akill", do_send_akill))
+	    module_log("Unable to add send_akill callback");
+	if (!add_callback(mod, "cancel_akill", do_cancel_akill))
+	    module_log("Unable to add cancel_akill callback");
+    } else if (strcmp(modname, "operserv/sline") == 0) {
+	if (!add_callback(mod, "send_sgline", do_send_sgline))
+	    module_log("Unable to add send_sgline callback");
+	if (!add_callback(mod, "send_sqline", do_send_sqline))
+	    module_log("Unable to add send_sqline callback");
+	if (!add_callback(mod, "cancel_sgline", do_cancel_sgline))
+	    module_log("Unable to add cancel_sgline callback");
+	if (!add_callback(mod, "cancel_sqline", do_cancel_sqline))
+	    module_log("Unable to add cancel_sqline callback");
+    } else if (strcmp(modname, "nickserv/main") == 0) {
+	if (!add_callback(mod, "identified", do_nick_identified))
+	    module_log("Unable to add NickServ identified callback");
+    } else if (strcmp(modname, "chanserv/main") == 0) {
+	if (!add_callback(mod, "check_chan_user_modes",
+			  do_check_chan_user_modes))
+	    module_log("Unable to add ChanServ check_chan_user_modes"
+		       " callback");
+	if (!add_callback(mod, "check_kick", do_check_kick))
+	    module_log("Unable to add ChanServ check_kick callback");
+    }
+    return 0;
+}
+
+/*************************************************************************/
+
+static int do_unload_module(Module *mod)
+{
+    if (mod == module_operserv) {
+	module_operserv = NULL;
+	p_is_services_admin = NULL;
+    }
+    return 0;
+}
+
+/*************************************************************************/
+
+int init_module(Module *module_)
+{
+    unsigned char c;
+
+    module = module_;
+
+    protocol_name     = "PTlink";
+    protocol_version  = "6.x";
+    protocol_features = PF_BANEXCEPT | PF_NOQUIT;
+    protocol_nickmax  = 20;
+
+    if (!register_messages(ptlink_messages)) {
+	module_log("Unable to register messages");
+	exit_module(1);
+	return 0;
+    }
+
+    if (!add_callback(NULL, "load module", do_load_module)
+     || !add_callback(NULL, "unload module", do_unload_module)
+     || !add_callback(NULL, "user MODE", do_user_mode)
+     || !add_callback(NULL, "set topic", do_set_topic)
+    ) {
+	module_log("Unable to add callbacks");
+	exit_module(1);
+	return 0;
+    }
+
+    if (!init_banexcept(module) || !init_sjoin(module)
+     || !init_svsnick(module)
+    ) {
+	exit_module(1);
+	return 0;
+    }
+
+    init_modes();
+
+    irc_lowertable['['] = '[';
+    irc_lowertable['\\'] = '\\';
+    irc_lowertable[']'] = ']';
+    for (c = 'A'; c <= '}'; c++)
+	valid_nick_table[c] = 3;
+    for (c = 0; c < 32; c++)
+	valid_chan_table[c] = 0;
+    valid_chan_table[160] = 0;
+
+    send_nick          = do_send_nick;
+    send_nickchange    = do_send_nickchange;
+    send_namechange    = do_send_namechange;
+    send_server        = do_send_server;
+    send_server_remote = do_send_server_remote;
+    wallops            = do_wallops;
+    notice_all         = do_notice_all;
+    send_channel_cmd   = do_send_channel_cmd;
+    pseudoclient_modes = "";
+    enforcer_modes     = "";
+
+    setstring(OPER_BOUNCY_MODES, OPER_BOUNCY_MODES_U_LINE);
+
+    return 1;
+}
+
+/*************************************************************************/
+
+int exit_module(int shutdown)
+{
+    if (!shutdown) {
+	/* Do not allow removal */
+	return 0;
+    }
+
+    exit_svsnick();
+    exit_sjoin();
+    exit_banexcept();
+    remove_callback(NULL, "set topic", do_set_topic);
+    remove_callback(NULL, "user MODE", do_user_mode);
+    remove_callback(NULL, "unload module", do_unload_module);
+    remove_callback(NULL, "load module", do_load_module);
+    unregister_messages(ptlink_messages);
+    return 1;
+}
+
+/*************************************************************************/
diff -uNr ircservices-5.0.6/modules/protocol/rfc1459.c ircservices-5.0.7/modules/protocol/rfc1459.c
--- ircservices-5.0.6/modules/protocol/rfc1459.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/rfc1459.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* RFC1459 protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/sjoin.c ircservices-5.0.7/modules/protocol/sjoin.c
--- ircservices-5.0.6/modules/protocol/sjoin.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/sjoin.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* SJOIN-related functions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -40,7 +40,7 @@
  *	av[4] = limit / key (depends on modes in av[3])
  *	av[5] = limit / key (depends on modes in av[3])
  *	av[ac-1] = nickname(s), with modes, joining channel
- * Bahamut SSJOIN format (server source) / Unreal SJOIN2/SJ3 format:
+ * Bahamut SSJOIN (server source) / PTlink / Unreal SJOIN2/SJ3 format:
  *	av[0] = TS3 timestamp - channel creation time
  *	av[1] = channel
  *	av[2] = modes (limit/key in av[3]/av[4] as needed)
@@ -95,7 +95,7 @@
 	do {
 	    thismode = cumode_prefix_to_flag(*nick);
 	    modes |= thismode;
-	} while (thismode && nick++); /* increment nick only if thismode!=0 */
+	} while (thismode && *nick++); /* increment nick only if thismode!=0 */
 	user = get_user(nick);
 	if (!user) {
 	    module_log("sjoin: SJOIN to channel %s for non-existent nick %s"
diff -uNr ircservices-5.0.6/modules/protocol/sjoin.h ircservices-5.0.7/modules/protocol/sjoin.h
--- ircservices-5.0.6/modules/protocol/sjoin.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/sjoin.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* sjoin.c header file.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/svsnick.c ircservices-5.0.7/modules/protocol/svsnick.c
--- ircservices-5.0.6/modules/protocol/svsnick.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/svsnick.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Code for servers supporting the ircd.dal SVSNICK command.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/svsnick.h ircservices-5.0.7/modules/protocol/svsnick.h
--- ircservices-5.0.6/modules/protocol/svsnick.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/svsnick.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* SVSNICK support external declarations.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/token.c ircservices-5.0.7/modules/protocol/token.c
--- ircservices-5.0.6/modules/protocol/token.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/token.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines for processing message tokens.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/token.h ircservices-5.0.7/modules/protocol/token.h
--- ircservices-5.0.6/modules/protocol/token.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/token.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Declarations for token handling.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/trircd.c ircservices-5.0.7/modules/protocol/trircd.c
--- ircservices-5.0.6/modules/protocol/trircd.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/trircd.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,7 +1,7 @@
 /* trircd protocol module for IRC Services.
  * Provided by Yusuf Iskenderoglu <uhc0@stud.uni-karlsruhe.de>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -285,6 +285,7 @@
 	}
 	for (i = 0; i < lenof(new_chanmodes_v5); i++)
 	    chanmodes[new_chanmodes_v5[i].mode] = new_chanmodes_v5[i].data;
+	mode_setup();
     }
 }
 
diff -uNr ircservices-5.0.6/modules/protocol/ts8.c ircservices-5.0.7/modules/protocol/ts8.c
--- ircservices-5.0.6/modules/protocol/ts8.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/ts8.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* RFC1459+TS8 protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/undernet-p9.c ircservices-5.0.7/modules/protocol/undernet-p9.c
--- ircservices-5.0.6/modules/protocol/undernet-p9.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/undernet-p9.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Undernet 2.9.x (P9) protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/protocol/unreal.c ircservices-5.0.7/modules/protocol/unreal.c
--- ircservices-5.0.6/modules/protocol/unreal.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/protocol/unreal.c	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Unreal protocol module for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -456,14 +456,40 @@
 
 /*************************************************************************/
 
-/* TKL message handler. */
+/* TKL message handler.  Format of a TKL message:
+ *    TKL + type user host set-by expire-time set-time reason 
+ * or TKL - type user host removed-by
+ */
 
 static void m_tkl(char *source, int ac, char **av)
 {
-    /* Clear out any Services-set TKL we get; if it's really valid, the
-     * relevant modules will re-add it for us. */
+    /* If we get a TKL + that claims to have been set by Services, send a
+     * TKL - for the same mask to remove it.  This is needed in the case
+     * that a TKL is removed by Services while one or more servers are
+     * split; in such a case, the split server would, when it relinked,
+     * propogate the TKL back out across the network even though it was no
+     * longer "valid" from Services' perspective.  Any TKLs that really are
+     * valid will be re-added as soon as a user matches them.
+     *
+     * As a special case, when we receive a TKL - Z, we first check whether
+     * such a TKL exists in the SZline list, and do not remove it if it's
+     * found; Unreal does not report IP address information for users, so
+     * we have no way to re-add the masks by checking connecting users.
+     */
+
+    /* Pointer to the `get_maskdata' function defined in the database
+     * module.  It would be more efficient to store this statically, but
+     * doing so would require watching for the database module to be
+     * unloaded, and as we should not normally receive many TKL messages
+     * anyway, the additional CPU burden is negligible. */
+    typeof(get_maskdata) *p_get_maskdata = NULL;
+
     if (ac < 5 || *av[0] != '+' || strcmp(av[4],ServerName) != 0)
 	return;
+    if (!(p_get_maskdata = get_module_symbol(NULL, "get_maskdata")))
+	return;
+    if (*av[1] == 'Z' && (*p_get_maskdata)(MD_SZLINE, av[3]))
+	return;
     send_cmd(ServerName, "TKL - %c %s %s %s",
 	     *av[1], av[2], av[3], ServerName);
 }
diff -uNr ircservices-5.0.6/modules/statserv/Makefile ircservices-5.0.7/modules/statserv/Makefile
--- ircservices-5.0.6/modules/statserv/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/modules/statserv/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for StatServ modules.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules/statserv/main.c ircservices-5.0.7/modules/statserv/main.c
--- ircservices-5.0.6/modules/statserv/main.c	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/statserv/main.c	2003-01-31 00:14:14.000000000 +0900
@@ -2,7 +2,7 @@
  * Based on code (c) Andrew Kempe (TheShadow)
  *     E-mail: <andrewk@isdial.net>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -462,6 +462,11 @@
 {
     if (user->server) {
 	ServerStats *ss = user->server->stats;
+	if (!ss) {
+	    module_log("BUG! no serverstats for %s in do_quit(%s)",
+		       user->server->name, user->nick);
+	    return 0;
+	}
 	ss->usercnt--;
 	if (is_oper(user))
 	    ss->opercnt--;
@@ -477,10 +482,16 @@
 {
     if (user->server) {
 	if (modechar == 'o') {
+	    ServerStats *ss = user->server->stats;
+	    if (!ss) {
+		module_log("BUG! no serverstats for %s in do_quit(%s)",
+			   user->server->name, user->nick);
+		return 0;
+	    }
 	    if (add)
-		user->server->stats->opercnt++;
+		ss->opercnt++;
 	    else
-		user->server->stats->opercnt--;
+		ss->opercnt--;
 	}
     }
     return 0;
@@ -488,7 +499,7 @@
 
 /*************************************************************************/
 
-/* Save OperServ data */
+/* Save StatServ data */
 
 static int do_save_data()
 {
diff -uNr ircservices-5.0.6/modules/statserv/statserv.h ircservices-5.0.7/modules/statserv/statserv.h
--- ircservices-5.0.6/modules/statserv/statserv.h	2002-11-27 01:33:44.000000000 +0900
+++ ircservices-5.0.7/modules/statserv/statserv.h	2003-01-31 00:14:14.000000000 +0900
@@ -1,6 +1,6 @@
 /* Statistical information.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules.c ircservices-5.0.7/modules.c
--- ircservices-5.0.6/modules.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Module support.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/modules.h ircservices-5.0.7/modules.h
--- ircservices-5.0.6/modules.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/modules.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Module support include file (interface definition).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/process.c ircservices-5.0.7/process.c
--- ircservices-5.0.6/process.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/process.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main processing code for Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
@@ -87,7 +87,6 @@
     char *s;
     int ac;			/* Parameters for the command */
     char **av;
-    Message *m;
 
 
     /* If debugging, log the buffer. */
@@ -125,12 +124,16 @@
 
     /* Do something with the message. */
     if (call_callback_4(NULL, cb_recvmsg, source, cmd, ac, av) <= 0) {
-	m = find_message(cmd);
-	if (m) {
-	    if (m->func)
-		m->func(source, ac, av);
+	if (!source && stricmp(cmd, "NICK") != 0) {
+	    log("Source missing for `%s' message from server (%s)",cmd,inbuf);
 	} else {
-	    log("unknown message from server (%s)", inbuf);
+	    Message *m = find_message(cmd);
+	    if (m) {
+		if (m->func)
+		    m->func(source, ac, av);
+	    } else {
+		log("unknown message from server (%s)", inbuf);
+	    }
 	}
     }
 
diff -uNr ircservices-5.0.6/send.c ircservices-5.0.7/send.c
--- ircservices-5.0.6/send.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/send.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines for sending stuff to the network.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/servers.c ircservices-5.0.7/servers.c
--- ircservices-5.0.6/servers.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/servers.c	2003-01-31 00:14:13.000000000 +0900
@@ -2,7 +2,7 @@
  * by Andrew Kempe (TheShadow)
  *     E-mail: <theshadow@shadowfire.org>
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/servers.h ircservices-5.0.7/servers.h
--- ircservices-5.0.6/servers.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/servers.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Online server data.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/services.h ircservices-5.0.7/services.h
--- ircservices-5.0.6/services.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/services.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Main header for Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/signals.c ircservices-5.0.7/signals.c
--- ircservices-5.0.6/signals.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/signals.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Signal handling routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/sockets.c ircservices-5.0.7/sockets.c
--- ircservices-5.0.6/sockets.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/sockets.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Socket routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/sockets.h ircservices-5.0.7/sockets.h
--- ircservices-5.0.6/sockets.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/sockets.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Definitions/declarations for socket utility routines.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/timeout.c ircservices-5.0.7/timeout.c
--- ircservices-5.0.6/timeout.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/timeout.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines for time-delayed actions.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/timeout.h ircservices-5.0.7/timeout.h
--- ircservices-5.0.6/timeout.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/timeout.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Time-delay routine include stuff.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/Makefile ircservices-5.0.7/tools/Makefile
--- ircservices-5.0.6/tools/Makefile	2002-11-27 01:33:42.000000000 +0900
+++ ircservices-5.0.7/tools/Makefile	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 # Makefile for Services tools directory.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-db.c ircservices-5.0.7/tools/convert-db.c
--- ircservices-5.0.6/tools/convert-db.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-db.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Convert other programs' databases to XML.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-db.h ircservices-5.0.7/tools/convert-db.h
--- ircservices-5.0.6/tools/convert-db.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-db.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* External declarations for convert-db.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-epona.c ircservices-5.0.7/tools/convert-epona.c
--- ircservices-5.0.6/tools/convert-epona.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-epona.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Conversion routines for Epona databases (version 1.3.0 and later).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-magick.c ircservices-5.0.7/tools/convert-magick.c
--- ircservices-5.0.6/tools/convert-magick.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-magick.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Conversion routines for Magick 1.4b2 and Wrecked 1.2 databases.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-ptlink.c ircservices-5.0.7/tools/convert-ptlink.c
--- ircservices-5.0.6/tools/convert-ptlink.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-ptlink.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Conversion routines for PTlink 2.18.x databases.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-sirv.c ircservices-5.0.7/tools/convert-sirv.c
--- ircservices-5.0.6/tools/convert-sirv.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-sirv.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,7 +1,7 @@
 /* Conversion routines for SirvNET databases (any version), Auspice
  * databases (versions 2.5-2.7), and Bolivia databases (version 1.2.0).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-trircd.c ircservices-5.0.7/tools/convert-trircd.c
--- ircservices-5.0.6/tools/convert-trircd.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-trircd.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Conversion routines for trircd Services program (version 4.26).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/convert-ver8.c ircservices-5.0.7/tools/convert-ver8.c
--- ircservices-5.0.6/tools/convert-ver8.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/tools/convert-ver8.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,7 +1,7 @@
 /* Conversion routines for datafile version 8 based databases (Daylight and
  * IRCS 1.2).
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/tools/ircservices-chk.in ircservices-5.0.7/tools/ircservices-chk.in
--- ircservices-5.0.6/tools/ircservices-chk.in	2002-06-19 11:37:17.000000000 +0900
+++ ircservices-5.0.7/tools/ircservices-chk.in	2003-01-22 23:36:43.000000000 +0900
@@ -6,7 +6,7 @@
 #        ircservices-options: options to pass to ircservices executable
 # If you change PIDFile in ircservices.conf, also change PIDFILE below.
 #
-# IRC Services is copyright (c) 1996-2002 Andrew Church.
+# IRC Services is copyright (c) 1996-2003 Andrew Church.
 #     E-mail: <achurch@achurch.org>
 # Parts written by Andrew Kempe and others.
 # This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/users.c ircservices-5.0.7/users.c
--- ircservices-5.0.6/users.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/users.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Routines to maintain a list of online users.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/users.h ircservices-5.0.7/users.h
--- ircservices-5.0.6/users.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/users.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* Online user data structure.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/version.h ircservices-5.0.7/version.h
--- ircservices-5.0.6/version.h	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/version.h	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* External declarations for version.c.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/version.sh ircservices-5.0.7/version.sh
--- ircservices-5.0.6/version.sh	2002-11-25 13:39:43.000000000 +0900
+++ ircservices-5.0.7/version.sh	2003-01-30 23:42:35.000000000 +0900
@@ -3,7 +3,7 @@
 # Build the version.c file which contains all the version related info and
 # needs to be updated on a per-build basis.
 
-VERSION=5.0.6
+VERSION=5.0.7
 
 # Increment Services build number
 if [ -f version.c ] ; then
@@ -24,7 +24,7 @@
 cat >version.c <<EOF
 /* Version information for IRC Services.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for
diff -uNr ircservices-5.0.6/vsnprintf.c ircservices-5.0.7/vsnprintf.c
--- ircservices-5.0.6/vsnprintf.c	2002-11-27 01:33:43.000000000 +0900
+++ ircservices-5.0.7/vsnprintf.c	2003-01-31 00:14:13.000000000 +0900
@@ -1,6 +1,6 @@
 /* An implementation of vsnprintf() for systems that don't have it.
  *
- * IRC Services is copyright (c) 1996-2002 Andrew Church.
+ * IRC Services is copyright (c) 1996-2003 Andrew Church.
  *     E-mail: <achurch@achurch.org>
  * Parts written by Andrew Kempe and others.
  * This program is free but copyrighted software; see the file COPYING for