diff -ubrN irc2.10.3p6+hemp2/README-jp irc2.10.3p6+hemp2+jp6/README-jp
--- irc2.10.3p6+hemp2/README-jp	1970-01-01 09:00:00.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/README-jp	2004-03-09 18:40:18.000000000 +0900
@@ -0,0 +1,85 @@
+IRC server jp-patched version (2004/03/09 irc2.10.3p6+hemp2+jp6)
+
+  このjp-patched versionは、IRC server (ftp://ftp.irc.org/irc/server/) に
+  対して主に以下のような機能を付加したものです。
+
+   ・日本語対応IRCクライアントの多くが持っている不備を補うため、
+     多くのケースでユーザが不便な状態になるのを防ぐための機能。
+     (最終的には、各クライアントの実装で解決するべき部分。)
+   ・IRCサーバの元々の仕様のために日本語を用いる上でユーザの利便性が
+     失われている面を部分的に解決するための機能。
+
+  最新のjp6版においては、いままではチャネル名に使用することができなかった、
+  あるいは、使用において制限されていた、ISO-2022-JPにおける数百文字の漢字を
+  チャネル名の中ですべて使用することができるように対応しています。(いわゆる
+  #がが 問題への対応、および、#ずず 問題への対応。) この機能はjp6版以降の
+  対応サーバ間でのみ有効となりますが、該当するチャネルはちょうどマスク付
+  チャネル(例えば、#abc:*.jpなど)と同じ位置付けになるため、同じIRC網内に
+  非対応サーバとの接続があっても相互接続上のプロトコルに影響がないように
+  実装されています。
+
+  今後も、本体の irc2.x と矛盾なく実現可能な機能について可能な限り実装を
+  行なっていく予定です。要望や改善案などがありましたらよろしくお願いします。
+  また、bug情報および不具合や問題点なども可能な限り対応したいと思いますので、
+  それらについてもみなさまからの情報をお待ちしております。
+  
+変更履歴
+
+  jp6 ← jp5
+      irc2.10.3対応
+      ircd/s_user.cにおけるチャネル名正規化洩れをfix
+      split時に発生するチャネルマスク関係の伝播洩れbugをfix
+      GOOD_USERNAMEを A-Z,a-z,0-9,_,-,. へと増加
+      いわゆる #がが 問題に対応して利用可能へ
+      いわゆる #ずず 問題に対応して利用可能へ
+
+  jp5 ← jp4
+      ircd/channel.cにおけるチャネル名正規化bugをfix
+
+  jp4 ← jp3
+      irc2.9.5対応
+      common/send.cにおけるdeliver_it()でのエラー時にエラー情報を返すため、
+      common/bsd.cでのdeliver_it()の戻り値を-1ではなく-errnoを返すようにした。
+
+  jp3 ← jp2
+      irc2.9.4対応
+      GOOD_USERNAMEでのjp2y1b版に合わせた。
+         A-Z,a-z,0-9,_,- の任意の組み合わせでOKと緩和
+
+注意事項
+
+  入手先:   http://www.ircnet.jp/dist/server/jp-patch/
+  告知先:   http://www.ircnet.jp/server/jp-patch/
+  連絡先:   mailto:jp-patch@ircnet.jp
+
+  このjp-patched版は 菊地高広 <kick@wide.ad.jp> が作成管理しています。
+  不具合などがありましたら jp-patch@ircnet.jp までお願いします。
+  今後の情報などは http://www.ircnet.jp/server/jp-patch/ で告知する予定です。
+
+  本体及びpatchともにGPLに従います。詳しくはdoc/の下の文書類をどうぞ。
+  ただし、このpatchを利用したものを改変して再配布する場合は、この文書を
+  そのまま付けるとともに jp-patch@ircnet.jp まで連絡をいただけると幸いです。
+  改変なくそのまま再配布する場合は自由にしてくださって結構です。
+
+その他の関連情報
+
+  JIRCC (Japan Internet-Relay-Chat Club)
+    JIRCCは日本におけるIRCの普及とIRCer間の交流ををはかるために
+    1990年3月にできたIRCのユーザ会です。メーリングリストがあり、
+    IRCに関する種々の情報交換や議論や告知が行なわれてきています。
+
+      jircc mailing list
+         IRC全般に関するメーリングリストです。
+         jircc-request@ircnet.jp へメールを送ると参加方法が
+         自動返送されてきます。メールの内容はあっても空でも大丈夫です。
+
+  http://www.ircnet.jp/
+    IRCに関する情報を集めたページです。
+
+謝辞
+
+  本patchの開発及びdebuggingにおいて、開発環境や多くの便宜を与えてくれた
+  情報技術開発株式会社京都ネットワーク技術研究所 http://www.tdi.co.jp/
+  及び、その皆様方に感謝の意を表わしたいと思います。また、動作確認など
+  実運用に際して利用させていただいたIRCnet、及び、その多くのユーザの皆様方に
+  対し、ここに感謝の意を表わしたいと思います。
diff -ubrN irc2.10.3p6+hemp2/common/bsd.c irc2.10.3p6+hemp2+jp6/common/bsd.c
--- irc2.10.3p6+hemp2/common/bsd.c	2004-03-09 17:21:33.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/common/bsd.c	2004-03-09 18:18:54.000000000 +0900
@@ -106,6 +106,10 @@
 	(void)alarm(WRITEWAITDELAY);
 #endif
 	retval = send(cptr->fd, str, len, 0);
+	
+	if (retval < 0)
+		retval = -errno;
+
 	/*
 	** Convert WOULDBLOCK to a return of "0 bytes moved". This
 	** should occur only if socket was non-blocking. Note, that
diff -ubrN irc2.10.3p6+hemp2/common/send.c irc2.10.3p6+hemp2+jp6/common/send.c
--- irc2.10.3p6+hemp2/common/send.c	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/common/send.c	2004-03-09 18:18:54.000000000 +0900
@@ -345,7 +345,13 @@
 		msg = dbuf_map(&to->sendQ, &len);
 					/* Returns always len > 0 */
 		if ((rlen = deliver_it(to, msg, len)) < 0)
-			return dead_link(to,"Write error to %s, closing link");
+		    {
+			char	linebuf[1024];
+			(void)sprintf(linebuf,
+				      "Write error (%s) to %%s, closing link",
+				      sys_errlist[-rlen]);
+			return dead_link(to, linebuf);
+		    }
 		(void)dbuf_delete(&to->sendQ, rlen);
 		to->lastsq = DBufLength(&to->sendQ)/1024;
 		if (rlen < len) /* ..or should I continue until rlen==0? */
@@ -1058,7 +1064,7 @@
 	    {
 		if (*chptr->chname == '&')
 			return;
-		if ((mask = (char *)rindex(chptr->chname, ':')))
+		if ((mask = get_channelmask(chptr->chname)))
 			mask++;
 	    }
 	else
@@ -1071,6 +1077,8 @@
 			continue;
 		if (!BadPtr(mask) && match(mask, cptr->name))
 			continue;
+		if (!valid_channel(cptr, chptr, 0))
+			continue;
 		if (chptr &&
 		    *chptr->chname == '!' && !(cptr->serv->version & SV_NJOIN))
 			continue;
@@ -1113,7 +1121,7 @@
 	    {
 		if (*chptr->chname == '&')
 			return 0;
-		if ((mask = (char *)rindex(chptr->chname, ':')))
+		if ((mask = get_channelmask(chptr->chname)))
 			mask++;
 	    }
 	else
@@ -1126,6 +1134,8 @@
 			continue;
 		if (!BadPtr(mask) && match(mask, cptr->name))
 			continue;
+		if (!valid_channel(cptr, chptr, 0))
+			continue;
 		if (chptr &&
 		    *chptr->chname == '!' && !(cptr->serv->version & SV_NJOIN))
 			continue;
@@ -1174,7 +1184,7 @@
 	    {
 		if (*chptr->chname == '&')
 			return 0;
-		if ((mask = (char *)rindex(chptr->chname, ':')))
+		if ((mask = get_channelmask(chptr->chname)))
 			mask++;
 	    }
 	else
@@ -1187,6 +1197,8 @@
 			continue;
 		if (!BadPtr(mask) && match(mask, cptr->name))
 			continue;
+		if (!valid_channel(cptr, chptr, 0))
+			continue;
 		if (chptr &&
 		    *chptr->chname == '!' && !(cptr->serv->version & SV_NJOIN))
 			continue;
diff -ubrN irc2.10.3p6+hemp2/common/struct_def.h irc2.10.3p6+hemp2+jp6/common/struct_def.h
--- irc2.10.3p6+hemp2/common/struct_def.h	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/common/struct_def.h	2004-03-09 18:18:54.000000000 +0900
@@ -172,6 +172,7 @@
 #define FLAGS_EOBWAIT  0x2000000 /* waiting for EOB */
 #endif
 #define	FLAGS_HELD     0x8000000 /* connection held and reconnect try */
+#define	FLAGS_JP      0x10000000 /* jp version */
 
 #define	FLAGS_OPER       0x0001	/* Operator */
 #define	FLAGS_LOCOP      0x0002 /* Local operator -- SRB */
@@ -640,6 +641,7 @@
 	Link	*clist;		/* list of local! connections which are members */
 	time_t	history;	/* channel history (aka channel delay) */
 	time_t	reop;		/* server reop stamp for !channels */
+	int	flags;
 	char	chname[1];
 };
 
diff -ubrN irc2.10.3p6+hemp2/common/support.c irc2.10.3p6+hemp2+jp6/common/support.c
--- irc2.10.3p6+hemp2/common/support.c	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/common/support.c	2004-03-09 18:18:54.000000000 +0900
@@ -61,6 +61,10 @@
 {
     char *pos = *save;	/* keep last position across calls */
     Reg char *tmp;
+    int flag = 0;
+
+    if (fs[0] == ',' && fs[1] == '\0')
+	flag = 1;
 
     if (str)
 	pos = str;		/* new string scan */
@@ -73,8 +77,25 @@
 
     tmp = pos; 			/* now, keep position of the token */
 
+    if (flag) {
+	flag = 0;
+	while (*pos) {
+	    if (!flag && *pos == ',') {
+		break;
+	    } else if (pos[0] == '\033' && pos[1] == '$' && pos[2] == 'B') {
+		pos += 3;
+		flag = 1;
+	    } else if (pos[0] == '\033' && pos[1] == '(' && pos[2] == 'B') {
+		pos += 3;
+		flag = 0;
+	    } else {
+		pos++;
+	    }
+	}	      
+    } else {
     while (*pos && index(fs, *pos) == NULL)
 	pos++; 			/* skip content of the token */
+    }
 
     if (*pos)
 	*pos++ = '\0';		/* remove first sep after the token */
@@ -862,6 +883,7 @@
 	if (pl)	/* patchlevel */
 		sprintf(ver + strlen(ver), "p%d", pl);
 	strcat(ver,"+hemp2");
+	strcat(ver,"+jp6");
 	return mystrdup(ver);
 }
 #ifndef CLIENTCOMPILE
diff -ubrN irc2.10.3p6+hemp2/ircd/channel.c irc2.10.3p6+hemp2+jp6/ircd/channel.c
--- irc2.10.3p6+hemp2/ircd/channel.c	2004-03-09 17:53:06.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/channel.c	2004-03-09 18:38:46.000000000 +0900
@@ -47,6 +47,7 @@
 static	int	can_join __P((aClient *, aChannel *, char *));
 void	channel_modes __P((aClient *, char *, char *, aChannel *));
 static	int	check_channelmask __P((aClient *, aClient *, char *));
+static	int	special_channel __P((char *));
 static	aChannel *get_channel __P((aClient *, char *, int));
 static	int	set_mode __P((aClient *, aClient *, aChannel *, int *, int,\
 				char **, char *,char *));
@@ -544,6 +545,45 @@
 	return 0;
 }
 
+char	*get_channelmask(chname)
+char	*chname;
+{
+	char	*mask;
+
+	mask = rindex(chname, ':');
+	if (mask && !index(mask, '\033'))
+		return mask;
+
+	return NULL;
+}
+
+int	special_channel(chname)
+char	*chname;
+{
+	char *mask;
+
+	mask = rindex(chname, ':');
+	if (mask && index(mask, '\033'))
+		return 1;
+	if (index(chname, ','))
+		return 1;
+
+	return 0;
+}
+
+int	valid_channel(cptr, chptr, chname)
+aClient	*cptr;
+aChannel *chptr;
+char	*chname;
+{
+	if (((chptr && (chptr->flags & FLAGS_JP)) ||
+	     (chname && special_channel(chname))) &&
+	    (!cptr || (IsServer(cptr) && !(cptr->flags & FLAGS_JP))))
+		return 0;
+
+	return 1;
+}
+
 aChannel *find_channel(chname, chptr)
 Reg	char	*chname;
 Reg	aChannel *chptr;
@@ -767,6 +807,8 @@
 
 	if (check_channelmask(&me, cptr, chptr->chname))
 		return;
+	if (!valid_channel(cptr, chptr, 0))
+		return;
 
 	*modebuf = *parabuf = '\0';
 	channel_modes(cptr, modebuf, parabuf, chptr);
@@ -814,6 +856,8 @@
 
 	if (check_channelmask(&me, cptr, chptr->chname) == -1)
 		return;
+	if (!valid_channel(cptr, chptr, 0))
+		return;
 	if (*chptr->chname == '!' && !(cptr->serv->version & SV_NCHAN))
 		return;
 
@@ -920,7 +964,7 @@
 			modebuf[1] = '\0';
 			channel_modes(sptr, modebuf, parabuf, chptr);
 			sendto_one(sptr, rpl_str(RPL_CHANNELMODEIS, parv[0]),
-				   name, modebuf, parabuf);
+				   chptr->chname, modebuf, parabuf);
 			penalty += 1;
 		    }
 		else	/* Check parameters for the channel */
@@ -965,7 +1009,7 @@
 				    {
 					sendto_channel_butserv(chptr, sptr,
 						        ":%s MODE %s %s %s",
-							parv[0], name,
+							parv[0], chptr->chname,
 							modebuf, parabuf);
 #ifdef USE_SERVICES
 					*modebuf = *parabuf = '\0';
@@ -1866,11 +1910,24 @@
 void	clean_channelname(cn)
 Reg	char *cn;
 {
-	for (; *cn; cn++)
-		if (*cn == '\007' || *cn == ' ' || *cn == ',')
-		    {
+  int flag = 0;
+
+  while (*cn) {
+    if (*cn == '\007' || *cn == ' ') {
 			*cn = '\0';
 			return;
+    } else if (!flag && *cn == ',') {
+      *cn = '\0';
+      return;
+    } else if (cn[0] == '\033' && cn[1] == '$' && cn[2] == 'B') {
+      cn += 3;
+      flag = 1;
+    } else if (cn[0] == '\033' && cn[1] == '(' && cn[2] == 'B') {
+      cn += 3;
+      flag = 0;
+    } else {
+      cn++;
+    }
 		    }
 }
 
@@ -1885,7 +1942,7 @@
 
 	if (*chname == '&' && IsServer(cptr))
 		return -1;
-	s = rindex(chname, ':');
+	s = get_channelmask(chname);
 	if (!s)
 		return 0;
 	if ((t = index(s, '\007')))
@@ -1926,6 +1983,8 @@
 	    {
 		len = CHANNELLEN;
 		*(chname+CHANNELLEN) = '\0';
+		if (check_channelmask(cptr, cptr, chname) == -1)
+		    return NULL;
 	    }
 	if ((chptr = find_channel(chname, (aChannel *)NULL)))
 		return (chptr);
@@ -1939,6 +1998,9 @@
 		chptr->prevch = NULL;
 		chptr->nextch = channel;
 		chptr->history = 0;
+		chptr->flags = 0;
+		if (special_channel(chname))
+			chptr->flags = FLAGS_JP;
 		channel = chptr;
 		(void)add_to_channel_hash_table(chname, chptr);
 	    }
@@ -2409,14 +2471,15 @@
 		** notify all users on the channel
 		*/
 		sendto_channel_butserv(chptr, sptr, ":%s JOIN :%s",
-						parv[0], name);
+						parv[0], chptr->chname);
 		if (s && UseModes(name))
 		    {
 			/* no need if user is creating the channel */
 			if (chptr->users != 1)
 				sendto_channel_butserv(chptr, sptr,
 						       ":%s MODE %s +%s %s %s",
-						       cptr->name, name, s,
+						       cptr->name,
+						       chptr->chname, s,
 						       parv[0],
 						       *(s+1)=='v'?parv[0]:"");
 			*--s = '\007';
@@ -2455,7 +2518,8 @@
 		/*
 	        ** notify other servers
 		*/
-		if (index(name, ':') || *chptr->chname == '!') /* compat */
+		if (!valid_channel(0, chptr, 0) || get_channelmask(name)
+		    || *chptr->chname == '!') /* compat */
 			sendto_match_servs(chptr, cptr, ":%s JOIN :%s%s",
 					   parv[0], name, chop);
 		else if (*chptr->chname != '&')
@@ -2603,7 +2667,7 @@
 						     "");
 		/* send join to local users on channel */
 		sendto_channel_butserv(chptr, acptr, ":%s JOIN %s", name,
-				       parv[1]);
+				       chptr->chname);
 		/* build MODE for local users on channel, eventually send it */
 		if (*mbuf)
 		    {
@@ -2635,7 +2699,8 @@
 			case 2:
 				sendto_channel_butserv(chptr, &me,
 					       ":%s MODE %s +%s%c %s %s",
-						       sptr->name, parv[1], 
+						       sptr->name,
+						       chptr->chname,
 						       modebuf, mbuf[1],
 						       parabuf, name);
 				if (mbuf[2])
@@ -2652,7 +2717,8 @@
 			    {
 				sendto_channel_butserv(chptr, &me,
 						       ":%s MODE %s +%s %s",
-						       sptr->name, parv[1],
+						       sptr->name,
+						       chptr->chname,
 						       modebuf, parabuf);
 				cnt = 0;
 			    }
@@ -2661,7 +2727,8 @@
 	/* send eventual MODE leftover */
 	if (cnt)
 		sendto_channel_butserv(chptr, &me, ":%s MODE %s +%s %s",
-				       sptr->name, parv[1], modebuf, parabuf);
+				       sptr->name, chptr->chname,
+				       modebuf, parabuf);
 
 	/* send NJOIN to capable servers */
 	*q = '\0';
@@ -2730,7 +2797,8 @@
 		/*
 		**  Remove user from the old channel (if any)
 		*/
-		if (!index(name, ':') && (*chptr->chname != '!'))
+		if (valid_channel(0, chptr, 0)
+		    && !get_channelmask(name) && (*chptr->chname != '!'))
 		    {	/* channel:*.mask */
 			if (*name != '&')
 			    {
@@ -2755,7 +2823,7 @@
 			sendto_match_servs(chptr, cptr, PartFmt,
 				   	   parv[0], name, comment);
 		sendto_channel_butserv(chptr, sptr, PartFmt,
-				       parv[0], name, comment);
+				       parv[0], chptr->chname, comment);
 		remove_user_from_channel(sptr, chptr);
 	    }
 	if (*buf)
@@ -2847,7 +2915,8 @@
 			    {
 				sendto_channel_butserv(chptr, sptr,
 						":%s KICK %s %s :%s", parv[0],
-						name, who->name, comment);
+						chptr->chname,
+						who->name, comment);
 				/* Don't send &local kicks out */
 				/* Send !channels and #chan:*.els kicks only
 				   to servers that understand those channels.
@@ -2858,7 +2927,9 @@
 				   upon chptr being &channel --Beeth */
 				if (*chptr->chname != '&' &&
 				    *chptr->chname != '!' &&
-				    index(chptr->chname, ':') == NULL) {
+				    !get_channelmask(chptr->chname) &&
+				    valid_channel(0, chptr, 0))
+				    {
 					if (*nickbuf)
 						(void)strcat(nickbuf, ",");
 					(void)strcat(nickbuf, who->name);
@@ -3025,6 +3096,12 @@
 	if (*parv[2] == '&' && !MyClient(acptr))
 		return 1;
 	chptr = find_channel(parv[2], NullChn);
+	if (!valid_channel(acptr->from, chptr, parv[2]))
+	    {
+		sendto_one(sptr, err_str(ERR_BADCHANMASK, parv[0]),
+			   chptr ? chptr->chname : parv[2]);
+		return 1;
+	    }
 
 	if (!chptr)
 	    {
@@ -3190,7 +3267,7 @@
 			if (chptr && ShowChannel(sptr, chptr) && sptr->user)
 			    {
 				rlen += sendto_one(sptr, rpl_str(RPL_LIST,
-						   parv[0]), name,
+						   parv[0]), chptr->chname,
 						   chptr->users, chptr->topic);
 				if (!MyConnect(sptr) && rlen > CHREPLLEN)
 					break;
@@ -3487,6 +3564,7 @@
 	return MAXPENALTY;
 }
 
+
 void	send_user_joins(cptr, user)
 aClient	*cptr, *user;
 {
@@ -3508,9 +3586,11 @@
 		if (*chptr->chname == '!' && !(cptr->serv->version & SV_NCHAN))
 			/* in reality, testing SV_NCHAN here is pointless */
 			continue;
-		if ((mask = rindex(chptr->chname, ':')))
+		if ((mask = get_channelmask(chptr->chname)))
 			if (match(++mask, cptr->name))
 				continue;
+		if (!valid_channel(cptr, chptr, 0))
+			continue;
 		clen = strlen(chptr->chname);
 		if ((clen + len) > (size_t) BUFSIZE - 7)
 		    {
diff -ubrN irc2.10.3p6+hemp2/ircd/channel_ext.h irc2.10.3p6+hemp2+jp6/ircd/channel_ext.h
--- irc2.10.3p6+hemp2/ircd/channel_ext.h	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/channel_ext.h	2004-03-09 18:18:54.000000000 +0900
@@ -38,6 +38,8 @@
 EXTERN int is_chan_op __P((aClient *cptr, aChannel *chptr));
 EXTERN int has_voice __P((aClient *cptr, aChannel *chptr));
 EXTERN int can_send __P((aClient *cptr, aChannel *chptr));
+EXTERN char *get_channelmask __P((char *));
+EXTERN int valid_channel __P((aClient *, aChannel *, char *));
 EXTERN aChannel *find_channel __P((Reg char *chname, Reg aChannel *chptr));
 EXTERN void setup_server_channels __P((aClient *mp));
 EXTERN void channel_modes __P((aClient *cptr, Reg char *mbuf, Reg char *pbuf,
diff -ubrN irc2.10.3p6+hemp2/ircd/ircd.c irc2.10.3p6+hemp2+jp6/ircd/ircd.c
--- irc2.10.3p6+hemp2/ircd/ircd.c	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/ircd.c	2004-03-09 18:18:54.000000000 +0900
@@ -961,9 +961,8 @@
 	    }
 #endif
 
-#if !defined(CHROOTDIR)
 	(void)setuid((uid_t)euid);
-# if defined(IRC_UID) && defined(IRC_GID)
+#if defined(IRC_UID) && defined(IRC_GID)
 	if ((int)getuid() == 0)
 	    {
 		/* run as a specified user */
@@ -973,8 +972,7 @@
 		(void)setgid(IRC_GID);
 		(void)setuid(IRC_UID);
 	    } 
-# endif
-#endif /*CHROOTDIR/UID/GID*/
+#endif
 
 #if defined(USE_IAUTH)
 	if ((bootopt & BOOT_NOIAUTH) == 0)
diff -ubrN irc2.10.3p6+hemp2/ircd/s_bsd.c irc2.10.3p6+hemp2+jp6/ircd/s_bsd.c
--- irc2.10.3p6+hemp2/ircd/s_bsd.c	2004-03-09 17:53:06.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/s_bsd.c	2004-03-09 18:38:46.000000000 +0900
@@ -1106,11 +1106,11 @@
 	    }
 	if (!BadPtr(aconf->passwd))
 #ifndef	ZIP_LINKS
-		sendto_one(cptr, "PASS %s %s IRC|%s %s", aconf->passwd,
+		sendto_one(cptr, "PASS %s %s IRC|%s %sj", aconf->passwd,
 			   pass_version, serveropts,
 			   (bootopt & BOOT_STRICTPROT) ? "P" : "");
 #else
-		sendto_one(cptr, "PASS %s %s IRC|%s %s%s", aconf->passwd,
+		sendto_one(cptr, "PASS %s %s IRC|%s %s%sj", aconf->passwd,
 			   pass_version, serveropts,
 			   (bootopt & BOOT_STRICTPROT) ? "P" : "",
 			   (aconf->status == CONF_ZCONNECT_SERVER) ? "Z" : "");
diff -ubrN irc2.10.3p6+hemp2/ircd/s_serv.c irc2.10.3p6+hemp2+jp6/ircd/s_serv.c
--- irc2.10.3p6+hemp2/ircd/s_serv.c	2004-03-09 17:53:06.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/s_serv.c	2004-03-09 18:38:46.000000000 +0900
@@ -360,6 +360,9 @@
 		    }
 	    }
 
+	if (link && strchr(link, 'j'))	/* jp version */
+		cptr->flags |= FLAGS_JP;
+
 	/* right now, I can't code anything good for this */
 	/* Stop whining, and do it! ;) */
 	if (link && strchr(link, 'Z'))	/* Compression requested */
@@ -795,11 +798,11 @@
 	    {
 		if (bconf->passwd[0])
 #ifndef	ZIP_LINKS
-			sendto_one(cptr, "PASS %s %s IRC|%s %s", bconf->passwd,
-				   pass_version, serveropts,
+			sendto_one(cptr, "PASS %s %s IRC|%s %sj",
+				   bconf->passwd, pass_version, serveropts,
 				   (bootopt & BOOT_STRICTPROT) ? "P" : "");
 #else
-			sendto_one(cptr, "PASS %s %s IRC|%s %s%s",
+			sendto_one(cptr, "PASS %s %s IRC|%s %s%sj",
 				   bconf->passwd, pass_version, serveropts,
 			   (bconf->status == CONF_ZCONNECT_SERVER) ? "Z" : "",
 				   (bootopt & BOOT_STRICTPROT) ? "P" : "");
diff -ubrN irc2.10.3p6+hemp2/ircd/s_user.c irc2.10.3p6+hemp2+jp6/ircd/s_user.c
--- irc2.10.3p6+hemp2/ircd/s_user.c	2004-03-09 17:53:06.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/s_user.c	2004-03-09 18:38:46.000000000 +0900
@@ -1339,7 +1339,8 @@
 			if (can_send(sptr, chptr) == 0 || IsServer(sptr))
 				sendto_channel_butone(cptr, sptr, chptr,
 						      ":%s %s %s :%s",
-						      parv[0], cmd, nick,
+						      parv[0], cmd,
+						      chptr->chname,
 						      parv[2]);
 			else if (!notice)
 				sendto_one(sptr, err_str(ERR_CANNOTSENDTOCHAN,
@@ -1627,7 +1628,7 @@
 	for (acptr = client; acptr; acptr = acptr->next)
 	    {
 			
-		if (!IsPerson(acptr))
+		if (!IsPerson(acptr) || IsInvisible(acptr))
 			continue;
 		
 		/* clear the flag */
@@ -1661,6 +1662,49 @@
 		     match(mask, acptr->info) == 0)
 			who_one(sptr, acptr, NULL, NULL);
 	    }
+	
+	/* Now check common channels
+	 * little bit dirty, but at least faster - jv */
+	for (lp = sptr->user->channel; lp ;lp = lp->next)
+	{
+		chptr = lp->value.chptr;
+		if (IsAnonymous(chptr))
+			continue;
+		for (lp2 = chptr->members; lp2 ;lp2 = lp2->next)
+		{
+			acptr = lp2->value.cptr;
+			
+			if (!IsInvisible(acptr) || (acptr->flags & FLAGS_HIDDEN))
+			{
+				continue;
+			}
+			
+			if (oper && !IsAnOper(acptr))
+			{
+				continue;
+			}
+			
+			acptr->flags |= FLAGS_HIDDEN;
+			if (!mask ||
+			     match(mask, acptr->name) == 0 ||
+			     match(mask, acptr->user->username) == 0 ||
+			     match(mask, acptr->user->host) == 0 ||
+			     match(mask, acptr->user->server) == 0 ||
+			     match(mask, acptr->info) == 0)
+				who_one(sptr, acptr, chptr, NULL);
+		
+		}
+	}
+	/* Now we have to cleanup that flag */
+	for (lp = sptr->user->channel; lp ;lp = lp->next)
+	{
+		chptr = lp->value.chptr;
+		for (lp2 = chptr->members; lp2 ;lp2 = lp2->next)
+		{
+			acptr = lp2->value.cptr;
+			acptr->flags &= ~FLAGS_HIDDEN;
+		}
+	}
 }
 
 /*
@@ -1694,6 +1738,7 @@
 	    mask && penalty <= MAXPENALTY;
 		mask = strtoken(&p, NULL, ","))
 	{
+		chptr = NULL;
 		channame = NULL;
 		penalty += 1;
 
@@ -1790,7 +1835,8 @@
 			}
 		}
 		sendto_one(sptr, rpl_str(RPL_ENDOFWHO, parv[0]),
-			   BadPtr(mask) ?  "*" : mask);
+			   BadPtr(mask) ?  "*" :
+			   (chptr ? chptr->chname : mask));
 	}
 	return penalty;
 }
diff -ubrN irc2.10.3p6+hemp2/ircd/version.c.SH.in irc2.10.3p6+hemp2+jp6/ircd/version.c.SH.in
--- irc2.10.3p6+hemp2/ircd/version.c.SH.in	2004-03-09 17:53:06.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/ircd/version.c.SH.in	2004-03-09 18:38:46.000000000 +0900
@@ -107,6 +107,10 @@
 	"Thanks also to those who provide the kind sys admins who let me and",
 	"others continue to develop IRC.",
 	"",
+	"This program is a jp-patched version. The jp-patch was written by",
+	"KIKUCHI Takahiro <kick@wide.ad.jp>. You can find it in",
+	"http://www.ircnet.jp/dist/server/jp-patch/.",
+	"",
 	"[$sumsserv] [$sumchan] [$sumsbsd] [$sumsuser]",
 	"[$sumhash] [$sumsmisc] [$sumircd]",
 	"",
diff -ubrN irc2.10.3p6+hemp2/support/config.h.dist irc2.10.3p6+hemp2+jp6/support/config.h.dist
--- irc2.10.3p6+hemp2/support/config.h.dist	2004-03-09 17:29:27.000000000 +0900
+++ irc2.10.3p6+hemp2+jp6/support/config.h.dist	2004-03-09 18:18:54.000000000 +0900
@@ -98,7 +98,7 @@
  * mode "i" (i == invisible). Invisibility means people dont showup in
  * WHO or NAMES unless they are on the same channel as you.
  */
-#undef	NO_DEFAULT_INVISIBLE
+#define	NO_DEFAULT_INVISIBLE
 
 /* OPER_KILL
  *
@@ -121,7 +121,7 @@
 #undef	OPER_KILL
 #define	OPER_REHASH
 #undef	OPER_RESTART
-#define	OPER_DIE
+#undef	OPER_DIE
 #undef	OPER_REMOTE
 #undef	LOCOP_REHASH
 #undef	LOCOP_RESTART
@@ -271,7 +271,7 @@
  * define this if you want to use crypted passwords for operators in your
  * ircd.conf file. See contrib/mkpasswd/README for more details on this.
  */
-#undef	CRYPT_OPER_PASSWORD
+#define	CRYPT_OPER_PASSWORD
 
 /*
  * If you want to store encrypted passwords in N-lines for server links,
@@ -345,7 +345,7 @@
  * Some people believe a bot can exactly time the delay and don't like it,
  * I think this is a useless concern. -krys
  */
-#undef RANDOM_NDELAY
+#define RANDOM_NDELAY
 
 /*
  * You've read the BOFH saga and you liked it, then define the following.
@@ -391,6 +391,13 @@
 #define SIXBONE_HACK
 
 /*
+ * Defining this will make the server accept a only good username.
+ * (isalnum(c) || strchr("-_.", c))
+ * obsolete. please use RESTRICT_USERNAMES instead.
+ */
+/* #define GOOD_USERNAME */
+
+/*
  * Disclaimer: The following part concerns the Cr-patches. By defining this
  *             you will end up with "no warranty" whatsoever - use at your
  *             own risk.