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 6c5251667f379a3030bb60d4d22d7494387a1c68..cc5915acc2fc0fdd2fe2c57c4f3ccd6577e47af1 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -133,7 +133,7 @@ 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 ((parc == 3 && *mask == '-') || parc == 5) {
     if (!find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD))
       return need_more_params(sptr, "GLINE");
 
@@ -151,10 +151,11 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
     if (!IsMe(acptr)) { /* manually propagate */
       if (!lastmod)
-       sendcmdto_one(acptr, CMD_GLINE, sptr, "%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(acptr, CMD_GLINE, sptr, "%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 +172,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);
 
@@ -187,7 +188,8 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       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);
 }
@@ -198,12 +200,12 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
  * parv[0] = Sender prefix
  * parv[1] = [[+|-]<G-line mask>]
  *
- * Old style:
+ * Local (to me) style:
  *
  * parv[2] = [Expiration offset]
  * parv[3] = [Comment]
  *
- * New style:
+ * Global (or remote local) style:
  *
  * parv[2] = [target]
  * parv[3] = [Expiration offset]
@@ -231,10 +233,8 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     return gline_list(sptr, mask);
 
 #ifndef LOCOP_LGLINE
-  if (!IsOper(sptr)) {
-    send_error_to_client(sptr, ERR_NOPRIVILEGES);
-    return 0;
-  }
+  if (!IsOper(sptr))
+    return send_reply(sptr, ERR_NOPRIVILEGES);
 #endif
 
   if (parc == 4) {
@@ -251,26 +251,30 @@ 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_reply(sptr, ERR_DISABLED, "GLINE");
+#else
        if (!IsOper(sptr))
-         return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+         return send_reply(sptr, ERR_NOPRIVILEGES);
 
-       sendcmdto_one(acptr, CMD_GLINE, sptr, "%C %c%s %s %Tu :%s", acptr,
+       sendcmdto_one(sptr, CMD_GLINE, acptr, "%C %c%s %s %Tu :%s", acptr,
                      flags & GLINE_ACTIVE ? '?' : '-', mask, parv[3],
                      TStime(), reason);
        return 0;
+#endif
       }
 
       flags |= GLINE_LOCAL;
     } else if (!IsOper(sptr))
-      return send_error_to_client(sptr, ERR_NOPRIVILEGES);
+      return send_reply(sptr, ERR_NOPRIVILEGES);
   }
 
 #ifndef CONFIG_OPERCMDS
   if (!(flags & GLINE_LOCAL))
-    return send_error_to_client(sptr, ERR_DISABLED, "GLINE");
+    return send_reply(sptr, ERR_DISABLED, "GLINE");
 #endif /* CONFIG_OPERCMDS */
 
   agline = gline_find(mask, GLINE_ANY | GLINE_EXACT);
@@ -279,6 +283,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);
@@ -302,7 +309,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]);
 }