Clean up / regularize parts of m*_gline().

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

diff --git a/ChangeLog b/ChangeLog
index 28916be22b816b3ccb578c5542d9d153a8b3e5d2..b69439ce9ab9682e369e7768b100bccee6241026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_gline.c (ms_gline): Remove dead branch when 4 < parc < 5.
+       (mo_gline): Consistently use the last argument as the reason.
+
 2007-09-05  Michael Poole <mdpoole@troilus.org>
 
        * ircd/Makefile.in: Fix dependencies for version.h generation.

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index cf0f002b57983b519abe741b330a45d46e7129d7..cd930a9da2047a8fe80f1f51aa360b5bf64bb1fd 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -292,9 +292,6 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   case GLINE_MODIFY: /* modifying a G-line */
     /* convert expire and lastmod, look for lifetime and reason */
     if (parc > 4) { /* protect against fall-through from 4-param form */
-      if (parc < 5)
-       return need_more_params(sptr, "GLINE");
-
       expire = atoi(parv[3]); /* convert expiration and lastmod */
       expire = abs_expire(expire);
       lastmod = atoi(parv[4]);
@@ -418,7 +415,7 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     flags |= GLINE_EXPIRE; /* remember that we got an expire time */
 
     if (parc > 4) { /* also got a reason... */
-      reason = parv[4];
+      reason = parv[parc - 1];
       flags |= GLINE_REASON;
     }