Support more human friendly k/d/x-line duration format

[solanum.git] / ircd / s_newconf.c

diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index e429507de1e56851c63c50ec0c7bb4c2ec91988f..d1cdc59e63da2f5dc36a55889625a0799ec5b836 100644 (file)
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -48,7 +48,6 @@
 
 rb_dlink_list cluster_conf_list;
 rb_dlink_list oper_conf_list;
-rb_dlink_list hubleaf_conf_list;
 rb_dlink_list server_conf_list;
 rb_dlink_list xline_conf_list;
 rb_dlink_list resv_conf_list;  /* nicks only! */
@@ -87,12 +86,6 @@ clear_s_newconf(void)
                free_remote_conf(ptr->data);
        }
 
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, hubleaf_conf_list.head)
-       {
-               rb_dlinkDelete(ptr, &hubleaf_conf_list);
-               free_remote_conf(ptr->data);
-       }
-
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, oper_conf_list.head)
        {
                free_oper_conf(ptr->data);
@@ -510,7 +503,7 @@ set_server_conf_autoconn(struct Client *source_p, const char *name, int newval)
                else
                        server_p->flags &= ~SERVER_AUTOCONN;
 
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                "%s has changed AUTOCONN for %s to %i",
                                get_oper_name(source_p), name, newval);
        }
@@ -528,7 +521,7 @@ disable_server_conf_autoconn(const char *name)
        {
                server_p->flags &= ~SERVER_AUTOCONN;
 
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                "Disabling AUTOCONN for %s because of error",
                                name);
                ilog(L_SERVER, "Disabling AUTOCONN for %s because of error",
@@ -692,23 +685,43 @@ time_t
 valid_temp_time(const char *p)
 {
        time_t result = 0;
+       long current = 0;
+       char *ch = strdup(p), *och;
 
-       while(*p)
-       {
-               if(IsDigit(*p))
-               {
-                       result *= 10;
-                       result += ((*p) & 0xF);
-                       p++;
-               }
-               else
+       while (*ch) {
+               och = ch;
+               current = strtol(ch, &ch, 10);
+               if (errno == ERANGE)
+                       return -1;
+               if (och == ch)
+                       /* No numbers were given so return invalid */
                        return -1;
+               if (current) {
+                       switch (*ch) {
+                               case '\0': /* No unit was given so send it back as minutes */
+                               case 'm':
+                                       result += (current * 60);
+                                       break;
+                               case 'h':
+                                       result += (current * 3600);
+                                       break;
+                               case 'd':
+                                       result += (current * 86400);
+                                       break;
+                               case 'w':
+                                       result += (current * 604800);
+                                       break;
+                               default:
+                                       /* Bad time unit was given */
+                                       return -1;
+                       }
+                       if (*ch++ == '\0')
+                               break;
+               }
        }
-
-       if(result > (60 * 24 * 7 * 52))
-               result = (60 * 24 * 7 * 52);
-
-       return(result * 60);
+       if(result > (60 * 60 * 24 * 7 * 52))
+               result = (60 * 60 * 24 * 7 * 52);
+       return result;
 }
 
 /* Propagated bans are expired elsewhere. */