*** ../ircu2.10.05/ircd/s_debug.c	Thu Mar 18 15:20:33 1999
--- ../ircu2.10.05+/ircd/s_debug.c	Thu Mar 18 15:21:24 1999
***************
*** 165,171 ****
  #else
      '-',
  #endif
!     'C','S',
  #ifdef OPER_CHANNEL_SERVICE_ESNET
      '+',
  #else
--- 165,171 ----
  #else
      '-',
  #endif
!     'C','S','4',
  #ifdef OPER_CHANNEL_SERVICE_ESNET
      '+',
  #else
*** ../ircu2.10.05/ircd/whocmds.c	Thu Mar 18 15:33:36 1999
--- ../ircu2.10.05+/ircd/whocmds.c	Thu Mar 18 15:48:08 1999
***************
*** 204,211 ****
       unless the listing is for a channel service, we already know
       that there are no common channels, thus use PubChannel and not
       SeeChannel */
!   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)
--- 204,214 ----
       unless the listing is for a channel service, we already know
       that there are no common channels, thus use PubChannel and not
       SeeChannel */
!   if (!chptr && (!fields || (fields & (WHO_FIELD_CHA | WHO_FIELD_FLA)))
! #ifndef OPER_CHANNEL_SERVICE_ESNET
!       && !IsChannelService(acptr)
! #endif
!       )
    {
      Reg3 Link *lp;
      for (lp = acptr->user->channel; lp && !chptr; lp = lp->next)
***************
*** 749,755 ****
  	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)
--- 752,762 ----
  	found = 1;
  
        exact_match:
! 	if (user
! #ifndef OPER_CHANNEL_SERVICE_ESNET
!           && !IsChannelService(acptr)
! #endif
!           )
  	{
  	  mlen = strlen(me.name) + strlen(parv[0]) + 12 + strlen(name);
  	  for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next)