Remove ^M on line endings.

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 53e698b347b7005e52f3f6af35e94664fe663d19..51e5b77a25e3b56350fdc87886b5d1b5a6a367cd 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -61,7 +61,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 {
        struct ConfItem *aconf;
        struct ConfItem *resv_p;
-       struct irc_sockaddr_storage ip;
+       struct rb_sockaddr_storage ip;
        char user_trunc[USERLEN + 1], notildeuser_trunc[USERLEN + 1];
        const char *name = NULL;
        const char *username = NULL;
@@ -119,7 +119,7 @@ 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
+#ifdef RB_IPV6
                if(type == HM_IPV6)
                        aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
                else
@@ -153,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)))
@@ -172,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.. */