forward port of asuka-his_usergline.patch to .12

diff --git a/include/ircd_features.h b/include/ircd_features.h
index 6fbc20abba9f3703f55952b191a39e9e525050dc..f17fb072ce24f04a5976972f66a430eaa9315c55 100644 (file)
--- a/include/ircd_features.h
+++ b/include/ircd_features.h
@@ -150,6 +150,7 @@ enum Feature {
   FEAT_HIS_SERVERNAME,
   FEAT_HIS_SERVERINFO,
   FEAT_HIS_URLSERVERS,
+  FEAT_HIS_USERGLINE,
 
   /* Misc. random stuff */
   FEAT_NETWORK,

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index afdb91f57254cc4c27f1f4e274d54acbad37e2ac..faab82a201e49e3aacb02ecd7c1ce008b53eb5e1 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -403,6 +403,7 @@ static struct FeatureDesc {
   F_S(HIS_SERVERNAME, 0, "*.undernet.org", feature_notify_servername),
   F_S(HIS_SERVERINFO, 0, "The Undernet Underworld", feature_notify_serverinfo),
   F_S(HIS_URLSERVERS, 0, "http://www.undernet.org/servers.php", 0),
+  F_B(HIS_USERGLINE, 0, 1, 0),
 
   /* Misc. random stuff */
   F_S(NETWORK, 0, "UnderNet", 0),

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index b79fc9c2a777e9fec236c2faaf8fdb7c9d288097..49ddca6bc1972c784619ba3ca51b4c7ffe50fa6f 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -333,6 +333,9 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 int
 m_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
+  if (feature_bool(FEAT_HIS_USERGLINE))
+    return send_reply(sptr, ERR_DISABLED, "GLINE");
+
   if (parc < 2)
     return send_reply(sptr, ERR_NOSUCHGLINE, "");