Allow (but ignore) additional arguments in server GLINE messages.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1666 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 5f74dce41d21a2361406cc0ad304c965cced246f..89347bb37556f90d319851ec558e6415eae13505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-08  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_gline.c (ms_gline): Use final argument as G-line reason.
+
 2006-06-08  Michael Poole <mdpoole@troilus.org>
 
        * ircd/gline.c (gline_stats): Show activation state in /stats g.

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index ab60a1a81b6d7e96f4f438e2f4ad7a3b2302ddd3..1db879ac7d150c23295f393337363bda3cb923f7 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -139,18 +139,16 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     if (!find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD))
       return need_more_params(sptr, "GLINE");
 
-    if (parc > 4)
-      reason = parv[4];
     flags |= GLINE_FORCE;
   }
   else if (parc > 5)
-  {
     lastmod = atoi(parv[4]);
-    reason = parv[5];
-  }
   else
     return need_more_params(sptr, "GLINE");
 
+  if (parc > 4)
+    reason = parv[parc - 1];
+
   if (IsServer(sptr))
     flags |= GLINE_FORCE;