From: Richard Bonhomme <tincanteksup@gmail.com>
Date: Thu, 24 Oct 2019 21:48:32 +0000 (+0100)
Subject: Ignore --pull-filter for --mode server
X-Git-Tag: v2.5_beta1~261
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb1ea491cd16d11b448342e8287beacae619f980;p=thirdparty%2Fopenvpn.git

Ignore --pull-filter for --mode server

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>
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>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 752f5f2cf..796e632ea 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))
         {