Module: ngircd.git Branch: master Commit: 9230f2fff1d374ecef93dafeb14099f22c9ef787 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9230f...

Author: Federico G. Schwindt fgsch@lodoss.net Date: Sun Dec 8 01:43:55 2013 +0000

Fix permanent k/gline

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

---

src/ngircd/irc-oper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index ab4023a..49768bc 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -387,6 +387,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); @@ -431,8 +432,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).",