Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_gline.c

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index a63331a4662c790aedd10389688ab89353729075..6a5f1e037cc0cb135cc78b89718c50394f49d8f4 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -91,6 +91,7 @@
 #include "gline.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_features.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -133,8 +134,8 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   time_t expire_off, lastmod = 0;
   char *mask = parv[2], *target = parv[1], *reason;
 
-  if (parc == 5) {
-    if (!find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
+  if ((parc == 3 && *mask == '-') || parc == 5) {
+    if (!find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD))
       return need_more_params(sptr, "GLINE");
 
     reason = parv[4];
@@ -151,10 +152,11 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
     if (!IsMe(acptr)) { /* manually propagate */
       if (!lastmod)
-       sendcmdto_one(sptr, CMD_GLINE, acptr, "%s %s %s :%s", target, mask,
+       sendcmdto_one(sptr, CMD_GLINE, acptr,
+                     (parc == 3) ? "%C %s" : "%C %s %s :%s", acptr, mask,
                      parv[3], reason);
       else
-       sendcmdto_one(sptr, CMD_GLINE, acptr, "%s %s %s %s :%s", target, mask,
+       sendcmdto_one(sptr, CMD_GLINE, acptr, "%C %s %s %s :%s", acptr, mask,
                      parv[3], parv[4], reason);
 
       return 0;
@@ -171,7 +173,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   } else
     flags |= GLINE_ACTIVE;
 
-  expire_off = atoi(parv[3]);
+  expire_off = parc < 5 ? 0 : atoi(parv[3]);
 
   agline = gline_find(mask, GLINE_ANY | GLINE_EXACT);
 
@@ -183,11 +185,12 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
        return gline_activate(cptr, sptr, agline, lastmod, flags);
       else
        return gline_deactivate(cptr, sptr, agline, lastmod, flags);
-    } else if (GlineLastMod(agline) == lastmod)
+    } else if (GlineLastMod(agline) == lastmod || IsBurstOrBurstAck(cptr))
       return 0;
     else
       return gline_resend(cptr, agline); /* other server desynched WRT gline */
-  }
+  } else if (parc < 5)
+    return need_more_params(sptr, "GLINE");
 
   return gline_add(cptr, sptr, mask, reason, expire_off, lastmod, flags);
 }
@@ -225,18 +228,12 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (*mask == '+') {
     flags |= GLINE_ACTIVE;
     mask++;
+
   } else if (*mask == '-')
     mask++;
   else
     return gline_list(sptr, mask);
 
-#ifndef LOCOP_LGLINE
-  if (!IsOper(sptr)) {
-    send_error_to_client(sptr, ERR_NOPRIVILEGES);
-    return 0;
-  }
-#endif
-
   if (parc == 4) {
     expire_off = atoi(parv[2]);
     reason = parv[3];
@@ -251,31 +248,29 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (target) {
     if (!(target[0] == '*' && target[1] == '\0')) {
       if (!(acptr = find_match_server(target)))
-       return send_error_to_client(sptr, ERR_NOSUCHSERVER, target);
+       return send_reply(sptr, ERR_NOSUCHSERVER, target);
 
       if (!IsMe(acptr)) { /* manually propagate, since we don't set it */
-#ifndef CONFIG_OPERCMDS
-       return send_error_to_client(sptr, ERR_DISABLED, "GLINE");
-#else
-       if (!IsOper(sptr))
-         return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+       if (!feature_bool(FEAT_CONFIG_OPERCMDS))
+         return send_reply(sptr, ERR_DISABLED, "GLINE");
+
+       if (!HasPriv(sptr, PRIV_GLINE))
+         return send_reply(sptr, ERR_NOPRIVILEGES);
 
        sendcmdto_one(sptr, CMD_GLINE, acptr, "%C %c%s %s %Tu :%s", acptr,
-                     flags & GLINE_ACTIVE ? '?' : '-', mask, parv[3],
+                     flags & GLINE_ACTIVE ? '+' : '-', mask, parv[3],
                      TStime(), reason);
        return 0;
-#endif
-      }
+      } else if (!HasPriv(sptr, PRIV_LOCAL_GLINE))
+       return send_reply(sptr, ERR_NOPRIVILEGES);
 
       flags |= GLINE_LOCAL;
-    } else if (!IsOper(sptr))
-      return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+    } else if (!HasPriv(sptr, PRIV_GLINE))
+      return send_reply(sptr, ERR_NOPRIVILEGES);
   }
 
-#ifndef CONFIG_OPERCMDS
-  if (!(flags & GLINE_LOCAL))
-    return send_error_to_client(sptr, ERR_DISABLED, "GLINE");
-#endif /* CONFIG_OPERCMDS */
+  if (!(flags & GLINE_LOCAL) && !feature_bool(FEAT_CONFIG_OPERCMDS))
+    return send_reply(sptr, ERR_DISABLED, "GLINE");
 
   agline = gline_find(mask, GLINE_ANY | GLINE_EXACT);
 
@@ -283,6 +278,9 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     if (GlineIsLocal(agline) && !(flags & GLINE_LOCAL)) /* global over local */
       gline_free(agline);
     else {
+      if (!GlineLastMod(agline)) /* force mods to Uworld-set G-lines local */
+       flags |= GLINE_LOCAL;
+
       if (flags & GLINE_ACTIVE)
        return gline_activate(cptr, sptr, agline,
                              GlineLastMod(agline) ? TStime() : 0, flags);
@@ -306,7 +304,7 @@ int
 m_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
   if (parc < 2)
-    return send_error_to_client(sptr, ERR_NOSUCHGLINE, "");
+    return send_reply(sptr, ERR_NOSUCHGLINE, "");
 
   return gline_list(sptr, parv[1]);
 }