From 3f248ff90ecb28ae15dcf8e8191e79ca7889f69d Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 20 Feb 2018 06:36:24 +0100
Subject: Rename the "client" NTP option to "allow-clients" to make it more
 clear what it does (fixes T553).

---
 scripts/system/vyatta_update_ntp.pl                 | 4 ++--
 templates/system/ntp/allow-clients/address/node.def | 6 ++++++
 templates/system/ntp/allow-clients/node.def         | 1 +
 templates/system/ntp/client/address/node.def        | 6 ------
 templates/system/ntp/client/node.def                | 1 -
 5 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 templates/system/ntp/allow-clients/address/node.def
 create mode 100644 templates/system/ntp/allow-clients/node.def
 delete mode 100644 templates/system/ntp/client/address/node.def
 delete mode 100644 templates/system/ntp/client/node.def

diff --git a/scripts/system/vyatta_update_ntp.pl b/scripts/system/vyatta_update_ntp.pl
index eaaae14a..78a617bc 100755
--- a/scripts/system/vyatta_update_ntp.pl
+++ b/scripts/system/vyatta_update_ntp.pl
@@ -78,10 +78,10 @@ my @clients;
 
 if ($dhclient_script == 1) {
     @servers = $cfg->listOrigNodes("server");
-    @clients = $cfg->returnOrigValues("client address");
+    @clients = $cfg->returnOrigValues("allow-clients address");
 } else {
     @servers = $cfg->listNodes("server");
-    @clients = $cfg->returnValues("client address");
+    @clients = $cfg->returnValues("allow-clients address");
 }
 
 if (scalar(@servers) > 0) {
diff --git a/templates/system/ntp/allow-clients/address/node.def b/templates/system/ntp/allow-clients/address/node.def
new file mode 100644
index 00000000..a48a2b5a
--- /dev/null
+++ b/templates/system/ntp/allow-clients/address/node.def
@@ -0,0 +1,6 @@
+multi:
+type: ipv4net,ipv6net
+help: IP address
+
+val_help: ipv4net; IP address and prefix length
+val_help: ipv6net; IPv6 address and prefix length
diff --git a/templates/system/ntp/allow-clients/node.def b/templates/system/ntp/allow-clients/node.def
new file mode 100644
index 00000000..8228130e
--- /dev/null
+++ b/templates/system/ntp/allow-clients/node.def
@@ -0,0 +1 @@
+help: Network Time Protocol (NTP) server options
diff --git a/templates/system/ntp/client/address/node.def b/templates/system/ntp/client/address/node.def
deleted file mode 100644
index a48a2b5a..00000000
--- a/templates/system/ntp/client/address/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-multi:
-type: ipv4net,ipv6net
-help: IP address
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
diff --git a/templates/system/ntp/client/node.def b/templates/system/ntp/client/node.def
deleted file mode 100644
index dd849f8f..00000000
--- a/templates/system/ntp/client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Network Time Protocol (NTP) client
-- 
cgit v1.2.3