diff -uNr ircservices-5.0.2/Changes ircservices-5.0.3/Changes
--- ircservices-5.0.2/Changes	Tue Oct 22 17:10:16 2002
+++ ircservices-5.0.3/Changes	Sat Nov 16 18:44:49 2002
@@ -1,5 +1,23 @@
 Version 5.0
 -----------
+2002/11/16 .3	Fixed case-sensitivity bug with channel bans.  Reported by
+		    Alexander Janssens <alex@cyga.net>
+2002/11/16	Fixed topic time setting on Unreal.  Reported by
+		    <cyberdems@wwirc.za.org>
+2002/11/16	Added support for Intel's Linux/x86 compiler (icc) with
+		    optimization disabled.  "./configure -cc icc" to use it.
+2002/11/16	Fixed missing list terminators in several modules
+		    potentially causing crashes on startup or rehash.
+2002/11/13	Fixed a bug causing the contents of the cache to not be
+		    properly read in when using bash 2.05b.
+2002/10/29	Fixed cosmetic bugs when using NickServ IDENTIFY and GETPASS
+		    with forbidden nicknames.  Reported by <cc@omega.org.za>
+2002/10/25	Autokills, session exceptions, and S-lines are now checked
+		    for expiration at each database update.  Reported by
+		    Ali Sor <alisor@softhome.net>
+2002/10/24	Fixed compilation problem on Solaris reported by Geoff
+		    Byers <geoff@systemred.net>
+2002/10/24	Fixed string-constant-related warnings.
 2002/10/22 .2	Clarified bug-reporting instructions.
 2002/10/21	Fixed bug in recording channel topic setters in nick!user@host
 		    format.  Reported by Marcin Wolniewicz <marcin@di.pl>
diff -uNr ircservices-5.0.2/KnownBugs ircservices-5.0.3/KnownBugs
--- ircservices-5.0.2/KnownBugs	Sat Aug 17 10:14:51 2002
+++ ircservices-5.0.3/KnownBugs	Thu Oct 31 13:18:15 2002
@@ -27,3 +27,8 @@
 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
+own nickname's settings are left alone.)
diff -uNr ircservices-5.0.2/Makefile ircservices-5.0.3/Makefile
--- ircservices-5.0.2/Makefile	Tue Oct 22 17:15:58 2002
+++ ircservices-5.0.3/Makefile	Sat Nov 16 20:12:20 2002
@@ -19,10 +19,14 @@
 
 # Add any extra flags you want here.  The default line below enables
 # warnings and debugging symbols on GCC.  If you have a non-GCC compiler,
-# you may want to comment it out or change it.
-
-MORE_CFLAGS = -Wall -Wmissing-prototypes -g
+# you may want to comment it out or change it.  ("icc" below is the Intel
+# C compiler for Linux, which doesn't understand GCC's -W options.)
 
+ifeq ($(CC),icc)
+MORE_CFLAGS = -g
+else
+MORE_CFLAGS = -g -Wall -Wmissing-prototypes
+endif
 
 ######################## End configuration section ########################
 ###########################################################################
diff -uNr ircservices-5.0.2/TODO ircservices-5.0.3/TODO
--- ircservices-5.0.2/TODO	Wed Oct  9 16:03:26 2002
+++ ircservices-5.0.3/TODO	Sun Nov 10 11:09:55 2002
@@ -1,5 +1,11 @@
 Things to probably do:
 
+**	Allow switching encryption methods for databases (i.e. none->MD5)
+	    [Rayford Pomeroy <rayfordp@mhonline.net>]
+OS	Allow multiple parameters for KILLCLONES
+	    [Ian Justman <ianj@esper.net>]
+NS	Allow LISTCHANS on other users for servadmins
+	    [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
@@ -34,6 +40,13 @@
 
 Things to think about:
 
+CS	Option to kill/autokill users who join a forbidden channel
+	    [<Ganja51@lcirc.net>]
+NS	Show successor channels in LISTCHANS
+	    [Marc-Andre A. Fuentes <nothing@psychopat.org>]
+OS	For AKILL/SLINE/EXCEPTION ADD, set expiration time to given time
+		instead of erroring out
+	    [<RT.Mail@verizon.net>]
 CS	GETKEY command to get the key of a +k channel for privileged users
 	    [Dennis Sela <Schutzgeist@uni.de>]
 **	Add a way to clear one or more databases (currently done by rm *.db)
diff -uNr ircservices-5.0.2/actions.c ircservices-5.0.3/actions.c
--- ircservices-5.0.2/actions.c	Tue Oct 22 17:15:58 2002
+++ ircservices-5.0.3/actions.c	Sat Nov 16 20:12:20 2002
@@ -223,9 +223,6 @@
     else
 	c->topic = NULL;
     strscpy(c->topic_setter, setter, NICKMAX);
-    /* Make sure topic_time is not zero */
-    if (!c->topic_time)
-	c->topic_time = time(NULL);
     if (call_callback_4(NULL, cb_set_topic, c, NULL, NULL, t) > 0)
 	return;
 }
diff -uNr ircservices-5.0.2/conffile.h ircservices-5.0.3/conffile.h
--- ircservices-5.0.2/conffile.h	Tue Oct 22 17:15:58 2002
+++ ircservices-5.0.3/conffile.h	Sat Nov 16 20:12:20 2002
@@ -26,7 +26,7 @@
 
 /* Information about a configuration directive: */
 typedef struct {
-    char *name;
+    const char *name;
     struct {
 	int type;	/* CD_* below */
 	int flags;	/* CF_* below */
diff -uNr ircservices-5.0.2/configure ircservices-5.0.3/configure
--- ircservices-5.0.2/configure	Fri Oct 18 15:39:29 2002
+++ ircservices-5.0.3/configure	Wed Nov 13 19:39:30 2002
@@ -40,6 +40,18 @@
 
 ###########################################################################
 
+# Return the default flags for the given C compiler.
+
+def_cc_flags () {
+    if [ "X$1" = "Xgcc" -o "X$1" = "Xgcc3" -o "X$1" = "Xkgcc" ] ; then
+	echo "-O2 -fno-strict-aliasing"
+    elif [ "X$1" = "Xicc" ] ; then
+	echo "-O0 -wd144,167,556"
+    fi
+}
+
+###########################################################################
+
 # Test for the presence of a given include file or function.  If the
 # variable TEST is non-empty, it contains code to be placed at the end of
 # main(), and should return 0 if everything is okay, else 1.
@@ -193,6 +205,7 @@
 SIZEOF_TIME_T=
 MAX_TIME_T=
 SIZEOF_GID_T=bonkle
+HAVE_SOCKLEN_T=
 
 HAVE_STRINGS_H=
 HAVE_SYS_SELECT_H=
@@ -424,7 +437,7 @@
 give the command-line option "-ignore-cache".
 
 EOT
-    . config.cache
+    . ./config.cache
     # Clear list of missing functions if either a relevant HAVE_* variable
     # is missing or -no-use-local-funcs was specified.
     if [ "$NO_USE_LOCAL_FUNCS" \
@@ -628,6 +641,9 @@
 # Search for a compiler.
 
 MODE="find_cc         "
+# Don't use the cached flags unless we use the cached compiler as well
+CACHED_CC_FLAGS=$CC_FLAGS
+CC_FLAGS=bonkle
 echo2 "Searching for a suitable compiler... "
 if [ "$USER_CC" ] ; then
     CC="$USER_CC"
@@ -674,12 +690,13 @@
 	fi
     else
 	echo "(supplied) using $CC."
-	log user supplied \`"$USER_CC'"
-	DEF_CC_FLAGS=
+	log user supplied \`"$CC'"
+	DEF_CC_FLAGS=`def_cc_flags $CC`
     fi
 elif [ "$CC" ] ; then
     echo "(cached) using $CC."
     log cache supplied \`"$CC'"
+    CC_FLAGS=$CACHED_CC_FLAGS
 elif run gcc --version ; then
     if gcc --version 2>&1 | fgrep 2.96 >/dev/null ; then
 	cat <<EOT
@@ -756,14 +773,16 @@
     else
 	echo "great, found gcc!"
 	CC=gcc
-	DEF_CC_FLAGS="-O2 -fno-strict-aliasing"
+	DEF_CC_FLAGS=`def_cc_flags $CC`
 	log using \`gcc\'
     fi
 else
     echo "gcc not found."
     echo2 "    Looking for alternatives... "
     echo >tmp/test.c "int main(){return 1;}"
-    if run cc tmp/test.c -o tmp/test ; then
+    if run icc tmp/test.c -o tmp/test ; then
+	CC=icc
+    elif run cc tmp/test.c -o tmp/test ; then
 	CC=cc
     elif run c89 tmp/test.c -o tmp/test ; then
 	CC=c89
@@ -782,7 +801,8 @@
     log "test for ANSI..."
     if run $CC tmp/test.c -o tmp/test ; then
 	echo "using $CC."
-	if [ "x$USER_CC_FLAGS" = "x" ] ; then
+	DEF_CC_FLAGS=`def_cc_flags $CC`
+	if [ "x$DEF_CC_FLAGS" = "x" -a "x$USER_CC_FLAGS" = "x" ] ; then
 	    echo "    Defaulting to no compiler flags.  Use the -cflags option"
 	    echo "    if you need to specify any."
 	fi
@@ -793,7 +813,6 @@
 	log \`"$CC' not ANSI-compliant"
 	exit 2
     fi
-    DEF_CC_FLAGS=
 fi
 
 
@@ -1450,6 +1469,35 @@
     fi
 fi
 
+MODE="check_socklen_t "
+echo2 "Checking for socklen_t... "
+if [ "$HAVE_SOCKLEN_T" ] ; then
+    if [ $HAVE_SOCKLEN_T = 1 ] ; then
+	echo "(cached) present."
+	log "cache said present"
+    else
+	echo "(cached) not present."
+	log "cache said not present"
+    fi
+else
+    cat >tmp/test.c <<EOT
+	#include <unistd.h>
+	int main() {
+	    socklen_t a;
+	    return 0;
+	}
+EOT
+    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+	log "socklen_t found"
+	echo "present."
+	HAVE_SOCKLEN_T=1
+    else
+	log "socklen_t not found"
+	echo "not present."
+	HAVE_SOCKLEN_T=0
+    fi
+fi
+
 ###########################################################################
 
 # Look for include files that might or might not be here.
@@ -1991,6 +2039,7 @@
 #define SIZEOF_GID_T		$SIZEOF_GID_T
 EOT
 cat >>config.h.new <<EOT
+#define HAVE_SOCKLEN_T		$HAVE_SOCKLEN_T
 
 #define HAVE_STRINGS_H		$HAVE_STRINGS_H
 #define HAVE_SYS_SELECT_H	$HAVE_SYS_SELECT_H
@@ -2122,6 +2171,7 @@
 SIZEOF_TIME_T=$SIZEOF_TIME_T
 MAX_TIME_T='$MAX_TIME_T'
 SIZEOF_GID_T=$SIZEOF_GID_T
+HAVE_SOCKLEN_T=$HAVE_SOCKLEN_T
 
 HAVE_STRINGS_H=$HAVE_STRINGS_H
 HAVE_SYS_SELECT_H=$HAVE_SYS_SELECT_H
diff -uNr ircservices-5.0.2/defs.h ircservices-5.0.3/defs.h
--- ircservices-5.0.2/defs.h	Tue Oct 22 17:15:58 2002
+++ ircservices-5.0.3/defs.h	Sat Nov 16 20:12:20 2002
@@ -164,6 +164,11 @@
 /* We have our own encrypt(). */
 #define encrypt encrypt_
 
+/* socklen_t for systems without it. */
+#if !HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 
 #if INTTYPE_WORKAROUND
 # undef int16
diff -uNr ircservices-5.0.2/extern.h ircservices-5.0.3/extern.h
--- ircservices-5.0.2/extern.h	Tue Oct 22 17:15:58 2002
+++ ircservices-5.0.3/extern.h	Sat Nov 16 20:12:20 2002
@@ -172,7 +172,7 @@
 
 E int    quitting;
 E int    delayed_quit;
-E const char *quitmsg;
+E char * quitmsg;
 E char   inbuf[BUFSIZE];
 E Socket *servsock;
 E int    save_data;
diff -uNr ircservices-5.0.2/main.c ircservices-5.0.3/main.c
--- ircservices-5.0.2/main.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/main.c	Sat Nov 16 20:12:20 2002
@@ -40,7 +40,7 @@
 int delayed_quit = 0;
 
 /* Contains a message as to why services is terminating */
-const char *quitmsg = NULL;
+char *quitmsg = NULL;
 
 /* Input buffer - global, so we can dump it if something goes wrong */
 char inbuf[BUFSIZE];
@@ -94,7 +94,7 @@
 	if (quitmsg) {
 	    snprintf(quitmsg, BUFSIZE, "%s: %s", msg, strerror(errno_save));
 	} else {
-	    quitmsg = msg;
+	    quitmsg = (char *)msg;
 	}
 	quitting = 1;
     }
@@ -259,7 +259,7 @@
 	log("Restarting");
 	modules_exit();
 	if (!quitmsg)
-	    quitmsg = "Restarting";
+	    quitmsg = (char *)"Restarting";
 	send_cmd(ServerName, "SQUIT %s :%s", ServerName, quitmsg);
 	disconn(servsock);
 	close_log();
@@ -276,7 +276,7 @@
 
     /* Disconnect and exit */
     if (!quitmsg)
-	quitmsg = "Terminating, reason unknown";
+	quitmsg = (char *)"Terminating, reason unknown";
     log("%s", quitmsg);
     modules_exit();
     if (sock_isconn(servsock))
diff -uNr ircservices-5.0.2/misc.c ircservices-5.0.3/misc.c
--- ircservices-5.0.2/misc.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/misc.c	Sat Nov 16 20:12:20 2002
@@ -447,7 +447,7 @@
     atmark++;
 
     /* Don't allow [] in username */
-    s = strpbrk(str, "[]");
+    s = (const unsigned char *)strpbrk(str, "[]");
     if (s && (const char *)s < atmark)
 	return 0;
 
@@ -458,10 +458,10 @@
 	int len = bracket - (atmark+1);
 	/* Valid IP addresses have no more than 15 characters */
 	if (len <= 15 && !bracket[1]) {
-	    strncpy(ipstr, atmark+1, len);
+	    strncpy((char *)ipstr, atmark+1, len);
 	    ipstr[len] = 0;
 	    /* Use pack_ip() to see if it's a valid address */
-	    if (pack_ip(ipstr))
+	    if (pack_ip((const char *)ipstr))
 		return 1;
 	}
     }
@@ -502,13 +502,13 @@
     if (strspn(str, letters) != s - (const unsigned char *)str)
 	return 0;  /* Protocol has non-alphabetic characters */
     host = s+3;
-    colon = (const unsigned char *)strchr(host, ':');
+    colon = (const unsigned char *)strchr((const char *)host, ':');
     /* s will eventually point to the expected end of the host string */
-    s = host + strcspn(host, "/");
+    s = host + strcspn((const char *)host, "/");
     /* Make sure the port is valid if present. */
     if (colon && colon < s) {
 	const unsigned char *tmp;
-	int port = strtol(colon+1, (char **)&tmp, 10);
+	int port = strtol((const char *)colon+1, (char **)&tmp, 10);
 	if (port < 1 || port > 65535 || tmp != s)
 	    return 0;  /* Invalid port number or non-numeric characters */
 	s = colon;
diff -uNr ircservices-5.0.2/modules/Makerules ircservices-5.0.3/modules/Makerules
--- ircservices-5.0.2/modules/Makerules	Thu Oct 10 14:34:17 2002
+++ ircservices-5.0.3/modules/Makerules	Thu Oct 24 11:22:38 2002
@@ -49,7 +49,7 @@
 all-dynamic: $(MODULES)
 all-static: $(MODULES:.so=.a)
 	ld -r -o $(DIRNAME).o `ar t .$(DIRNAME).a`
-	ar cr ../modules.a $(DIRNAME).o
+	ar -cr ../modules.a $(DIRNAME).o
 
 ifeq ($(MODULES),)
 install:
@@ -97,7 +97,7 @@
 # list.  The .a file we create here is just a placeholder to show that
 # we've compiled the module; the objects themselves go into ../modules.a.
 $(TARGET).a: $(TARGET)_static.o $(OBJECTS) $(OTHEROBJ)
-	ar cru .$(DIRNAME).a $^
+	ar -cru .$(DIRNAME).a $^
 	@set -e ; \
 	FILENAME=$(@:.a=) ; \
 	MODNAME=`echo $(DIRNAME)_$$FILENAME | sed -e 'y/-/_/' -e 's/_$$//'` ; \
@@ -127,7 +127,7 @@
 	sed 's/[^:]*:\(.*\)/extern \1;/' <.modsyms.tmp >>.modext-$$FILENAME.h;\
 	rm -f .modsyms.tmp ; \
 	echo '{0}};' >>.modsyms-$$FILENAME.c
-	@ar rc $@
+	@ar -rc $@
 
 
 ifneq ($(REALLY_COMPILE),2)
diff -uNr ircservices-5.0.2/modules/chanserv/autokick.c ircservices-5.0.3/modules/chanserv/autokick.c
--- ircservices-5.0.2/modules/chanserv/autokick.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/modules/chanserv/autokick.c	Sat Nov 16 20:12:21 2002
@@ -56,7 +56,8 @@
 
     } else if (stricmp(cmd, "ADD") == 0) {
 
-	char *mask2, *nick, *user, *host;
+	char *mask2, *user, *host;
+	const char *nick;
 
 	if (readonly) {
 	    notice_lang(s_ChanServ, u, CHAN_AKICK_DISABLED);
diff -uNr ircservices-5.0.2/modules/chanserv/check.c ircservices-5.0.3/modules/chanserv/check.c
--- ircservices-5.0.2/modules/chanserv/check.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/modules/chanserv/check.c	Sat Nov 16 20:12:21 2002
@@ -262,7 +262,7 @@
     ChannelInfo *ci = get_channelinfo(chan);
     int i;
     NickGroupInfo *ngi;
-    char *av[3], *mask, *s;
+    char *mask, *s;
     const char *reason;
     Timeout *t;
     int stay;
@@ -343,7 +343,6 @@
      * ENFORCE, this will always be false, but that's okay because if
      * someone tries to join again we'll just kickban them again. */
     stay = (c == NULL);
-    av[0] = (char *)chan;
     if (stay) {
 	CSInhabitData *data;
 	/* Only enter the channel if we're not already in it */
@@ -370,13 +369,11 @@
 	clear_channel(s_ChanServ, c, CLEAR_EXCEPTS, user);
     /* Apparently invites can get around bans, so check for ban first */
     if (!chan_has_ban(chan, mask)) {
-	av[1] = "+b";
-	av[2] = mask;
 	send_channel_cmd(s_ChanServ, "MODE %s +b %s", chan, mask);
 	if (c) {
 	    char *av[3];
 	    av[0] = (char *)chan;
-	    av[1] = "+b";
+	    av[1] = (char *)"+b";
 	    av[2] = mask;
 	    do_cmode(s_ChanServ, 3, av);
 	}
diff -uNr ircservices-5.0.2/modules/chanserv/sendpass.c ircservices-5.0.3/modules/chanserv/sendpass.c
--- ircservices-5.0.2/modules/chanserv/sendpass.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/modules/chanserv/sendpass.c	Sat Nov 16 20:12:21 2002
@@ -37,6 +37,7 @@
 
 static Command commands[] = {
     { "SENDPASS", do_sendpass, NULL,              CHAN_HELP_SENDPASS, -1,-1 },
+    { NULL }
 };
 
 /*************************************************************************/
diff -uNr ircservices-5.0.2/modules/database/extsyms.c ircservices-5.0.3/modules/database/extsyms.c
--- ircservices-5.0.2/modules/database/extsyms.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/database/extsyms.c	Sat Nov 16 20:12:21 2002
@@ -15,11 +15,17 @@
 
 /*************************************************************************/
 
+#ifdef __INTEL_COMPILER  /* icc hides the symbols from the inline asm */
+# define static
+#endif
 static Module *module_nickserv;
 static Module *module_chanserv;
 static Module *module_memoserv;
 static Module *module_operserv;
 static Module *module_statserv;
+#ifdef __INTEL_COMPILER
+# undef static
+#endif
 
 static const char *this_module_name = "(unknown-module)";
 
@@ -33,7 +39,8 @@
 /*************************************************************************/
 /*************************************************************************/
 
-#ifdef GCC3_HACK
+#if defined(GCC3_HACK)
+
 #define IMPORT_FUNC(modulename, module, func)				\
 static void __dblocal_##func##_stub0(void) {				\
     void *ptr = NULL;							\
@@ -50,8 +57,10 @@
     __builtin_return(__builtin_apply((void *)__dblocal_##func,		\
 		     __builtin_apply_args(), 64));			\
 }									\
-typeof(func) *__dblocal_##func = (void *) __dblocal_##func##_stub;
-#else  /* !GCC3_HACK */
+typeof(func) *__dblocal_##func = (typeof(func) *) __dblocal_##func##_stub;
+
+#elif defined(__GNUC__)
+
 #define IMPORT_FUNC(modulename, module, func)				\
 static void *__dblocal_##func##_stub(void) {				\
     void *ptr = NULL;							\
@@ -64,8 +73,50 @@
     __dblocal_##func = ptr;						\
     __builtin_return(__builtin_apply(ptr, __builtin_apply_args(), 64));	\
 }									\
-typeof(func) *__dblocal_##func = (void *) __dblocal_##func##_stub;
-#endif  /* GCC3_HACK */
+typeof(func) *__dblocal_##func = (typeof(func) *) __dblocal_##func##_stub;
+
+#elif defined(__INTEL_COMPILER)
+
+volatile void *_fatal_no_symbol = (void *)fatal_no_symbol;
+
+#define IMPORT_FUNC(modulename, module, func)	\
+static void __dblocal_##func##_stub(void) {	\
+asm("	movl	"#module",%eax;			\
+	testl	%eax,%eax;			\
+	jnz	1f;				\
+	leal	8f,%eax;			\
+	pushl	%eax;				\
+	call	find_module;			\
+	leal	4(%esp),%esp;			\
+	movl	%eax,"#module";			\
+1:	testl	%eax,%eax;			\
+	jz	2f;				\
+	leal	9f,%edx;			\
+	pushl	%edx;				\
+	pushl	%eax;				\
+	call	get_module_symbol;		\
+	leal	8(%esp),%esp;			\
+2:	testl	%eax,%eax;			\
+	jnz	3f;				\
+	leal	9f,%eax;			\
+	pushl	%eax;				\
+	call	*_fatal_no_symbol;		\
+	leal	4(%esp),%esp;			\
+3:	movl	%eax,__dblocal_"#func";		\
+	movl	%ebp,%esp;			\
+	popl	%ebp;				\
+	jmp	*%eax;				\
+8:	.ascii	\"" modulename "\\0\";		\
+9:	.ascii	\""#func"\\0\"			\
+");						\
+}						\
+typeof(func) *__dblocal_##func = (typeof(func) *) __dblocal_##func##_stub;
+
+#else
+
+#error IMPORT_FUNC not implemented for this compiler
+
+#endif  /* GCC3_HACK/etc */
 
 
 #define IMPORT_VAR(modulename, module, var)				\
diff -uNr ircservices-5.0.2/modules/database/version4.c ircservices-5.0.3/modules/database/version4.c
--- ircservices-5.0.2/modules/database/version4.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/database/version4.c	Sat Nov 16 20:12:21 2002
@@ -1853,8 +1853,9 @@
     int16 i;
     static time_t lastwarn[256];
     MaskData *list = masklist[type];
-    int count = masklist_count[type];
+    int count;
 
+    count = masklist_count[type];
     write_int16(count, f);
     for (i = 0; i < count; i++) {
 	SAFE(write_string(list[i].mask, f));
@@ -1874,6 +1875,14 @@
 	SAFE(write_time(list[i].time, f));
 	SAFE(write_time(list[i].expires, f));
 	SAFE(write_time(list[i].lastused, f));
+	/* _Now_ check for expiration.  Doing it this way means the record
+	 * is stored one more time than necessary, but also means we don't
+	 * have to seek back to the beginning of the file and rewrite the
+	 * count. */
+	if (check_expire_maskdata(type, &list[i])) {
+	    i--;
+	    count--;
+	}
     }
 
     return 1;
diff -uNr ircservices-5.0.2/modules/misc/xml-import.c ircservices-5.0.3/modules/misc/xml-import.c
--- ircservices-5.0.2/modules/misc/xml-import.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/misc/xml-import.c	Sat Nov 16 20:12:22 2002
@@ -694,7 +694,7 @@
  * returned as with read_tag().
  */
 
-static void *parse_tag(char *caller_tag, char found_tag_ret[256],
+static void *parse_tag(const char *caller_tag, char found_tag_ret[256],
 		       char **text_ret, int *textlen_ret)
 {
     char local_tag[256], local_attr[256], local_attrval[256];
@@ -2505,6 +2505,7 @@
     { "OnChannelCollision",  { { CD_FUNC, 0, do_OnChannelCollision } } },
     { "OnNicknameCollision", { { CD_FUNC, 0, do_OnNicknameCollision } } },
     { "VerboseImport",       { { CD_SET, 0, &VerboseImport } } },
+    { NULL }
 };
 
 /*************************************************************************/
diff -uNr ircservices-5.0.2/modules/nickserv/mail-auth.c ircservices-5.0.3/modules/nickserv/mail-auth.c
--- ircservices-5.0.2/modules/nickserv/mail-auth.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/nickserv/mail-auth.c	Sat Nov 16 20:12:22 2002
@@ -68,6 +68,7 @@
 		-1,-1,NICK_OPER_HELP_GETAUTH   },
     { "CLEARAUTH",do_clearauth,is_services_admin,
 		-1,-1,NICK_OPER_HELP_CLEARAUTH },
+    { NULL }
 };
 
 /*************************************************************************/
diff -uNr ircservices-5.0.2/modules/nickserv/main.c ircservices-5.0.3/modules/nickserv/main.c
--- ircservices-5.0.2/modules/nickserv/main.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/nickserv/main.c	Sat Nov 16 20:12:22 2002
@@ -571,10 +571,14 @@
     if (!pass) {
 	syntax_error(s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX);
 
-    } else if (!(ni = u->ni) || !(ngi = u->ngi)
-	       || ngi == NICKGROUPINFO_INVALID) {
-	if (ni)
-	    module_log("IDENTIFY: missing NickGroupInfo for %s", u->nick);
+    } else if (!(ni = u->ni)) {
+	notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
+
+    } else if (ni->status & NS_VERBOTEN) {
+	notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
+
+    } else if (!(ngi = u->ngi) || ngi == NICKGROUPINFO_INVALID) {
+	module_log("IDENTIFY: missing NickGroupInfo for %s", u->nick);
 	notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
 
     } else if (ngi->suspendinfo) {
@@ -1206,6 +1210,8 @@
 	syntax_error(s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX);
     } else if (!(ni = get_nickinfo(nick))) {
 	notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick);
+    } else if (ni->status & NS_VERBOTEN) {
+	notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
     } else if (!(ngi = get_ngi(ni))) {
 	notice_lang(s_NickServ, u, INTERNAL_ERROR);
     } else if (NSSecureAdmins && nick_is_services_admin(ni) &&
diff -uNr ircservices-5.0.2/modules/nickserv/sendpass.c ircservices-5.0.3/modules/nickserv/sendpass.c
--- ircservices-5.0.2/modules/nickserv/sendpass.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/nickserv/sendpass.c	Sat Nov 16 20:12:22 2002
@@ -35,6 +35,7 @@
 
 static Command commands[] = {
     { "SENDPASS", do_sendpass, NULL,              NICK_HELP_SENDPASS, -1,-1 },
+    { NULL },
 };
 
 /*************************************************************************/
diff -uNr ircservices-5.0.2/modules/operserv/main.c ircservices-5.0.3/modules/operserv/main.c
--- ircservices-5.0.2/modules/operserv/main.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/operserv/main.c	Sat Nov 16 20:12:22 2002
@@ -1155,7 +1155,7 @@
 {
     quitmsg = malloc(28 + strlen(u->nick));
     if (!quitmsg)
-	quitmsg = "QUIT command received, but out of memory!";
+	quitmsg = (char *)"QUIT command received, but out of memory!";
     else
 	sprintf(quitmsg, "QUIT command received from %s", u->nick);
     quitting = 1;
@@ -1167,7 +1167,7 @@
 {
     quitmsg = malloc(32 + strlen(u->nick));
     if (!quitmsg)
-	quitmsg = "SHUTDOWN command received, but out of memory!";
+	quitmsg = (char *)"SHUTDOWN command received, but out of memory!";
     else
 	sprintf(quitmsg, "SHUTDOWN command received from %s", u->nick);
     save_data = 1;
@@ -1180,7 +1180,7 @@
 {
     quitmsg = malloc(31 + strlen(u->nick));
     if (!quitmsg)
-	quitmsg = "RESTART command received, but out of memory!";
+	quitmsg = (char *)"RESTART command received, but out of memory!";
     else
 	sprintf(quitmsg, "RESTART command received from %s", u->nick);
     save_data = 1;
diff -uNr ircservices-5.0.2/modules/operserv/maskdata.c ircservices-5.0.3/modules/operserv/maskdata.c
--- ircservices-5.0.2/modules/operserv/maskdata.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/operserv/maskdata.c	Sat Nov 16 20:12:22 2002
@@ -29,7 +29,8 @@
 
 void do_maskdata_cmd(MaskDataCmdInfo *info, User *u)
 {
-    char *cmd, *mask, *reason, *expiry, *s;
+    const char *cmd;
+    char *mask, *reason, *expiry, *s;
     time_t expires;
     MaskData *md;
 
@@ -129,8 +130,8 @@
 	int is_view = stricmp(cmd,"VIEW")==0;
 
 	if (!mask) {
-	    mask = "*";
-	    expires = -1;  /* Don't match on expiry time */
+	    mask = (char *)"*";	/* Not modified in this block */
+	    expires = -1;	/* Don't match on expiry time */
 	} else {
 	    /* This is a little longwinded for what it acheives - but we can
 	     * extend it later to allow for user defined expiry times. */
diff -uNr ircservices-5.0.2/modules/operserv/maskdata.h ircservices-5.0.3/modules/operserv/maskdata.h
--- ircservices-5.0.2/modules/operserv/maskdata.h	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/operserv/maskdata.h	Sat Nov 16 20:12:22 2002
@@ -119,7 +119,7 @@
     void (*do_del_mask)(User *u, uint8 type, MaskData *md);
     /* Handler for unknown commands; should return 1 if the command was
      * handled, 0 otherwise. */
-    int (*do_unknown_cmd)(User *u, char *cmd, char *mask);
+    int (*do_unknown_cmd)(User *u, const char *cmd, char *mask);
 } MaskDataCmdInfo;
 
 /*************************************************************************/
diff -uNr ircservices-5.0.2/modules/operserv/news.c ircservices-5.0.3/modules/operserv/news.c
--- ircservices-5.0.2/modules/operserv/news.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/operserv/news.c	Sat Nov 16 20:12:22 2002
@@ -57,7 +57,7 @@
 
 struct newsmsgs {
     int16 type;
-    char *name;
+    const char *name;
     int msgs[MSG_MAX+1];
 };
 static struct newsmsgs msgarray[] = {
@@ -98,7 +98,7 @@
     for (i = 0; i < lenof(msgarray); i++) {
 	if (msgarray[i].type == type) {
 	    if (typename)
-		*typename = msgarray[i].name;
+		*typename = (char *)msgarray[i].name;
 	    return msgarray[i].msgs;
 	}
     }
@@ -177,7 +177,7 @@
 /* Main news command handling routine. */
 static void do_news(User *u, int16 type)
 {
-    char *cmd = strtok(NULL, " ");
+    const char *cmd = strtok(NULL, " ");
     char *typename;
     int *msgs;
 
diff -uNr ircservices-5.0.2/modules/operserv/sessions.c ircservices-5.0.3/modules/operserv/sessions.c
--- ircservices-5.0.2/modules/operserv/sessions.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/operserv/sessions.c	Sat Nov 16 20:12:22 2002
@@ -131,8 +131,8 @@
 {
     Session *session;
     MaskData *exception;
-    char *cmd = strtok(NULL, " ");
-    char *param1 = strtok(NULL, " ");
+    const char *cmd = strtok(NULL, " ");
+    const char *param1 = strtok(NULL, " ");
     int mincount;
     int i;
 
@@ -325,7 +325,7 @@
 
 static void do_exception(User *u)
 {
-    char *cmd = strtok(NULL, " ");
+    const char *cmd = strtok(NULL, " ");
 
     if (!cmd)
 	cmd = "";
diff -uNr ircservices-5.0.2/modules/protocol/dalnet.c ircservices-5.0.3/modules/protocol/dalnet.c
--- ircservices-5.0.2/modules/protocol/dalnet.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/protocol/dalnet.c	Sat Nov 16 20:12:22 2002
@@ -210,7 +210,7 @@
 static int do_set_topic(Channel *c, const char *topic, const char *setter,
 			time_t t)
 {
-    if (t >= c->topic_time)
+    if (c->topic_time && t >= c->topic_time)
 	t = c->topic_time - 1;  /* Force topic change */
     if (setter)
 	return 0;
diff -uNr ircservices-5.0.2/modules/protocol/dreamforge.c ircservices-5.0.3/modules/protocol/dreamforge.c
--- ircservices-5.0.2/modules/protocol/dreamforge.c	Tue Oct 22 17:16:00 2002
+++ ircservices-5.0.3/modules/protocol/dreamforge.c	Sat Nov 16 20:12:22 2002
@@ -322,7 +322,7 @@
 {
     if (setter)
 	return 0;
-    if (t >= c->topic_time)
+    if (c->topic_time && t >= c->topic_time)
 	t = c->topic_time - 1;  /* Force topic change */
     c->topic_time = t;
     send_cmd(ServerName, "TOPIC %s %s %ld :%s", c->name, c->topic_setter,
diff -uNr ircservices-5.0.2/modules/protocol/monkey.c ircservices-5.0.3/modules/protocol/monkey.c
--- ircservices-5.0.2/modules/protocol/monkey.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/monkey.c	Sat Nov 16 20:12:22 2002
@@ -359,6 +359,7 @@
 }
 
 /*************************************************************************/
+
 static int do_set_topic(Channel *c, const char *topic, const char *setter,
 			time_t t)
 {
diff -uNr ircservices-5.0.2/modules/protocol/rfc1459.c ircservices-5.0.3/modules/protocol/rfc1459.c
--- ircservices-5.0.2/modules/protocol/rfc1459.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/rfc1459.c	Sat Nov 16 20:12:22 2002
@@ -80,13 +80,13 @@
 
     if (ac != 5)
 	return;
-    new_av[0] = source;	/* Nickname */
-    new_av[1] = "0";	/* # of hops (was in NICK command... we lose) */
-    new_av[2] = "0";	/* Timestamp */
-    new_av[3] = av[0];	/* Username */
-    new_av[4] = av[1];	/* Hostname */
-    new_av[5] = av[2];	/* Server */
-    new_av[6] = av[3];	/* Real name */
+    new_av[0] = source;      /* Nickname */
+    new_av[1] = (char *)"0"; /* # of hops (was in NICK command... we lose) */
+    new_av[2] = (char *)"0"; /* Timestamp */
+    new_av[3] = av[0];       /* Username */
+    new_av[4] = av[1];       /* Hostname */
+    new_av[5] = av[2];       /* Server */
+    new_av[6] = av[3];       /* Real name */
     do_nick("", 7, new_av);
 }
 
diff -uNr ircservices-5.0.2/modules/protocol/sjoin.c ircservices-5.0.3/modules/protocol/sjoin.c
--- ircservices-5.0.2/modules/protocol/sjoin.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/sjoin.c	Sat Nov 16 20:12:22 2002
@@ -87,7 +87,7 @@
 	    /* Ban (&) or exception (") */
 	    char *av[3];
 	    av[0] = channel;
-	    av[1] = (*nick=='&') ? "+b" : "+e";
+	    av[1] = (char *)((*nick=='&') ? "+b" : "+e");
 	    av[2] = nick+1;
 	    do_cmode(source, 3, av);
 	    continue;
diff -uNr ircservices-5.0.2/modules/protocol/trircd.c ircservices-5.0.3/modules/protocol/trircd.c
--- ircservices-5.0.2/modules/protocol/trircd.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/trircd.c	Sat Nov 16 20:12:22 2002
@@ -274,13 +274,13 @@
     }
     if (!got_dtone) {
         send_error("Need DT1 protocol");
-        quitmsg = "Remote server doesn't support DT1 protocol change";
+        quitmsg = (char *)"Remote server doesn't support DT1 protocol change";
         quitting = 1;  
     }
     if (GET_PROTOCOL_VERSION() == 5) {
 	if (!init_token(module, trircd5_tokens) || !init_halfop(module)) {
 	    send_error("Internal initialization error");
-	    quitmsg = "Error initializing tokens/halfops for trircd5";
+	    quitmsg = (char *)"Error initializing tokens/halfops for trircd5";
 	    quitting = 1;
 	}
 	for (i = 0; i < lenof(new_chanmodes_v5); i++)
diff -uNr ircservices-5.0.2/modules/protocol/ts8.c ircservices-5.0.3/modules/protocol/ts8.c
--- ircservices-5.0.2/modules/protocol/ts8.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/ts8.c	Sat Nov 16 20:12:22 2002
@@ -80,13 +80,13 @@
 
     if (ac != 5)
 	return;
-    new_av[0] = source;	/* Nickname */
-    new_av[1] = "0";	/* # of hops (was in NICK command... we lose) */
-    new_av[2] = av[0];	/* Timestamp */
-    new_av[3] = av[1];	/* Username */
-    new_av[4] = av[2];	/* Hostname */
-    new_av[5] = av[3];	/* Server */
-    new_av[6] = av[4];	/* Real name */
+    new_av[0] = source;      /* Nickname */
+    new_av[1] = (char *)"0"; /* # of hops (was in NICK command... we lose) */
+    new_av[2] = av[0];       /* Timestamp */
+    new_av[3] = av[1];       /* Username */
+    new_av[4] = av[2];       /* Hostname */
+    new_av[5] = av[3];       /* Server */
+    new_av[6] = av[4];       /* Real name */
     do_nick("", 7, new_av);
 }
 
@@ -213,7 +213,7 @@
 static int do_set_topic(Channel *c, const char *topic, const char *setter,
 			time_t t)
 {
-    if (t >= c->topic_time)
+    if (c->topic_time && t >= c->topic_time)
 	t = c->topic_time - 1;  /* Force topic change */
     if (setter)
 	return 0;
diff -uNr ircservices-5.0.2/modules/protocol/unreal.c ircservices-5.0.3/modules/protocol/unreal.c
--- ircservices-5.0.2/modules/protocol/unreal.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/protocol/unreal.c	Sat Nov 16 20:12:22 2002
@@ -329,7 +329,7 @@
     /* Make sure we got a NICKv2 from the remote server; if not, abort. */
     if (!got_nickv2) {
 	send_error("Need NICKv2 protocol");
-	quitmsg = "Remote server doesn't support NICKv2";
+	quitmsg = (char *)"Remote server doesn't support NICKv2";
 	quitting = 1;
     }
 }
diff -uNr ircservices-5.0.2/modules/statserv/main.c ircservices-5.0.3/modules/statserv/main.c
--- ircservices-5.0.2/modules/statserv/main.c	Tue Oct 22 17:16:01 2002
+++ ircservices-5.0.3/modules/statserv/main.c	Sat Nov 16 20:12:22 2002
@@ -97,8 +97,8 @@
 
 static int statserv(const char *source, const char *target, char *buf)
 {
-    char *cmd;
-    char *s;
+    const char *cmd;
+    const char *s;
     User *u;
 
     if (irc_stricmp(target, s_StatServ) != 0)
@@ -166,7 +166,7 @@
 static void do_servers(User *u)
 {
     ServerStats *ss;
-    char *cmd = strtok(NULL, " ");
+    const char *cmd = strtok(NULL, " ");
     char *mask = strtok(NULL, " ");
     int count = 0, nservers = 0;
 
@@ -345,7 +345,7 @@
 
 static void do_users(User *u)
 {
-    char *cmd = strtok(NULL, " ");
+    const char *cmd = strtok(NULL, " ");
     int avgusers, avgopers;
 
     if (!cmd)
diff -uNr ircservices-5.0.2/modules.c ircservices-5.0.3/modules.c
--- ircservices-5.0.2/modules.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/modules.c	Sat Nov 16 20:12:20 2002
@@ -39,8 +39,8 @@
 /* Structure for module data. */
 struct Module_ {
     struct Module_ *next, *prev;
-    char *path;			/* Path passed to load_module() */
-    char *name;			/* Name of the module from `module_name' */
+    const char *path;		/* Path passed to load_module() */
+    const char *name;		/* Name of the module from `module_name' */
     ConfigDirective *modconfig;	/* `module_config' in this module */
     char *module_name_ptr;	/* `module_name' in this module */
     const int32 *module_version_ptr;  /* `module_version' in this module */
@@ -339,9 +339,9 @@
     return module;
 
   err_freename:
-    free(module->name);
+    free((char *)module->name);
   err_freemod:
-    free(module->path);
+    free((char *)module->path);
     free(module);
     my_dlclose(handle);
   err_return:
@@ -401,7 +401,7 @@
     return module;
 
   fail:
-    free(module->name);
+    free((char *)module->name);
     my_dlclose(module->dllhandle);
     LIST_REMOVE(module, modulelist);
     free(module);
@@ -443,7 +443,7 @@
 	}
     }
     LIST_REMOVE(module, modulelist);
-    free(module->name);
+    free((char *)module->name);
     my_dlclose(module->dllhandle);
     free(module);
     return 1;
diff -uNr ircservices-5.0.2/signals.c ircservices-5.0.3/signals.c
--- ircservices-5.0.2/signals.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/signals.c	Sat Nov 16 20:12:20 2002
@@ -47,7 +47,7 @@
     signal(SIGTERM, SIG_IGN);
     signal(SIGHUP, SIG_IGN);
     log("Received SIGTERM, exiting.");
-    quitmsg = "Shutting down on SIGTERM";
+    quitmsg = (char *)"Shutting down on SIGTERM";
     siglongjmp(*panic_ptr, 1);
 }
 
@@ -110,7 +110,7 @@
 
     /* Pick an appropriate quit message */
     if (signum == SIGUSR1 || !(quitmsg = malloc(BUFSIZE))) {
-	quitmsg = "Out of memory!";
+	quitmsg = (char *)"Out of memory!";
 	quitting = 1;
     } else {
 #if HAVE_STRSIGNAL
diff -uNr ircservices-5.0.2/sockets.c ircservices-5.0.3/sockets.c
--- ircservices-5.0.2/sockets.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/sockets.c	Sat Nov 16 20:12:20 2002
@@ -353,7 +353,8 @@
 		continue;
 	    } else if (s->flags & SF_CONNECTING) {
 		/* Connection established (or failed) */
-		int val, vallen;
+		int val;
+		socklen_t vallen;
 		vallen = sizeof(val);
 		if (debug >= 2)
 		    log("debug: sockets: connect on fd %d returned", i);
@@ -947,7 +948,7 @@
 {
     int i;
     struct sockaddr_in sin;
-    int sin_len = sizeof(sin);
+    socklen_t sin_len = sizeof(sin);
     int newfd;
 
     newfd = accept(s->fd, (struct sockaddr *)&sin, &sin_len);
diff -uNr ircservices-5.0.2/tools/convert-epona.c ircservices-5.0.3/tools/convert-epona.c
--- ircservices-5.0.2/tools/convert-epona.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-epona.c	Sat Nov 16 20:12:21 2002
@@ -134,10 +134,10 @@
 	    }
 	    SAFE(read_string(&ni->last_usermask, f));
 	    if (!ni->last_usermask)
-		ni->last_usermask = "@";
+		ni->last_usermask = (char *)"@";
 	    SAFE(read_string(&ni->last_realname, f));
 	    if (!ni->last_realname)
-		ni->last_realname = "";
+		ni->last_realname = (char *)"";
 	    SAFE(read_string(&ni->last_quit, f));
 	    SAFE(read_int32(&tmp32, f));
 	    ni->time_registered = tmp32;
@@ -274,7 +274,7 @@
 	    memcpy(ci->founderpass, passbuf, sizeof(passbuf));
 	    SAFE(read_string(&ci->desc, f));
 	    if (!ci->desc)
-		ci->desc = "";
+		ci->desc = (char *)"";
 	    SAFE(read_string(&ci->url, f));
 	    SAFE(read_string(&ci->email, f));
 	    SAFE(read_int32(&tmp32, f));
diff -uNr ircservices-5.0.2/tools/convert-magick.c ircservices-5.0.3/tools/convert-magick.c
--- ircservices-5.0.2/tools/convert-magick.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-magick.c	Sat Nov 16 20:12:21 2002
@@ -94,9 +94,10 @@
 	    if (oldni.flags & 0x00000020) {
 		ngi->suspendinfo = scalloc(sizeof(SuspendInfo), 1);
 		strcpy(ngi->suspendinfo->who, "<unknown>");
-		ngi->suspendinfo->reason =
+		ngi->suspendinfo->reason = (char *)(
 		    version==6 ? "Unknown (imported from Wrecked IRC Services)"
-		               : "Unknown (imported from Magick IRC Services)";
+		               : "Unknown (imported from Magick IRC Services)"
+		    );
 		ngi->suspendinfo->suspended = time(NULL);
 		ngi->suspendinfo->expires = 0;
 	    }
@@ -314,9 +315,10 @@
 	    if (oldci.flags & 0x00000100) {
 		ci->suspendinfo = scalloc(sizeof(SuspendInfo), 1);
 		strcpy(ci->suspendinfo->who, "<unknown>");
-		ci->suspendinfo->reason =
+		ci->suspendinfo->reason = (char *)(
 		    version==6 ? "Unknown (imported from Wrecked IRC Services)"
-		               : "Unknown (imported from Magick IRC Services)";
+		               : "Unknown (imported from Magick IRC Services)"
+		    );
 		ci->suspendinfo->suspended = time(NULL);
 		ci->suspendinfo->expires = 0;
 	    }
diff -uNr ircservices-5.0.2/tools/convert-ptlink.c ircservices-5.0.3/tools/convert-ptlink.c
--- ircservices-5.0.2/tools/convert-ptlink.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-ptlink.c	Sat Nov 16 20:12:21 2002
@@ -68,10 +68,10 @@
 	    SAFE(read_string(&s, f));  /* location */
 	    SAFE(read_string(&ni->last_usermask, f));
 	    if (!ni->last_usermask)
-		ni->last_usermask = "@";
+		ni->last_usermask = (char *)"@";
 	    SAFE(read_string(&ni->last_realname, f));
 	    if (!ni->last_realname)
-		ni->last_realname = "";
+		ni->last_realname = (char *)"";
 	    SAFE(read_string(&ni->last_quit, f));
 	    SAFE(read_int32(&tmp32, f));
 	    ni->time_registered = tmp32;
@@ -148,7 +148,7 @@
 		    ngi->suspendinfo = scalloc(sizeof(SuspendInfo), 1);
 		    strcpy(ngi->suspendinfo->who, "<unknown>");
 		    ngi->suspendinfo->reason =
-			"Unknown (imported from PTlink IRC Services)";
+			(char *)"Unknown (imported from PTlink IRC Services)";
 		    SAFE(read_int32(&tmp32, f));
 		    ngi->suspendinfo->expires = tmp32;
 		}
@@ -340,7 +340,7 @@
 	    memcpy(ci->founderpass, passbuf, sizeof(passbuf));
 	    SAFE(read_string(&ci->desc, f));
 	    if (!ci->desc)
-		ci->desc = "";
+		(char *)ci->desc = (char *)"";
 	    SAFE(read_string(&ci->url, f));
 	    SAFE(read_string(&ci->email, f));
 	    SAFE(read_int32(&tmp32, f));
diff -uNr ircservices-5.0.2/tools/convert-sirv.c ircservices-5.0.3/tools/convert-sirv.c
--- ircservices-5.0.2/tools/convert-sirv.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-sirv.c	Sat Nov 16 20:12:21 2002
@@ -192,7 +192,7 @@
 		ngi->suspendinfo = smalloc(sizeof(*ngi->suspendinfo));
 		strscpy(ngi->suspendinfo->who, "<unknown>", NICKMAX);
 		ngi->suspendinfo->reason =
-		    "Unknown (imported from Bolivia IRC Services)";
+		    (char *)"Unknown (imported from Bolivia IRC Services)";
 		ngi->suspendinfo->suspended = time(NULL);
 		ngi->suspendinfo->expires = 0;
 	    }
@@ -572,10 +572,10 @@
 		strcpy(ci->suspendinfo->who, "<unknown>");
 		if (type == TYPE_AUSPICE) {
 		    ci->suspendinfo->reason =
-			"Unknown (imported from Auspice Services)";
+			(char *)"Unknown (imported from Auspice Services)";
 		} else {
 		    ci->suspendinfo->reason =
-			"Unknown (imported from SirvNET IRC Services)";
+			(char *)"Unknown (imported from SirvNET IRC Services)";
 		}
 		ci->suspendinfo->suspended = time(NULL);
 		ci->suspendinfo->expires = 0;
@@ -924,7 +924,7 @@
 	    trigger.tvalue = 32767;
 	md[i].limit = trigger.tvalue;
 	strscpy(md[i].who, trigger.who, NICKMAX);
-	md[i].reason = "(unknown)";
+	md[i].reason = (char *)"(unknown)";
 	md[i].time = time(NULL);
 	md[i].expires = 0;
     }
@@ -952,7 +952,7 @@
 	SAFE(read_string(&md[i].reason, f));
 	SAFE(read_string(&s, f));
 	if (!s)
-	    s = "<unknown>";
+	    s = (char *)"<unknown>";
 	strscpy(md[i].who, s, NICKMAX);
 	add_maskdata(MD_SGLINE, &md[i]);
     }
@@ -972,7 +972,7 @@
     md = scalloc(sizeof(*md), n);
     for (i = 0; i < n; i++) {
 	SAFE(read_string(&md[i].mask, f));
-	md[i].reason = "Unknown (imported from Bolivia IRC Services)";
+	md[i].reason = (char *)"Unknown (imported from Bolivia IRC Services)";
 	strscpy(md[i].who, "<unknown>", NICKMAX);
 	add_maskdata(MD_SQLINE, &md[i]);
     }
@@ -996,7 +996,7 @@
 	SAFE(read_string(&md[i].reason, f));
 	SAFE(read_string(&s, f));
 	if (!s)
-	    s = "<unknown>";
+	    s = (char *)"<unknown>";
 	strscpy(md[i].who, s, NICKMAX);
 	add_maskdata(MD_SZLINE, &md[i]);
     }
diff -uNr ircservices-5.0.2/tools/convert-trircd.c ircservices-5.0.3/tools/convert-trircd.c
--- ircservices-5.0.2/tools/convert-trircd.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-trircd.c	Sat Nov 16 20:12:21 2002
@@ -46,10 +46,10 @@
 	    SAFE(read_string(&ngi->email, f));
 	    SAFE(read_string(&ni->last_usermask, f));
 	    if (!ni->last_usermask)
-		ni->last_usermask = "@";
+		ni->last_usermask = (char *)"@";
 	    SAFE(read_string(&ni->last_realname, f));
 	    if (!ni->last_realname)
-		ni->last_realname = "";
+		ni->last_realname = (char *)"";
 	    SAFE(read_string(&ni->last_quit, f));
 	    SAFE(read_int32(&tmp32, f));
 	    ni->time_registered = tmp32;
@@ -360,7 +360,7 @@
 	    memcpy(ci->founderpass, passbuf, sizeof(passbuf));
 	    SAFE(read_string(&ci->desc, f));
 	    if (!ci->desc)
-		ci->desc = "";
+		ci->desc = (char *)"";
 	    SAFE(read_string(&ci->url, f));
 	    SAFE(read_string(&ci->email, f));
 	    SAFE(read_int32(&tmp32, f));
diff -uNr ircservices-5.0.2/tools/convert-ver8.c ircservices-5.0.3/tools/convert-ver8.c
--- ircservices-5.0.2/tools/convert-ver8.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/tools/convert-ver8.c	Sat Nov 16 20:12:21 2002
@@ -57,10 +57,10 @@
 	    SAFE(read_string(&ngi->email, f));
 	    SAFE(read_string(&ni->last_usermask, f));
 	    if (!ni->last_usermask)
-		ni->last_usermask = "@";
+		ni->last_usermask = (char *)"@";
 	    SAFE(read_string(&ni->last_realname, f));
 	    if (!ni->last_realname)
-		ni->last_realname = "";
+		ni->last_realname = (char *)"";
 	    SAFE(read_string(&ni->last_quit, f));
 	    SAFE(read_int32(&tmp32, f));
 	    ni->time_registered = tmp32;
@@ -300,7 +300,7 @@
 	    }
 	    SAFE(read_string(&ci->desc, f));
 	    if (!ci->desc)
-		ci->desc = "";
+		ci->desc = (char *)"";
 	    SAFE(read_string(&ci->url, f));
 	    SAFE(read_string(&ci->email, f));
 	    if (type == TYPE_IRCS)
diff -uNr ircservices-5.0.2/users.c ircservices-5.0.3/users.c
--- ircservices-5.0.2/users.c	Tue Oct 22 17:15:59 2002
+++ ircservices-5.0.3/users.c	Sat Nov 16 20:12:20 2002
@@ -670,7 +670,7 @@
 	free(mask2);
 	return 0;
     }
-    match_user = match_wild(username, user->username);
+    match_user = match_wild_nocase(username, user->username);
     match_host = match_wild_nocase(host, user->host);
     if (user->fakehost)
 	match_host |= match_wild_nocase(host, user->fakehost);
@@ -712,11 +712,11 @@
 	    *myhost++ = 0;
     }
     if (!mynick || !*mynick)
-	mynick = "*";
+	mynick = (char *)"*";
     if (!myuser || !*myuser)
-	myuser = "*";
+	myuser = (char *)"*";
     if (!myhost || !*myhost)
-	myhost = "*";
+	myhost = (char *)"*";
     *nick = sstrdup(mynick);
     *user = sstrdup(myuser);
     *host = sstrdup(myhost);
diff -uNr ircservices-5.0.2/version.sh ircservices-5.0.3/version.sh
--- ircservices-5.0.2/version.sh	Tue Oct 22 17:10:27 2002
+++ ircservices-5.0.3/version.sh	Sat Nov 16 18:44:53 2002
@@ -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.2
+VERSION=5.0.3
 
 # Increment Services build number
 if [ -f version.c ] ; then