make more snotes L_NETWIDE

[solanum.git] / ircd / s_conf.c

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 99eec2835e4713292b9dcf89b47499cb0e831004..2aae3ddee6e11c75b8bc8572bd1fcf198f8da013 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -267,7 +267,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                        static char ipaddr[HOSTIPLEN];
                        rb_inet_ntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr));
 #endif
-                       sendto_realops_snomask(SNO_UNAUTH, L_ALL,
+                       sendto_realops_snomask(SNO_UNAUTH, L_NETWIDE,
                                        "Unauthorised client connection from "
                                        "%s!%s%s@%s [%s] on [%s/%u].",
                                        source_p->name, IsGotId(source_p) ? "" : "~",
@@ -332,7 +332,7 @@ verify_access(struct Client *client_p, const char *username)
 
                        if(IsConfSpoofNotice(aconf))
                        {
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                                "%s spoofing: %s as %s",
                                                client_p->name,
                                                show_ip(NULL, client_p) ? client_p->host : aconf->info.name,
@@ -649,7 +649,7 @@ rehash(bool sig)
        hook_data_rehash hdata = { sig };
 
        if(sig)
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                     "Got signal SIGHUP, reloading ircd conf. file");
 
        rehash_authd();
@@ -1381,7 +1381,7 @@ get_printable_kline(struct Client *source_p, struct ConfItem *aconf,
        *user = EmptyString(aconf->user) ? null : aconf->user;
        *reason = get_user_ban_reason(aconf);
 
-       if(!IsOper(source_p))
+       if(!IsOperGeneral(source_p))
                *oper_reason = NULL;
        else
        {
@@ -1436,7 +1436,7 @@ read_conf_files(bool cold)
                }
                else
                {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                             "Can't open file '%s' - aborting rehash!", filename);
                        return;
                }
@@ -1491,7 +1491,7 @@ clear_out_old_conf(void)
                MaxUsers(cltmp) = -1;
        }
 
-       clear_out_address_conf();
+       clear_out_address_conf(AC_CONFIG);
        clear_s_newconf();
 
        /* clean out module paths */
@@ -1535,6 +1535,14 @@ clear_out_old_conf(void)
        rb_free(ConfigFileEntry.sasl_service);
        ConfigFileEntry.sasl_service = NULL;
 
+       if (ConfigFileEntry.hidden_caps != NULL)
+       {
+               for (size_t i = 0; ConfigFileEntry.hidden_caps[i] != NULL; i++)
+                       rb_free(ConfigFileEntry.hidden_caps[i]);
+               rb_free(ConfigFileEntry.hidden_caps);
+       }
+       ConfigFileEntry.hidden_caps = NULL;
+
        /* clean out log */
        rb_free(ConfigFileEntry.fname_userlog);
        ConfigFileEntry.fname_userlog = NULL;
@@ -1680,7 +1688,7 @@ yyerror(const char *msg)
        strip_tabs(newlinebuf, yy_linebuf, sizeof(newlinebuf));
 
        ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf);
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'",
+       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "\"%s\", line %d: %s at '%s'",
                             conffilebuf, lineno + 1, msg, newlinebuf);
 
 }