diff -ur irc2.10.3p4+hemp/doc/CVS/Entries irc2.10.3p4+hemp+fic/doc/CVS/Entries
--- irc2.10.3p4+hemp/doc/CVS/Entries	Sun Oct 12 14:39:35 2003
+++ irc2.10.3p4+hemp+fic/doc/CVS/Entries	Sun Oct 12 14:19:26 2003
@@ -1,8 +1,6 @@
 /2.10-New/1.2/Sun Sep 20 19:37:22 1998//Tv2_10_3-patches
 /2.9-New/1.1.1.1/Mon Apr 14 13:32:40 1997//Tv2_10_3-patches
 /Authors/1.7/Mon Jun 21 02:56:53 1999//Tv2_10_3-patches
-/BUGS/1.14.2.1/Sat Oct 11 19:50:31 2003//Tv2_10_3-patches
-/ChangeLog/1.94.2.83/Sat Oct 11 20:00:30 2003//Tv2_10_3-patches
 /Etiquette/1.1.1.1/Mon Apr 14 13:25:02 1997//Tv2_10_3-patches
 /INSTALL.appendix/1.1.1.1/Mon Apr 14 13:37:09 1997//Tv2_10_3-patches
 /INSTALL.info/1.38/Fri Aug 13 17:22:12 1999//Tv2_10_3-patches
@@ -10,9 +8,6 @@
 /INSTALL.txt/1.38/Fri Aug 13 17:22:12 1999//Tv2_10_3-patches
 /LICENSE/1.1/Mon Mar  8 17:28:36 1999//Tv2_10_3-patches
 /Makefile/1.3/Fri Aug  8 14:44:13 1997//Tv2_10_3-patches
-/README/1.5.2.1/Sat Oct 11 19:57:45 2003//Tv2_10_3-patches
-/RELEASE_LOG/1.6.2.4/Sat Oct 11 19:59:11 2003//Tv2_10_3-patches
-/RELEASE_NOTES/1.34.2.2/Sat Oct 11 19:50:31 2003//Tv2_10_3-patches
 /SERVICE.sgml/1.6/Thu Apr 15 21:55:52 1999//Tv2_10_3-patches
 /SERVICE.txt/1.7/Thu Apr 15 21:56:53 1999//Tv2_10_3-patches
 /alt-irc-faq/1.1.1.1/Mon Apr 14 13:25:02 1997//Tv2_10_3-patches
@@ -22,7 +17,6 @@
 /iauth.conf.5/1.16/Sun Jul  4 22:09:09 1999//Tv2_10_3-patches
 /irc.1/1.5/Sun Dec 13 00:02:34 1998//Tv2_10_3-patches
 /ircd.8/1.9/Thu Apr  8 22:12:19 1999//Tv2_10_3-patches
-/m4macros/1.2.8.1/Sat Oct 11 19:55:02 2003//Tv2_10_3-patches
 /rfc1459.txt/1.1/Fri Apr 28 13:24:39 2000//Tv2_10_3-patches
 /rfc2810.txt/1.1/Fri Apr 28 13:24:39 2000//Tv2_10_3-patches
 /rfc2811.txt/1.1/Fri Apr 28 13:24:40 2000//Tv2_10_3-patches
@@ -30,3 +24,9 @@
 /rfc2813.txt/1.1/Fri Apr 28 13:24:40 2000//Tv2_10_3-patches
 D/Juped////
 D/Nets////
+/BUGS/1.14.2.1/Sat Oct 11 19:57:50 2003//Tv2_10_3-patches
+/README/1.5.2.1/Sat Oct 11 19:57:50 2003//Tv2_10_3-patches
+/RELEASE_NOTES/1.34.2.2/Sat Oct 11 19:57:50 2003//Tv2_10_3-patches
+/m4macros/1.2.8.1/Sat Oct 11 19:57:50 2003//Tv2_10_3-patches
+/ChangeLog/1.94.2.83/Sun Oct 12 12:19:21 2003//Tv2_10_3-patches
+/RELEASE_LOG/1.6.2.4/Sun Oct 12 12:19:21 2003//Tv2_10_3-patches
Only in irc2.10.3p4+hemp+fic/: i386-unknown-freebsd4.8
diff -ur irc2.10.3p4+hemp/ircd/CVS/Entries irc2.10.3p4+hemp+fic/ircd/CVS/Entries
--- irc2.10.3p4+hemp/ircd/CVS/Entries	Sun Oct 12 14:39:35 2003
+++ irc2.10.3p4+hemp+fic/ircd/CVS/Entries	Sun Oct 12 14:19:44 2003
@@ -8,7 +8,6 @@
 /hash.c/1.15.2.10/Fri Oct 10 22:32:05 2003//Tv2_10_3-patches
 /hash_def.h/1.1/Wed Sep  3 17:45:50 1997//Tv2_10_3-patches
 /hash_ext.h/1.3/Sun Jan 17 01:13:54 1999//Tv2_10_3-patches
-/ircd.c/1.62.2.9/Sat Oct 11 17:13:03 2003//Tv2_10_3-patches
 /ircd_ext.h/1.2/Fri Feb 12 04:00:47 1999//Tv2_10_3-patches
 /list.c/1.9.2.3/Sun May  6 21:36:55 2001//Tv2_10_3-patches
 /list_ext.h/1.5/Fri Jul  2 16:49:37 1999//Tv2_10_3-patches
@@ -23,9 +22,7 @@
 /res_mkquery.c/1.4/Wed Sep  3 17:45:55 1997//Tv2_10_3-patches
 /res_mkquery_ext.h/1.1/Wed Sep  3 17:45:56 1997//Tv2_10_3-patches
 /resolv_def.h/1.5.4.1/Wed Nov  3 22:00:00 1999//Tv2_10_3-patches
-/s_auth.c/1.43.2.7/Sat Oct 11 20:04:29 2003//Tv2_10_3-patches
 /s_auth_ext.h/1.7/Mon Mar  8 21:59:08 1999//Tv2_10_3-patches
-/s_bsd.c/1.73.2.26/Sat Oct 11 13:57:53 2003//Tv2_10_3-patches
 /s_bsd_ext.h/1.6/Thu Feb  4 23:50:21 1999//Tv2_10_3-patches
 /s_conf.c/1.42.2.18/Sat Oct 11 09:59:59 2003//Tv2_10_3-patches
 /s_conf_ext.h/1.4.2.2/Fri Feb  9 11:35:34 2001//Tv2_10_3-patches
@@ -56,4 +53,7 @@
 /whowas.c/1.6.2.8/Sat May  5 23:56:44 2001//Tv2_10_3-patches
 /whowas_def.h/1.1.6.1/Fri Dec  1 21:29:40 2000//Tv2_10_3-patches
 /whowas_ext.h/1.1/Wed Sep  3 17:46:09 1997//Tv2_10_3-patches
+/ircd.c/1.62.2.9/Sat Oct 11 18:33:11 2003//Tv2_10_3-patches
+/s_auth.c/1.43.2.7/Sun Oct 12 00:26:20 2003//Tv2_10_3-patches
+/s_bsd.c/1.73.2.26/Sun Oct 12 12:19:43 2003//Tv2_10_3-patches
 D
Only in irc2.10.3p4+hemp+fic/ircd: hemp+fic3.patch
Only in irc2.10.3p4+hemp+fic/ircd: report_error.diff
diff -ur irc2.10.3p4+hemp/ircd/s_misc.c irc2.10.3p4+hemp+fic/ircd/s_misc.c
--- irc2.10.3p4+hemp/ircd/s_misc.c	Sun Oct 12 14:40:11 2003
+++ irc2.10.3p4+hemp+fic/ircd/s_misc.c	Sun Oct 12 14:27:13 2003
@@ -1384,13 +1384,7 @@
 	user = parv[1];
 	while (*user)
 	    {
-		if ((*user == ' ') || (*user =='#') ||
-#ifdef INET6
-			(*user == '%')
-#else
-			(*user == ':')
-#endif
-			)
+		if ((*user == ' ') || (*user =='#') || (*user == IRCDCONF_DELIMITER))
 			break;
 		user++;
 	    }
@@ -1440,13 +1434,7 @@
 
 	for (i = strlen(kline_reason) - 1; i >= 0; i--)
 	    {
-		if ((kline_reason[i] == '#') || 
-#ifdef INET6
-			(kline_reason[i] == '%')
-#else
-			(kline_reason[i] == ':')
-#endif
-			)
+		if ((kline_reason[i] == '#') || (kline_reason[i] == IRCDCONF_DELIMITER))
 		    {
 			sendto_one(sptr,
 			    ":%s NOTICE %s :The %skline reason may not\
@@ -1495,11 +1483,9 @@
 			return 0;
 		    }
 
-#ifdef INET6
-		sprintf(buffer, "K%%%s%%%s%%%s%%\n\n", host, kline_reason, user);
-#else
-		sprintf(buffer, "K:%s:%s:%s:\n\n", host, kline_reason, user);
-#endif
+		sprintf(buffer, "K%c%s%c%s%c%s%c\n\n", IRCDCONF_DELIMITER, host, IRCDCONF_DELIMITER, kline_reason,
+			IRCDCONF_DELIMITER, user, IRCDCONF_DELIMITER);
+
 		if (write(out, buffer, strlen(buffer)) <= 0)
 		    {
 			sendto_one(sptr,
