removed autosethost - covered in sethost patch

diff --git a/autosethost.patch b/autosethost.patch
deleted file mode 100644 (file)
index 0793b8c..0000000
--- a/autosethost.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-when autoapplying spoof blocks notify user what their hidden host is (same as when the host is hidden normally)
-
-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 350a7bb87be2 include/numeric.h
---- a/include/numeric.h
-+++ b/include/numeric.h
-@@ -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 350a7bb87be2 ircd/s_conf.c
---- a/ircd/s_conf.c
-+++ b/ircd/s_conf.c
-@@ -1270,8 +1270,9 @@
-         continue;
- 
-       ircd_strncpy(cli_user(cptr)->host, hostonly, HOSTLEN);
--      log_write(LS_USER, L_INFO, LOG_NOSNOTICE, "S-Line (%s@%s) by (%#R)",
-+      log_write(LS_USER, L_INFO, LOG_NOSNOTICE, "Spoofhost (%s@%s) by (%#R)",
-           cli_user(cptr)->username, hostonly, cptr);
-+      SetSetHost(cptr);
-       return 1;
-     }
-   }
-diff -r 350a7bb87be2 ircd/s_err.c
---- a/ircd/s_err.c
-+++ b/ircd/s_err.c
-@@ -830,7 +830,7 @@
- /* 398 */
-   { RPL_STATSSLINE, "%d %s %s %s %s", "398" },
- /* 399 */
--  { RPL_USINGSLINE, ":Using S-line privilege", "399" },
-+  { 0 },
- /* 400 */
-   { 0 },
- /* 401 */
-diff -r 350a7bb87be2 ircd/s_user.c
---- a/ircd/s_user.c
-+++ b/ircd/s_user.c
-@@ -373,12 +373,11 @@
- 
-     if (feature_bool(FEAT_AUTOINVISIBLE))
-       SetInvisible(sptr);
--    
-+
-+    /* apply auto sethost if needed */
-     if(feature_bool(FEAT_SETHOST_AUTO)) {
--      if (conf_check_slines(sptr)) {
--        send_reply(sptr, RPL_USINGSLINE);
--        SetSetHost(sptr);
--      }
-+      if (conf_check_slines(sptr))
-+        sendrawto_one(sptr, "NOTICE AUTH :*** Using Spoof block privilege");
-     }
- 
-     SetUser(sptr);
-@@ -456,6 +455,9 @@
-    */
-   if (HasHiddenHost(sptr))
-     hide_hostmask(sptr, FLAG_HIDDENHOST);
-+  /* my user has sethost, inform them of their hidden host from auto applied sethost */
-+  if (IsSetHost(sptr) && MyConnect(sptr))
-+    send_reply(sptr, RPL_HOSTHIDDEN, cli_user(sptr)->host);
-   if (IsInvisible(sptr))
-     ++UserStats.inv_clients;
-   if (IsOper(sptr))

diff --git a/series b/series
index 8f8d4df3a9d28b1d4022d4ac9e499e42770b7167..42a8bb80ca2788e9a60de2775c37ad11bc65bcfa 100644 (file)
--- a/series
+++ b/series
@@ -31,7 +31,6 @@ hiskgline.patch
 opername.patch
 operautomodes.patch
 noticepluschan.patch
-autosethost.patch
 hashiddenhostorissethost.patch
 netriderkickoutsideburst.patch
 killalwaysshowvictimuip.patch