round three of CIDR fixes; spotted by Tomoki AONO

(This used to be commit 920958a392b41c23ecd4db3ca32ae90a2e09bff9)

diff --git a/source3/lib/access.c b/source3/lib/access.c
index 9d07893c2f78b7c9682101babbec8a4fdd14f87f..c30b3c33cc2867897c659b1ade86933c4d522682 100644 (file)
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -34,6 +34,8 @@ static BOOL masked_match(const char *tok, const char *slash, const char *s)
                 mask = interpret_addr(slash + 1);
         } else {
                mask = (uint32)((ALLONES >> atoi(slash + 1)) ^ ALLONES);
+               /* convert to network byte order */
+               mask = htonl(mask);
         }
 
        if (net == INADDR_NONE || mask == INADDR_NONE) {
@@ -41,9 +43,6 @@ static BOOL masked_match(const char *tok, const char *slash, const char *s)
                return (False);
        }
        
-       /* convert to network byte order */
-       mask = htonl(mask);
-       
        return ((addr & mask) == net);
 }