summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-02-20 06:36:24 +0100
committerDaniil Baturin <daniil@baturin.org>2018-02-20 06:37:03 +0100
commit3f248ff90ecb28ae15dcf8e8191e79ca7889f69d (patch)
tree051e56c3597c6fa2fb595a16330062a49575796f
parenta3d11e6c039b9c3226325ce01e39f6affa56a46a (diff)
downloadvyatta-cfg-system-3f248ff90ecb28ae15dcf8e8191e79ca7889f69d.tar.gz
vyatta-cfg-system-3f248ff90ecb28ae15dcf8e8191e79ca7889f69d.zip
Rename the "client" NTP option to "allow-clients" to make it more clear what it does (fixes T553).
-rwxr-xr-xscripts/system/vyatta_update_ntp.pl4
-rw-r--r--templates/system/ntp/allow-clients/address/node.def (renamed from templates/system/ntp/client/address/node.def)0
-rw-r--r--templates/system/ntp/allow-clients/node.def1
-rw-r--r--templates/system/ntp/client/node.def1
4 files changed, 3 insertions, 3 deletions
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/client/address/node.def b/templates/system/ntp/allow-clients/address/node.def
index a48a2b5a..a48a2b5a 100644
--- a/templates/system/ntp/client/address/node.def
+++ b/templates/system/ntp/allow-clients/address/node.def
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/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