From: hashiz <hashiz@meridiani.jp>
Date: Thu, 28 Sep 2017 03:16:20 +0000 (+0900)
Subject: Fix '--bind ipv6only'
X-Git-Tag: v2.4.5~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0ef0003c554db34f5623a920874c97b22bc0224;p=thirdparty%2Fopenvpn.git

Fix '--bind ipv6only'

Commit 3d6a4cded2b20fb81 introduced checking for "too many parameters"
at option processing, and neglected to take "ipv6only" as possible
(and optional) argument to "--bind" into account.

Trac: #938

Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20170928031620.22331-1-hashiz@meridiani.jp>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15522.html

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit cdeba63ca3a9e5c765edecd11745e9e2cc1b945d)
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 8dee5d13d..4a9c0e779 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5902,7 +5902,7 @@ add_option(struct options *options,
         VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
         options->ce.remote_port = p[1];
     }
-    else if (streq(p[0], "bind") && !p[1])
+    else if (streq(p[0], "bind") && !p[2])
     {
         VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
         options->ce.bind_defined = true;