From: Federico G. Schwindt <fgsch@lodoss.net>
Date: Sun, 8 Dec 2013 01:43:55 +0000 (+0000)
Subject: Fix permanent k/gline
X-Git-Tag: rel-21.1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b86da5ed9ac5c6f4702a51e5e3c3ff5d431338f1;p=ngircd

Fix permanent k/gline

Reported by Toni Spets (hifi - at - jnz - dot - fi).

(cherry picked from commit 9230f2fff1d374ecef93dafeb14099f22c9ef787)
---

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 4ccc76a6..2c2ea3c2 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -389,6 +389,7 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
 	CLIENT *from, *c, *c_next;
 	char reason[COMMAND_LEN], class_c;
 	struct list_head *list;
+	time_t timeout;
 	int class;
 
 	assert(Client != NULL);
@@ -435,8 +436,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
 		}
 	} else {
 		/* Add new mask to list */
+		timeout = atol(Req->argv[1]);
+		if (timeout > 0)
+			timeout += time(NULL);
 		if (Class_AddMask(class, Req->argv[0],
-				  time(NULL) + atol(Req->argv[1]),
+				  timeout,
 				  Req->argv[2])) {
 			Log(LOG_NOTICE|LOG_snotice,
 			    "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).",