CurrentTime -> rb_currenttime();

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 83f0c58775b4ef574a311d3063cd7ce22a000ffe..3951baf909f9925e721a170b4a241574029174cb 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -935,17 +935,17 @@ conf_connect_allowed(struct sockaddr *addr, int aftype)
 void
 add_temp_kline(struct ConfItem *aconf)
 {
-       if(aconf->hold >= CurrentTime + (10080 * 60))
+       if(aconf->hold >= rb_current_time() + (10080 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
-       else if(aconf->hold >= CurrentTime + (1440 * 60))
+       else if(aconf->hold >= rb_current_time() + (1440 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
-       else if(aconf->hold >= CurrentTime + (60 * 60))
+       else if(aconf->hold >= rb_current_time() + (60 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
@@ -969,17 +969,17 @@ add_temp_kline(struct ConfItem *aconf)
 void
 add_temp_dline(struct ConfItem *aconf)
 {
-       if(aconf->hold >= CurrentTime + (10080 * 60))
+       if(aconf->hold >= rb_current_time() + (10080 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
-       else if(aconf->hold >= CurrentTime + (1440 * 60))
+       else if(aconf->hold >= rb_current_time() + (1440 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
-       else if(aconf->hold >= CurrentTime + (60 * 60))
+       else if(aconf->hold >= rb_current_time() + (60 * 60))
        {
                rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
@@ -1012,7 +1012,7 @@ expire_temp_kd(void *list)
        {
                aconf = ptr->data;
 
-               if(aconf->hold <= CurrentTime)
+               if(aconf->hold <= rb_current_time())
                {
                        /* Alert opers that a TKline expired - Hwy */
                        if(ConfigFileEntry.tkline_expire_notices)
@@ -1037,7 +1037,7 @@ reorganise_temp_kd(void *list)
        {
                aconf = ptr->data;
 
-               if(aconf->hold < (CurrentTime + (60 * 60)))
+               if(aconf->hold < (rb_current_time() + (60 * 60)))
                {
                        rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                        &temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
@@ -1045,14 +1045,14 @@ reorganise_temp_kd(void *list)
                }
                else if(aconf->port > TEMP_HOUR)
                {
-                       if(aconf->hold < (CurrentTime + (1440 * 60)))
+                       if(aconf->hold < (rb_current_time() + (1440 * 60)))
                        {
                                rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
                                aconf->port = TEMP_HOUR;
                        }
                        else if(aconf->port > TEMP_DAY && 
-                               (aconf->hold < (CurrentTime + (10080 * 60))))
+                               (aconf->hold < (rb_current_time() + (10080 * 60))))
                        {
                                rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
@@ -1377,18 +1377,18 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
                rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
                           user, host, reason, oper_reason, current_date,
-                          get_oper_name(source_p), CurrentTime);
+                          get_oper_name(source_p), rb_current_time());
        }
        else if(type == DLINE_TYPE)
        {
                rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
-                          reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
+                          reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time());
        }
        else if(type == RESV_TYPE)
        {
                rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
-                          host, reason, get_oper_name(source_p), CurrentTime);
+                          host, reason, get_oper_name(source_p), rb_current_time());
        }
 
        if(fputs(buffer, out) == -1)