From: Michael Poole <mdpoole@troilus.org>
Date: Mon, 6 Jul 2009 01:41:45 +0000 (+0000)
Subject: Fix SF bug #2721107 (Gline lifetime changes from servers change the reason.)
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=79f4396535284e060d4a4ada4a4cc897cd5f69d3

Fix SF bug #2721107 (Gline lifetime changes from servers change the reason.)


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

diff --git a/ChangeLog b/ChangeLog
index 0167084..f119950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-05  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/m_gline.c (ms_gline): Fix the sense of the test for
+	strtoul() when parsing G-line lifetimes -- zero indicates failure.
+
 2009-07-05  Michael Poole <mdpoole@troilus.org>
 
 	* ircd/channel.c (mode_parse_client): Ignore anything after a
diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index d379c61..549ae14 100644
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -1,4 +1,4 @@
-/*
+\/*
  * IRC - Internet Relay Chat, ircd/m_gline.c
  * Copyright (C) 1990 Jarkko Oikarinen and
  *                    University of Oulu, Computing Center
@@ -308,7 +308,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 	if (!agline || /* gline creation, has to be the reason */
 	    /* trial-convert as lifetime, and if it doesn't fully convert,
 	     * it must be the reason */
-	    ((lifetime = strtoul(parv[5], &tmp, 10)) && !*tmp)) {
+	    (!(lifetime = strtoul(parv[5], &tmp, 10)) && !*tmp)) {
 	  lifetime = 0;
 	  reason = parv[5];