Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / src / s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 592b410ddf78d7465d8601022d2d11d53042c2bb..7ca43ad67ef82880525e7af239ba3dbf5ac7c2cc 100644 (file)
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -44,6 +44,8 @@
 #include "newconf.h"
 #include "hash.h"
 #include "irc_dictionary.h"
+#include "s_assert.h"
+#include "logger.h"
 
 rb_dlink_list shared_conf_list;
 rb_dlink_list cluster_conf_list;
@@ -173,7 +175,7 @@ free_remote_conf(struct remote_conf *remote_p)
 }
 
 int
-find_shared_conf(const char *username, const char *host, 
+find_shared_conf(const char *username, const char *host,
                const char *server, int flags)
 {
        struct remote_conf *shared_p;
@@ -215,7 +217,7 @@ propagate_generic(struct Client *source_p, const char *command,
                        "ENCAP %s %s %s",
                        target, command, buffer);
 }
-                       
+
 void
 cluster_generic(struct Client *source_p, const char *command,
                int cltype, int cap, const char *format, ...)
@@ -262,6 +264,7 @@ free_oper_conf(struct oper_conf *oper_p)
        rb_free(oper_p->username);
        rb_free(oper_p->host);
        rb_free(oper_p->name);
+       rb_free(oper_p->certfp);
 
        if(oper_p->passwd)
        {
@@ -651,6 +654,7 @@ valid_temp_time(const char *p)
        return(result * 60);
 }
 
+/* Propagated bans are expired elsewhere. */
 static void
 expire_temp_rxlines(void *unused)
 {
@@ -663,6 +667,8 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
+               if(aconf->lifetime != 0)
+                       continue;
                if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
@@ -680,6 +686,8 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
+               if(aconf->lifetime != 0)
+                       continue;
                if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
@@ -695,6 +703,8 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
+               if(aconf->lifetime != 0)
+                       continue;
                if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
@@ -722,7 +732,7 @@ add_nd_entry(const char *name)
                return;
 
        nd = rb_bh_alloc(nd_heap);
-       
+
        rb_strlcpy(nd->name, name, sizeof(nd->name));
        nd->expire = rb_current_time() + ConfigFileEntry.nick_delay;