Remove stray SetCork.

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index d6448aa42ef7df72f23858ab163006e74f16ada3..51e5b77a25e3b56350fdc87886b5d1b5a6a367cd 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -40,7 +40,6 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "sprintf_irc.h"
-#include "reject.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);
@@ -120,12 +119,12 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        /* parses as an IP, check for a dline */
        if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
        {
-#ifdef IPV6\r
-               if(type == HM_IPV6)\r
-                       aconf = find_dline((struct sockaddr *)&ip);\r
-               else\r
-#endif\r
-                       aconf = find_dline((struct sockaddr *)&ip);
+#ifdef RB_IPV6
+               if(type == HM_IPV6)
+                       aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
+               else
+#endif
+                       aconf = find_dline((struct sockaddr *)&ip, AF_INET);
 
                if(aconf && aconf->status & CONF_DLINE)
                {
@@ -154,7 +153,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
                                (type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
                                (type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
                                 (type == HM_IPV6) ? AF_INET6 : 
 #endif
                                  AF_INET) : 0)))
@@ -173,16 +172,6 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                                buf, aconf->passwd);
                        return 0;
                }
-               else if(aconf->status & CONF_GLINE)
-               {
-                       rb_snprintf(buf, sizeof(buf), "%s@%s",
-                                       aconf->user, aconf->host);
-                       sendto_one(source_p, form_str(RPL_TESTLINE),
-                               me.name, source_p->name,
-                               'G', (long) ((aconf->hold - rb_current_time()) / 60),
-                               buf, aconf->passwd);
-                       return 0;
-               }
        }
 
        /* they asked us to check a nick, so hunt for resvs.. */