Merge pull request #82 from grawity/sasl-send-conn-info

[solanum.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 1a70de25300cb91eb94256a087c098a1ff51c0d7..a329c7b786d74f687012e457f10f9c662cdaa253 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -692,6 +692,7 @@ set_default_conf(void)
        ConfigFileEntry.default_operstring = NULL;
        ConfigFileEntry.default_adminstring = NULL;
        ConfigFileEntry.servicestring = NULL;
+       ConfigFileEntry.sasl_service = NULL;
 
        ConfigFileEntry.default_umodes = UMODE_INVISIBLE;
        ConfigFileEntry.failed_oper_notice = YES;
@@ -886,6 +887,9 @@ validate_conf(void)
        if (ConfigFileEntry.servicestring == NULL)
                ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
+       if (ConfigFileEntry.sasl_service == NULL)
+               ConfigFileEntry.sasl_service = rb_strdup("SaslServ");
+
        /* RFC 1459 says 1 message per 2 seconds on average and bursts of
         * 5 messages are acceptable, so allow at least that.
         */
@@ -1489,6 +1493,8 @@ clear_out_old_conf(void)
        ConfigFileEntry.servicestring = NULL;
        rb_free(ConfigFileEntry.kline_reason);
        ConfigFileEntry.kline_reason = NULL;
+       rb_free(ConfigFileEntry.sasl_service);
+       ConfigFileEntry.sasl_service = NULL;
 
        /* clean out log */
        rb_free(ConfigFileEntry.fname_userlog);