Skip to contentSkip to conversation

Ignore --pull-filter for --mode server

PATCH Superseded Richard Bonhomme 2 participants 3 messages Oct 24, 2019 – Oct 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Ignore --pull-filter for --mode server

Closes trac#1164

---
 src/openvpn/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/options.c +1 -1
index 752f5f2c..796e632e 100644
@@ -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))
         {
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 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.

---
 src/openvpn/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/options.c +1 -1
index 752f5f2c..796e632e 100644
@@ -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))
         {
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#2 lore raw

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 <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18964.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering