Merge branch 'csircd-callerid'

* csircd-callerid:
  * Fix CALLERID on CSIRCD servers
  * Remove CSIRCD servers from default server list

doc/UPDATES

@@ -80,6 +80,7 @@
   * Removed 'set chanset' as it has been replaced by 'chanset default'
   * Add new channel setting 'ban-type' which support mIRC style ban types (adapted from recent eggdrop patch)
   * EFnet server list updates (To update yours: .set -YES servers - | .set -YES servers6 -)
+  * EFnet's CSIRCD servers have been removed as they have proven to be highly incompatible with Ratbox features. (irc.nac.net/irc.efnet.no)
   * Give localhubs credit for adding their child bots in 'whois'.
   * Ident lookup timeout is now 5 seconds (will speed up linking / partyline connecting)
   * Cleanup all string parsing to trim excess whitespaces (fixes #268)

doc/settings.txt

@@ -18,7 +18,6 @@ irc.easynews.com
 irc.eversible.com
 irc.he.net
 irc.mzima.net
-irc.nac.net
 irc.paraphysics.net
 irc.serious.biz
 irc.servercentral.net
@@ -37,7 +36,6 @@ irc.du.se
 irc.efnet.ch
 irc.efnet.fr
 irc.efnet.nl
-irc.efnet.no
 irc.efnet.pl
 irc.efnet.ru
 irc.homelien.no

src/mod/server.mod/servmsg.c

@@ -1631,6 +1631,8 @@ static int got465(char *from, char *msg)
 
 /* 718 $me nick user@host :msg 
  * for receiving a msg while +g
+ * csircd: :irc.nac.net 718 bryand_ bryand_ bryan bryan@shatow.net :is messaging you, but you have CALLERID enabled (umode +g)
+ * ratbox: :irc.servercentral.net 718 bryand_ bryan bryan@shatow.net :is messaging you, and you have umode +g.
  */
 static int got718(char *from, char *msg)
 {
@@ -1638,6 +1640,9 @@ static int got718(char *from, char *msg)
 
   newsplit(&msg);
   nick = newsplit(&msg);
+  if (match_my_nick(nick)) // CSIRCD is stupid.
+    nick = newsplit(&msg);
+
   uhost = newsplit(&msg);
   fixcolon(msg);