forward port of asuka-his_gline.patch to .12

diff --git a/include/ircd_features.h b/include/ircd_features.h
index 85d4e2bc92c6ef2a386cd6e6b19b3ddc87394078..6fbc20abba9f3703f55952b191a39e9e525050dc 100644 (file)
--- a/include/ircd_features.h
+++ b/include/ircd_features.h
@@ -142,6 +142,8 @@ enum Feature {
   FEAT_HIS_WHO_HOPCOUNT,
   FEAT_HIS_BANWHO,
   FEAT_HIS_KILLWHO,
+  /* Asuka - Reimplement HEAD_IN_SAND_GLINE from Lain */
+  FEAT_HIS_GLINE,
   FEAT_HIS_REWRITE,
   FEAT_HIS_REMOTE,
   FEAT_HIS_NETSPLIT,

diff --git a/ircd/gline.c b/ircd/gline.c
index 89cdb3333a400cef0b485c9f99cc6f156174298b..3b4fea7435fe7439929d4b941faf7fe6d32271a4 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -239,9 +239,10 @@ do_gline(struct Client *cptr, struct Client *sptr, struct Gline *gline)
                            get_client_name(acptr, SHOW_IP));
 
       /* and get rid of him */
-      if ((tval = exit_client_msg(cptr, acptr, &me, "G-lined (%s)",
-          gline->gl_reason)))
-        retval = tval; /* retain killed status */
+      /* Asuka - Reimplement HEAD_IN_SAND_GLINE from Lain */
+      if ((tval = exit_client_msg(cptr, acptr, &me, 
+          feature_bool(FEAT_HIS_GLINE) ? "G-lined" : "G-lined (%s)", gline->gl_reason)))
+      retval = tval; /* retain killed status */
     }
   }
   return retval;

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index e8a838cc80f909c095fba2c3276af79ea5e1fbb8..afdb91f57254cc4c27f1f4e274d54acbad37e2ac 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -395,6 +395,8 @@ static struct FeatureDesc {
   F_B(HIS_WHO_HOPCOUNT, 0, 1, 0),
   F_B(HIS_BANWHO, 0, 1, 0),
   F_B(HIS_KILLWHO, 0, 1, 0),
+  /* Asuka - Reimplement HEAD_IN_SAND_GLINE from Lain */
+  F_B(HIS_GLINE, 0, 1, 0),
   F_B(HIS_REWRITE, 0, 1, 0),
   F_I(HIS_REMOTE, 0, 1, 0),
   F_B(HIS_NETSPLIT, 0, 1, 0),