listener.c fixes - part 1

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

diff --git a/src/listener.c b/src/listener.c
index d76bdfda80d64c0c44b34b36b46c2b8fd6270434..8ac2c8b9d316c10518247bea2899d5f81fc939d5 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -487,6 +487,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        struct Listener *listener = (struct Listener *)data;\r
        char buf[BUFSIZE];\r
        struct ConfItem *aconf;\r
+       static time_t last_oper_notice = 0;\r
 \r
        if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */\r
        {\r
@@ -508,7 +509,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
                return 0;\r
        }\r
 \r
-       aconf = find_dline(addr);\r
+       aconf = find_dline(addr, addr.ss_family);\r
        if(aconf != NULL && (aconf->status & CONF_EXEMPTDLINE))\r
                return 1;\r
        \r
@@ -554,5 +555,5 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
                rb_close(F);\r
        }\r
        \r
-       add_connection(listener, F, addr, (struct sockaddr *)&lip, NULL);\r
+       add_connection(listener, F, addr, (struct sockaddr *)&lip, 1);\r
 }