[augeas-devel] augeas: master - Ntp: allow additional options for server etc.

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=ca6f8ad8da5ab1c659d986ffcaa56683a19419e6
Commit:        ca6f8ad8da5ab1c659d986ffcaa56683a19419e6
Parent:        4ecca5de2f590182bbad6814a57ac00551e85586
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Wed Jul 8 17:27:03 2009 -0700
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Wed Jul 8 17:27:03 2009 -0700

Ntp: allow additional options for server etc.

Allow options listed on http://doc.ntp.org/4.2.4/confopt.html

Fixes bug #72 reported by Micah
---
 lenses/ntp.aug            |    6 ++++--
 lenses/tests/test_ntp.aug |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lenses/ntp.aug b/lenses/ntp.aug
index f324ba9..e72098b 100644
--- a/lenses/ntp.aug
+++ b/lenses/ntp.aug
@@ -31,8 +31,10 @@ module Ntp =
 
     (* Define a command record; see confopt.html#cfg in the ntp docs *)
     let command_record =
-      let opt = [ sep_spc . key /version|key/ . sep_spc . store word ]
-        | [ sep_spc . key "dynamic" ] in
+      let opt = [ sep_spc . key /minpoll|maxpoll|ttl|version|key/ .
+                      sep_spc . store word ]
+        | [ sep_spc . key (/autokey|burst|iburst|noselect|preempt/ |
+                           /prefer|true|dynamic/) ] in
       let cmd = /server|peer|broadcast|manycastclient/
         | /multicastclient|manycastserver/ in
         record cmd opt*
diff --git a/lenses/tests/test_ntp.aug b/lenses/tests/test_ntp.aug
index 4906873..9689d12 100644
--- a/lenses/tests/test_ntp.aug
+++ b/lenses/tests/test_ntp.aug
@@ -77,8 +77,8 @@ filegen clockstats file clockstats type day enable nolink
       { "#comment" = "# added by /sbin/dhclient-script" } }
 
   test Ntp.lns get
-    "server 0.fedora.pool.ntp.org dynamic\n" =
-    { "server" = "0.fedora.pool.ntp.org" { "dynamic" } }
+    "server 0.fedora.pool.ntp.org iburst dynamic\n" =
+    { "server" = "0.fedora.pool.ntp.org" { "iburst" } { "dynamic" } }
 
   test Ntp.lns get
     "restrict 127.0.0.1 \n" =