diff -uNr ircservices-5.0.54/Changes ircservices-5.0.55/Changes
--- ircservices-5.0.54/Changes	2005-08-16 11:19:37 +0900
+++ ircservices-5.0.55/Changes	2005-09-26 12:50:33 +0900
@@ -1,5 +1,10 @@
 Version 5.0
 -----------
+2005/09/26 .55	Added documentation on CSSetChannelTime configuration option.
+2005/08/25	Fixed rare bug allowing users to gain voice status
+		    improperly.  Reported by Anton Wolkov <phan70m@gmail.com>
+2005/08/23	Added "authed" callback for newly-authorized nicknames.
+		    Suggested by Robin Burchell <surreal.w00t@gmail.com>
 2005/08/16 .54	The ChanServ check_kick callback now passes the channel
 		    name as a string instead of the Channel structure, so
 		    the channel name can be known even if the channel is
diff -uNr ircservices-5.0.54/actions.c ircservices-5.0.55/actions.c
--- ircservices-5.0.54/actions.c	2005-08-16 12:42:19 +0900
+++ ircservices-5.0.55/actions.c	2005-09-26 12:55:52 +0900
@@ -287,7 +287,7 @@
  * sent out in a single command, decreasing network traffic (and scroll).
  * This function should be called as either:
  *	set_cmode(sender, channel, modes, param1, param2...)
- * to send a channel mode, or
+ * to send one or more channel modes, or
  *	set_cmode(NULL, channel)
  * to flush buffered modes for a channel (if `channel' is NULL, flushes
  * buffered modes for all channels).
diff -uNr ircservices-5.0.54/docs/3.html ircservices-5.0.55/docs/3.html
--- ircservices-5.0.54/docs/3.html	2005-03-31 18:19:08 +0900
+++ ircservices-5.0.55/docs/3.html	2005-09-26 12:49:40 +0900
@@ -711,9 +711,31 @@
 administrators (see <a href="#4-1">section 3-4-1</a>).  Channels which have
 already been registered can be used with Services as usual.
 
+<a name="2-1.channel-ts"></a>
+<p>Most modern IRC servers keep track of the time a channel was created,
+and use that time to keep track of which channel is the "original" channel
+during netsplits.  For example, if server A splits from the network and
+no users on server A are in channel <tt>#B</tt>, then channel <tt>#B</tt>
+will disappear from server A; if a user on server A then enters channel
+<tt>#B</tt> while the server is still split, he will gain channel operator
+privileges, which he would (in the absence of these timestamps) keep even
+after the server rejoined the network.  Services can take advantage of this
+feature to set the timestamp of registered channels to the time of channel
+registration, ensuring that the channel's proper modes will always be
+retained through netsplits.  This functionality is enabled with the
+<a href="a.html#protocol/(insert_protocol_name_here).CSSetChannelTime"><tt>CSSetChannelTime</tt></a>
+configuration option in <tt>modules.conf</tt> (note that the option is
+located in the protocol module section, rather than the ChanServ module
+section; it is planned to be moved to the ChanServ section in version 5.1
+of Services).  However, the use of this option has the unfortunate side
+effect of generating spurious mode changes and warning messages on many IRC
+servers; these can be safely ignored, but if they prove to be a bother, you
+may want to consider disabling the option.  (See <a href="faq.html#E11">FAQ
+E.11</a> for details.)
+
 <p>Finally, note that the channel "<tt>#</tt>" (a single "<tt>#</tt>"
 character with no name following) is treated specially by Services.  While
-this channel is legal according to the IRC protocol (RFC 1459) and in fact
+this channel is legal according to the IRC protocol (RFC 1459) and
 supported by most, if not all, IRC servers, it requires special treatment
 for use with a number of Services functions, and in fact bugs in previous
 versions of Services as well as other Services-like programs have allowed
diff -uNr ircservices-5.0.54/docs/5.html ircservices-5.0.55/docs/5.html
--- ircservices-5.0.54/docs/5.html	2005-01-25 17:54:38 +0900
+++ ircservices-5.0.55/docs/5.html	2005-09-22 01:20:36 +0900
@@ -38,11 +38,21 @@
 <tt>ircservices.conf</tt> file to enable this option.  The option has the
 format "<tt>-export</tt>" or "<tt>-export=<i>filename</i></tt>", where
 <tt><i>filename</i></tt> is the name of the file to write the XML data to;
-if it does not begin with a slash, it is taken relative to the Services
-data directory (the directory containing the database and log files).  If
-<tt><i>filename</i></tt> is not given or is a single hyphen ("<tt>-</tt>"),
-the data will be printed on standard output.  When the export completes,
-Services will terminate, and will not connect to the IRC network.
+if it does not begin with a slash, it is taken to be relative to the
+Services data directory (the directory containing the database and log
+files).  If <tt><i>filename</i></tt> is not given or is a single hyphen
+("<tt>-</tt>"), the data will be printed on standard output.  When the
+export completes, Services will terminate, and will not connect to the IRC
+network.  This action can be performed while another copy of Services is
+running, but the output will not include changes made online since the
+last time the databases were saved to disk.  (It is also possible for the
+running copy of Services to report a "data directory locked" error if it
+tries to save the databases while the export operation is in progress.
+This is harmless; you can force the databases to be written after the
+export completes by using the OperServ
+<a href="4.html#oper.update"><tt>UPDATE</tt></a> command, but do not use
+the <tt>FORCE</tt> option while the export is still running as this may
+result in corrupted database files.)
 
 <p>Additionally, if the <tt>misc/xml-export</tt> module is loaded into
 Services, the HTTP database access module (<tt>httpd/dbaccess</tt>) will
@@ -54,7 +64,7 @@
 Internet Explorer, right-click on the link and select "Save target as..."
 from the pop-up menu.
 
-<p>The format of the exported XML data is discussed in
+<p>The format of the exported XML data is described in
 <a href=b.html>Appendix B</a>.  No DTD is currently available.
 
 <p><b>Notes:</b> Services will not respond to any network activity while you
@@ -63,8 +73,8 @@
 even get disconnected from the network in extreme cases.  Additionally, be
 aware that the data may change after you have downloaded it; if you want to
 avoid this, for example when exporting data to move it to another machine
-or network, use the command-line option <tt>-export</tt> rather than the
-HTTP server interface.
+or network, use the command-line option <tt>-export</tt> (after shutting
+Services down) rather than the HTTP server interface.
 
 <p><b>Note to Internet Explorer users:</b>  Some versions of Internet
 Explorer have a bug which can prevent the XML data from being displayed or
@@ -104,11 +114,11 @@
 <p>To import a set of data stored in XML format into Services, start
 Services with the command-line option "<tt>-import=<i>filename</i></tt>",
 where <tt><i>filename</i></tt> is the name of the file containing the data;
-if it does not begin with a slash, it is taken relative to the Services
-data directory.  Services will parse the data file, and if no errors are
-found, the data will be merged into Services' databases and the program
-will terminate.  If problems are found, they will be printed on standard
-output.
+if it does not begin with a slash, it is taken to be relative to the
+Services data directory.  Services will parse the data file, and if no
+errors are found, the data will be merged into Services' databases and the
+program will terminate.  If problems are found, they will be printed on
+standard output and the databases will not be modified.
 
 <p>Normally, if nickname or channel "collisions" occur&mdash;that is, if a
 nickname or channel in the input data is already registered in Services'
@@ -324,11 +334,11 @@
 	have no privileges on the channel.
 <li>Services does not support "root" and "master" privilege levels as in
 	Auspice.  There can only be one root nickname, which is set in
-	<tt>ircservices.conf</tt>; all root/master settings in the data
-	files will be discarded.  (Admin/oper settings will be retained.)
-	Note that Services admins can perform any function (except
-	modifying the admin list), including modifying Services settings
-	and shutting down Services.
+	<tt>modules.conf</tt>; all root/master settings in the data files
+	will be discarded.  (Admin/oper settings will be retained.)  Note
+	that Services admins can perform any function (except modifying the
+	admin list), including modifying Services settings and shutting
+	down Services.
 <li>NickServ <tt>AUTH</tt>, <tt>COMMENT</tt>, <tt>NOTE</tt>, <tt>LOCK</tt>,
 	<tt>MARK</tt>, <tt>SET KILL HIGH</tt>, <tt>SETFLAG AUTOJOIN</tt>,
 	and <tt>SETMLOCK</tt>, as well as ChanServ <tt>BADWORDS</tt>,
@@ -379,7 +389,7 @@
 	</ul>
 <li>Nicknames designated as CSOPs will be converted to Services operators.
 	Note that the privileges granted by IRC Services to Services
-	operators are different than those granted by Cygnus to CSOPs.
+	operators are different from those granted by Cygnus to CSOPs.
 <li>Nicknames will retain their memo limit settings in the converted data;
 	however, they will not be affected by changes to the
 	<a href="a.html#memoserv/main.MSMaxMemos"><tt>MSMaxMemos</tt></a>
diff -uNr ircservices-5.0.54/docs/6.html ircservices-5.0.55/docs/6.html
--- ircservices-5.0.54/docs/6.html	2005-08-16 11:16:13 +0900
+++ ircservices-5.0.55/docs/6.html	2005-08-23 14:11:06 +0900
@@ -1169,7 +1169,18 @@
 <h4>6-2-3. NickServ callbacks</h4>
 
 <p><dl>
-<dt><a name="2-3-cancel_user"></a>
+<dt><a name="2-3-authed"></a>
+<tt><b>authed</b></tt> (module <tt>nickserv/mail-auth</tt>)
+<br>Parameters: <tt>User *<i>u</i></tt>, <tt>NickInfo *<i>ni</i></tt>,
+	<tt>NickGroupInfo *<i>ngi</i></tt>, <tt>int <i>authreason</i></tt>
+    <dd>Called when a user successfully authenticates their nickname with
+	the <tt>AUTH</tt> command, after all normal processing has been
+	performed.  <tt><i>authreason</i></tt> is the value that the
+	<tt>ngi-&gt;authreason</tt> field had before being cleared (one of
+	the <tt>NICKAUTH_*</tt> constants).  The callback routine should
+	always return 0.
+
+<p><dt><a name="2-3-cancel_user"></a>
 <tt><b>cancel_user</b></tt>
 <br>Parameters: <tt>User *<i>u</i></tt>, <tt>int <i>old_status</i></tt>,
 	<tt>int <i>old_authstat</i></tt>
diff -uNr ircservices-5.0.54/docs/faq.html ircservices-5.0.55/docs/faq.html
--- ircservices-5.0.54/docs/faq.html	2005-02-23 03:26:50 +0900
+++ ircservices-5.0.55/docs/faq.html	2005-09-26 12:44:52 +0900
@@ -124,6 +124,9 @@
 <br><a href="#E10">E.10. Why are the <tt>STATUS</tt> error messages so
 	strange?  Why doesn't <tt>STATUS</tt> obey the language setting in
 	NickServ?</a>
+<br><a href="#E11">E.11. Whenever a user enters an empty channel, I see
+	messages about "channel TS", and the user loses and then gets
+	channel ops again.</a>
 
 <h3>F. OperServ features</h3>
 <a href="#F1">F.1. Using the OperServ <tt>JUPE</tt> command results in server
@@ -834,6 +837,30 @@
 </dl>
 
 
+<a name=E11></a>
+<p><dl><dt><b>E.11. Whenever a user enters an empty channel, I see
+	messages about "channel TS", and the user loses and then gets
+	channel ops again.</b>
+<dd><p>
+	These messages and mode changes are harmless, and are caused by the
+<a href="a.html#protocol/(insert_protocol_name_here).CSSetChannelTime"><tt>CSSetChannelTime</tt></a>
+	configuration option (see also
+	<a href="3.html#2-1.channel-ts">section 3-2-1</a>).  This
+	functionality is implemented by sending a message to the network
+	that Services has the "proper" timestamp (TS) and modes for the
+	channel.  Unfortunately, many IRC servers blindly cancel their own
+	modes, including the channel ops of the user who initially joined
+	the channel, before noticing that Services is not actually changing
+	any modes; this resultes in the server sending out a "<tt>-o</tt>"
+	mode change immediately followed by a "<tt>+o</tt>".  Some servers
+	also seem to think that the timestamp change is a bug (or hack
+	attempt) and send out a warning to IRC operators about it.
+	<p>
+	All of these messages are harmless and can be safely ignored, but
+	if they bother you, you may want to consider disabling the
+	<tt>CSSetChannelTime</tt> option.
+</dl>
+
 
 <!------------------------------------------------------------------------>
 <p><hr>
diff -uNr ircservices-5.0.54/docs/upgrade.html ircservices-5.0.55/docs/upgrade.html
--- ircservices-5.0.54/docs/upgrade.html	2003-05-28 15:31:04 +0900
+++ ircservices-5.0.55/docs/upgrade.html	2005-09-22 01:02:34 +0900
@@ -63,7 +63,10 @@
 "<tt>listnicks</tt>" and "<tt>listchans</tt>", to show nickname and
 channel data from the command line.  These programs have been removed in
 version 5.0 in favor of the new HTTP interface; the <tt>httpd/dbaccess</tt>
-module provides the same functionality and much, much more.
+module provides the same functionality and much, much more.  (It is still
+possible to retrieve data from the command line as well, using the
+<tt>-export</tt> option; see <a href="5.html#1">section 5-1</a> for
+details.)
 
 <p align=center><hr width="50%">
 
@@ -127,6 +130,19 @@
 linked must be <i>unregistered</i> nicknames, which is also a change from
 version 4.x; make sure your users are aware of these changes.
 
+<p>Related to these changes, it is also important to note that the
+behavior of the NickServ <tt>UNLINK</tt> and <tt>DROP</tt> commands has
+changed with respect to de-registration of nicknames; in particular, <b>the
+<tt>DROP</tt> command will now drop <i>all</i> linked nicknames!</b>  The
+syntax for the <tt>DROP</tt> command has changed as well, requiring a
+password to confirm the action, and the help message includes a warning,
+but be aware that users may simply append their password to the command
+without checking the help message, resulting in the unintended
+de-registration of all of the user's nicks.  The <tt>UNLINK</tt> command
+should be used to cancel single nicknames out of a group of links (a
+nickname which is unlinked is deregistered as well, similar to
+<tt>UNLINK</tt> followed by <tt>DROP</tt> in version 4.x).
+
 <p align=center><hr width="50%">
 
 <a name=7></a>
diff -uNr ircservices-5.0.54/modules/chanserv/check.c ircservices-5.0.55/modules/chanserv/check.c
--- ircservices-5.0.54/modules/chanserv/check.c	2005-08-16 12:42:20 +0900
+++ ircservices-5.0.55/modules/chanserv/check.c	2005-09-26 12:55:53 +0900
@@ -26,7 +26,7 @@
 static int cb_check_kick = -1;
 
 static void local_set_cumodes(Channel *c, char plusminus, int32 modes,
-			      const char *nick);
+			      struct c_userlist *cu);
 
 /*************************************************************************/
 /*************************************************************************/
@@ -173,7 +173,7 @@
 	    if (!((oldmodes & cumode_h)
 		  && !((oldmodes^modes) & ~(CUMODE_v|cumode_h)))
 	    ) {
-		local_set_cumodes(c, '-', (modes & ~oldmodes), user->nick);
+		local_set_cumodes(c, '-', (modes & ~oldmodes), u);
 	    }
 	}
 	return;
@@ -218,7 +218,7 @@
     if ((res & ~modes)
      && (oldmodes < 0 || is_servermode || (ci->flags & CI_ENFORCE))
     ) {
-	local_set_cumodes(c, '+', res & ~modes, user->nick);
+	local_set_cumodes(c, '+', res & ~modes, u);
 	if ((res & ~modes) & CUMODE_o) {
 	    ci->last_used = time(NULL);
 	    put_channelinfo(ci);
@@ -231,7 +231,7 @@
 
     /* Check for mode subtractions */
     if (res & modes)
-	local_set_cumodes(c, '-', res & modes, user->nick);
+	local_set_cumodes(c, '-', res & modes, u);
 }
 
 /*************************************************************************/
@@ -446,11 +446,11 @@
 /*************************************************************************/
 
 /* Helper routine for check_chan_user_modes(): sets all of the given modes
- * on client `nick' in channel `c'.
+ * on client `cu' in channel `c'.
  */
 
 static void local_set_cumodes(Channel *c, char plusminus, int32 modes,
-			      const char *nick)
+			      struct c_userlist *cu)
 {
     char buf[3], modestr[BUFSIZE], *s;
 
@@ -461,8 +461,14 @@
     s = modestr;
     while (*s) {
 	buf[1] = *s++;
-	set_cmode(s_ChanServ, c, buf, nick);
+	set_cmode(s_ChanServ, c, buf, cu->user->nick);
     }
+    /* Set user's modes now, so check_chan_user_modes() can properly
+     * determine whether subsequent modes should be set or not */
+    if (plusminus == '+')
+	cu->mode |= modes;
+    else if (plusminus == '-')
+	cu->mode &= ~modes;
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.54/modules/nickserv/mail-auth.c ircservices-5.0.55/modules/nickserv/mail-auth.c
--- ircservices-5.0.54/modules/nickserv/mail-auth.c	2005-08-16 12:42:21 +0900
+++ ircservices-5.0.55/modules/nickserv/mail-auth.c	2005-09-26 12:55:54 +0900
@@ -44,6 +44,8 @@
 static time_t NSNoAuthExpire = 0;
 static time_t NSSendauthDelay = 0;
 
+static int cb_authed = -1;
+
 
 static void do_auth(User *u);
 static void do_sendauth(User *u);
@@ -197,6 +199,7 @@
 	}
 	module_log("%s@%s authenticated %s for %s", u->username, u->host,
 		   what, ni->nick);
+	call_callback_4(module, cb_authed, u, ni, ngi, authreason);
     }
 }
 
@@ -497,6 +500,13 @@
 	return 0;
     }
 
+    cb_authed = register_callback(module, "authed");
+    if (cb_authed < 0) {
+	module_log("Unable to register callback");
+	exit_module(0);
+	return 0;
+    }
+
     if (!add_callback(module_nickserv, "registered", do_registered)
      || !add_callback(module_nickserv, "SET EMAIL", do_set_email)
      || !add_callback(module_nickserv, "IDENTIFY check", do_identify_check)
@@ -558,6 +568,8 @@
 	module_nickserv = NULL;
     }
 
+    unregister_callback(module, cb_authed);
+
     return 1;
 }
 
diff -uNr ircservices-5.0.54/version.sh ircservices-5.0.55/version.sh
--- ircservices-5.0.54/version.sh	2005-08-16 11:19:58 +0900
+++ ircservices-5.0.55/version.sh	2005-08-25 15:00:53 +0900
@@ -6,7 +6,7 @@
 # $PROGRAM is the string returned as the first part of a /VERSION reply,
 # and must not contain spaces.  It is not used anywhere else.
 PROGRAM=ircservices
-VERSION=5.0.54
+VERSION=5.0.55
 
 # Increment Services build number
 if [ -f version.c ] ; then