diff -uNr ircservices-5.0.41/Changes ircservices-5.0.42/Changes
--- ircservices-5.0.41/Changes	2004-10-03 10:59:54 +0900
+++ ircservices-5.0.42/Changes	2004-11-22 19:10:01 +0900
@@ -1,5 +1,27 @@
 Version 5.0
 -----------
+2004/11/22 .42	The mail/smtp module now allows multiple RelayHost
+		    configuration directives for backup relay servers.
+		    Suggested by Torbjorn Svennson <azoff@se.linux.org>
+2004/11/22	Fixed extraneous "Unknown message" log messages on Unreal.
+		    Reported by Ali Sor <alisor@softhome.net>
+2004/10/29	Clarified "please change your nick" message text.
+		    Suggested by Dylan v.d Merwe <dylanvdm@icon.co.za>
+2004/10/25	Fixed crash when using the Japanese language file with the
+		    OperServ SLINE COUNT command.
+2004/10/19	Fixed bug allowing StatServ and global noticer nicknames to
+		    be registered/linked.  Reported by M. van Cuijk
+		    <mark@phedny.net>
+2004/10/14	Fixed various bugs and warnings when compiling on x86-64.
+		    Reported by <liverbugg@rinux.org>
+2004/10/14	Added workaround for GNU coreutils (>=5.2) brokenness.
+2004/10/13	SET MLOCK no longer allows locking +K without +i on Unreal.
+		    Reported by <help@thaiirc.in.th>
+2004/10/13	Fixed cosmetic bug in MemoServ IGNORE.  Reported by
+		    <saman@ttnet.net.tr>
+2004/10/11	Fixed disconnect on incoming data flood.  Reported by
+		    <ballsy@mystical.net>
+2004/10/03	Updated the README file for the current manual structure.
 2004/10/03 .41	Fixed SQUIT of juped servers on Bahamut.  Reported by Pasi
 		    Hirvonen <psh@iki.fi>
 2004/10/03	Fixed cosmetic bug in NickServ SUSPEND help.  Reported by
@@ -414,8 +436,7 @@
 2003/02/14	Added checks to avoid "sockprintf() with NULL socket" errors
 		    appearing in the logfile.
 2003/02/14	Fixed trivial bug in calculating socket read timeout.
-2003/02/01 .9	Fixed a bug leading to desynchs.  Reported by
-		    <gastaman@azzurra.org>
+2003/02/01 .9	Fixed a bug leading to desynchs.
 2003/01/31 .8	Fixed a number of compilation warnings.
 2003/01/31	Fixed typo and thinko causing crashes on channel mode changes.
 2003/01/30 .7	Fixed crash when opening a corrupt StatServ database.
diff -uNr ircservices-5.0.41/KnownBugs ircservices-5.0.42/KnownBugs
--- ircservices-5.0.41/KnownBugs	2003-01-22 23:45:10 +0900
+++ ircservices-5.0.42/KnownBugs	2004-11-18 20:56:39 +0900
@@ -34,3 +34,8 @@
 will incorrectly respond with "Your <option name> has been changed" or the
 like.  (The target nickname's settings are correctly modified, while your
 own nickname's settings are left alone.)
+
+OperServ AKILL LIST/VIEW only show the first 50 entries on the list, to
+prevent IRC operators being flooded off by the list results; however, the
+help messages and command responses do not make any note of this.  This has
+been corrected for version 5.1.
diff -uNr ircservices-5.0.41/README ircservices-5.0.42/README
--- ircservices-5.0.41/README	2002-01-08 22:46:35 +0900
+++ ircservices-5.0.42/README	2004-10-03 19:40:37 +0900
@@ -1,14 +1,14 @@
 IRC Services -- a system of IRC services for IRC networks
 ---------------------------------------------------------
 
-IRC Services is copyright (c) 1996-2002 Andrew Church.  There is absolutely
+IRC Services is copyright (c) 1996-2004 Andrew Church.  There is absolutely
 NO WARRANTY provided with this program; if it blows up in your face, you
 get to clean up the mess.  Services is provided under the terms of the GNU
 General Public License, version 2, and may be freely redistributed, with
 certain limitations described in that license (notably, if you distribute
 IRC Services at all then you must distribute the source code as well).  See
-the GNU General Public License (in the file "COPYING") and appendix B of
-the documentation (docs/b.html).
+the GNU General Public License (in the file "COPYING") and the relevant
+section of the manual (docs/copyright.html).
 
 ---------------------------------------------------------------------------
 
diff -uNr ircservices-5.0.41/TODO ircservices-5.0.42/TODO
--- ircservices-5.0.41/TODO	2004-04-27 10:47:32 +0900
+++ ircservices-5.0.42/TODO	2004-10-25 15:45:20 +0900
@@ -28,8 +28,6 @@
 	    [Alistair Jamieson <ajamieson@student.ccgs.wa.edu.au>]
 NS/CS	Allow "/ns list +21 *.foo.com" and the like (is this syntax good?)
 	    [Michael D. Smith <msmith@acmecorp.org>]
-CS	Return XOP instead of numbers for STATUS when appropriate
-	    [Jollino <jollino@sogno.net>]
 NS	Optionally send memo to newly registered nicks
 	    [Yusuf Iskenderoglu <uhc0@stud.uni-karlsruhe.de>]
 OS	Allow wildcard/regex kills of nicks
diff -uNr ircservices-5.0.41/actions.c ircservices-5.0.42/actions.c
--- ircservices-5.0.41/actions.c	2004-10-03 11:04:33 +0900
+++ ircservices-5.0.42/actions.c	2004-11-22 20:04:43 +0900
@@ -120,7 +120,7 @@
     if (what & CLEAR_BANS)
 	clear_bans(sender, chan, (User *)param);
     if (what & CLEAR_UMODES)
-	clear_umodes(sender, chan, (int32)param);
+	clear_umodes(sender, chan, (int32)(long)param);
     set_cmode(NULL, chan);	/* Flush modes out */
 }
 
diff -uNr ircservices-5.0.41/conffile.c ircservices-5.0.42/conffile.c
--- ircservices-5.0.41/conffile.c	2004-10-03 11:04:33 +0900
+++ ircservices-5.0.42/conffile.c	2004-11-22 20:04:43 +0900
@@ -256,7 +256,7 @@
 		    break;
 		}
 #if SIZEOF_LONG > 4
-		if (longval > 0xFFFFFFFFL) {
+		if (ulongval > 0xFFFFFFFFL) {
 		    config_error(filename, linenum,
 				 "%s: Value out of range for parameter %d",
 				 d->name, optind);
diff -uNr ircservices-5.0.41/configure ircservices-5.0.42/configure
--- ircservices-5.0.41/configure	2004-07-29 13:05:52 +0900
+++ ircservices-5.0.42/configure	2004-10-14 11:32:43 +0900
@@ -47,6 +47,23 @@
     grep >/dev/null 2>&1 "$@"
 }
 
+# Kludge around GNU coreutils stuffiness.
+
+head_is_broken=""
+if [ x`echo test | head -1 2>/dev/null` != xtest ] ; then
+    head_is_broken=broken
+elif [ "x`echo test | head -1 2>&1 >/dev/null`" != x ] ; then
+    head_is_broken=broken
+fi
+HEAD () {
+    if test "$head_is_broken" ; then
+	count=$1; shift
+	head -n`echo x$count | cut -c3-` "$@"
+    else
+	head "$@"
+    fi
+}
+
 ###########################################################################
 
 # Return the default flags for the given C compiler.
@@ -802,7 +819,7 @@
     log cache supplied \`"$CC'"
     CC_FLAGS=$CACHED_CC_FLAGS
 elif run gcc --version ; then
-    version=`gcc --version 2>&1 | head -1 | sed 's/[^0-9]*[^0-9.]\([0-9][0-9.]*\).*/\1/'`
+    version=`gcc --version 2>&1 | HEAD -1 | sed 's/[^0-9]*[^0-9.]\([0-9][0-9.]*\).*/\1/'`
     vmajor=`echo "x.$version.0" | cut -d. -f2`
     vminor=`echo "x.$version.0" | cut -d. -f3`
     if test "x$version" = x || (echo "x$vmajor" | cut -c2- | grep '[^0-9]' >/dev/null 2>&1) || (echo "x$vminor" | cut -c2- | grep '[^0-9]' >/dev/null 2>&1) ; then
@@ -957,13 +974,16 @@
 # See whether compiler supports vararg macros.  Don't bother caching this
 # (besides, it's safer to test each time).
 
+log "test vararg macros..."
 cat >$CONFTMP/test.c <<EOT
 #define foo(a,...) int a() {printf("hello %s\n" , ##__VA_ARGS__); return 69;}
 foo(main,"world")
 EOT
 if run $CC $CONFTMP/test.c -o $CONFTMP/test && (run $CONFTMP/test; test $? = 69) ; then
+    log "vararg macros ok."
     NO_VARARG_MACROS=
 else
+    log "vararg macros NG!"
     if [ ! "$WARNED_OLD_GCC" ] ; then
 	cat <<EOT
 
diff -uNr ircservices-5.0.41/data/example-modules.conf ircservices-5.0.42/data/example-modules.conf
--- ircservices-5.0.41/data/example-modules.conf	2004-10-03 11:04:33 +0900
+++ ircservices-5.0.42/data/example-modules.conf	2004-11-22 20:04:42 +0900
@@ -111,7 +111,9 @@
 
     # RelayHost <hostname>  [REQUIRED]
     #     Specifies the host to which all mail will be sent, e.g. your
-    #     local mail server.
+    #     local mail server.  This directive may be given multiple times to
+    #     specify backup servers; the servers will be tried in the order
+    #     listed.
 
     #RelayHost	mail.example.net
 
diff -uNr ircservices-5.0.41/docs/a.html ircservices-5.0.42/docs/a.html
--- ircservices-5.0.41/docs/a.html	2004-04-09 17:51:16 +0900
+++ ircservices-5.0.42/docs/a.html	2004-11-22 19:57:53 +0900
@@ -697,7 +697,9 @@
 <p><ul><li>
 <tt><b>RelayHost</b> <i>hostname</i></tt>&nbsp;&nbsp;&nbsp;&nbsp;[REQUIRED]
 <p>Specifies the host to which all mail will be sent, e.g. your
-local mail server.
+local mail server.  This directive may be given multiple times to
+specify backup servers; the servers will be tried in the order
+listed.
 
 <p>Example: <tt>RelayHost	mail.example.net</tt>
 </ul>
diff -uNr ircservices-5.0.41/lang/de.l ircservices-5.0.42/lang/de.l
--- ircservices-5.0.41/lang/de.l	2004-09-19 15:35:08 +0900
+++ ircservices-5.0.42/lang/de.l	2004-10-29 21:36:14 +0900
@@ -246,15 +246,15 @@
 NICK_MAY_NOT_BE_USED
 	Dieser Chatname darf nicht genutzt werden.  W�hlen Sie bitte einen anderen Namen.
 DISCONNECT_IN_1_MINUTE
-	Falls Sie nicht innerhalb der n�chsten Minute Ihren Chatnamen �ndern, werden Sie vom Server getrennt.
+	Wenn Sie Ihren Chatnamen nicht innerhalb einer Minute �ndern, wird die Verbindung getrennt.
 DISCONNECT_IN_20_SECONDS
-	Falls Sie nicht innerhalb der n�chsten 20 Sekunden Ihren Chatnamen �ndern, werden Sie vom Server getrennt.
+	Wenn Sie Ihren Chatnamen nicht innerhalb von 20 Sekunden �ndern, wird die Verbindung getrennt.
 DISCONNECT_NOW
 	Dieser Chatname ist bereits registriert; Sie d�rfen ihn nicht benutzen. W�hlen Sie einen anderen Namen, bevor Sie sich neu verbinden.
 FORCENICKCHANGE_IN_1_MINUTE
-	Falls Sie nicht innerhalb der n�chsten Minute Ihren Chatnamen �ndern, wird er automatisch ge�ndert.
+	Wenn Sie Ihren Chatnamen nicht innerhalb einer Minute �ndern, wird Ihr Chatname ge�ndert.
 FORCENICKCHANGE_IN_20_SECONDS
-	Falls Sie nicht innerhalb der n�chsten 20 Sekunden Ihren Chatnamen �ndern, wird er automatisch ge�ndert.
+	Wenn Sie Ihren Chatnamen nicht innerhalb von 20 Sekunden �ndern, wird Ihr Chatname ge�ndert.
 FORCENICKCHANGE_NOW
 	Dieser Chatname ist bereits registriert; Sie d�rfen Ihn nicht benutzen. Ihr Chatname wird jetzt in %s ge�ndert.
 NICK_EXPIRES_SOON
@@ -997,8 +997,8 @@
 	Der Parameter f�r MLOCK +%c ist kein g�ltiger Raumname.
 CHAN_SET_MLOCK_LINK_SAME
 	Der Parameter f�r MLOCK +%c muss ein anderer Raum sein.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	Beim MLOCK +%c muss ebenfalls MLOCK +l gesetzt sein.
+CHAN_SET_MLOCK_REQUIRES
+	Beim MLOCK +%c muss ebenfalls MLOCK +%c gesetzt sein.
 CHAN_SET_MLOCK_BAD_PARAM
 	Der Parameter f�r MLOCK +%c ist nicht g�ltig.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
diff -uNr ircservices-5.0.41/lang/en_us.l ircservices-5.0.42/lang/en_us.l
--- ircservices-5.0.41/lang/en_us.l	2004-09-05 12:37:16 +0900
+++ ircservices-5.0.42/lang/en_us.l	2004-10-29 18:55:03 +0900
@@ -283,15 +283,15 @@
 NICK_MAY_NOT_BE_USED
 	This nickname may not be used. Please choose another one.
 DISCONNECT_IN_1_MINUTE
-	If you do not change within one minute, you will be disconnected.
+	If you do not change your nickname within one minute, you will be disconnected.
 DISCONNECT_IN_20_SECONDS
-	If you do not change within 20 seconds, you will be disconnected.
+	If you do not change your nickname within 20 seconds, you will be disconnected.
 DISCONNECT_NOW
-	This nickname has been registered; you may not use it. Please choose another nickname before reconnecting.
+	This nickname has been registered; you may not use it.  Please choose another nickname before reconnecting.
 FORCENICKCHANGE_IN_1_MINUTE
-	If you do not change within one minute, I will change your nickname.
+	If you do not change your nickname within one minute, it will be changed automatically.
 FORCENICKCHANGE_IN_20_SECONDS
-	If you do not change within 20 seconds, I will change your nickname.
+	If you do not change your nickname within 20 seconds, it will be changed automatically.
 FORCENICKCHANGE_NOW
 	This nickname has been registered; you may not use it.  Your nickname is now being changed to %s.
 NICK_EXPIRES_SOON
@@ -1032,8 +1032,8 @@
 	Parameter for MLOCK +%c is not a valid channel name.
 CHAN_SET_MLOCK_LINK_SAME
 	Parameter for MLOCK +%c must be a different channel.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	MLOCK +%c requires MLOCK +l to be set as well.
+CHAN_SET_MLOCK_REQUIRES
+	MLOCK +%c requires MLOCK +%c to be set as well.
 CHAN_SET_MLOCK_BAD_PARAM
 	Invalid parameter for MLOCK +%c.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
@@ -5086,4 +5086,4 @@
 # version of the master (English) language file was used to create a
 # translated file.
 
-# CVS: $Revision: 2.222.2.3 $
+# CVS: $Revision: 2.222.2.5 $
diff -uNr ircservices-5.0.41/lang/es.l ircservices-5.0.42/lang/es.l
--- ircservices-5.0.41/lang/es.l	2004-09-02 14:42:13 +0900
+++ ircservices-5.0.42/lang/es.l	2004-11-22 16:07:16 +0900
@@ -284,15 +284,15 @@
 NICK_MAY_NOT_BE_USED
 	Este apodo no puede utilizarse. Favor de escoger otro.
 DISCONNECT_IN_1_MINUTE
-	Si no cambia dentro de un minuto, ser� desconectado.
+	Si no cambia su apodo dentro de un minuto, ser� desconectado.
 DISCONNECT_IN_20_SECONDS
-	Si no cambia dentro de 20 segundos, ser� desconectado.
+	Si no cambia su apodo dentro de 20 segundos, ser� desconectado.
 DISCONNECT_NOW
 	Este apodo ha sido registrado; no lo puedes utilizar.  Favor de escoger otro apodo antes de reconectar.
 FORCENICKCHANGE_IN_1_MINUTE
-	Si no cambias dentro de un minuto, cambiar� tu apodo.
+	Si no cambia su apodo dentro de un minuto, le ser� cambiado autom�ticamente.
 FORCENICKCHANGE_IN_20_SECONDS
-	Si no cambias dentro de 20 segundos, cambiar� tu apodo.
+	Si no cambia su apodo dentro de 20 segundos, le ser� cambiado autom�ticamente.
 FORCENICKCHANGE_NOW
 	Este apodo ha sido registrado; no lo puedes utilizar.  Su apodo est� ah�ra siendo cambiado a %s.
 NICK_EXPIRES_SOON
@@ -509,6 +509,8 @@
 # ACCESS responses
 NICK_ACCESS_SYNTAX
 	ACCESS {ADD | DEL | LIST} [M�scara]
+NICK_ACCESS_DISABLED
+	Lo sentimos, modificaci�n a la lista de acceso del apodo est� temporalmente deshabilitada.
 NICK_ACCESS_ALREADY_PRESENT
 	M�scara %s ya existe en su lista de acceso.
 NICK_ACCESS_REACHED_LIMIT
@@ -731,6 +733,8 @@
 	AJOIN ADD canal
 NICK_AJOIN_DEL_SYNTAX
 	AJOIN DEL canal
+NICK_AJOIN_DISABLED
+	Lo sentimos, modificaci�n a la lista de Auto-Ingreso est� temporalmente deshabilitada.
 NICK_AJOIN_ALREADY_PRESENT
 	El canal %s ya est� presente en su lista autojoin (Auto-Ingreso).
 NICK_AJOIN_LIST_FULL
@@ -1030,8 +1034,8 @@
 	Par�metro para MLOCK +%c no es un nombre v�lido de canal.
 CHAN_SET_MLOCK_LINK_SAME
 	Par�metro para MLOCK +%c debe ser canal diferente.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	MLOCK +%c requiere que se fije MLOCK +l tambien.
+CHAN_SET_MLOCK_REQUIRES
+	MLOCK +%c requiere que se fije MLOCK +%c tambien.
 CHAN_SET_MLOCK_BAD_PARAM
 	Par�metro inv�lido para MLOCK +%c.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
@@ -1282,6 +1286,8 @@
 # LEVELS responses
 CHAN_LEVELS_SYNTAX
 	LEVELS Canal {SET | DIS[ABLE] | LIST | RESET} [Articulo [Nivel]]
+CHAN_LEVELS_READONLY
+	Lo sentimos, modificaci�n a la lista de nivel de privilegios del canal est� actualmente deshabilitada.
 CHAN_LEVELS_RANGE
 	Nivel debe de estar entre %d y %d.
 CHAN_LEVELS_CHANGED
@@ -1452,6 +1458,8 @@
 	Todos los bloqueos en el canal %s han sido removidos.
 CHAN_CLEARED_EXCEPTIONS
 	Todas las excepciones en el canal %s han sido removidas.
+CHAN_CLEARED_INVITES
+	Todas las m�scaras de invitaci�n en el canal %s han sido removidas.
 CHAN_CLEARED_MODES
 	Todos los modos en el canal %s han sido borrados.
 CHAN_CLEARED_OPS
@@ -4041,6 +4049,8 @@
 	    BANS        Borra todos los bans (bloqueos) en el canal.
 CHAN_HELP_CLEAR_EXCEPTIONS
 	    EXCEPTIONS  Borra todas las excepciones en el canal.
+CHAN_HELP_CLEAR_INVITES
+	    INVITES     Remueve todas las m�scaras de invitaci�n en el canal.
 CHAN_HELP_CLEAR_MID
 	    OPS         Remueve el estatus de operador de canal (modo +o)
 	                    de todos los usuarios.
diff -uNr ircservices-5.0.41/lang/fr.l ircservices-5.0.42/lang/fr.l
--- ircservices-5.0.41/lang/fr.l	2004-09-02 14:43:42 +0900
+++ ircservices-5.0.42/lang/fr.l	2004-10-13 22:37:59 +0900
@@ -1013,8 +1013,8 @@
 	Le param�tre +%c pour MLOCK n'est pas un nom de canal valide.
 CHAN_SET_MLOCK_LINK_SAME
 	Le param�tre +%c pour MLOCK doit �tre un canal diff�rent.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	Le mode MLOCK +%c requiert que MLOCK +l soit s�lectionn� comme il faut.
+CHAN_SET_MLOCK_REQUIRES
+	Le mode MLOCK +%c requiert que MLOCK +%c soit s�lectionn� comme il faut.
 CHAN_SET_MLOCK_BAD_PARAM
 	Param�tre invalide pour MLOCK +%c.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
diff -uNr ircservices-5.0.41/lang/hu.l ircservices-5.0.42/lang/hu.l
--- ircservices-5.0.41/lang/hu.l	2004-09-05 13:24:13 +0900
+++ ircservices-5.0.42/lang/hu.l	2004-11-02 20:05:55 +0900
@@ -292,15 +292,15 @@
 NICK_MAY_NOT_BE_USED
 	Ez a nickn�v nem haszn�lhat�. K�rlek v�lassz m�sikat!
 DISCONNECT_IN_1_MINUTE
-	Ha nem v�ltoztatsz egy percen bel�l nevet, megszakad a kapcsolatod.
+	Ha nem v�ltoztatod meg a nickneved egy percen bel�l, akkor a kapcsolatod meg fog szakadni.
 DISCONNECT_IN_20_SECONDS
-	Ha nem v�ltoztatsz 20 m�sodpercen bel�l nevet, megszakad a kapcsolatod.
+	Ha nem v�ltoztatod meg a nicknevedet 20 m�sodpercen bel�l, akkor a kapcsolatod meg fog szakadni.
 DISCONNECT_NOW
 	Ez a nickn�v regisztr�lt; nem haszn�lhatod. K�rlek v�lassz m�sik nicknevet, miel�tt �jracsatlakozol.
 FORCENICKCHANGE_IN_1_MINUTE
-	Ha nem v�ltoztatsz nevet egy percen bel�l, �n fogom megv�ltoztatni.
+	Ha nem valtoztatod meg a nicknevedet egy percen belul, akkor automatikusan meg fog valtozni a nickneved.
 FORCENICKCHANGE_IN_20_SECONDS
-	Ha nem v�ltoztatsz nevet 20 m�sodpercen bel�l, �n fogom megv�ltoztatni.
+	Ha nem valtoztatod meg a nicknevedet 20 masodpercen belul, akkor automatikusan meg fog valtozni a nickneved.
 FORCENICKCHANGE_NOW
 	Ez a nickn�v regisztr�lt; te nem haszn�lhatod.  A te nickneved most meg lesz v�ltoztatva: %s.
 NICK_EXPIRES_SOON
@@ -1043,8 +1043,8 @@
 	A megadott flaghez (+%c) csatornan�v sz�ks�ges.
 CHAN_SET_MLOCK_LINK_SAME
 	Az MLOCK +%c param�tern�l egy m�sik szob�t kell megadni.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	A megadott flag (+%c) j� be�ll�t�s�hoz +l flag is sz�ks�ges.
+CHAN_SET_MLOCK_REQUIRES
+	A megadott flag (+%c) j� be�ll�t�s�hoz +%c flag is sz�ks�ges.
 CHAN_SET_MLOCK_BAD_PARAM
 	A megdott flag (+%c) �rv�nytelen.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
diff -uNr ircservices-5.0.41/lang/index ircservices-5.0.42/lang/index
--- ircservices-5.0.41/lang/index	2004-09-05 12:38:51 +0900
+++ ircservices-5.0.42/lang/index	2004-11-18 09:58:50 +0900
@@ -366,7 +366,7 @@
 CHAN_SET_MLOCK_MODE_REG_BAD
 CHAN_SET_MLOCK_LINK_BAD
 CHAN_SET_MLOCK_LINK_SAME
-CHAN_SET_MLOCK_LINK_NO_LIMIT
+CHAN_SET_MLOCK_REQUIRES
 CHAN_SET_MLOCK_BAD_PARAM
 CHAN_SET_MLOCK_UNKNOWN_CHAR
 CHAN_SET_MLOCK_CANNOT_LOCK
diff -uNr ircservices-5.0.41/lang/ja_euc.l ircservices-5.0.42/lang/ja_euc.l
--- ircservices-5.0.41/lang/ja_euc.l	2004-09-02 14:45:38 +0900
+++ ircservices-5.0.42/lang/ja_euc.l	2004-10-31 20:16:26 +0900
@@ -229,9 +229,9 @@
 DISCONNECT_NOW
 	���Υ˥å�����Ͽ����Ƥ��ޤ��Τǡ����Ȥ��ˤʤ�ޤ��󡣺���³��������¾�Υ˥å����ѹ����Ʋ�������
 FORCENICKCHANGE_IN_1_MINUTE
-	1ʬ����˥˥å����Ѥ��ʤ���С��˥å����ѹ�����ޤ���
+	1ʬ����˥˥å����Ѥ��ʤ���С��˥å�����ưŪ���ѹ�����ޤ���
 FORCENICKCHANGE_IN_20_SECONDS
-	20�ð���˥˥å����Ѥ��ʤ���С��˥å����ѹ�����ޤ���
+	20�ð���˥˥å����Ѥ��ʤ���С��˥å�����ưŪ���ѹ�����ޤ���
 FORCENICKCHANGE_NOW
 	���Υ˥å�����Ͽ����Ƥ��ޤ��Τǡ����Ȥ��ˤʤ�ޤ��󡣤��ʤ��Υ˥å��ϡ�%s�פ��ѹ�����ޤ�����
 NICK_EXPIRES_SOON
@@ -448,6 +448,8 @@
 # ACCESS����
 NICK_ACCESS_SYNTAX
 	ACCESS {ADD | DEL | LIST} [�ޥ���]
+NICK_ACCESS_DISABLED
+	�˥å������ѵ��ĥꥹ�Ȥ��Խ��ϸ��߽���ޤ���
 NICK_ACCESS_REACHED_LIMIT
 	���ѵ��ĥꥹ�Ȥ����äѤ��Ǥ���
 NICK_ACCESS_ALREADY_PRESENT
@@ -475,7 +477,7 @@
 NICK_LINK_SYNTAX
 	LINK �˥å�
 NICK_LINK_DISABLED
-	��󥯤ϸ��߽���ޤ���
+	�˥å��Υ�󥯤ϸ��߽���ޤ���
 NICK_LINK_FAILED
 	��󥯤Ͻ���ޤ���Ǥ�����
 NICK_CANNOT_BE_LINKED
@@ -507,7 +509,7 @@
 NICK_UNLINK_OPER_SYNTAX
 	UNLINK �˥å� [FORCE]
 NICK_UNLINK_DISABLED
-	��󥯲���ϸ��߽���ޤ���
+	�˥å��Υ�󥯲���ϸ��߽���ޤ���
 NICK_UNLINK_FAILED
 	��󥯲���Ͻ���ޤ���Ǥ�����
 NICK_UNLINK_SAME
@@ -670,10 +672,12 @@
 	AJOIN ADD �����ͥ�
 NICK_AJOIN_DEL_SYNTAX
 	AJOIN DEL �����ͥ�
+NICK_AJOIN_DISABLED
+	�˥å��μ�ư���åꥹ�Ȥ��Խ��ϸ��߽���ޤ���
 NICK_AJOIN_ALREADY_PRESENT
 	�����ͥ��%s�פϤ��Ǥ˼�ư���åꥹ�Ȥ���Ͽ����Ƥ��ޤ���
 NICK_AJOIN_LIST_FULL
-	��ư�����ͥ뻲�åꥹ�Ȥ����äѤ��Ǥ���
+	��ư���åꥹ�Ȥ����äѤ��Ǥ���
 NICK_AJOIN_ADDED
 	�����ͥ��%s�פ�ư���åꥹ�Ȥ��ɲä��ޤ�����
 NICK_AJOIN_NOT_FOUND
@@ -681,13 +685,13 @@
 NICK_AJOIN_DELETED
 	�����ͥ��%s�פ�ư���åꥹ�Ȥ��������ޤ�����
 NICK_AJOIN_LIST_EMPTY
-	��ư�����ͥ뻲�åꥹ�Ȥ϶��Ǥ���
+	��ư���åꥹ�Ȥ϶��Ǥ���
 NICK_AJOIN_LIST
-	��ư�����ͥ뻲�åꥹ�ȡ�
+	��ư���åꥹ�ȡ�
 NICK_AJOIN_LIST_X_EMPTY
-	�˥å���%s�פμ�ư�����ͥ뻲�åꥹ�Ȥ϶��Ǥ���
+	�˥å���%s�פμ�ư���åꥹ�Ȥ϶��Ǥ���
 NICK_AJOIN_LIST_X
-	�˥å���%s�פμ�ư�����ͥ뻲�åꥹ�ȡ�
+	�˥å���%s�פμ�ư���åꥹ�ȡ�
 
 ################ mail-auth�⥸�塼���ѥ�å�����
 
@@ -974,8 +978,8 @@
 	�⡼�ɡ�+%c�פΥѥ�᡼����ͭ���ʥ����ͥ�̾�ǤϤ���ޤ���
 CHAN_SET_MLOCK_LINK_SAME
 	�⡼�ɡ�+%c�פΥѥ�᡼���ˡ�Ʊ�������ͥ����ꤹ�뤳�ȤϤǤ��ޤ���
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	�⡼�ɡ�+%c�פ���å�����ˤϡ��⡼�ɡ�+l�פ�Ʊ���˥��å����ʤ���Фʤ�ޤ���
+CHAN_SET_MLOCK_REQUIRES
+	�⡼�ɡ�+%c�פ���å�����Ȥ��ϡ��⡼�ɡ�+%c�פ�Ʊ���˥��å����ʤ���Фʤ�ޤ���
 CHAN_SET_MLOCK_BAD_PARAM
 	�⡼�ɡ�+%c�פΥѥ�᡼����̵���Ǥ���
 CHAN_SET_MLOCK_UNKNOWN_CHAR
@@ -1099,7 +1103,7 @@
 CHAN_ACCESS_SYNTAX
 	ACCESS �����ͥ� {ADD | DEL | LIST | COUNT} [�˥å� [��٥�] | ����ȥ꡼�ֹ�]
 CHAN_ACCESS_DISABLED
-	���������ꥹ�Ȥ��ѹ��ϸ��߽���ޤ���
+	���������ꥹ�Ȥ��Խ��ϸ��߽���ޤ���
 CHAN_ACCESS_LEVEL_NONZERO
 	����������٥�ϥ����ˤ�����Ǥ��ޤ���
 CHAN_ACCESS_LEVEL_RANGE
@@ -1185,7 +1189,7 @@
 CHAN_AKICK_SYNTAX
 	AKICK �����ͥ� {ADD | DEL | LIST | VIEW | ENFORCE | COUNT} [�ޥ��� | �ꥹ��]
 CHAN_AKICK_DISABLED
-	��ư���å��ꥹ�Ȥ��ѹ��ϸ��ߤǤ��ޤ���
+	��ư���å��ꥹ�Ȥ��Խ��ϸ��ߤǤ��ޤ���
 CHAN_AKICK_ALREADY_EXISTS
 	��%s�פϤ��Ǥ�%s�μ�ư���å��ꥹ�Ȥ�¸�ߤ��Ƥ��ޤ���
 CHAN_AKICK_REACHED_LIMIT
@@ -1226,6 +1230,8 @@
 # LEVELS����
 CHAN_LEVELS_SYNTAX
 	LEVELS �����ͥ� {SET | DIS[ABLE] | LIST | RESET} [���� [��٥�]]
+CHAN_LEVELS_READONLY
+	�����ͥ�θ��¥�٥�������ѹ��ϸ��߽���ޤ���
 CHAN_LEVELS_RANGE
 	��٥�ϡ�%d��%d���ϰ�������ꤷ�Ʋ�������
 CHAN_LEVELS_CHANGED
@@ -1936,7 +1942,7 @@
 	����ͭ�����¡�%s
 	����������ͳ��%s
 OPER_AKILL_COUNT
-	��ư���ǥꥹ�Ȥˤ�%d�ĤΥޥ�������Ͽ����Ƥ��ޤ���
+	%d�ĤΥޥ�������ư���ǥꥹ�Ȥ���Ͽ����Ƥ��ޤ���
 
 # AKILLCHAN����
 OPER_AKILLCHAN_SYNTAX
@@ -1989,7 +1995,7 @@
 	����ͭ�����¡�%s
 	����������ͳ��%s
 OPER_EXCLUDE_COUNT
-	��ư���ǽ����ꥹ�Ȥˤ�%d�ĤΥޥ�������Ͽ����Ƥ��ޤ���
+	%d�ĤΥޥ�������ư���ǽ����ꥹ�Ȥ���Ͽ����Ƥ��ޤ���
 
 # SLINE����
 OPER_SLINE_SYNTAX
@@ -2030,7 +2036,7 @@
 	����ͭ�����¡�%s
 	����������ͳ��%s
 OPER_SLINE_COUNT
-	%s�ꥹ�Ȥˤ�%d�ĤΥޥ�������Ͽ����Ƥ��ޤ���
+	%d�ĤΥޥ�����%s�ꥹ�Ȥ���Ͽ����Ƥ��ޤ���
 OPER_SZLINE_NOT_AVAIL
 	����IRC�����ФǤϡ�SZLINE�ϻȤ��ޤ���
 
diff -uNr ircservices-5.0.41/lang/ja_sjis.l ircservices-5.0.42/lang/ja_sjis.l
--- ircservices-5.0.41/lang/ja_sjis.l	2004-09-05 12:29:32 +0900
+++ ircservices-5.0.42/lang/ja_sjis.l	2004-11-18 09:58:57 +0900
@@ -229,9 +229,9 @@
 DISCONNECT_NOW
 	���̃j�b�N�͓o�^����Ă��܂��̂ŁA���g���ɂȂ�܂���B�Đڑ�����O�ɑ��̃j�b�N�ɕύX���ĉ������B
 FORCENICKCHANGE_IN_1_MINUTE
-	1���ȓ��Ƀj�b�N��ς��Ȃ���΁A�j�b�N���ύX����܂��B
+	1���ȓ��Ƀj�b�N��ς��Ȃ���΁A�j�b�N�������I�ɕύX����܂��B
 FORCENICKCHANGE_IN_20_SECONDS
-	20�b�ȓ��Ƀj�b�N��ς��Ȃ���΁A�j�b�N���ύX����܂��B
+	20�b�ȓ��Ƀj�b�N��ς��Ȃ���΁A�j�b�N�������I�ɕύX����܂��B
 FORCENICKCHANGE_NOW
 	���̃j�b�N�͓o�^����Ă��܂��̂ŁA���g���ɂȂ�܂���B���Ȃ��̃j�b�N�́u%s�v�ɕύX����܂����B
 NICK_EXPIRES_SOON
@@ -448,6 +448,8 @@
 # ACCESS����
 NICK_ACCESS_SYNTAX
 	ACCESS {ADD | DEL | LIST} [�}�X�N]
+NICK_ACCESS_DISABLED
+	�j�b�N�̗��p���ƒ��X�g�̕ҏW�͌��ݏo���܂���B
 NICK_ACCESS_REACHED_LIMIT
 	���p���ƒ��X�g�������ς��ł��B
 NICK_ACCESS_ALREADY_PRESENT
@@ -475,7 +477,7 @@
 NICK_LINK_SYNTAX
 	LINK �j�b�N
 NICK_LINK_DISABLED
-	�����N�͌��ݏo���܂���B
+	�j�b�N�̃����N�͌��ݏo���܂���B
 NICK_LINK_FAILED
 	�����N�͏o���܂���ł����B
 NICK_CANNOT_BE_LINKED
@@ -507,7 +509,7 @@
 NICK_UNLINK_OPER_SYNTAX
 	UNLINK �j�b�N [FORCE]
 NICK_UNLINK_DISABLED
-	�����N�����͌��ݏo���܂���B
+	�j�b�N�̃����N�����͌��ݏo���܂���B
 NICK_UNLINK_FAILED
 	�����N�����͏o���܂���ł����B
 NICK_UNLINK_SAME
@@ -670,10 +672,12 @@
 	AJOIN ADD �`�����l��
 NICK_AJOIN_DEL_SYNTAX
 	AJOIN DEL �`�����l��
+NICK_AJOIN_DISABLED
+	�j�b�N�̎����Q�����X�g�̕ҏW�͌��ݏo���܂���B
 NICK_AJOIN_ALREADY_PRESENT
 	�`�����l���u%s�v�͂��łɎ����Q�����X�g�ɓo�^����Ă��܂��B
 NICK_AJOIN_LIST_FULL
-	�����`�����l���Q�����X�g�������ς��ł��B
+	�����Q�����X�g�������ς��ł��B
 NICK_AJOIN_ADDED
 	�`�����l���u%s�v�������Q�����X�g�ɒlj����܂����B
 NICK_AJOIN_NOT_FOUND
@@ -681,13 +685,13 @@
 NICK_AJOIN_DELETED
 	�`�����l���u%s�v�������Q�����X�g����폜���܂����B
 NICK_AJOIN_LIST_EMPTY
-	�����`�����l���Q�����X�g�͋�ł��B
+	�����Q�����X�g�͋�ł��B
 NICK_AJOIN_LIST
-	�����`�����l���Q�����X�g�F
+	�����Q�����X�g�F
 NICK_AJOIN_LIST_X_EMPTY
-	�j�b�N�u%s�v�̎����`�����l���Q�����X�g�͋�ł��B
+	�j�b�N�u%s�v�̎����Q�����X�g�͋�ł��B
 NICK_AJOIN_LIST_X
-	�j�b�N�u%s�v�̎����`�����l���Q�����X�g�F
+	�j�b�N�u%s�v�̎����Q�����X�g�F
 
 ################ mail-auth���W���[���p���b�Z�[�W
 
@@ -974,8 +978,8 @@
 	���[�h�u+%c�v�̃p�����[�^�͗L���ȃ`�����l�����ł͂���܂���B
 CHAN_SET_MLOCK_LINK_SAME
 	���[�h�u+%c�v�̃p�����[�^�ɁA�����`�����l�����w�肷�邱�Ƃ͂ł��܂���B
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	���[�h�u+%c�v�����b�N����ɂ́A���[�h�u+l�v�𓯎��Ƀ��b�N���Ȃ���΂Ȃ�܂���B
+CHAN_SET_MLOCK_REQUIRES
+	���[�h�u+%c�v�����b�N����Ƃ��́A���[�h�u+%c�v�𓯎��Ƀ��b�N���Ȃ���΂Ȃ�܂���B
 CHAN_SET_MLOCK_BAD_PARAM
 	���[�h�u+%c�v�̃p�����[�^�͖����ł��B
 CHAN_SET_MLOCK_UNKNOWN_CHAR
@@ -1099,7 +1103,7 @@
 CHAN_ACCESS_SYNTAX
 	ACCESS �`�����l�� {ADD | DEL | LIST | COUNT} [�j�b�N [���x��] | �G���g���[�ԍ�]
 CHAN_ACCESS_DISABLED
-	�A�N�Z�X���X�g�̕ύX�͌��ݏo���܂���B
+	�A�N�Z�X���X�g�̕ҏW�͌��ݏo���܂���B
 CHAN_ACCESS_LEVEL_NONZERO
 	�A�N�Z�X���x���̓[���ɂ͐ݒ�ł��܂���B
 CHAN_ACCESS_LEVEL_RANGE
@@ -1185,7 +1189,7 @@
 CHAN_AKICK_SYNTAX
 	AKICK �`�����l�� {ADD | DEL | LIST | VIEW | ENFORCE | COUNT} [�}�X�N | ���X�g]
 CHAN_AKICK_DISABLED
-	�����L�b�N���X�g�̕ύX�͌��݂ł��܂���B
+	�����L�b�N���X�g�̕ҏW�͌��݂ł��܂���B
 CHAN_AKICK_ALREADY_EXISTS
 	�u%s�v�͂��ł�%s�̎����L�b�N���X�g�ɑ��݂��Ă��܂��B
 CHAN_AKICK_REACHED_LIMIT
@@ -1226,6 +1230,8 @@
 # LEVELS����
 CHAN_LEVELS_SYNTAX
 	LEVELS �`�����l�� {SET | DIS[ABLE] | LIST | RESET} [��� [���x��]]
+CHAN_LEVELS_READONLY
+	�`�����l���̌������x���ݒ�̕ύX�͌��ݏo���܂���B
 CHAN_LEVELS_RANGE
 	���x���́A%d�`%d�͈͓̔��ɐݒ肵�ĉ������B
 CHAN_LEVELS_CHANGED
@@ -1936,7 +1942,7 @@
 	�@�@�L�������F%s
 	�@�@�@�@���R�F%s
 OPER_AKILL_COUNT
-	�����ؒf���X�g�ɂ�%d�‚̃}�X�N���o�^����Ă��܂��B
+	%d�‚̃}�X�N�������ؒf���X�g�ɓo�^����Ă��܂��B
 
 # AKILLCHAN����
 OPER_AKILLCHAN_SYNTAX
@@ -1989,7 +1995,7 @@
 	�@�@�L�������F%s
 	�@�@�@�@���R�F%s
 OPER_EXCLUDE_COUNT
-	�����ؒf���O���X�g�ɂ�%d�‚̃}�X�N���o�^����Ă��܂��B
+	%d�‚̃}�X�N�������ؒf���O���X�g�ɓo�^����Ă��܂��B
 
 # SLINE����
 OPER_SLINE_SYNTAX
@@ -2030,7 +2036,7 @@
 	�@�@�L�������F%s
 	�@�@�@�@���R�F%s
 OPER_SLINE_COUNT
-	%s���X�g�ɂ�%d�‚̃}�X�N���o�^����Ă��܂��B
+	%d�‚̃}�X�N��%s���X�g�ɓo�^����Ă��܂��B
 OPER_SZLINE_NOT_AVAIL
 	����IRC�T�[�o�ł́ASZLINE�͎g���܂���B
 
diff -uNr ircservices-5.0.41/lang/langstrs.h ircservices-5.0.42/lang/langstrs.h
--- ircservices-5.0.41/lang/langstrs.h	2004-10-03 11:04:34 +0900
+++ ircservices-5.0.42/lang/langstrs.h	2004-11-22 20:04:44 +0900
@@ -366,7 +366,7 @@
 #define CHAN_SET_MLOCK_MODE_REG_BAD      365
 #define CHAN_SET_MLOCK_LINK_BAD          366
 #define CHAN_SET_MLOCK_LINK_SAME         367
-#define CHAN_SET_MLOCK_LINK_NO_LIMIT     368
+#define CHAN_SET_MLOCK_REQUIRES          368
 #define CHAN_SET_MLOCK_BAD_PARAM         369
 #define CHAN_SET_MLOCK_UNKNOWN_CHAR      370
 #define CHAN_SET_MLOCK_CANNOT_LOCK       371
diff -uNr ircservices-5.0.41/lang/nl.l ircservices-5.0.42/lang/nl.l
--- ircservices-5.0.41/lang/nl.l	2004-09-06 15:57:06 +0900
+++ ircservices-5.0.42/lang/nl.l	2004-10-31 20:07:54 +0900
@@ -287,15 +287,15 @@
 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 uw bijnaam niet binnen ��n minuut verandert wordt uw verbinding verbroken.
 DISCONNECT_IN_20_SECONDS
-	Als u niet verandert binnen 20 seconden, wordt uw verbinding verbroken.
+	Als u uw bijnaam niet binnen 20 seconden verandert wordt uw verbinding verbroken.
 DISCONNECT_NOW
 	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 uw bijnaam niet binnen ��n minuut verandert zal deze automatisch gewijzigd worden.
 FORCENICKCHANGE_IN_20_SECONDS
-	Als u niet binnen 20 seconden verandert zal ik uw bijnaam wijzigen.
+	Als u uw bijnaam niet binnen 20 seconden verandert zal deze automatisch gewijzigd worden.
 FORCENICKCHANGE_NOW
 	Deze bijnaam is geregistreerd: U kunt deze niet gebruiken. Uw bijnaam wordt nu veranderd naar %s.
 NICK_EXPIRES_SOON
@@ -1046,8 +1046,8 @@
 	Parameter voor MLOCK +%c is geen geldige kamer naam.
 CHAN_SET_MLOCK_LINK_SAME
 	Parameter voor MLOCK +%c dient een andere kamer te zijn.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	MLOCK +%c vereist dat MLOCK +l is ingesteld.
+CHAN_SET_MLOCK_REQUIRES
+	MLOCK +%c vereist dat MLOCK +%c is ingesteld.
 CHAN_SET_MLOCK_BAD_PARAM
 	Ongeldige parameter voor MLOCK +%c.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
diff -uNr ircservices-5.0.41/lang/tr.l ircservices-5.0.42/lang/tr.l
--- ircservices-5.0.41/lang/tr.l	2004-09-15 09:48:17 +0900
+++ ircservices-5.0.42/lang/tr.l	2004-10-13 22:38:56 +0900
@@ -997,8 +997,8 @@
 	MLOCK icin +%c parametersi gecerli bir kanal ismi degil.
 CHAN_SET_MLOCK_LINK_SAME
 	MLOCK icin +%c farkli bir kanal olmak zorunda.
-CHAN_SET_MLOCK_LINK_NO_LIMIT
-	+%c icin belirtilen mod kilidinde ayrica +l de bulunmalidir.
+CHAN_SET_MLOCK_REQUIRES
+	+%c icin belirtilen mod kilidinde ayrica +%c de bulunmalidir.
 CHAN_SET_MLOCK_BAD_PARAM
 	+%c modu icin hatali parametre verildi.
 CHAN_SET_MLOCK_UNKNOWN_CHAR
diff -uNr ircservices-5.0.41/log.c ircservices-5.0.42/log.c
--- ircservices-5.0.41/log.c	2004-10-03 11:04:34 +0900
+++ ircservices-5.0.42/log.c	2004-11-22 20:04:43 +0900
@@ -97,6 +97,11 @@
 
 static void vlogprintf(const char *fmt, va_list args)
 {
+    if (nofork) {
+	va_list argscopy;
+	va_copy(argscopy, args);
+	vfprintf(stderr, fmt, argscopy);
+    }
     if (logfile) {
 	check_log_rotate();
 	vfprintf(logfile, fmt, args);
@@ -119,8 +124,6 @@
 	    logmemptr += len;
 	}
     }
-    if (nofork)
-	vfprintf(stderr, fmt, args);
 }
 
 static void logprintf(const char *fmt, ...) FORMAT(printf,1,2);
diff -uNr ircservices-5.0.41/modes.h ircservices-5.0.42/modes.h
--- ircservices-5.0.41/modes.h	2004-10-03 11:04:34 +0900
+++ ircservices-5.0.42/modes.h	2004-11-22 20:04:44 +0900
@@ -46,7 +46,7 @@
 
 /*
  * Arrays of mode characters--one entry for each possible character.  These
- * are declared E to allow modules to add entries; read access should
+ * are declared extern to allow modules to add entries; read access should
  * be done through the functions below.
  *
  * The following modes are predefined:
diff -uNr ircservices-5.0.41/modules/chanserv/main.c ircservices-5.0.42/modules/chanserv/main.c
--- ircservices-5.0.41/modules/chanserv/main.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/chanserv/main.c	2004-11-22 20:04:45 +0900
@@ -578,7 +578,7 @@
     } else if (stricmp(cmd, "KICK") == 0) {
 	cmdrec = lookup_cmd(module, cmd);
 	notice_help(s_ChanServ, u, CHAN_HELP_KICK,
-	     getstring_cmdacc(u->ngi, cmdrec ? (int)cmdrec->help_param1 : -1));
+	     getstring_cmdacc(u->ngi, cmdrec ? (int)(long)cmdrec->help_param1 : -1));
 	if (protocol_features & PF_CHANPROT)
 	    notice_help(s_ChanServ, u, CHAN_HELP_KICK_PROTECTED);
     } else if (stricmp(cmd, "CLEAR") == 0) {
@@ -592,7 +592,7 @@
 	    notice_help(s_ChanServ, u, CHAN_HELP_CLEAR_HALFOPS);
 	cmdrec = lookup_cmd(module, cmd);
 	notice_help(s_ChanServ, u, CHAN_HELP_CLEAR_END,
-	     getstring_cmdacc(u->ngi, cmdrec ? (int)cmdrec->help_param1 : -1));
+	     getstring_cmdacc(u->ngi, cmdrec ? (int)(long)cmdrec->help_param1 : -1));
     } else if ((stricmp(cmd, "AKICK") == 0
 		|| stricmp(cmd, "OP") == 0
 		|| stricmp(cmd, "DEOP") == 0
@@ -611,7 +611,7 @@
 	    && (cmdrec = lookup_cmd(module, cmd)) != NULL
     ) {
 	notice_help(s_ChanServ, u, cmdrec->helpmsg_all,
-		    getstring_cmdacc(u->ngi, (int)cmdrec->help_param1));
+		    getstring_cmdacc(u->ngi, (int)(long)cmdrec->help_param1));
     } else {
 	help_cmd(s_ChanServ, u, module, cmd);
     }
diff -uNr ircservices-5.0.41/modules/database/version4.c ircservices-5.0.42/modules/database/version4.c
--- ircservices-5.0.41/modules/database/version4.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/database/version4.c	2004-11-22 20:04:46 +0900
@@ -1610,7 +1610,7 @@
 	fatal("add_news(): too many news items!");
     ARRAY_EXTEND(newslist);
     memcpy(&newslist[newslist_count-1], newsitem, sizeof(NewsItem));
-    newslist[newslist_count-1].next = (NewsItem *)(newslist_count-1); /*index*/
+    newslist[newslist_count-1].next = (NewsItem *)(long)(newslist_count-1); /*index*/
     free(newsitem);
     return &newslist[newslist_count-1];
 }
@@ -1619,7 +1619,7 @@
 
 void del_news(NewsItem *newsitem)
 {
-    int num = (int)(newsitem->next);
+    int num = (int)(long)(newsitem->next);
     if (num < 0 || num >= newslist_count) {
 	module_log("del_news(): invalid index %d in news item at %p",
 		   num, newsitem);
@@ -1630,7 +1630,7 @@
     if (num < newslist_iterator)
 	newslist_iterator--;
     while (num < newslist_count) {
-	newslist[num].next = (NewsItem *)num;
+	newslist[num].next = (NewsItem *)(long)num;
 	num++;
     }
 }
@@ -1699,7 +1699,7 @@
     for (i = 0; i < tmp16; i++) {
 	int32 tmp32;
 	if (i < newslist_count) {  /* watch out for stored count > MAX_NEWS */
-	    newslist[i].next = (NewsItem *) i;
+	    newslist[i].next = (NewsItem *) (long)i;
 	    SAFE(read_int16(&newslist[i].type, f));
 	    SAFE(read_int32(&newslist[i].num, f));
 	    SAFE(read_string(&newslist[i].text, f));
@@ -1791,7 +1791,7 @@
 	fatal("add_maskdata(): too many items for type %u", type);
     ARRAY2_EXTEND(masklist[type], masklist_count[type]);
     memcpy(&masklist[type][num], data, sizeof(*data));
-    masklist[type][num].next = (MaskData *)num;  /* use as index */
+    masklist[type][num].next = (MaskData *)(long)num;  /* use as index */
     free(data);
     return &masklist[type][num];
 }
@@ -1800,7 +1800,7 @@
 
 void del_maskdata(uint8 type, MaskData *data)
 {
-    int num = (int)(data->next);
+    int num = (int)(long)(data->next);
     if (num < 0 || num >= masklist_count[type]) {
 	module_log("del_maskdata(): invalid index %d for type %u at %p",
 		   num, type, data);
@@ -1812,7 +1812,7 @@
     if (num < masklist_iterator[type])
 	masklist_iterator[type]--;
     while (num < masklist_count[type]) {
-	masklist[type][num].next = (MaskData *)num;
+	masklist[type][num].next = (MaskData *)(long)num;
 	num++;
     }
 }
@@ -1901,7 +1901,7 @@
     for (i = 0; i < tmp16; i++) {
 	int32 tmp32;
 	if (i < count) {  /* watch out for # of entries > MAX_MASKDATA */
-	    list[i].next = (MaskData *) i;
+	    list[i].next = (MaskData *) (long)i;
 	    SAFE(read_string(&list[i].mask, f));
 	    if (type == MD_EXCEPTION) {
 		SAFE(read_int16(&list[i].limit, f));
diff -uNr ircservices-5.0.41/modules/httpd/main.c ircservices-5.0.42/modules/httpd/main.c
--- ircservices-5.0.41/modules/httpd/main.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/httpd/main.c	2004-11-22 20:04:46 +0900
@@ -331,7 +331,7 @@
 static void do_readdata(Socket *socket, void *param)
 {
     Client *c = find_client(socket);
-    int32 available = (int32)param, needed, nread;
+    int32 available = (int32)(long)param, needed, nread;
 
     if (!c) {
 	module_log("BUG: unexpected readdata callback for socket %p", socket);
diff -uNr ircservices-5.0.41/modules/mail/smtp.c ircservices-5.0.42/modules/mail/smtp.c
--- ircservices-5.0.41/modules/mail/smtp.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/mail/smtp.c	2004-11-22 20:04:47 +0900
@@ -18,7 +18,8 @@
 
 static Module *module;
 
-static char *RelayHost;
+static char **RelayHosts;
+int RelayHosts_count;
 static char *SMTPName;
 static int MaxSockets;
 
@@ -33,6 +34,7 @@
 typedef struct {
     Socket *sock;   /* NULL if unused */
     char *from, *fromname, *to, *subject, *body;
+    int relaynum;   /* Index into RelayHosts[], used to try backup servers */
     enum { ST_GREETING, ST_HELO, ST_MAIL, ST_RCPT, ST_DATA, ST_FINISH } state;
     int replycode;  /* nonzero if in the middle of a line (no EOL) */
     char replychar; /* 4th character of reply (space or hyphen) */
@@ -42,6 +44,7 @@
 
 static SocketInfo *get_socketinfo(Socket *sock);
 static void free_socketinfo(SocketInfo *si);
+static int try_next_relay(SocketInfo *si);
 static void smtp_readline(Socket *sock, void *param_unused);
 static void smtp_writeline(Socket *sock, const char *fmt, ...)
     FORMAT(printf,2,3);
@@ -78,18 +81,15 @@
 	free_socketinfo(si);
 	return 1;
     }
+    si->relaynum = -1;
     si->state = ST_GREETING;
     si->replycode = 0;
     si->garbage = 0;
     sock_setcb(si->sock, SCB_READLINE, smtp_readline);
     sock_setcb(si->sock, SCB_DISCONNECT, smtp_disconnect);
-    if (conn(si->sock, RelayHost, 25, NULL, 0) < 0) {
-	module_log_perror("send_smtp(): connection to %s:25 failed",RelayHost);
-	free_socketinfo(si);
-	return -1;
-    }
-    /* Connection initiated, return to main program */
-    return 0;
+    si->relaynum = -1;  /* incremented by try_next_relay() */
+    /* Initiate connection and return */
+    return try_next_relay(si);
 }
 
 /*************************************************************************/
@@ -135,6 +135,28 @@
 /*************************************************************************/
 /*************************************************************************/
 
+/* Try connecting to the next relay in RelayHosts[].  Return 0 if a
+ * connection was successfully initiated (but possibly not completed), else
+ * free the SocketInfo and return -1. */
+
+static int try_next_relay(SocketInfo *si)
+{
+    si->relaynum++;
+    if (si->relaynum >= RelayHosts_count) {
+	module_log("send_smtp(): No relay hosts available");
+	free_socketinfo(si);
+	return -1;
+    }
+    if (conn(si->sock, RelayHosts[si->relaynum], 25, NULL, 0) < 0) {
+	module_log_perror("send_smtp(): Connection to %s:25 failed",
+			  RelayHosts[si->relaynum]);
+	return try_next_relay(si);
+    }
+    return 0;
+}
+
+/*************************************************************************/
+
 /* Read a line from an SMTP socket. */
 
 static void smtp_readline(Socket *sock, void *param_unused)
@@ -152,6 +174,7 @@
 	module_log("smtp_readline(): no SocketInfo for socket %p!", sock);
 	sock_setcb(sock, SCB_DISCONNECT, NULL);
 	disconn(sock);
+	return;
     }
 
     /* Remove any double quotes in the From: name and log a warning */
@@ -293,11 +316,15 @@
     }
     if (why == DISCONN_LOCAL)  /* we explicitly closed the socket */
 	return;
-    if (why == DISCONN_CONNFAIL)
-	module_log("Connection to server failed for socket %p", sock);
-    else
-	module_log("Connection to server broken for socket %p", sock);
-    free_socketinfo(si);
+    if (why == DISCONN_CONNFAIL) {
+	module_log_perror("Connection to server %s failed for socket %p",
+			  RelayHosts[si->relaynum], sock);
+	try_next_relay(si);
+    } else {
+	module_log("Connection to server %s broken for socket %p",
+		   RelayHosts[si->relaynum], sock);
+	free_socketinfo(si);
+    }
 }
 
 /*************************************************************************/
@@ -306,8 +333,9 @@
 
 const int32 module_version = MODULE_VERSION_CODE;
 
+static int do_RelayHost(const char *filename, int linenum, char *param);
 ConfigDirective module_config[] = {
-    { "RelayHost",        { { CD_STRING, CF_DIRREQ, &RelayHost } } },
+    { "RelayHost",        { { CD_FUNC, CF_DIRREQ, do_RelayHost } } },
     { "SMTPName",         { { CD_STRING, CF_DIRREQ, &SMTPName } } },
     { "MaxSockets",       { { CD_POSINT, CF_DIRREQ, &MaxSockets } } },
     { NULL }
@@ -315,6 +343,49 @@
 
 /*************************************************************************/
 
+static int do_RelayHost(const char *filename, int linenum, char *param)
+{
+    static char **new_RelayHosts = NULL;
+    static int new_RelayHosts_count = 0;
+    int i;
+
+    if (filename) {
+	/* Check parameter for validity and save */
+	if (!*param) {
+	    /* Empty value */
+	    config_error(filename, linenum, "Empty hostname in RelayHost");
+	}
+	ARRAY_EXTEND(new_RelayHosts);
+	new_RelayHosts[new_RelayHosts_count-1] = sstrdup(param);
+    } else if (linenum == CDFUNC_INIT) {
+	/*Prepare for reading config file: clear out "new" array just in case*/
+	ARRAY_FOREACH (i, new_RelayHosts)
+	    free(new_RelayHosts[i]);
+	free(new_RelayHosts);
+	new_RelayHosts = NULL;
+	new_RelayHosts_count = 0;
+    } else if (linenum == CDFUNC_SET) {
+	/* Copy new values to config variables and clear */
+	ARRAY_FOREACH (i, RelayHosts)
+	    free(RelayHosts[i]);
+	free(RelayHosts);
+	RelayHosts = new_RelayHosts;
+	RelayHosts_count = new_RelayHosts_count;
+	new_RelayHosts = NULL;
+	new_RelayHosts_count = 0;
+    } else if (linenum == CDFUNC_DECONFIG) {
+	/* Reset to defaults */
+	ARRAY_FOREACH (i, RelayHosts)
+	    free(RelayHosts[i]);
+	free(RelayHosts);
+	RelayHosts = NULL;
+	RelayHosts_count = 0;
+    }
+    return 1;
+}
+
+/*************************************************************************/
+
 static int do_load_module(Module *mod, const char *modname)
 {
     if (strcmp(modname, "mail/main") == 0) {
diff -uNr ircservices-5.0.41/modules/memoserv/ignore.c ircservices-5.0.42/modules/memoserv/ignore.c
--- ircservices-5.0.41/modules/memoserv/ignore.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/memoserv/ignore.c	2004-11-22 20:04:47 +0900
@@ -97,7 +97,7 @@
 	notice_lang(s_MemoServ, u, NICK_NOT_REGISTERED);
 
     } else if (!user_identified(u)) {
-	notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_MemoServ);
+	notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
 
     } else if (stricmp(cmd, "ADD") == 0) {
 	if (!mask) {
diff -uNr ircservices-5.0.41/modules/nickserv/main.c ircservices-5.0.42/modules/nickserv/main.c
--- ircservices-5.0.41/modules/nickserv/main.c	2004-10-03 11:04:35 +0900
+++ ircservices-5.0.42/modules/nickserv/main.c	2004-11-22 20:04:47 +0900
@@ -1808,9 +1808,6 @@
 
 int init_module(Module *module_)
 {
-    Command *cmd;
-
-
     module = module_;
 
     handle_config();
diff -uNr ircservices-5.0.41/modules/operserv/main.c ircservices-5.0.42/modules/operserv/main.c
--- ircservices-5.0.41/modules/operserv/main.c	2004-10-03 11:04:36 +0900
+++ ircservices-5.0.42/modules/operserv/main.c	2004-11-22 20:04:48 +0900
@@ -323,7 +323,8 @@
 static int do_reglink_check(const User *u, const char *nick,
 			    const char *pass, const char *email)
 {
-    return irc_stricmp(nick, s_OperServ) == 0;
+    return irc_stricmp(nick, s_OperServ) == 0
+	|| irc_stricmp(nick, s_GlobalNoticer) == 0;
 }
 
 /*************************************************************************/
diff -uNr ircservices-5.0.41/modules/protocol/bahamut.c ircservices-5.0.42/modules/protocol/bahamut.c
--- ircservices-5.0.41/modules/protocol/bahamut.c	2004-10-03 11:04:36 +0900
+++ ircservices-5.0.42/modules/protocol/bahamut.c	2004-11-22 20:04:48 +0900
@@ -752,7 +752,7 @@
 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);
+    send_cmd(ServerName, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
     return 1;
 }
 
diff -uNr ircservices-5.0.41/modules/protocol/monkey.c ircservices-5.0.42/modules/protocol/monkey.c
--- ircservices-5.0.41/modules/protocol/monkey.c	2004-10-03 11:04:36 +0900
+++ ircservices-5.0.42/modules/protocol/monkey.c	2004-11-22 20:04:49 +0900
@@ -404,7 +404,7 @@
 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);
+    send_cmd(ServerName, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
     return 1;
 }
 
diff -uNr ircservices-5.0.41/modules/protocol/ptlink.c ircservices-5.0.42/modules/protocol/ptlink.c
--- ircservices-5.0.41/modules/protocol/ptlink.c	2004-10-03 11:04:36 +0900
+++ ircservices-5.0.42/modules/protocol/ptlink.c	2004-11-22 20:04:49 +0900
@@ -555,7 +555,7 @@
 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);
+    send_cmd(ServerName, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
     return 1;
 }
 
diff -uNr ircservices-5.0.41/modules/protocol/trircd.c ircservices-5.0.42/modules/protocol/trircd.c
--- ircservices-5.0.41/modules/protocol/trircd.c	2004-10-03 11:04:36 +0900
+++ ircservices-5.0.42/modules/protocol/trircd.c	2004-11-22 20:04:49 +0900
@@ -1043,7 +1043,7 @@
 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);
+    send_cmd(ServerName, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
     return 1;
 }
 
diff -uNr ircservices-5.0.41/modules/protocol/unreal.c ircservices-5.0.42/modules/protocol/unreal.c
--- ircservices-5.0.41/modules/protocol/unreal.c	2004-10-03 11:04:37 +0900
+++ ircservices-5.0.42/modules/protocol/unreal.c	2004-11-22 20:04:49 +0900
@@ -620,6 +620,7 @@
     { "NICK",      m_nick },
     { "PROTOCTL",  m_protoctl },
     { "RAKILL",    NULL },
+    { "SENDSNO",   NULL },
     { "SETHOST",   m_sethost },
     { "SETIDENT",  m_setident },
     { "SETNAME",   m_setname },
@@ -794,8 +795,13 @@
     { "BR", "SVSJOIN" },
     { "BS", "BOTSERV" },
     { "BT", "SVSPART" },
+
+    /* 0x45xx */
     { "ES", "EOS" },
 
+    /* 0x53xx */
+    { "Ss", "SENDSNO" },
+
     /* Fencepost */
     { NULL }
 };
@@ -1317,16 +1323,23 @@
 /*************************************************************************/
 
 /*
- * ChanServ SET MLOCK callback; we handle locking modes +/-L and +/-f.
+ * ChanServ SET MLOCK callback; we handle locking modes f, K, and L.
  */
 
 static int do_set_mlock(User *u, ChannelInfo *ci, int mode, int add, char **av)
 {
     if (!mode) {
 	/* Final check of new mode lock */
+	if ((ci->mlock_on & mode_char_to_flag('K',MODE_CHANNEL))
+	 && !(ci->mlock_on & CMODE_i)
+	) {
+	    /* +K requires +i */
+	    notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_REQUIRES, 'K', 'i');
+	    return 1;
+	}
 	if (ci->mlock_link && !ci->mlock_limit) {
 	    /* +L requires +l */
-	    notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_LINK_NO_LIMIT, 'L');
+	    notice_lang(s_ChanServ, u, CHAN_SET_MLOCK_REQUIRES, 'L', 'l');
 	    return 1;
 	}
 	return 0;
diff -uNr ircservices-5.0.41/modules/statserv/main.c ircservices-5.0.42/modules/statserv/main.c
--- ircservices-5.0.41/modules/statserv/main.c	2004-10-03 11:04:37 +0900
+++ ircservices-5.0.42/modules/statserv/main.c	2004-11-22 20:04:49 +0900
@@ -584,6 +584,9 @@
 
 int init_module(Module *module_)
 {
+    Module *tmpmod;
+
+
     module = module_;
 
     if (!new_commandlist(module) || !register_commands(module, cmds)) {
@@ -619,6 +622,10 @@
 	return 0;
     }
 
+    tmpmod = find_module("nickserv/main");
+    if (tmpmod)
+	do_load_module(tmpmod, "nickserv/main");
+
     if (!open_statserv_db(StatDBName)) {
 	module_log("Unable to read database");
 	exit_module(0);
diff -uNr ircservices-5.0.41/modules.h ircservices-5.0.42/modules.h
--- ircservices-5.0.41/modules.h	2004-10-03 11:04:34 +0900
+++ ircservices-5.0.42/modules.h	2004-11-22 20:04:44 +0900
@@ -125,9 +125,9 @@
 #define call_callback_4(module,id,arg1,arg2,arg3,arg4) \
     call_callback_5(module, id, arg1, arg2, arg3, arg4, NULL)
 #define call_callback_5(module,id,arg1,arg2,arg3,arg4,arg5) \
-    call_callback_5(module, id, (void *)(int)(arg1), (void *)(int)(arg2), \
-		    (void *)(int)(arg3), (void *)(int)(arg4), \
-		    (void *)(int)(arg5))
+    call_callback_5(module, id, (void *)(long)(arg1), (void *)(long)(arg2), \
+		    (void *)(long)(arg3), (void *)(long)(arg4), \
+		    (void *)(long)(arg5))
 
 /* Delete a callback list. */
 extern int unregister_callback(Module *module, int id);
diff -uNr ircservices-5.0.41/sockets.c ircservices-5.0.42/sockets.c
--- ircservices-5.0.41/sockets.c	2004-10-03 11:04:34 +0900
+++ ircservices-5.0.42/sockets.c	2004-11-22 20:04:44 +0900
@@ -476,6 +476,16 @@
 		continue;
 	    }
 	    /* Normal read */
+	    if (read_buffer_len(s) >= s->rbufsize-1) {
+		/* Buffer is full, try to expand it */
+		int newsize = 0;
+		if (s->rbufsize < NET_MIN_BUFSIZE)
+		    newsize = NET_MIN_BUFSIZE;
+		else if (s->rbufsize+NET_MIN_BUFSIZE < NetBufferSize)
+		    newsize = s->rbufsize + NET_MIN_BUFSIZE;
+		if (newsize > 0)
+		    resize_rbuf(s, newsize);
+	    }
 	    res = fill_read_buffer(s);
 	    if (res < 0) {
 		/* Connection was closed (or some other error occurred) */
@@ -497,7 +507,7 @@
 		do {
 		    newleft = left;
 		    if (s->cb_read) {
-			s->cb_read(s, (void *)newleft);
+			s->cb_read(s, (void *)(long)newleft);
 			if ((s->flags & SF_DISCONNECT) || s->fd < 0)
 			    break;
 			newleft = read_buffer_len(s);
@@ -513,7 +523,7 @@
 						 s->rend - s->rbuf);
 			}
 			if (newline) {
-			    s->cb_readline(s, (void *)newleft);
+			    s->cb_readline(s, (void *)(long)newleft);
 			    if ((s->flags & SF_DISCONNECT) || s->fd < 0)
 				break;
 			    newleft = read_buffer_len(s);
@@ -558,6 +568,10 @@
  * If either host or lhost is not a valid IP address and the gethostbyname()
  * function is available, this function may block while the hostname is
  * being resolved.
+ *
+ * This function may be called from a socket's disconnect callback to
+ * establish a new connection using the same socket.  It may not be called,
+ * however, if the socket is being freed with sock_free().
  */
 
 int conn(Socket *s, const char *host, int port, const char *lhost, int lport)
@@ -577,6 +591,11 @@
 	errno = EINVAL;
 	return -1;
     }
+    if (s->flags & SF_DELETEME) {
+	log("sockets: conn() called on a freeing socket (%p)", s);
+	errno = EPERM;
+	return -1;
+    }
     memset(&lsa, 0, sizeof(lsa));
     lsa.sin_family = AF_INET;
     if (lhost) {
@@ -1412,9 +1431,9 @@
     if (s == NULL || (s->flags & SF_LISTENER)) {
 	if (s)
 	    log("sockets: do_disconn(%d) with listener socket (%d)!",
-		(int)code, s->fd);
+		(int)(long)code, s->fd);
 	else
-	    log("sockets: do_disconn(%d) with NULL socket!", (int)code);
+	    log("sockets: do_disconn(%d) with NULL socket!", (int)(long)code);
 	errno = EINVAL;
 	return -1;
     }
@@ -1434,13 +1453,18 @@
 	    return 0;
 	}
     }
+    shutdown(s->fd, 2);
+    sock_closefd(s);
     s->flags |= SF_DISCONN_CB;
     if (s->cb_disconn) {
 	errno = errno_save;
 	s->cb_disconn(s, code);
     }
-    shutdown(s->fd, 2);
-    sock_closefd(s);
+    if (s->fd >= 0) {
+	/* The socket was reconnected */
+	s->flags &= ~SF_DISCONN_CB;
+	return 0;
+    }
     s->flags &= ~(SF_CONNECTING | SF_CONNECTED | SF_DISCONN_CB);
     if (s->flags & (SF_SELFCREATED | SF_DELETEME)) {
 	if (s->flags & SF_CALLBACK)
diff -uNr ircservices-5.0.41/version.sh ircservices-5.0.42/version.sh
--- ircservices-5.0.41/version.sh	2004-10-03 11:00:00 +0900
+++ ircservices-5.0.42/version.sh	2004-10-14 11:33:11 +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.41
+VERSION=5.0.42
 
 # Increment Services build number
 if [ -f version.c ] ; then