diff -uNr ircservices-5.0.16/Changes ircservices-5.0.17/Changes
--- ircservices-5.0.16/Changes	2003-04-10 10:45:01.000000000 +0900
+++ ircservices-5.0.17/Changes	2003-04-20 16:32:03.000000000 +0900
@@ -1,5 +1,12 @@
 Version 5.0
 -----------
+2003/04/20 .17	Fixed crash when using UNLINK FORCE with non-linked nicks.
+		    Reported by Matthew Hodgson <arathorn@theonering.net>
+2003/04/15	The configure script now uses "conf-tmp" instead of "tmp"
+		    as its temporary directory name, to avoid potential
+		    clashes with pre-existing directories.
+2003/04/12	Precompiled binaries should now work with Linux kernel 2.2.x.
+		    Reported by <jay@hyperion.sleepygeek.org>
 2003/04/10 .16	Fixed crash on some systems when giving only spaces to
 		    certain commands.  Reported by Joao Luis Marques Pinto
 		    <Lamego@PTlink.net>
diff -uNr ircservices-5.0.16/Makefile ircservices-5.0.17/Makefile
--- ircservices-5.0.16/Makefile	2003-04-10 11:52:27.000000000 +0900
+++ ircservices-5.0.17/Makefile	2003-04-20 19:28:15.000000000 +0900
@@ -81,7 +81,7 @@
 	$(MAKE) -C lang spotless
 	$(MAKE) -C modules spotless
 	$(MAKE) -C tools spotless
-	rm -f config.cache config.h* configure.log Makefile.inc* \
+	rm -f config.cache config.h* configure.log conf-tmp Makefile.inc* \
 		langstrs.h version.c
 
 install: myall myinstall
diff -uNr ircservices-5.0.16/configure ircservices-5.0.17/configure
--- ircservices-5.0.16/configure	2003-04-10 10:35:14.000000000 +0900
+++ ircservices-5.0.17/configure	2003-04-15 15:13:14.000000000 +0900
@@ -10,6 +10,11 @@
 
 ###########################################################################
 
+# Temporary directory to use for various things.
+CONFTMP=conf-tmp
+
+###########################################################################
+
 # Nifty handy functions.
 
 echo2 () {
@@ -77,11 +82,11 @@
 	log "found $include in /usr/include"
 	return 0
     fi
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 #include <$include>
 int main() { return 0; }
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
 	eval "HAVE_${inc2}=1"
 	log "found $include"
 	return 0
@@ -107,13 +112,13 @@
     if [ ! "$TEST" ] ; then
 	TEST="return 0;"
     fi
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
     int main() {
 	extern int $func$proto;
 	$TEST
     }
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test && (run tmp/test) 2>&1 ; then
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test && (run $CONFTMP/test) 2>&1 ; then
 	eval "HAVE_${func2}=1"
 	log "found $func"
 	return 0
@@ -135,7 +140,7 @@
 
 We suddenly couldn't compile using the C compiler we already tested!
 The command line we used was:
-     $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test
+     $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test
 Please try to fix this; if you can't, mail achurch@achurch.org
 with information about your system, the output from this script,
 and the \`configure.log' file generated by this script.
@@ -153,14 +158,14 @@
 
 # Create a temporary directory for our use.
 
-if exists tmp ; then
-    rm -rf tmp
+if exists $CONFTMP ; then
+    rm -rf $CONFTMP
 fi
-if mkdir tmp ; then : ; else
+if mkdir $CONFTMP ; then : ; else
     echo "Failed to create temporary directory!  Exiting."
     exit 2
 fi
-if chmod u+rwx tmp ; then : ; else
+if chmod u+rwx $CONFTMP ; then : ; else
     echo "Cannot write to temporary directory!  Exiting."
     exit 2
 fi
@@ -802,12 +807,12 @@
 else
     echo "gcc not found."
     echo2 "    Looking for alternatives... "
-    echo >tmp/test.c "int main(){return 1;}"
-    if run icc tmp/test.c -o tmp/test ; then
+    echo >$CONFTMP/test.c "int main(){return 1;}"
+    if run icc $CONFTMP/test.c -o $CONFTMP/test ; then
 	CC=icc
-    elif run cc tmp/test.c -o tmp/test ; then
+    elif run cc $CONFTMP/test.c -o $CONFTMP/test ; then
 	CC=cc
-    elif run c89 tmp/test.c -o tmp/test ; then
+    elif run c89 $CONFTMP/test.c -o $CONFTMP/test ; then
 	CC=c89
     else
 	echo "no C compiler found!"
@@ -816,13 +821,13 @@
 	exit 2
     fi
     # See if it handles ANSI.
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
     int main(int argc, char **argv) {
 	extern void foo(int bar);
     }
 EOT
     log "test for ANSI..."
-    if run $CC tmp/test.c -o tmp/test ; then
+    if run $CC $CONFTMP/test.c -o $CONFTMP/test ; then
 	echo "using $CC."
 	DEF_CC_FLAGS=`def_cc_flags $CC`
 	if [ "x$DEF_CC_FLAGS" = "x" -a "x$USER_CC_FLAGS" = "x" ] ; then
@@ -852,12 +857,12 @@
 else
     CC_FLAGS=$DEF_CC_FLAGS
     echo2 "Testing default compiler flags ($CC_FLAGS)... "
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main(int argc, char **argv) {
 	    extern void foo(int bar);
 	}
 EOT
-    if run $CC $CC_FLAGS -c tmp/test.c -o tmp/test.o ; then
+    if run $CC $CC_FLAGS -c $CONFTMP/test.c -o $CONFTMP/test.o ; then
 	echo "looks good."
     else
 	echo "no luck!  Using no flags."
@@ -891,13 +896,13 @@
     log "-os2 option given, using \`.exe'"
     EXE_SUFFIX=.exe
 else
-    rm -f tmp/test tmp/test.exe
-    echo >tmp/test.c "int main(){return 1;}"
-    if run $CC $CC_FLAGS $CC_LFLAGS tmp/test.c -o tmp/test ; then
-	if [ -f tmp/test.exe ] ; then
+    rm -f $CONFTMP/test $CONFTMP/test.exe
+    echo >$CONFTMP/test.c "int main(){return 1;}"
+    if run $CC $CC_FLAGS $CC_LFLAGS $CONFTMP/test.c -o $CONFTMP/test ; then
+	if [ -f $CONFTMP/test.exe ] ; then
 	    log using .exe
 	    EXE_SUFFIX=.exe
-	elif [ -f tmp/test ] ; then
+	elif [ -f $CONFTMP/test ] ; then
 	    log using nothing
 	    EXE_SUFFIX=""
 	else
@@ -925,40 +930,40 @@
     log cache supplied \`"$CC_LIBS'"
 else
     CC_LIBS=
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main(int argc, char **argv) {
 	    extern void foo(int bar);
 	}
 EOT
-    cat >tmp/test-socket.c <<EOT
+    cat >$CONFTMP/test-socket.c <<EOT
 	int main(int argc, char **argv) {
 	    extern void socket();
 	    socket();
 	}
 EOT
-    cat >tmp/test-gethost.c <<EOT
+    cat >$CONFTMP/test-gethost.c <<EOT
 	int main(int argc, char **argv) {
 	    extern void gethostbyname();
 	    gethostbyname();
 	}
 EOT
-#    if run $CC $CC_FLAGS tmp/test.c -lnsl -o tmp/test ; then
+#    if run $CC $CC_FLAGS $CONFTMP/test.c -lnsl -o $CONFTMP/test ; then
 #	CC_LIBS="$CC_LIBS -lnsl"
 #	echo2 "-lnsl "
 #    fi
-    if run $CC $CC_FLAGS tmp/test-socket.c -o tmp/test ; then
+    if run $CC $CC_FLAGS $CONFTMP/test-socket.c -o $CONFTMP/test ; then
 	:
-    elif run $CC $CC_FLAGS tmp/test-socket.c -lsocket -o tmp/test ; then
+    elif run $CC $CC_FLAGS $CONFTMP/test-socket.c -lsocket -o $CONFTMP/test ; then
 	CC_LIBS="$CC_LIBS -lsocket"
 	echo2 "-lsocket "
     fi
-    if run $CC $CC_FLAGS tmp/test-gethost.c -o tmp/test ; then
+    if run $CC $CC_FLAGS $CONFTMP/test-gethost.c -o $CONFTMP/test ; then
 	:
-    elif run $CC $CC_FLAGS tmp/test-gethost.c -lresolv -o tmp/test ; then
+    elif run $CC $CC_FLAGS $CONFTMP/test-gethost.c -lresolv -o $CONFTMP/test ; then
 	CC_LIBS="$CC_LIBS -lresolv"
 	echo2 "-lresolv "
     fi
-#    if run $CC $CC_FLAGS tmp/test.c -lbsd -o tmp/test ; then
+#    if run $CC $CC_FLAGS $CONFTMP/test.c -lbsd -o $CONFTMP/test ; then
 #	CC_LIBS="$CC_LIBS -lbsd"
 #	echo2 "-lbsd "
 #    fi
@@ -999,23 +1004,23 @@
 	fi
 	if [ $dlfcn_ok = 1 ] ; then
 	    log "testing dlfcn method"
-	    cat >tmp/test-dlopen.c <<EOT
+	    cat >$CONFTMP/test-dlopen.c <<EOT
 		#include <dlfcn.h>
 		int main(int argc, char **argv) {
-		    void *lib = dlopen("tmp/test-lib.so", RTLD_NOW);
+		    void *lib = dlopen("$CONFTMP/test-lib.so", RTLD_NOW);
 		    printf("%d\n", lib != 0);
 		    if (lib)
 			dlclose(lib);
 		    return 0;
 		}
 EOT
-	    cat >tmp/test-lib.c <<EOT
+	    cat >$CONFTMP/test-lib.c <<EOT
 		int foo() {no_such_symbol();}
 EOT
-	    if run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -o tmp/test ; then
+	    if run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
 		CC_DYN_LIBS=""
 		log "dlopen() found (no libs)"
-	    elif run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -ldl -o tmp/test
+	    elif run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -ldl -o $CONFTMP/test
 	    then
 		CC_DYN_LIBS=" -ldl"
 		log "dlopen() found (libdl)"
@@ -1024,7 +1029,7 @@
 		OK=
 	    fi
 	    if [ "$OK" ] ; then
-		if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dlopen.c -o tmp/test ; then
+		if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
 		    log "-rdynamic works"
 		    CC_DYN_LFLAGS=" -rdynamic"
 		else
@@ -1038,7 +1043,7 @@
 		else
 		    CC_SHARED="$CC -shared"
 		fi
-		if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-lib.c -o tmp/test-lib.so ; then
+		if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so ; then
 		    log "-shared works"
 		else
 		    log "no -shared, aborting dlfcn test"
@@ -1047,9 +1052,9 @@
 		fi
 	    fi
 	    if [ "$OK" ] ; then
-		if run tmp/test ; then
-		    a=`tmp/test`
-		    log "missing-symbol test: tmp/test => $a"
+		if run $CONFTMP/test ; then
+		    a=`$CONFTMP/test`
+		    log "missing-symbol test: $CONFTMP/test => $a"
 		    if [ "x$a" = "x0" ] ; then
 			log "missing-symbol test succeeded"
 		    else
@@ -1062,7 +1067,7 @@
 		fi
 	    fi
 	    if [ "$OK" ] ; then
-		cat >tmp/test-dynamic2.c <<EOT
+		cat >$CONFTMP/test-dynamic2.c <<EOT
 		    #include <stdio.h>
 		    int main(int argc, char **argv) {
 			printf("%d\n", foo(atoi(argv[1])));
@@ -1071,16 +1076,16 @@
 			return xyzzy+1;
 		    }
 EOT
-		cat >tmp/test-dynamic.c <<EOT
+		cat >$CONFTMP/test-dynamic.c <<EOT
 		    int foo(int bar) {
 			return quux(bar)*2;
 		    }
 EOT
-		if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-dynamic.c -o tmp/test.so \
-		&& run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
+		if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-dynamic.c -o $CONFTMP/test.so \
+		&& run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
 		then
-		    a=`tmp/test 1`
-		    log "symbol resolution test: tmp/test 1 => $a"
+		    a=`$CONFTMP/test 1`
+		    log "symbol resolution test: $CONFTMP/test 1 => $a"
 		    if [ "x$a" = "x4" ] ; then
 			log "symbol resolution test: succeeded => using dynamic modules (dlfcn)"
 		    else
@@ -1095,7 +1100,7 @@
 	fi  # dlfcn test
 	if [ "$OK" ] ; then
 	    log "checking for underscores in symbols"
-	    cat >tmp/test-dynamic2.c <<EOT
+	    cat >$CONFTMP/test-dynamic2.c <<EOT
 		#include <stdio.h>
 	        #include <dlfcn.h>
 		int main(int argc, char **argv) {
@@ -1106,10 +1111,10 @@
 		}
 		int quux(int x) {return x;}
 EOT
-	    if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
+	    if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
 	    then
-		a=`tmp/test`
-		log "underscore test: tmp/test => $a"
+		a=`$CONFTMP/test`
+		log "underscore test: $CONFTMP/test => $a"
 		with_underscore=`echo "$a" | cut -c2`
 		without_underscore=`echo "$a" | cut -c1`
 		if [ "x$with_underscore" = "x1" ] ; then
@@ -1152,15 +1157,15 @@
     echo "(cached) $TYPE_INT8"
     log "cache supplied $TYPE_INT8"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    char a;
 	    printf("%d", sizeof(a));
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(char)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming short."
@@ -1171,15 +1176,15 @@
 	    log "char is 8 bits"
 	    TYPE_INT8=char
 	else
-	    cat >tmp/test.c <<EOT
+	    cat >$CONFTMP/test.c <<EOT
 		int main() {
 		    byte a;
 		    printf("%d", sizeof(a));
 		    return 0;
 		}
 EOT
-	    if run $CC $CC_FLAGS tmp/tset.c $CC_LIBS -o tmp/test ; then
-		a="`tmp/test`"
+	    if run $CC $CC_FLAGS $CONFTMP/tset.c $CC_LIBS -o $CONFTMP/test ; then
+		a="`$CONFTMP/test`"
 		log "test program 2 output (sizeof(byte)): $a"
 		if [ "$a" = 1 ] ; then
 		    echo byte
@@ -1212,7 +1217,7 @@
     echo "(cached) $TYPE_INT16"
     log "cache supplied $TYPE_INT16"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    int a;
 	    short b;
@@ -1220,8 +1225,8 @@
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(int) sizeof(short)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming short."
@@ -1261,7 +1266,7 @@
     echo "(cached) $TYPE_INT32"
     log "cache supplied $TYPE_INT32"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    int a;
 	    long b;
@@ -1269,8 +1274,8 @@
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(int) sizeof(long)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming long."
@@ -1310,15 +1315,15 @@
     echo "(cached) `expr $SIZEOF_INT \* 8` bits"
     log "cache supplied `expr $SIZEOF_INT \* 8` bits"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    int a = 0;
 	    printf("%d", sizeof(a));
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(int)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming 16 bits."
@@ -1351,15 +1356,15 @@
     echo "(cached) `expr $SIZEOF_LONG \* 8` bits"
     log "cache supplied `expr $SIZEOF_LONG \* 8` bits"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    long a = 0;
 	    printf("%d", sizeof(a));
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(long)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming 32 bits."
@@ -1392,7 +1397,7 @@
     echo "(cached) `expr $SIZEOF_TIME_T \* 8` bits"
     log "cache supplied `expr $SIZEOF_TIME_T \* 8` bits, max $MAX_TIME_T"
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	#include <time.h>
 	int main() {
 	    time_t a = 0;
@@ -1404,8 +1409,8 @@
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(time_t) MAX_TIME_T): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming 32 bits."
@@ -1454,7 +1459,7 @@
 	log "cache said no gid_t"
     fi
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	#include <sys/types.h>
 	int main() {
 	    gid_t a;
@@ -1462,8 +1467,8 @@
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
-	a="`tmp/test`"
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
+	a="`$CONFTMP/test`"
 	log "test program output (sizeof(gid_t)): $a"
 	if [ ! "$a" ] ; then
 	    echo "test program failed!  Assuming 16 bits."
@@ -1503,7 +1508,7 @@
 	log "cache said not present"
     fi
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	#include <unistd.h>
 	#include <sys/socket.h>
 	int main() {
@@ -1511,7 +1516,7 @@
 	    return 0;
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
 	log "socklen_t found"
 	echo "present."
 	HAVE_SOCKLEN_T=1
@@ -1625,20 +1630,20 @@
 	    log "cache supplied pseudo sys_errlist"
 	fi
     else
-	cat >tmp/test.c <<EOT
+	cat >$CONFTMP/test.c <<EOT
 	    int main() {
 		extern void strerror(void);
 		strerror();
 	    }
 EOT
-	if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+	if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
 	    HAVE_STRERROR=1
 	    echo "ah, strerror() is here."
 	    log "using strerror()"
 	else
 	    HAVE_STRERROR=0
 	    echo "no strerror()."
-	    cat >tmp/test.c <<EOT
+	    cat >$CONFTMP/test.c <<EOT
 		int main() {
 		    extern char *sys_errlist[];
 		    char *s;
@@ -1646,7 +1651,7 @@
 		}
 EOT
 	    log "trying sys_errlist..."
-	    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+	    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
 		HAVE_SYS_ERRLIST=1
 		echo "    But you have sys_errlist, which will do nicely."
 		log "using sys_errlist"
@@ -1720,7 +1725,7 @@
 	if test_function int snprintf "(char *, int, const char *, ...)" ; then
 	    BAD_SNPRINTF=0
 	else
-	    tmp="`tmp/test 2>&1`"
+	    tmp="`$CONFTMP/test 2>&1`"
 	    res="`echo $tmp | cut -d\  -f10 2>&1`"
 	    if [ "$res" = "-1)" ] ; then
 		BAD_SNPRINTF=1
@@ -1859,14 +1864,14 @@
     fi
 
     MODE="check_getsetrlimit "
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() {
 	    extern void getrlimit(), setrlimit();
 	    getrlimit();
 	    setrlimit();
 	}
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then
 	log "found getrlimit/setrlimit"
 	HAVE_GETSETRLIMIT=1
     else
@@ -1905,13 +1910,13 @@
 	log "cache says use regular "\`"install'"
     fi
 else
-    cat >tmp/test.c <<EOT
+    cat >$CONFTMP/test.c <<EOT
 	int main() { return 0; }
 EOT
-    if run $CC $CC_FLAGS tmp/test.c $CC_LIBS -o tmp/test ; then : ; else
+    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test ; then : ; else
 	whoa_there
     fi
-    if run cp -p tmp/test$EXE_SUFFIX tmp/test3$EXE_SUFFIX ; then : ; else
+    if run cp -p $CONFTMP/test$EXE_SUFFIX $CONFTMP/test3$EXE_SUFFIX ; then : ; else
 	echo ""
 	echo ""
 	echo "*** WHOA THERE! ***"
@@ -1921,13 +1926,13 @@
 	exit 4
     fi
 
-    if run install -m 500 tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX && test -f tmp/test$EXE_SUFFIX && run cmp tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX ; then
+    if run install -m 500 $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX && test -f $CONFTMP/test$EXE_SUFFIX && run cmp $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX ; then
 	echo 'looks like "install" will work.'
 	INSTALL="install"
-    elif run cp -p tmp/test3$EXE_SUFFIX tmp/test$EXE_SUFFIX ; run install -c -m 500 tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX && test -f tmp/test$EXE_SUFFIX && run cmp tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX ; then
+    elif run cp -p $CONFTMP/test3$EXE_SUFFIX $CONFTMP/test$EXE_SUFFIX ; run install -c -m 500 $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX && test -f $CONFTMP/test$EXE_SUFFIX && run cmp $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX ; then
 	echo 'looks like "install -c" will work.'
 	INSTALL="install -c"
-    elif run cp -p tmp/test3$EXE_SUFFIX tmp/test$EXE_SUFFIX ; run ginstall -m 500 tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX && test -f tmp/test$EXE_SUFFIX && run cmp tmp/test$EXE_SUFFIX tmp/test2$EXE_SUFFIX ; then
+    elif run cp -p $CONFTMP/test3$EXE_SUFFIX $CONFTMP/test$EXE_SUFFIX ; run ginstall -m 500 $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX && test -f $CONFTMP/test$EXE_SUFFIX && run cmp $CONFTMP/test$EXE_SUFFIX $CONFTMP/test2$EXE_SUFFIX ; then
 	echo 'looks like "ginstall" will work.'
 	INSTALL="ginstall"
     else
@@ -1958,7 +1963,7 @@
     else
 	MKDIR=$tmp
 	log "trying $MKDIR"
-	if run $MKDIR -d -m 700 tmp/testdir && test -d tmp/testdir ; then
+	if run $MKDIR -d -m 700 $CONFTMP/testdir && test -d $CONFTMP/testdir ; then
 	    echo "OK."
 	    log "successful"
 	else
@@ -1988,10 +1993,10 @@
 	*)      CP_ALL="/bin/cp -pr";
 	        log "guessing: cp -pr";;
     esac
-    run rm -rf tmp/test*
-    run echo test >tmp/test
-    run cp tmp/test tmp/test2
-    if run /bin/mkdir tmp/testA && run /bin/mkdir tmp/testB && run /bin/mv tmp/test2 tmp/testA ; then
+    run rm -rf $CONFTMP/test*
+    run echo test >$CONFTMP/test
+    run cp $CONFTMP/test $CONFTMP/test2
+    if run /bin/mkdir $CONFTMP/testA && run /bin/mkdir $CONFTMP/testB && run /bin/mv $CONFTMP/test2 $CONFTMP/testA ; then
 	:
     else
 	echo ""
@@ -2002,13 +2007,13 @@
 	echo "Are you out of disk space?"
 	exit 4
     fi
-    if run $CP_ALL tmp/testA tmp/testB/testC && run cmp tmp/testA/test2 tmp/testB/testC/test2 ; then
+    if run $CP_ALL $CONFTMP/testA $CONFTMP/testB/testC && run cmp $CONFTMP/testA/test2 $CONFTMP/testB/testC/test2 ; then
 	echo "$CP_ALL"
 	log \`"$CP_ALL' works"
     else
 	log \`"$CP_ALL' doesn't work"
-	run /bin/rm -rf tmp/testB/*
-	if run sh -c '/bin/tar Ccf tmp/testA - . | /bin/tar Cxf tmp/testB -'
+	run /bin/rm -rf $CONFTMP/testB/*
+	if run sh -c '/bin/tar Ccf $CONFTMP/testA - . | /bin/tar Cxf $CONFTMP/testB -'
 	then
 	    echo "tar (yuck)"
 	    CP_ALL='$(TOPDIR)/cp-recursive -t'
@@ -2240,7 +2245,7 @@
 
 # Delete the temporary directory we created.
 
-rm -rf tmp
+rm -rf $CONFTMP
 
 ###########################################################################
 
diff -uNr ircservices-5.0.16/modules/nickserv/link.c ircservices-5.0.17/modules/nickserv/link.c
--- ircservices-5.0.16/modules/nickserv/link.c	2003-04-10 11:52:28.000000000 +0900
+++ ircservices-5.0.17/modules/nickserv/link.c	2003-04-20 19:28:16.000000000 +0900
@@ -118,7 +118,7 @@
 static void do_unlink(User *u)
 {
     NickInfo *ni = u->ni, *ni2;
-    NickGroupInfo *ngi = u->ngi;
+    NickGroupInfo *ngi = u->ngi, *ngi2 = NULL;
     char *nick = strtok(NULL, " ");
     char *extra = strtok(NULL, " ");
     int is_servadmin = is_services_admin(u);
@@ -138,7 +138,8 @@
 	notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
     } else if (irc_stricmp(nick, u->nick) == 0) {
 	notice_lang(s_NickServ, u, NICK_UNLINK_SAME);
-    } else if (!(ni2 = get_nickinfo(nick)) || !ni2->nickgroup) {
+    } else if (!(ni2 = get_nickinfo(nick)) || !ni2->nickgroup
+	       || !(ngi2 = get_ngi(ni2)) || ngi2->nicks_count == 1) {
 	notice_lang(s_NickServ, u, force ? NICK_UNLINK_NOT_LINKED
 					 : NICK_UNLINK_NOT_LINKED_YOURS,
 		    nick);
@@ -148,11 +149,12 @@
 	int msg, i;
 	char *param1;
 
-	/* Adjust main nick if unlinking our current main nick (we set it
-	 * to the caller's nick) */
-	if (ni2->nickgroup == ni->nickgroup) {
-	    ARRAY_SEARCH_PLAIN(ngi->nicks, ni2->nick, irc_stricmp, i);
-	    if (i == ngi->mainnick) {
+	/* Adjust main nick if unlinking the current main nick (we set it
+	 * to the caller's nick if the caller is unlinking their own nick,
+	 * else the first in the list) */
+	ARRAY_SEARCH_PLAIN(ngi2->nicks, ni2->nick, irc_stricmp, i);
+	if (i == ngi2->mainnick) {
+	    if (ngi == ngi2) {
 		ARRAY_SEARCH_PLAIN(ngi->nicks, nick, irc_stricmp, i);
 		if (i >= ngi->nicks_count) {
 		    module_log("BUG: UNLINK: no entry in ngi->nicks[] for"
@@ -160,15 +162,12 @@
 		} else {
 		    ngi->mainnick = i;
 		}
+	    } else {
+		ngi2->mainnick = 0;
 	    }
 	}
 	/* Actually delete the nick */
 	if (ni2->nickgroup != ni->nickgroup) {
-	    NickGroupInfo *ngi2 = NULL;
-	    if (!(ngi2 = get_ngi(ni2))) {
-		notice_lang(s_NickServ, u, INTERNAL_ERROR);
-		return;
-	    }
 	    delnick(ni2);
 	    msg = NICK_X_UNLINKED;
 	    param1 = ngi2->nicks[ngi2->mainnick];
diff -uNr ircservices-5.0.16/version.sh ircservices-5.0.17/version.sh
--- ircservices-5.0.16/version.sh	2003-04-10 11:13:07.000000000 +0900
+++ ircservices-5.0.17/version.sh	2003-04-20 16:33:46.000000000 +0900
@@ -3,7 +3,7 @@
 # Build the version.c file which contains all the version related info and
 # needs to be updated on a per-build basis.
 
-VERSION=5.0.16
+VERSION=5.0.17
 
 # Increment Services build number
 if [ -f version.c ] ; then