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, 2 insertions, 11 deletions

diff --git a/options.c b/options.c
index d02530e..1ef201c 100644
--- a/options.c
+++ b/options.c
@@ -4058,17 +4058,8 @@ add_option (struct options *options,
 	  msg (msglevel, "error parsing --ifconfig-pool parameters");
 	  goto err;
 	}
-      if (start > end)
-	{
-	  msg (msglevel, "--ifconfig-pool start IP is greater than end IP");
-	  goto err;
-	}
-      if (end - start >= IFCONFIG_POOL_MAX)
-	{
-	  msg (msglevel, "--ifconfig-pool address range is too large.  Current maximum is %d addresses.",
-	       IFCONFIG_POOL_MAX);
-	  goto err;
-	}
+      if (!ifconfig_pool_verify_range (msglevel, start, end))
+	goto err;
 
       options->ifconfig_pool_defined = true;
       options->ifconfig_pool_start = start;