summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorttrask <ttrask@ab2d0c66-481e-0410-8bed-d214d4d58bed>2009-03-13 12:34:00 +0000
committerttrask <ttrask@ab2d0c66-481e-0410-8bed-d214d4d58bed>2009-03-13 12:34:00 +0000
commit5545ccd381846ae866b67130780d96b30c95656e (patch)
tree36779381c4697a79915e1cd3bcbf3c749878aa6e
parent0f362beaec8173d546fc70d10688843f1ceb4ae6 (diff)
downloadacf-chrony-5545ccd381846ae866b67130780d96b30c95656e.tar.bz2
acf-chrony-5545ccd381846ae866b67130780d96b30c95656e.tar.xz
Fixed chrony validation to allow empty command key, modified status view.
git-svn-id: svn://svn.alpinelinux.org/acf/chrony/trunk@1728 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--chrony-details-html.lsp6
-rw-r--r--chrony-model.lua2
2 files changed, 5 insertions, 3 deletions
diff --git a/chrony-details-html.lsp b/chrony-details-html.lsp
index fb74521..46306de 100644
--- a/chrony-details-html.lsp
+++ b/chrony-details-html.lsp
@@ -14,7 +14,9 @@ io.write("</span>")
<H2><%= html.html_escape(data.label) %></H2>
<DL>
<% displayitem(data.value.time) %>
-<% displayitem(data.value.sources) %>
-<% displayitem(data.value.sourcestats) %>
<% displayitem(data.value.tracking) %>
</DL>
+<H3>Sources</H3>
+<pre><%= html.html_escape(data.value.sources.value) %></pre>
+<H3>Source Stats</H3>
+<pre><%= html.html_escape(data.value.sourcestats.value) %></pre>
diff --git a/chrony-model.lua b/chrony-model.lua
index 3af9bd9..c1001ed 100644
--- a/chrony-model.lua
+++ b/chrony-model.lua
@@ -41,7 +41,7 @@ function validate_config(config)
config.value.keyfile.errtxt = "Invalid file name"
success = false
end
- if not validator.is_integer(config.value.commandkey.value) then
+ if config.value.commandkey.value ~= "" and not validator.is_integer(config.value.commandkey.value) then
config.value.commandkey.errtxt = "Must be an integer"
success = false
end