filterip.patch

   1 # HG changeset patch
   2 # Parent 36e5e33e7d19c9e6511c539ebbcbfab9bda9df3c
   3
   4 diff -r 36e5e33e7d19 include/ircd_features.h
   5 --- a/include/ircd_features.h   Sun Jul 14 17:26:44 2013 +0100
   6 +++ b/include/ircd_features.h   Sun Jul 14 17:28:44 2013 +0100
   7 @@ -152,6 +152,7 @@
   8    FEAT_HIS_WHOIS_LOCALCHAN,
   9    FEAT_HIS_WHO_SERVERNAME,
  10    FEAT_HIS_WHO_HOPCOUNT,
  11 +  FEAT_HIS_WHO_FILTERIP,
  12    FEAT_HIS_MODEWHO,
  13    FEAT_HIS_BANWHO,
  14    FEAT_HIS_KILLWHO,
  15 diff -r 36e5e33e7d19 ircd/ircd_features.c
  16 --- a/ircd/ircd_features.c      Sun Jul 14 17:26:44 2013 +0100
  17 +++ b/ircd/ircd_features.c      Sun Jul 14 17:28:44 2013 +0100
  18 @@ -417,6 +417,7 @@
  19    F_B(HIS_WHOIS_LOCALCHAN, 0, 1, 0),
  20    F_B(HIS_WHO_SERVERNAME, 0, 1, 0),
  21    F_B(HIS_WHO_HOPCOUNT, 0, 1, 0),
  22 +  F_B(HIS_WHO_FILTERIP, 0, 1, 0),
  23    F_B(HIS_MODEWHO, 0, 1, 0),
  24    F_B(HIS_BANWHO, 0, 1, 0),
  25    F_B(HIS_KILLWHO, 0, 1, 0),
  26 diff -r 36e5e33e7d19 ircd/m_kick.c
  27 --- a/ircd/m_kick.c     Sun Jul 14 17:26:44 2013 +0100
  28 +++ b/ircd/m_kick.c     Sun Jul 14 17:28:44 2013 +0100
  29 @@ -176,7 +176,7 @@
  30      sendcmdto_one(sptr, CMD_KICK, sptr, "%H %C :%s", chptr, who, comment);
  31      CheckDelayedJoins(chptr);
  32    } else
  33 -    sendcmdto_channel_butserv_butone(sptr, CMD_KICK, chptr, NULL, 0, "%H %C :%s", chptr, who,
  34 +    sendcmdto_channel_butserv_butone((IsServer(sptr) ? &me : sptr), CMD_KICK, chptr, NULL, 0, "%H %C :%s", chptr, who,
  35                                       comment);
  36
  37    make_zombie(member, who, cptr, sptr, chptr);
  38 diff -r 36e5e33e7d19 ircd/m_who.c
  39 --- a/ircd/m_who.c      Sun Jul 14 17:26:44 2013 +0100
  40 +++ b/ircd/m_who.c      Sun Jul 14 17:28:44 2013 +0100
  41 @@ -291,6 +291,9 @@
  42    if (feature_bool(FEAT_HIS_WHO_SERVERNAME) && !IsAnOper(sptr))
  43      matchsel &= ~WHO_FIELD_SER;
  44
  45 +  if (feature_bool(FEAT_HIS_WHO_FILTERIP) && !IsAnOper(sptr))
  46 +    matchsel &= ~WHO_FIELD_NIP;
  47 +
  48    if (qrt && (fields & WHO_FIELD_QTY))
  49    {
  50      p = qrt;