Remove check that very rarely equates to true

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 0ad39701fa119c5bebbb75019d56267bdd20d4d1..1821120f462f01ab5762dcf4178cf60ceafee1fc 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -49,10 +49,6 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas
        unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
        unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
 
-       /* We shouldnt match anything, /0 is always valid */
-       if (!mask_bits)
-               return true;
-
        /* First compare the whole bytes, if they dont match, return false */
        if (memcmp(address, mask, divisor))
                return false;
@@ -97,9 +93,10 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
                 * of the @ symbol in each */
                char* address_dupe = strdup(address);
                char* cidr_dupe = strdup(cidr_mask);
-               
-               char* username_mask_pos = strchr(cidr_dupe, '@');
-               char* username_addr_pos = strchr(address_dupe, '@');
+       
+               /* Use strchr not strrchr, because its going to be nearer to the left */
+               char* username_mask_pos = strrchr(cidr_dupe, '@');
+               char* username_addr_pos = strrchr(address_dupe, '@');
 
                /* Both strings have an @ symbol in them */
                if (username_mask_pos && username_addr_pos)
@@ -142,7 +139,8 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
        in_addr  mask_in4;
 
 
-       char* bits_chars = strchr(mask,'/');
+       /* Use strrchr for this, its nearer to the right */
+       char* bits_chars = strrchr(mask,'/');
 
        if (bits_chars)
        {