Merge branch 'bug145-ProvideHelp'

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index f6b9dc59b6086c060aa2dc5c1c5f7a1c521ebe1d..e76abcb8a4af00250d819d00d332ca4a5cdc0f65 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -82,6 +82,17 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
+       if (Client_Type(Client) != CLIENT_GOTPASS
+           && Client_Type(Client) != CLIENT_GOTPASS_2813
+           && Client_Type(Client) != CLIENT_UNKNOWNSERVER
+           && Client_Type(Client) != CLIENT_SERVER
+           && Client_Type(Client) != CLIENT_SERVICE) {
+               LogDebug("Ignored ERROR command from \"%s\" ...",
+                        Client_Mask(Client));
+               IRC_SetPenalty(Client, 2);
+               return CONNECTED;
+       }
+
        if (Req->argc < 1)
                Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
                    Client_Mask(Client));