Skip to content

Commit 6361bd5

Browse files
committed
python: ConfigParser did not accept dns-fallback-google and persist-tun overrides
These two override flags was not listed among the accepted list of override values. And they were also not properly documented. The 'persist-tun' override isn't strictly needed, since the --perist-tun option is converted into such an override. But it enables a possibility to disable it. Signed-off-by: David Sommerseth <[email protected]>
1 parent b4da65d commit 6361bd5

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

docs/man/openvpn2.1.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ OPTIONS
191191
Override connection protocol.
192192
Valid values: :code:`tcp` or :code:`udp`
193193

194+
:code:`persist-tun`
195+
Alternative approach to set `--persist-tun`.
196+
194197
:code:`ipv6`
195198
Enable or disable IPv6 inside the tunnel.
196199
Valid values: :code:`yes`, :code:`no` or :code:`default`
@@ -204,6 +207,10 @@ OPTIONS
204207
``openvpn3-config-manage``\(1) for details.
205208
Valid values: :code:`yes`, :code:`no` or :code:`asym`
206209

210+
:code:`dns-fallback-google`
211+
If set to true, the DNS resolver settings will include
212+
Google DNS servers.
213+
207214
:code:`dns-setup-disabled`
208215
Disable configuring pushed DNS settings.
209216
Valid values: :code:`true` or :code:`false`

src/python/openvpn3/ConfigParser.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,13 @@ def __init_arguments(self):
183183
# in the generated configuration, but are profile settings
184184
# sent to the Configuration Manager separately
185185
profile_overrides = [
186-
'server-override', 'port-override', 'proto-override',
187-
'ipv6', 'dns-scope', 'dns-setup-disabled', 'dns-sync-lookup',
186+
'server-override', 'port-override', 'proto-override', 'ipv6',
187+
'dns-fallback-google', 'dns-scope',
188+
'dns-setup-disabled', 'dns-sync-lookup',
188189
'auth-fail-retry', 'proxy-host', 'proxy-port',
189190
'proxy-username', 'proxy-password',
190191
'proxy-auth-cleartext', 'enable-legacy-algorithms',
191-
'allow-compression']
192+
'allow-compression', 'persist-tun']
192193

193194
self.__parser.add_argument('--auth', metavar='ALG',
194195
action='store',

0 commit comments

Comments
 (0)