Revert 415a87c328d1 as the corresponding ConfItem change won't be done now.

[irc/rqf/shadowircd.git] / modules / m_gline.c

diff --git a/modules/m_gline.c b/modules/m_gline.c
index 9e8148ea0aa9b910e6d86253a1933621cbe80e40..8301c87afd4419fd5ae59e9a181ca2ee9d7b577d 100644 (file)
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -562,7 +562,7 @@ set_local_gline(struct Client *source_p, const char *user,
        aconf->passwd = rb_strdup(buffer);
        aconf->user = rb_strdup(user);
        aconf->host = rb_strdup(host);
-       aconf->hold = CurrentTime + ConfigFileEntry.gline_time;
+       aconf->hold = rb_current_time() + ConfigFileEntry.gline_time;
        add_gline(aconf);
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -651,8 +651,8 @@ majority_gline(struct Client *source_p, const char *user,
                                        sizeof(pending->oper_host2));
                                pending->reason2 = rb_strdup(reason);
                                pending->oper_server2 = scache_get_name(source_p->servptr->serv->nameinfo);
-                               pending->last_gline_time = CurrentTime;
-                               pending->time_request2 = CurrentTime;
+                               pending->last_gline_time = rb_current_time();
+                               pending->time_request2 = rb_current_time();
                                return NO;
                        }
                }
@@ -676,8 +676,8 @@ majority_gline(struct Client *source_p, const char *user,
        pending->reason1 = rb_strdup(reason);
        pending->reason2 = NULL;
 
-       pending->last_gline_time = CurrentTime;
-       pending->time_request1 = CurrentTime;
+       pending->last_gline_time = rb_current_time();
+       pending->time_request1 = rb_current_time();
 
        rb_dlinkAddAlloc(pending, &pending_glines);
 
@@ -695,7 +695,7 @@ remove_temp_gline(const char *user, const char *host)
 {
        struct ConfItem *aconf;
        rb_dlink_node *ptr;
-       struct irc_sockaddr_storage addr, caddr;
+       struct rb_sockaddr_storage addr, caddr;
        int bits, cbits;
        int mtype, gtype;