Allow <connect motd> to select an alternate MOTD file to display

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

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 31101836c930375484df444e007d7545910fb25f..c7ad9174aacca2c1cdd76ae20fdc0468bd8de1bc 100644 (file)
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -75,6 +75,9 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                cidr_copy.assign(cidr_mask);
        }
 
+       if (cidr_copy.find('/') == std::string::npos)
+               return false;
+
        irc::sockets::sockaddrs addr;
        irc::sockets::aptosa(address_copy, 0, addr);
 
@@ -82,7 +85,6 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
        irc::sockets::cidr_mask mask2(addr, mask.length);
 
        return mask == mask2;
-
 }