From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Fri, 4 Nov 2005 00:05:02 +0000 (+0000)
Subject: svn merge -r 770:771 $SO/trunk/openvpn
X-Git-Tag: v2.1_rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e57abefbbc305afd4cfedbf8966412b36f247998;p=thirdparty%2Fopenvpn.git

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 1b8d32ec3..2db24fd5a 100644
--- 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 9b0857e41..7a69816f3 100644
--- 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));