Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/s_auth.c b/src/s_auth.c
index 7f89f86ee311dcfe21d64f93564a1767f527e00a..af4ab14bfa893763cd56d620c6ebd701353f11ce 100644 (file)
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -35,23 +35,19 @@
  */
 #include "stdinc.h"
 #include "config.h"
-#include "tools.h"
 #include "s_auth.h"
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_log.h"
 #include "s_stats.h"
 #include "send.h"
-#include "memory.h"
 #include "hook.h"
 #include "blacklist.h"
 
@@ -89,7 +85,7 @@ ReportType;
 
 #define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)]) 
 
-static dlink_list auth_poll_list;
+static rb_dlink_list auth_poll_list;
 static BlockHeap *auth_heap;
 static EVH timeout_auth_queries_event;
 
@@ -147,7 +143,7 @@ release_auth_client(struct AuthRequest *auth)
                return;
 
        client->localClient->auth_request = NULL;
-       dlinkDelete(&auth->node, &auth_poll_list);
+       rb_dlinkDelete(&auth->node, &auth_poll_list);
        free_auth_request(auth);        
        if(client->localClient->F->fd > highest_fd)
                highest_fd = client->localClient->F->fd;
@@ -159,7 +155,7 @@ release_auth_client(struct AuthRequest *auth)
         */
        client->localClient->allow_read = MAX_FLOOD;
        rb_setflush(client->localClient->F->fd, 1000, flood_recalc, client);
-       dlinkAddTail(client, &client->node, &global_client_list);
+       rb_dlinkAddTail(client, &client->node, &global_client_list);
        read_packet(client->localClient->F->fd, client);
 }
 
@@ -182,7 +178,7 @@ auth_dns_callback(void *vptr, struct DNSReply *reply)
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                        "auth_dns_callback(): auth->client->localClient (%s) is NULL", get_client_name(auth->client, HIDE_IP));
 
-               dlinkDelete(&auth->node, &auth_poll_list);
+               rb_dlinkDelete(&auth->node, &auth_poll_list);
                free_auth_request(auth);
 
                /* and they will silently drop through and all will hopefully be ok... -nenolod */
@@ -419,7 +415,7 @@ start_auth(struct Client *client)
        if(ConfigFileEntry.disable_auth == 0)
                start_auth_query(auth);
 
-       dlinkAdd(auth, &auth->node, &auth_poll_list);
+       rb_dlinkAdd(auth, &auth->node, &auth_poll_list);
 }
 
 /*
@@ -429,11 +425,11 @@ start_auth(struct Client *client)
 static void
 timeout_auth_queries_event(void *notused)
 {
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
        struct AuthRequest *auth;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, auth_poll_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, auth_poll_list.head)
        {
                auth = ptr->data;
 
@@ -613,6 +609,6 @@ delete_auth_queries(struct Client *target_p)
        if(auth->fd >= 0)
                rb_close(auth->fd);
                
-       dlinkDelete(&auth->node, &auth_poll_list);
+       rb_dlinkDelete(&auth->node, &auth_poll_list);
        free_auth_request(auth);
 }