Merge branch 'master' into next

* master:
  Fix CAPS/COLOR flood detection not obeying x|x flags
  Clarify comment regarding what gotmsg() is for

doc/UPDATES

@@ -8,6 +8,7 @@ maint
   * Remove 'chanset +meankicks'. You can customize your kicks in doc/responses.txt and recompile.
   * Don't allow running as root
   * Don't allow more than 5 bots per binary.
+  * Fix CAPS/COLOR flood detection not obeying x|x flags
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

src/mod/irc.mod/chan.c

@@ -3226,7 +3226,7 @@ static int gotquit(char *from, char *msg)
   return 0;
 }
 
-/* Got a private message.
+/* Got a channel message.
  */
 static int gotmsg(char *from, char *msg)
 {

src/mod/irc.mod/irc.c

@@ -127,6 +127,7 @@ detect_offense(memberlist* m, struct chanset_t *chan, char *msg)
   get_user_flagrec(u, &fr, chan->dname, chan);
 
   if (glob_bot(fr) ||
+      chk_noflood(fr) ||
       (m && chan->flood_exempt_mode == CHAN_FLAG_OP && chan_hasop(m)) ||
       (m && chan->flood_exempt_mode == CHAN_FLAG_VOICE && (chan_hasvoice(m) || chan_hasop(m))))
     return 0;