Merge branch 'master' of github.com:charybdis-ircd/charybdis into elizafox-cleanups

diff --cc ircd/modules.c
Simple merge

diff --cc modules/core/m_error.c
index c12556550e898b9fe32fec1eb7739d071c3f9c91,dc933a24d4fc9c3827d3bfc23e19fb3e6729c4e7..9d25b3ee79868dca9719b106ef3272b7dadc587e
--- 1/modules/core/m_error.c
--- 2/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@@ -62,23 -62,23 +62,23 @@@ is_safe_error(const char *message
        snprintf(prefix2, sizeof prefix2,
                        "Closing Link: 127.0.0.1 %s (", me.name);
        if (!strncmp(message, prefix2, strlen(prefix2)))
 -              return 1;
 +              return true;
        if (!strncmp(message, "Restart by ", 11))
 -              return 1;
 +              return true;
        if (!strncmp(message, "Terminated by ", 14))
 -              return 1;
 +              return true;
  
-       if (!ircncmp(message, "Closing Link", 12))
+       if (!strncmp(message, "Closing Link", 12))
 -              return 0;
 +              return false;
        if (strchr(message, '['))
 -              return 0;
 +              return false;
        p = strchr(message, '.');
        if (p != NULL && p[1] != '\0')
 -              return 0;
 +              return false;
        if (strchr(message, ':'))
 -              return 0;
 +              return false;
  
 -      return 1;
 +      return true;
  }
  
  /*