- minor MaskItem structure cleanup

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1649 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 3 insertions, 5 deletions

diff --git a/src/conf.c b/src/conf.c
index 8763885..7d04bd0 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -195,8 +195,6 @@ conf_free(struct MaskItem *conf)
 
   if (conf->rsa_public_key)
     RSA_free(conf->rsa_public_key);
-
-  MyFree(conf->rsa_public_key_file);
 #endif
   DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
   {
@@ -255,7 +253,7 @@ report_confitem_types(struct Client *source_p, enum maskitem_type type)
 
       sendto_one(source_p, form_str(RPL_STATSXLINE),
 		 me.name, source_p->name, 
-		 conf->hold ? "x": "X", conf->count,
+		 conf->until ? "x": "X", conf->count,
 		 conf->name, conf->reason);
     }
     break;
@@ -1617,7 +1615,7 @@ expire_tklines(dlink_list *tklist)
   {
     conf = ptr->data;
 
-    if (!conf->hold || conf->hold > CurrentTime)
+    if (!conf->until || conf->until > CurrentTime)
       continue;
 
     if (conf->type == CONF_XLINE)
@@ -1843,7 +1841,7 @@ clear_out_old_conf(void)
                conf->type == CONF_RXLINE ||
                conf->type == CONF_RKLINE)
       {
-        if (!conf->hold)
+        if (!conf->until)
           conf_free(conf);
       }
       else