summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--templates/service/dns/forwarding/name-server/node.def6
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d1169cde..0675e402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-system (0.20.44+vyos2+current7) unstable; urgency=medium
+
+ * T297: Fix DNS Forwarding server does not allow IPv6 address in name-server
+
+ -- Christian Poessinger <christian@poessinger.com> Thu, 28 Dec 2017 00:39:04 +0100
+
vyatta-cfg-system (0.20.44+vyos2+current6) unstable; urgency=medium
* T496: remove diagnostic partition for RAID1 installs
diff --git a/templates/service/dns/forwarding/name-server/node.def b/templates/service/dns/forwarding/name-server/node.def
index 3ed4c459..ac7e45b6 100644
--- a/templates/service/dns/forwarding/name-server/node.def
+++ b/templates/service/dns/forwarding/name-server/node.def
@@ -1,3 +1,5 @@
multi:
-type: ipv4
-help: DNS server to forward queries
+type: ipv4,ipv6
+help: Domain Name Server (DNS)
+val_help: ipv4; Domain Name Server (DNS) address
+val_help: ipv6; Domain Name Server (DNS) address