summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-01-06 10:56:33 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-06 10:56:55 +0100
commit60a8793aef2c1af95d7a992bfc0a381e1a8a61cd (patch)
treeaf200557b8f6b8ed419cf485c85c031e3995a2ea
parent3223b33a555c614e799a3e968f8da4aff6d31fdf (diff)
downloadvyos-1x-60a8793aef2c1af95d7a992bfc0a381e1a8a61cd.tar.gz
vyos-1x-60a8793aef2c1af95d7a992bfc0a381e1a8a61cd.zip
T1129: replace quotes when dealing with 'subnet/global-parameters'
-rwxr-xr-xsrc/conf_mode/dhcp_server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index c1f3c62dc..22ada72a8 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -773,6 +773,11 @@ def generate(dhcp):
tmpl = jinja2.Template(config_tmpl)
config_text = tmpl.render(dhcp)
+
+ # Please see: https://phabricator.vyos.net/T1129 for quoting of the raw parameters
+ # we can pass to ISC DHCPd
+ config_text = config_text.replace("&quot;",'"')
+
with open(config_file, 'w') as f:
f.write(config_text)