support default-route in usermask

pjstevns · Mar 17, 2014 · 582a155 · 582a155
1 parent 52432fa
commit 582a155
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/dm_cidr.c b/src/dm_cidr.c
@@ -144,6 +144,9 @@ int cidr_match(T base, T test)
 	if (test_addr.s_addr == match_addr.s_addr) 
 		result = base->mask ? base->mask : 32;
 
+	if (! base->mask)
+		result = 32;
+
 	return result;
 
 }

diff --git a/test/check_dbmail_server.c b/test/check_dbmail_server.c
@@ -66,7 +66,11 @@ START_TEST(test_dm_sock_compare)
 	X(0,"inet:127.0.0.1:143","inet:127.0.0.1:143","inet:127.0.0.1:143");
 	X(0,"inet:127.0.0.1:110","inet:127.0.0.1:143","");
 	X(0,"inet:127.0.0.1:143","inet:127.0.0.2:143","");
-	//X(0,"inet:127.0.0.1:143","","inet:0.0.0.0:0/0");
+	X(0,"inet:127.0.0.1:143","","inet:0.0.0.0/0:143");
+	X(0,"inet:127.0.0.1:143","inet:0.0.0.0/0:110","inet:0.0.0.0/0:143");
+	X(1,"inet:127.0.0.1:143","inet:0.0.0.0/0:143","");
+	X(1,"inet:127.0.0.1:143","inet:0.0.0.0/0:143","inet:0.0.0.0/0:110");
+
 	X(0,"inet:10.0.0.6:143","inet:10.0.0.6:110","");
 	X(1,"inet:127.0.0.1:143","inet:127.0.0.1:143","");
 	X(1,"inet:127.0.0.1:143","inet:127.0.0.1/8:143","");
@@ -83,7 +87,7 @@ START_TEST(test_dm_sock_compare)
 	Y(16,"inet:10.1.1.1/16:110","inet:10.1.1.1:110");
 	Y(32,"inet:10.1.1.1/32:110","inet:10.1.1.1:110");
 	Y(0,"inet:10.0.0.6:143","inet:10.0.0.6:110");
-	
+
 }
 END_TEST