[Openvpn-devel,v2] Ignore --pull-filter for --mode server

Message ID 20191024214832.22737-1-tincanteksup@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,v2] Ignore --pull-filter for --mode server
Related show

Commit Message

tincanteksup Oct. 24, 2019, 9:48 p.m.
OpenVPN-GUI (For Windows) currently always adds "--pull-filter"
which is a fatal error when also using "--mode server"

Using "--pull-filter" implicitly requires the use of "--pull".
Using "--mode server" and "--pull" is a fatal error which supercedes
"--pull-filter"

Safely ignore "--pull-filter" for "--mode server"

Trac: #1164

v2: Improve commit message, no functional changes.

Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
---
 src/openvpn/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gert Doering Oct. 25, 2019, 6:29 a.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Thanks.  (One could argue on whether this is the "most correct" patch,
but while we do so, it's very non-intrusive and fixes a real world problem 
for some users).

Your patch has been applied to the master and release/2.4 branch.

commit bb1ea491cd16d11b448342e8287beacae619f980 (master)
commit 6a90f36f69e1f41d6c61ab7e566e7e7e0ba7d71a (release/2.4)
Author: Richard Bonhomme
Date:   Thu Oct 24 22:48:32 2019 +0100

     Ignore --pull-filter for --mode server

     Signed-off-by: Richard Bonhomme <tincanteksup@gmail.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20191024214832.22737-1-tincanteksup@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18964.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 752f5f2c..796e632e 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2233,7 +2233,7 @@  options_postprocess_verify_ce(const struct options *options, const struct connec
         }
         if (options->pull_filter_list)
         {
-            msg(M_USAGE, "--pull-filter cannot be used with --mode server");
+            msg(M_WARN, "--pull-filter ignored for --mode server");
         }
         if (!(proto_is_udp(ce->proto) || ce->proto == PROTO_TCP_SERVER))
         {