Fix syntax of ERR_LISTFULL_MSG(478) numeric

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index b83c1eb49bc179119b278f75064737bc6f099b24..79ab2ebe94beaa41b904b01b1493a83d125e5e25 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-macros.h"
@@ -69,6 +68,13 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
 
        _IRC_GET_SENDER_OR_RETURN_(origin, Req, Client)
 
+       /* Test for "fake" MODE commands injected by this local instance,
+        * for example when handling the "DefaultUserModes" settings.
+        * This doesn't harm real commands, because prefixes of regular
+        * clients are checked in Validate_Prefix() and can't be faked. */
+       if (Req->prefix && Client_Search(Req->prefix) == Client_ThisServer())
+               Client = Client_Search(Req->prefix);
+
        /* Channel or user mode? */
        cl = NULL; chan = NULL;
        if (Client_IsValidNick(Req->argv[0]))
@@ -223,6 +229,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
                        break;
                case 'c': /* Receive connect notices */
                case 'q': /* KICK-protected user */
+               case 'F': /* disable flood protection */
                          /* (only settable by IRC operators!) */
                        if (!set || Client_Type(Client) == CLIENT_SERVER
                            || Client_HasMode(Origin, 'o'))