From 7267229981f1b933b60decd687d72b726453baf6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 30 Apr 2020 17:52:10 +0200 Subject: dhcpv6-server: T2406: move FQDN quoting to Jinja2 template ... no need to reinvent the wheel in our Python code. --- src/conf_mode/dhcpv6_server.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py index 6bfee94a1..04f2a5997 100755 --- a/src/conf_mode/dhcpv6_server.py +++ b/src/conf_mode/dhcpv6_server.py @@ -122,8 +122,7 @@ def get_config(): # The domain-search option specifies a 'search list' of Domain Names to be used # by the client to locate not-fully-qualified domain names. if conf.exists('domain-search'): - for value in conf.return_values('domain-search'): - subnet['domain_search'].append(f'"{value}"') + subnet['domain_search'] = conf.return_values('domain-search') # IPv6 address valid lifetime # (at the end the address is no longer usable by the client) @@ -172,7 +171,7 @@ def get_config(): if is_ipv6(value): subnet['sip_address'].append(value) else: - subnet['sip_hostname'].append(f'"{value}"') + subnet['sip_hostname'].append(value) # List of local SNTP servers available for the client to synchronize their clocks if conf.exists('sntp-server'): -- cgit v1.2.3