summaryrefslogtreecommitdiff
path: root/src/cidr.cpp
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:06:47 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:06:47 +0000
commit819147178db00008a215670992d0f532dd57f9e5 (patch)
treeadb4695096f5107cf4b81d03a98d27db28f8d007 /src/cidr.cpp
parent5c93325b53342095f7f7ba0339e4f3ea52229dfe (diff)
Strip SUPPORT_IP6LINKS #define
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11572 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/cidr.cpp')
-rw-r--r--src/cidr.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cidr.cpp b/src/cidr.cpp
index 040681766..d38056b02 100644
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -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)
{