Don't forward KILLs to other servers if they've been blocked locally

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 15bb90f73ced63e4d7134d5f49b56fb893debd2a..a6f04cba37a33412ae644d2414732183d5ea978e 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -85,6 +85,8 @@ IRC_CheckListTooBig(CLIENT *From, const int Count, const int Limit,
 GLOBAL bool
 IRC_ERROR(CLIENT *Client, REQUEST *Req)
 {
+       char *msg;
+
        assert( Client != NULL );
        assert( Req != NULL );
 
@@ -99,12 +101,20 @@ IRC_ERROR(CLIENT *Client, REQUEST *Req)
                return CONNECTED;
        }
 
-       if (Req->argc < 1)
+       if (Req->argc < 1) {
+               msg = "Got ERROR command";
                Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
                    Client_Mask(Client));
-       else
+       } else {
+               msg = Req->argv[0];
                Log(LOG_NOTICE, "Got ERROR from \"%s\": \"%s\"!",
-                   Client_Mask(Client), Req->argv[0]);
+                   Client_Mask(Client), msg);
+       }
+
+       if (Client_Conn(Client) != NONE) {
+               Client_Destroy(Client, NULL, msg, false);
+               return DISCONNECTED;
+       }
 
        return CONNECTED;
 } /* IRC_ERROR */
@@ -352,11 +362,6 @@ IRC_KillClient(CLIENT *Client, CLIENT *From, const char *Nick, const char *Reaso
                return CONNECTED;
        }
 
-       /* Inform other servers */
-       IRC_WriteStrServersPrefix(From ? Client : NULL,
-                                 From ? From : Client_ThisServer(),
-                                 "KILL %s :%s", Nick, Reason);
-
        if (Client_Type(c) != CLIENT_USER && Client_Type(c) != CLIENT_GOTNICK) {
                /* Target of this KILL is not a regular user, this is
                 * invalid! So we ignore this case if we received a
@@ -378,6 +383,12 @@ IRC_KillClient(CLIENT *Client, CLIENT *From, const char *Nick, const char *Reaso
                    Client_Type(c), Nick);
        }
 
+       /* Inform other servers */
+       IRC_WriteStrServersPrefix(From ? Client : NULL,
+                                 From ? From : Client_ThisServer(),
+                                 "KILL %s :%s", Nick, Reason);
+
+
        /* Save ID of this connection */
        if (Client)
                my_conn = Client_Conn(Client);
@@ -493,7 +504,6 @@ Option_String(UNUSED CONN_ID Idx)
        if(options & CONN_ZIP)          /* zlib compression enabled */
                strlcat(option_txt, "z", sizeof(option_txt));
 #endif
-       LogDebug(" *** %d: %d = %s", Idx, options, option_txt);
 
        return option_txt;
 } /* Option_String */
@@ -563,7 +573,9 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
        currentTarget = strtok_r(currentTarget, ",", &strtok_last);
        ngt_UpperStr(Req->command);
 
-       while (true) {
+       /* Please note that "currentTarget" is NULL when the target contains
+        * the separator character only, e. g. "," or ",,,," etc.! */
+       while (currentTarget) {
                /* Make sure that there hasn't been such a target already: */
                targets[target_nr++] = currentTarget;
                for(i = 0; i < target_nr - 1; i++) {