Fix permanent k/gline
authorFederico G. Schwindt <fgsch@lodoss.net>
Sun, 8 Dec 2013 01:43:55 +0000 (01:43 +0000)
committerAlexander Barton <alex@barton.de>
Sun, 29 Dec 2013 00:14:28 +0000 (01:14 +0100)
Reported by Toni Spets (hifi - at - jnz - dot - fi).

src/ngircd/irc-oper.c

index ab4023a..49768bc 100644 (file)
@@ -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).",