hashiddenhostorissethost: refresh for changes by sethost.patch

diff --git a/hashiddenhostorissethost.patch b/hashiddenhostorissethost.patch
index b4ec02db5219810130cbb60205d183487587bd00..e80099b68260f713402cb8d8eb434d730ba0ac72 100644 (file)
--- a/hashiddenhostorissethost.patch
+++ b/hashiddenhostorissethost.patch
@@ -1,6 +1,6 @@
 add HasHiddenHostOrIsSetHost() macro instead of having to test HasHiddenHost() and IsSetHost() in many places
 
-diff -r 2dbf2e34034c include/client.h
+diff -r 702b5aa2127f include/client.h
 --- a/include/client.h
 +++ b/include/client.h
 @@ -634,6 +634,8 @@
@@ -12,7 +12,7 @@ diff -r 2dbf2e34034c include/client.h
  
  /** Mark a client as having an in-progress net.burst. */
  #define SetBurst(x)             SetFlag(x, FLAG_BURST)
-diff -r 2dbf2e34034c ircd/m_check.c
+diff -r 702b5aa2127f ircd/m_check.c
 --- a/ircd/m_check.c
 +++ b/ircd/m_check.c
 @@ -489,7 +489,7 @@
@@ -24,37 +24,7 @@ diff -r 2dbf2e34034c ircd/m_check.c
      send_reply(sptr, SND_EXPLICIT | RPL_DATASTR, ": Real User/Host:: %s@%s", cli_user(acptr)->realusername, cli_user(acptr)->realhost);
  
    /* COLOR_OFF ? */
-diff -r 2dbf2e34034c ircd/m_sethost.c
---- a/ircd/m_sethost.c
-+++ b/ircd/m_sethost.c
-@@ -136,7 +136,7 @@
-       send_reply(sptr, ERR_BADHOSTMASK, hostmask);
-       return 0;
-       }
--      if (IsSetHost(sptr) || HasHiddenHost(sptr)) {
-+      if (HasHiddenHostOrIsSetHost(sptr)) {
-         ircd_snprintf(0, curhostmask, USERLEN + HOSTLEN + 2, "%s@%s", sptr->cli_user->username, sptr->cli_user->host);
-         if (0 == strcmp(hostmask, curhostmask)) {
-           send_reply(sptr, RPL_HOSTHIDDEN, curhostmask);
-@@ -150,7 +150,7 @@
-       send_reply(sptr, ERR_BADHOSTMASK, parv[1]);
-       return 0;
-       }
--      if (IsSetHost(sptr) || HasHiddenHost(sptr)) {
-+      if (HasHiddenHostOrIsSetHost(sptr)) {
-         if (0 == strcmp(parv[1], sptr->cli_user->host)) {
-           send_reply(sptr, RPL_HOSTHIDDEN, parv[1]);
-           return 0;
-@@ -206,7 +206,7 @@
-   setflags = cli_flags(target);
-   FlagClr(&setflags, FLAG_SETHOST);
- 
--  if (IsSetHost(target) || HasHiddenHost(target)) { 
-+  if (HasHiddenHostOrIsSetHost(target)) { 
-     if ((0 == strcmp(parv[2], target->cli_user->username)) && (0 == strcmp(parv[3], target->cli_user->host))) 
-       return 0;
-   }
-diff -r 2dbf2e34034c ircd/m_userhost.c
+diff -r 702b5aa2127f ircd/m_userhost.c
 --- a/ircd/m_userhost.c
 +++ b/ircd/m_userhost.c
 @@ -104,7 +104,7 @@
@@ -66,7 +36,7 @@ diff -r 2dbf2e34034c ircd/m_userhost.c
              cli_user(cptr)->host : cli_user(cptr)->realhost);
  }
  
-diff -r 2dbf2e34034c ircd/m_userip.c
+diff -r 702b5aa2127f ircd/m_userip.c
 --- a/ircd/m_userip.c
 +++ b/ircd/m_userip.c
 @@ -106,7 +106,7 @@
@@ -78,7 +48,7 @@ diff -r 2dbf2e34034c ircd/m_userip.c
              feature_str(FEAT_HIDDEN_IP) :
              ircd_ntoa(&cli_ip(cptr)));
  }
-diff -r 2dbf2e34034c ircd/m_who.c
+diff -r 702b5aa2127f ircd/m_who.c
 --- a/ircd/m_who.c
 +++ b/ircd/m_who.c
 @@ -398,14 +398,13 @@
@@ -115,7 +85,7 @@ diff -r 2dbf2e34034c ircd/m_who.c
              || !ipmask_check(&cli_ip(acptr), &imask, ibits))
              && ((!(matchsel & WHO_FIELD_ACC))
              || matchexec(cli_user(acptr)->account, mymask, minlen)))
-diff -r 2dbf2e34034c ircd/m_whois.c
+diff -r 702b5aa2127f ircd/m_whois.c
 --- a/ircd/m_whois.c
 +++ b/ircd/m_whois.c
 @@ -214,7 +214,7 @@
@@ -127,7 +97,7 @@ diff -r 2dbf2e34034c ircd/m_whois.c
        send_reply(sptr, RPL_WHOISACTUALLY, name, user->realusername,
                   user->realhost, ircd_ntoa(&cli_ip(acptr)));
  
-diff -r 2dbf2e34034c ircd/send.c
+diff -r 702b5aa2127f ircd/send.c
 --- a/ircd/send.c
 +++ b/ircd/send.c
 @@ -281,7 +281,7 @@
@@ -139,7 +109,7 @@ diff -r 2dbf2e34034c ircd/send.c
      case MATCH_SERVER:
      default:
        return (match(mask, cli_name(cli_user(one)->server)) == 0);
-diff -r 2dbf2e34034c ircd/whocmds.c
+diff -r 702b5aa2127f ircd/whocmds.c
 --- a/ircd/whocmds.c
 +++ b/ircd/whocmds.c
 @@ -134,7 +134,7 @@
@@ -151,7 +121,7 @@ diff -r 2dbf2e34034c ircd/whocmds.c
        feature_str(FEAT_HIDDEN_IP) :
        ircd_ntoa(&cli_ip(acptr));
      *(p1++) = ' ';
-diff -r 2dbf2e34034c ircd/whowas.c
+diff -r 702b5aa2127f ircd/whowas.c
 --- a/ircd/whowas.c
 +++ b/ircd/whowas.c
 @@ -272,7 +272,7 @@