diff mbox series

[Openvpn-devel,v2] dns: do not run updown scripts with lwipovpn

Message ID 20250708185210.30421-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v2] dns: do not run updown scripts with lwipovpn | expand

Commit Message

Gert Doering July 8, 2025, 6:52 p.m. UTC 
From: Heiko Hund <heiko@ist.eigentlich.net>

Running the script doesn't make sense with the AFUNIX dev node, so we
simply clear any scripts that have been set before.

Change-Id: I7e9a0c668e0950257632452cfd9eeb236f0120f2
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1077
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Arne Schwabe <arne-openvpn@rfc2549.org>

Comments

Gert Doering July 9, 2025, 7:46 a.m. UTC | #1 
Lightly tested on a FreeBSD build with lwipovpn, and stared a bit at
the code.

Your patch has been applied to the master branch.

commit 4dc57d923d23bdc73c7c24a9851c9137f2097d8c
Author: Heiko Hund
Date:   Tue Jul 8 20:52:04 2025 +0200

     dns: do not run updown scripts with lwipovpn

     Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
     Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
     Message-Id: <20250708185210.30421-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32069.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index af097f8..0662b49 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -61,6 +61,7 @@ 
 #include "xkey_common.h"
 #include "dco.h"
 #include "options_util.h"
+#include "tun_afunix.h"
 
 #include <ctype.h>
 
@@ -3593,6 +3594,13 @@ 
     struct gc_arena gc = gc_new();
     struct dns_options *dns = &o->dns_options;
 
+    if (is_tun_afunix(o->dev_node))
+    {
+        /* Disable running  dns-updown script with lwipovpn */
+        dns->updown_flags = DNS_UPDOWN_NO_FLAGS;
+        dns->updown = NULL;
+    }
+
     if (dns->servers || dns_updown_user_set(dns) || dns_updown_forced(dns))
     {
         /* Clean up env from --dhcp-option DNS config */