*** ../ircu2.10.03/ircd/s_user.c	Thu May 21 10:39:54 1998
--- ../ircu2.10.03+/ircd/s_user.c	Thu May 21 10:49:04 1998
***************
*** 1843,1852 ****
    chptr = repchan;
    buf1[1] = '\0';
  
!   /* If we don't have a channel and we need one... try to find it,
!      unless the listing is for a channel service. */
!   if (!chptr && (!fields || (fields & (WHO_FIELD_CHA | WHO_FIELD_FLA))) &&
!       !IsChannelService(acptr))
    {
      Reg3 Link *lp;
      for (lp = acptr->user->channel; lp && !chptr; lp = lp->next)
--- 1843,1850 ----
    chptr = repchan;
    buf1[1] = '\0';
  
!   /* If we don't have a channel and we need one... try to find it */
!   if (!chptr && (!fields || (fields & (WHO_FIELD_CHA | WHO_FIELD_FLA))))
    {
      Reg3 Link *lp;
      for (lp = acptr->user->channel; lp && !chptr; lp = lp->next)
***************
*** 2397,2403 ****
  	found = 1;
  
        exact_match:
! 	if (user && !IsChannelService(acptr))
  	{
  	  mlen = strlen(me.name) + strlen(parv[0]) + 12 + strlen(name);
  	  for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next)
--- 2395,2401 ----
  	found = 1;
  
        exact_match:
! 	if (user)
  	{
  	  mlen = strlen(me.name) + strlen(parv[0]) + 12 + strlen(name);
  	  for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next)
***************
*** 2656,2669 ****
    if (IsServer(acptr) || IsMe(acptr))
    {
      sendto_one(sptr, err_str(ERR_CANTKILLSERVER), me.name, parv[0]);
-     return 0;
-   }
- 
-   /* if the user is +k, prevent a kill from local user */
-   if (IsChannelService(acptr) && MyClient(sptr))
-   {
-     sendto_one(sptr, err_str(ERR_ISCHANSERVICE), me.name,
- 	parv[0], "KILL", acptr->name);
      return 0;
    }
  
--- 2654,2659 ----