- minor MaskItem structure cleanup

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

14 files changed, 40 insertions, 44 deletions

diff --git a/include/conf.h b/include/conf.h
index bde3956..97d5cf8 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -97,19 +97,18 @@ struct MaskItem
   unsigned int       htype;
   unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
   int                bits;
-  time_t             hold;     /* Hold action until this time (calendar time) */
+  time_t             until;     /* Hold action until this time (calendar time) */
   time_t             setat;
   struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
   struct irc_ssaddr  addr;  /* ip to connect to */
   struct ClassItem  *class;  /* Class of connection */
   char              *name;
+  char              *user;     /* user part of user@host */
   char              *host;     /* host part of user@host */
   char              *passwd;
   char              *spasswd;  /* Password to send. */
   char              *reason;
-  char              *user;     /* user part of user@host */
   char              *cipher_list;
-  char              *rsa_public_key_file;
   void              *rsa_public_key;
   void              *regexuser;
   void              *regexhost;
@@ -147,7 +146,6 @@ struct CidrItem
 #define CONF_FLAGS_IN_DATABASE          0x00008000
 #define CONF_FLAGS_EXEMPTRESV           0x00010000
 #define CONF_FLAGS_SSL                  0x00020000
-#define CONF_FLAGS_MAINCONF             0x00040000
 
 /* Macros for struct MaskItem */
 #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 7bc2070..a3b520d 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -56,7 +56,7 @@ apply_dline(struct Client *source_p, struct MaskItem *conf,
 {
   if (tkline_time)
   {
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s added temporary %d min. D-Line for [%s] [%s]",
                          get_oper_name(source_p), tkline_time/60,
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 13d6be2..ea76a4e 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -70,7 +70,7 @@ set_local_gline(const struct Client *source_p, const char *user,
   conf->host = xstrdup(host);
 
   conf->setat = CurrentTime;
-  conf->hold = CurrentTime + ConfigFileEntry.gline_time;
+  conf->until = CurrentTime + ConfigFileEntry.gline_time;
   SetConfDatabase(conf);
 
   sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 7e15935..4b9e573 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -208,7 +208,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
 {
   if (tkline_time)
   {
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s added temporary %d min. K-Line for [%s@%s] [%s]",
                          get_oper_name(source_p), tkline_time/60,
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 2fcbf88..1cfd0e4 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -248,7 +248,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
       ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]",
 	   source_p->name, (int)tkline_time/60,
 	   conf->name, conf->reason);
-      conf->hold = CurrentTime + tkline_time;
+      conf->until = CurrentTime + tkline_time;
     }
     else
     {
@@ -309,7 +309,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
       ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]",
 	   source_p->name, (int)tkline_time/60,
 	   conf->name, conf->reason);
-      conf->hold = CurrentTime + tkline_time;
+      conf->until = CurrentTime + tkline_time;
     }
     else
     {
diff --git a/modules/m_stats.c b/modules/m_stats.c
index ed75e39..ca70090 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -411,7 +411,7 @@ stats_deny(struct Client *source_p, int parc, char *parv[])
       conf = arec->conf;
 
       /* dont report a tdline as a dline */
-      if (conf->hold)
+      if (conf->until)
         continue;
 
       sendto_one(source_p, form_str(RPL_STATSDLINE),
@@ -446,7 +446,7 @@ stats_tdeny(struct Client *source_p, int parc, char *parv[])
       conf = arec->conf;
 
       /* dont report a permanent dline as a tdline */
-      if (!conf->hold)
+      if (!conf->until)
         continue;
 
       sendto_one(source_p, form_str(RPL_STATSDLINE),
@@ -790,7 +790,7 @@ report_Klines(struct Client *client_p, int tkline)
 
       conf = arec->conf;
 
-      if (!tkline && conf->hold)
+      if (!tkline && conf->until)
         continue;
 
       if (HasUMode(client_p, UMODE_OPER))
@@ -832,7 +832,7 @@ stats_tklines(struct Client *source_p, int parc, char *parv[])
       return;
 
     /* dont report a permanent kline as a tkline */
-    if (!conf->hold)
+    if (!conf->until)
       return;
 
     sendto_one(source_p, form_str(RPL_STATSKLINE), from,
@@ -872,7 +872,7 @@ stats_klines(struct Client *source_p, int parc, char *parv[])
       return;
 
     /* dont report a tkline as a kline */
-    if (conf->hold)
+    if (conf->until)
       return;
       
     sendto_one(source_p, form_str(RPL_STATSKLINE), from,
diff --git a/modules/m_testline.c b/modules/m_testline.c
index 674f9c7..f22b7b2 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -121,8 +121,8 @@ mo_testline(struct Client *client_p, struct Client *source_p,
       else
         sendto_one(source_p, form_str(RPL_TESTLINE),
                    me.name, source_p->name,
-                   conf->hold ? 'd' : 'D',
-                   conf->hold ? ((conf->hold - CurrentTime) / 60)
+                   conf->until ? 'd' : 'D',
+                   conf->until ? ((conf->until - CurrentTime) / 60)
                    : 0L,
                    conf->host, conf->reason);
     }
@@ -154,8 +154,8 @@ mo_testline(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, form_str(RPL_TESTLINE),
                  me.name, source_p->name,
-                 conf->hold ? 'k' : 'K',
-                 conf->hold ? ((conf->hold - CurrentTime) / 60)
+                 conf->until ? 'k' : 'K',
+                 conf->until ? ((conf->until - CurrentTime) / 60)
                  : 0L,
                  userhost, conf->reason? conf->reason : "No reason");
       ++matches;
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 5e079a8..037fc17 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -352,7 +352,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
     ilog(LOG_TYPE_KLINE, "%s added temporary %d min. X-Line for [%s] [%s]",
 	 source_p->name, (int)tkline_time/60,
 	 conf->name, conf->reason);
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
   }
   else
   {
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
diff --git a/src/conf_db.c b/src/conf_db.c
index a37840b..4f19ef7 100644
--- a/src/conf_db.c
+++ b/src/conf_db.c
@@ -646,7 +646,7 @@ save_kline_database(void)
         SAFE_WRITE(write_string(arec->conf->host, f), KPATH);
         SAFE_WRITE(write_string(arec->conf->reason, f), KPATH);
         SAFE_WRITE(write_uint64(arec->conf->setat, f), KPATH);
-        SAFE_WRITE(write_uint64(arec->conf->hold, f), KPATH);
+        SAFE_WRITE(write_uint64(arec->conf->until, f), KPATH);
       }
     }
   }
@@ -691,7 +691,7 @@ load_kline_database(void)
     conf->host = field_2;
     conf->reason = field_3;
     conf->setat = field_4;
-    conf->hold = field_5;
+    conf->until = field_5;
     SetConfDatabase(conf);
 
     add_conf_by_address(CONF_KLINE, conf);
@@ -735,7 +735,7 @@ save_dline_database(void)
         SAFE_WRITE(write_string(arec->conf->host, f), DLPATH);
         SAFE_WRITE(write_string(arec->conf->reason, f), DLPATH);
         SAFE_WRITE(write_uint64(arec->conf->setat, f), DLPATH);
-        SAFE_WRITE(write_uint64(arec->conf->hold, f), DLPATH);
+        SAFE_WRITE(write_uint64(arec->conf->until, f), DLPATH);
       }
     }
   }
@@ -777,7 +777,7 @@ load_dline_database(void)
     conf->host = field_1;
     conf->reason = field_2;
     conf->setat = field_3;
-    conf->hold = field_4;
+    conf->until = field_4;
     SetConfDatabase(conf);
 
     add_conf_by_address(CONF_DLINE, conf);
@@ -822,7 +822,7 @@ save_gline_database(void)
         SAFE_WRITE(write_string(arec->conf->host, f), GPATH);
         SAFE_WRITE(write_string(arec->conf->reason, f), GPATH);
         SAFE_WRITE(write_uint64(arec->conf->setat, f), GPATH);
-        SAFE_WRITE(write_uint64(arec->conf->hold, f), GPATH);
+        SAFE_WRITE(write_uint64(arec->conf->until, f), GPATH);
       }
     }
   }
@@ -867,7 +867,7 @@ load_gline_database(void)
     conf->host = field_2;
     conf->reason = field_3;
     conf->setat = field_4;
-    conf->hold = field_5;
+    conf->until = field_5;
     SetConfDatabase(conf);
 
     add_conf_by_address(CONF_GLINE, conf);
@@ -915,7 +915,7 @@ save_resv_database(void)
     SAFE_WRITE(write_string(conf->name, f), RESVPATH);
     SAFE_WRITE(write_string(conf->reason, f), RESVPATH);
     SAFE_WRITE(write_uint64(conf->setat, f), RESVPATH);
-    SAFE_WRITE(write_uint64(conf->hold, f), RESVPATH);
+    SAFE_WRITE(write_uint64(conf->until, f), RESVPATH);
   }
 
   DLINK_FOREACH(ptr, nresv_items.head)
@@ -928,7 +928,7 @@ save_resv_database(void)
     SAFE_WRITE(write_string(conf->name, f), RESVPATH);
     SAFE_WRITE(write_string(conf->reason, f), RESVPATH);
     SAFE_WRITE(write_uint64(conf->setat, f), RESVPATH);
-    SAFE_WRITE(write_uint64(conf->hold, f), RESVPATH);
+    SAFE_WRITE(write_uint64(conf->until, f), RESVPATH);
   }
 
   close_db(f);
@@ -969,7 +969,7 @@ load_resv_database(void)
         continue;
 
       conf->setat = tmp64_setat;
-      conf->hold = tmp64_hold;
+      conf->until = tmp64_hold;
       SetConfDatabase(conf);
     }
     else
@@ -978,7 +978,7 @@ load_resv_database(void)
         continue;
 
       conf->setat = tmp64_setat;
-      conf->hold = tmp64_hold;
+      conf->until = tmp64_hold;
       SetConfDatabase(conf);
     }
 
@@ -1020,7 +1020,7 @@ save_xline_database(void)
     SAFE_WRITE(write_string(conf->name, f), XPATH);
     SAFE_WRITE(write_string(conf->reason, f), XPATH);
     SAFE_WRITE(write_uint64(conf->setat, f), XPATH);
-    SAFE_WRITE(write_uint64(conf->hold, f), XPATH);
+    SAFE_WRITE(write_uint64(conf->until, f), XPATH);
   }
 
   close_db(f);
@@ -1062,7 +1062,7 @@ load_xline_database(void)
     conf->name = name;
     conf->reason = reason;
     conf->setat = tmp64_setat;
-    conf->hold = tmp64_hold;
+    conf->until = tmp64_hold;
   }
 
   close_db(f);
diff --git a/src/hostmask.c b/src/hostmask.c
index e6ec09a..35a9fc3 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -749,7 +749,7 @@ clear_out_address_conf(void)
        * We keep the temporary K-lines and destroy the permanent ones,
        * just to be confusing :) -A1kmm
        */
-      if (arec->conf->hold || IsConfDatabase(arec->conf))
+      if (arec->conf->until || IsConfDatabase(arec->conf))
         continue;
 
       dlinkDelete(&arec->node, &atable[i]);
@@ -801,7 +801,7 @@ hostmask_expire_temporary(void)
     {
       struct AddressRec *arec = ptr->data;
 
-      if (!arec->conf->hold || arec->conf->hold > CurrentTime)
+      if (!arec->conf->until || arec->conf->until > CurrentTime)
         continue;
 
       switch (arec->type)
diff --git a/src/resv.c b/src/resv.c
index 5fbcbf9..880444f 100644
--- a/src/resv.c
+++ b/src/resv.c
@@ -174,16 +174,16 @@ report_resv(struct Client *source_p)
     conf = ptr->data;
     sendto_one(source_p, form_str(RPL_STATSQLINE),
                me.name, source_p->name,
-	       conf->hold ? 'q' : 'Q',
+	       conf->until ? 'q' : 'Q',
 	       conf->name, conf->reason);
   }
 
   DLINK_FOREACH(ptr, nresv_items.head)
   {
-    conf = ptr->data;;
+    conf = ptr->data;
     sendto_one(source_p, form_str(RPL_STATSQLINE),
                me.name, source_p->name,
-	       conf->hold ? 'q' : 'Q',
+	       conf->until ? 'q' : 'Q',
 	       conf->name, conf->reason);
   }
 }
diff --git a/src/s_bsd.c b/src/s_bsd.c
index b3ea5f1..049c46b 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -217,7 +217,7 @@ close_connection(struct Client *client_p)
        * Reset next-connect cycle of all connect{} blocks that match
        * this servername.
        */
-      conf->hold = CurrentTime + conf->class->con_freq;
+      conf->until = CurrentTime + conf->class->con_freq;
     }
   }
   else
diff --git a/src/s_serv.c b/src/s_serv.c
index 118abc4..b6ccd60 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -297,7 +297,7 @@ try_connections(void *unused)
      * made one successfull connection... [this algorithm is
      * a bit fuzzy... -- msa >;) ]
      */
-    if (conf->hold > CurrentTime)
+    if (conf->until > CurrentTime)
       continue;
 
     if (conf->class == NULL)
@@ -309,7 +309,7 @@ try_connections(void *unused)
 	confrq = MIN_CONN_FREQ;
     }
 
-    conf->hold = CurrentTime + confrq;
+    conf->until = CurrentTime + confrq;
 
     /* Found a CONNECT config with port specified, scan clients
      * and see if this server is already connected?