*** ../irc2.8.21+TSora/ircd/s_user.c	Sun Jan 21 13:37:52 1996
--- s_user.c	Wed Jan 24 07:32:10 1996
***************
*** 664,672 ****
  	** A new NICK being introduced by a neighbouring
  	** server (e.g. message type "NICK new" received)
  	*/
! 		sameuser = (parc > 6) && 
! 			    mycmp(acptr->user->username, parv[5]) == 0 &&
! 			    mycmp(acptr->user->host, parv[6]) == 0;
  		if (!doests || !newts || !acptr->tsinfo
  		    || (newts == acptr->tsinfo))
  		    {
--- 664,676 ----
  	** A new NICK being introduced by a neighbouring
  	** server (e.g. message type "NICK new" received)
  	*/
! 		if (acptr->user)
! 			sameuser = (parc > 6) && 
! 			         mycmp(acptr->user->username, parv[5]) == 0 &&
! 			         mycmp(acptr->user->host, parv[6]) == 0;
! 		else
! 			newts = 0;  /* force both kills */
! 
  		if (!doests || !newts || !acptr->tsinfo
  		    || (newts == acptr->tsinfo))
  		    {
***************
*** 722,729 ****
  	** must be killed from the incoming connection, and "old" must
  	** be purged from all outgoing connections.
  	*/
! 	sameuser = mycmp(acptr->user->username, sptr->user->username) == 0 &&
! 		   mycmp(acptr->user->host, acptr->user->host) == 0;
  	if (!doests || !newts || !acptr->tsinfo || (newts == acptr->tsinfo))
  	    {
  	sendto_ops("Nick change collision from %s to %s(%s <- %s)(both killed)",
--- 726,738 ----
  	** must be killed from the incoming connection, and "old" must
  	** be purged from all outgoing connections.
  	*/
! 	if (acptr->user)
! 		sameuser = mycmp(acptr->user->username, sptr->user->username)
! 				 == 0 &&
! 			   mycmp(acptr->user->host, acptr->user->host) == 0;
! 	else
! 		newts = 0;   /* force both kills */
! 
  	if (!doests || !newts || !acptr->tsinfo || (newts == acptr->tsinfo))
  	    {
  	sendto_ops("Nick change collision from %s to %s(%s <- %s)(both killed)",