svn merge -r 770:771 $SO/trunk/openvpn

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

diff --git a/ChangeLog b/ChangeLog
index 1b8d32ec3952a7f6912527f158d8f83cad530eac..2db24fd5a3e32fb2b98e59241240dbe33e8c6562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ $Id$
 
 2005.11.xx -- Version 2.1-beta7
 
+* Fixed bug where --server directive in --dev tap mode
+  claimed that it would support subnets of /30 or less
+  but actually would only accept /29 or less.
 * Fixed bug in Linux get_default_gateway function
   introduced in 2.0.4, which would cause redirect-gateway
   on Linux clients to fail.

diff --git a/helper.c b/helper.c
index 9b0857e41d8f76a10001242ba0faf05337c5ab9a..7a69816f382b1189a805b286dbdef53c996f4e00 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -253,7 +253,7 @@ helper_client_server (struct options *o)
        }
       else if (dev == DEV_TYPE_TAP)
        {
-         if (netbits >= 30)
+         if (netbits > 30)
            msg (M_USAGE, "--server directive when used with --dev tap must define a subnet of %s or lower",
                 print_netmask (30, &gc));