svn merge -r 845:854 $SO/trunk/openvpn .

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@855 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 4 insertions, 0 deletions

diff --git a/helper.c b/helper.c
index 7a69816..d2b3d6f 100644
--- a/helper.c
+++ b/helper.c
@@ -223,6 +223,7 @@ helper_client_server (struct options *o)
 		  o->ifconfig_pool_defined = true;
 		  o->ifconfig_pool_start = o->server_network + 4;
 		  o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - pool_end_reserve;
+		  ifconfig_pool_verify_range (M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end);
 		}
 
 	      helper_add_route (o->server_network, o->server_netmask, o);
@@ -241,6 +242,7 @@ helper_client_server (struct options *o)
 		  o->ifconfig_pool_defined = true;
 		  o->ifconfig_pool_start = o->server_network + 2;
 		  o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - 2;
+		  ifconfig_pool_verify_range (M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end);
 		  o->ifconfig_pool_netmask = o->server_netmask;
 		}
 
@@ -267,6 +269,7 @@ helper_client_server (struct options *o)
 	      o->ifconfig_pool_defined = true;
 	      o->ifconfig_pool_start = o->server_network + 2;
 	      o->ifconfig_pool_end = (o->server_network | ~o->server_netmask) - 1;
+	      ifconfig_pool_verify_range (M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end);
 	      o->ifconfig_pool_netmask = o->server_netmask;
 	    }
 
@@ -325,6 +328,7 @@ helper_client_server (struct options *o)
       o->ifconfig_pool_defined = true;
       o->ifconfig_pool_start = o->server_bridge_pool_start;
       o->ifconfig_pool_end = o->server_bridge_pool_end;
+      ifconfig_pool_verify_range (M_USAGE, o->ifconfig_pool_start, o->ifconfig_pool_end);
       o->ifconfig_pool_netmask = o->server_bridge_netmask;
       push_option (o, print_opt_route_gateway (o->server_bridge_ip, &o->gc), M_USAGE);