Merge branch 'ducch-63-callerid-ignore' into next

* ducch-63-callerid-ignore:
  Update DOCS
  Ignore CALLERID requests from ignored users (#63)

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,6 +4,7 @@ next
   * Fix LASTON not being shared
   * Warn when using 'chattr +a' as some users may expect it to be auto-op
   * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
+  * Fix CALLERID not respecting ignores (#63)
 
 maint
   * Prevent crashing on startup if openssl can not be loaded

src/mod/server.mod/servmsg.c

@@ -1918,6 +1918,10 @@ static int got465(char *from, char *msg)
 static int got718(char *from, char *msg)
 {
   char *nick = NULL, *uhost = NULL;
+  bool ignoring = match_ignore(from);
+
+  if (ignoring)
+    return 0;
 
   newsplit(&msg);
   nick = newsplit(&msg);