X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcidr.cpp;h=d38056b0298195e46679637c9b51b2f05b0a8fb1;hb=63d3e056b742598f48ba9a8df216b06117a37910;hp=669ccd8d27f6df9fd685c1b29728f407c4ea2460;hpb=805d47c98e48df374976972c3fcbba36fd4289f8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cidr.cpp b/src/cidr.cpp index 669ccd8d2..d38056b02 100644 --- 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. @@ -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) {