On bad /oper set the penalty to 10 seconds

[ngircd-alex.git] / src / ngircd / irc-oper.c

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 74f17cc0dec9343483ec7844e9b9570a83ba57c0..0b50bca659e40c3f89ed217c00d0ccf1de060be1 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -28,12 +28,14 @@
 #include "conf.h"
 #include "channel.h"
 #include "class.h"
+#include "parse.h"
+#include "irc.h"
 #include "irc-macros.h"
 #include "irc-write.h"
+#include "lists.h"
 #include "log.h"
 #include "match.h"
 #include "messages.h"
-#include "parse.h"
 #include "op.h"
 
 #include <exp.h>
@@ -48,7 +50,8 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 {
        Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s",
            Client_Mask(Client), errtoken, errmsg);
-       return IRC_WriteErrClient(Client, ERR_PASSWDMISMATCH_MSG,
+       IRC_SetPenalty(Client, 10);
+       return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG,
                                  Client_ID(Client));
 } /* Bad_OperPass */
 
@@ -206,18 +209,14 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 
        /* Bad number of parameters? */
        if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 &&
-           Req->argc != 5 && Req->argc != 6) {
-               IRC_SetPenalty(Client, 2);
+           Req->argc != 5 && Req->argc != 6)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        /* Invalid port number? */
-       if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) {
-               IRC_SetPenalty(Client, 2);
+       if ((Req->argc > 1) && atoi(Req->argv[1]) < 1)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        if (Client_Type(Client) != CLIENT_SERVER
            && !Client_HasMode(Client, 'o'))
@@ -384,19 +383,18 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req )
 GLOBAL bool
 IRC_xLINE(CLIENT *Client, REQUEST *Req)
 {
-       CLIENT *from;
+       CLIENT *from, *c, *c_next;
+       char reason[COMMAND_LEN], class_c;
+       struct list_head *list;
        int class;
-       char class_c;
 
        assert(Client != NULL);
        assert(Req != NULL);
 
        /* Bad number of parameters? */
-       if (Req->argc != 1 && Req->argc != 3) {
-               IRC_SetPenalty(Client, 2);
+       if (Req->argc != 1 && Req->argc != 3)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        from = Op_Check(Client, Req);
        if (!from)
@@ -446,6 +444,20 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
                                                Req->argv[0], Req->argv[1],
                                                Req->argv[2]);
                        }
+
+                       /* Check currently connected clients */
+                       snprintf(reason, sizeof(reason), "%c-Line by \"%s\": \"%s\"",
+                                class_c, Client_ID(from), Req->argv[2]);
+                       list = Class_GetList(class);
+                       c = Client_First();
+                       while (c) {
+                               c_next = Client_Next(c);
+                               if ((class == CLASS_GLINE || Client_Conn(c) > NONE)
+                                   && Lists_Check(list, c))
+                                       IRC_KillClient(Client, NULL,
+                                                      Client_ID(c), reason);
+                               c = c_next;
+                       }
                }
        }