presence: If CLICAP_PRESENCE is enabled, then RPL_AWAY is replaced by the "away"...

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index b78fa51855ed3d69a7426b10328c9218b5d2065b..fcf83bfa24e5fdcd0bc1e61065ff617b2cf4aee0 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -28,6 +28,7 @@
 #include "ircd_defs.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "newconf.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "channel.h"
@@ -46,6 +47,7 @@
 #include "reject.h"
 #include "cache.h"
 #include "blacklist.h"
+#include "privilege.h"
 #include "sslproc.h"
 
 struct config_server_hide ConfigServerHide;
@@ -804,6 +806,7 @@ set_default_conf(void)
        ConfigChannel.max_chans_per_user = 15;
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
+       ConfigChannel.only_ascii_channels = NO;
        ConfigChannel.burst_topicwho = NO;
        ConfigChannel.kick_on_split_riding = NO;
 
@@ -853,6 +856,7 @@ read_conf(FILE * file)
        validate_conf();        /* Check to make sure some values are still okay. */
        /* Some global values are also loaded here. */
        check_class();          /* Make sure classes are valid */
+       privilegeset_delete_all_illegal();
 }
 
 static void
@@ -1253,6 +1257,8 @@ clear_out_old_conf(void)
 
        destroy_blacklists();
 
+       privilegeset_mark_all_illegal();
+
        /* OK, that should be everything... */
 }
 
@@ -1436,8 +1442,8 @@ conf_add_class_to_conf(struct ConfItem *aconf)
        {
                if(aconf->status == CONF_CLIENT)
                {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "Warning -- Using default class for missing class \"%s\" in auth{} for %s@%s",
+                       conf_report_error(
+                                            "Using default class for missing class \"%s\" in auth{} for %s@%s",
                                             aconf->className, aconf->user, aconf->host);
                }