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 a7560982598120c8a058dab298e4f032b881ac3a..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.
         */
@@ -1057,7 +1061,7 @@ find_prop_ban(unsigned int status, const char *user, const char *host)
 }
 
 void
-deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
+deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr, time_t now)
 {
        int i;
 
@@ -1096,7 +1100,7 @@ deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
                        del_from_resv_hash(aconf->host, aconf);
                        break;
        }
-       if (aconf->lifetime != 0 && rb_current_time() < aconf->lifetime)
+       if (aconf->lifetime != 0 && now < aconf->lifetime)
                aconf->status |= CONF_ILLEGAL;
        else
        {
@@ -1132,7 +1136,7 @@ replace_old_ban(struct ConfItem *aconf)
                        aconf->lifetime = aconf->hold;
                /* Tell deactivate_conf() to destroy it. */
                oldconf->lifetime = rb_current_time();
-               deactivate_conf(oldconf, ptr);
+               deactivate_conf(oldconf, ptr, oldconf->lifetime);
        }
 }
 
@@ -1142,13 +1146,15 @@ expire_prop_bans(void *list)
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
+       time_t now;
 
+       now = rb_current_time();
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
-               if(aconf->lifetime <= rb_current_time() ||
-                               (aconf->hold <= rb_current_time() &&
+               if(aconf->lifetime <= now ||
+                               (aconf->hold <= now &&
                                 !(aconf->status & CONF_ILLEGAL)))
                {
                        /* Alert opers that a TKline expired - Hwy */
@@ -1162,7 +1168,7 @@ expire_prop_bans(void *list)
                                                     aconf->host ? aconf->host : "*");
 
                        /* will destroy or mark illegal */
-                       deactivate_conf(aconf, ptr);
+                       deactivate_conf(aconf, ptr, now);
                }
        }
 }
@@ -1487,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);