Remove unneeded ProtocolInterface::Introduce

[user/henk/code/inspircd.git] / src / cidr.cpp

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 91f4d02376d1157be4a18bdef86b9f392cdc17d5..d38056b0298195e46679637c9b51b2f05b0a8fb1 100644 (file)
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -90,7 +90,7 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                         * symbols, and recursively call MatchCIDR without
                         * username matching enabled to match the host part.
                         */
-                       return (InspIRCd::Match(address.substr(0, username_addr_pos), cidr_mask.substr(0, username_mask_pos), NULL) &&
+                       return (InspIRCd::Match(address.substr(0, username_addr_pos), cidr_mask.substr(0, username_mask_pos), ascii_case_insensitive_map) &&
                                        MatchCIDR(address.substr(username_addr_pos + 1), cidr_mask.substr(username_mask_pos + 1), false));
                }
                else
@@ -121,7 +121,6 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                return false;
        }
 
-#ifdef SUPPORT_IP6LINKS
        in6_addr address_in6;
        in6_addr mask_in6;
 
@@ -143,9 +142,7 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                        return false;
                }
        }
-       else
-#endif
-       if (inet_pton(AF_INET, address_copy.c_str(), &address_in4) > 0)
+       else if (inet_pton(AF_INET, address_copy.c_str(), &address_in4) > 0)
        {
                if (inet_pton(AF_INET, cidr_copy.c_str(), &mask_in4) > 0)
                {