irc_string.h -> match.h, irc_string.h; includes changed

[solanum.git] / src / hostmask.c

diff --git a/src/hostmask.c b/src/hostmask.c
index 0b2b1605d0ba5383fdbb00025f6e2e81960e6613..e322e861cc9870fc4b90b86ee18d37027c9456b7 100644 (file)
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -31,7 +31,7 @@
 #include "hostmask.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #ifdef RB_IPV6
 static unsigned long hash_ipv6(struct sockaddr *, int);
@@ -75,7 +75,7 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
                                *b = 128;
                } else
                        *b = 128;
-               if(inetpton_sock(ip, (struct sockaddr *)addr) > 0)
+               if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
                        return HM_IPV6;
                else
                        return HM_HOST;
@@ -92,7 +92,7 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
                                *b = 32;
                } else
                        *b = 32;
-               if(inetpton_sock(ip, (struct sockaddr *)addr) > 0)
+               if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
                        return HM_IPV4;
                else
                        return HM_HOST;
@@ -404,15 +404,6 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
                        return kconf;
        }
 
-       /* hunt for a gline */
-       if(ConfigFileEntry.glines)
-       {
-               kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_GLINE, aftype, user);
-
-               if((kconf != NULL) && !IsConfExemptGline(iconf))
-                       return kconf;
-       }
-
        return iconf;
 }
 
@@ -683,8 +674,6 @@ show_iline_prefix(struct Client *sptr, struct ConfItem *aconf, char *name)
                *prefix_ptr++ = '=';
        if(IsOper(sptr) && IsConfExemptFlood(aconf))
                *prefix_ptr++ = '|';
-       if(IsOper(sptr) && IsConfExemptGline(aconf) && !IsConfExemptKline(aconf))
-               *prefix_ptr++ = '_';
        if(IsOper(sptr) && IsConfExemptDNSBL(aconf) && !IsConfExemptKline(aconf))
                *prefix_ptr++ = '$';
        if(IsOper(sptr) && IsConfExemptKline(aconf))