whoisparanoid: correct logic in notice

[irc/quakenet/snircd-patchqueue.git] / autosethost.patch

diff --git a/autosethost.patch b/autosethost.patch
index 9b9c1bd86acabb187c8e06a1328f92acb73f107a..5febb7ed6d52331e04b71efa307cd7b3828f54e3 100644 (file)
--- a/autosethost.patch
+++ b/autosethost.patch
@@ -1,9 +1,24 @@
-when autoapplying spoof blocks notify user what their hidden host is (same as /sethost or +rx)
-update numeric reply to reflect new conf format, blocks instead of lines
+when autoapplying spoof blocks notify user what their hidden host is (same as when the host is hidden normally)
 
-diff -r b03d03214a42 ircd/s_conf.c
---- a/ircd/s_conf.c    Thu Mar 18 09:57:00 2010 +0100
-+++ b/ircd/s_conf.c    Thu Mar 18 10:45:13 2010 +0100
+send "Using Spoof block privilege" as NOTICE AUTH, preventing sending any other numeric reples before the 001 002 etc replies
+send RPL_HOSTHIDDEN after all connect stuff, same place this reply is sent in case IAUTH set the user +rx
+commented out numeric reply RPL_USINGSLINE, no longer used
+
+diff -r 2c8273f25f9a include/numeric.h
+--- a/include/numeric.h        Thu Mar 18 11:04:00 2010 +0100
++++ b/include/numeric.h        Thu Mar 18 11:53:35 2010 +0100
+@@ -314,7 +314,7 @@
+ /*      RPL_NOUSERS          395        Dalnet/EFnet/IRCnet */
+ #define RPL_HOSTHIDDEN       396      /* UMODE +x completed succesfuly */
+ #define RPL_STATSSLINE       398      /* QuakeNet extension -froo */
+-#define RPL_USINGSLINE       399      /* QuakeNet extension -froo */
++/*      RPL_USINGSLINE       399         QuakeNet extension -froo */
+ 
+ /*
+  * Errors are in the range from 400-599 currently and are grouped by what
+diff -r 2c8273f25f9a ircd/s_conf.c
+--- a/ircd/s_conf.c    Thu Mar 18 11:04:00 2010 +0100
++++ b/ircd/s_conf.c    Thu Mar 18 11:53:35 2010 +0100
 @@ -1270,8 +1270,9 @@
          continue;
  
@@ -15,9 +30,9 @@ diff -r b03d03214a42 ircd/s_conf.c
        return 1;
      }
    }
-diff -r b03d03214a42 ircd/s_err.c
---- a/ircd/s_err.c     Thu Mar 18 09:57:00 2010 +0100
-+++ b/ircd/s_err.c     Thu Mar 18 10:45:13 2010 +0100
+diff -r 2c8273f25f9a ircd/s_err.c
+--- a/ircd/s_err.c     Thu Mar 18 11:04:00 2010 +0100
++++ b/ircd/s_err.c     Thu Mar 18 11:53:35 2010 +0100
 @@ -830,7 +830,7 @@
  /* 398 */
    { RPL_STATSSLINE, "%d %s %s %s %s", "398" },
@@ -27,9 +42,9 @@ diff -r b03d03214a42 ircd/s_err.c
  /* 400 */
    { 0 },
  /* 401 */
-diff -r b03d03214a42 ircd/s_user.c
---- a/ircd/s_user.c    Thu Mar 18 09:57:00 2010 +0100
-+++ b/ircd/s_user.c    Thu Mar 18 10:45:13 2010 +0100
+diff -r 2c8273f25f9a ircd/s_user.c
+--- a/ircd/s_user.c    Thu Mar 18 11:04:00 2010 +0100
++++ b/ircd/s_user.c    Thu Mar 18 11:53:35 2010 +0100
 @@ -373,12 +373,11 @@
  
      if (feature_bool(FEAT_AUTOINVISIBLE))
@@ -51,8 +66,8 @@ diff -r b03d03214a42 ircd/s_user.c
     */
    if (HasHiddenHost(sptr))
      hide_hostmask(sptr, FLAG_HIDDENHOST);
-+  /* client has sethost, inform them of their hidden host */
-+  if (HasSetHost(sptr))
++  /* my user has sethost, inform them of their hidden host from auto applied sethost */
++  if (HasSetHost(sptr) && MyConnect(sptr))
 +    send_reply(sptr, RPL_HOSTHIDDEN, cli_user(sptr)->host);
    if (IsInvisible(sptr))
      ++UserStats.inv_clients;