Merge branch 'bugfix2.1' into beta2.2

Conflicts:
	openvpn.8
	- New option descriped (--register-dns)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/options.c b/options.c
index ce53ad5..ca46ff4 100644
--- a/options.c
+++ b/options.c
@@ -4252,7 +4252,7 @@ add_option (struct options *options,
 
       VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION);
       port = atoi (p[1]);
-      if (!legal_ipv4_port (port))
+      if ((port != 0) && !legal_ipv4_port (port))
 	{
 	  msg (msglevel, "Bad local port number: %s", p[1]);
 	  goto err;