Add general::hidden_caps

[solanum.git] / ircd / s_conf.c

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index c2ee0164d9bd68ab220aded45af3ed014f89bf7b..8bd98aa05ed2187083a50fc1b64fd4a05c5d0ae4 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -805,6 +805,7 @@ set_default_conf(void)
        ConfigChannel.channel_target_change = true;
        ConfigChannel.disable_local_channels = false;
        ConfigChannel.displayed_usercount = 3;
+       ConfigChannel.opmod_send_statusmsg = false;
 
        ConfigChannel.autochanmodes = MODE_TOPICLIMIT | MODE_NOPRIVMSGS;
 
@@ -1380,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
        {
@@ -1490,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 */
@@ -1534,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;
@@ -1567,7 +1576,7 @@ clear_out_old_conf(void)
                alias_dict = NULL;
        }
 
-       del_blacklist_all();
+       del_dnsbl_entry_all();
 
        privilegeset_mark_all_illegal();