# HG changeset patch
# User Brian Utterback <Brian.Utterback@Oracle.COM>
# Date 1311780039 25200
# Node ID 4eda6f0a334658c391f0f0981b79bdc04fdba46f
# Parent  e60e527b817969d74984c0b2732c89d2d9465e87
6902531 ntp start method checks for global zone which should not be a requirement
7001642 ntp.client can not be copied to ntp.conf as is
7013030 /lib/svc/method/ntp contains typos

diff -r e60e527b8179 -r 4eda6f0a3346 components/ntp/Solaris/ntp.client
--- a/components/ntp/Solaris/ntp.client	Thu Jul 21 10:48:02 2011 -0700
+++ b/components/ntp/Solaris/ntp.client	Wed Jul 27 08:20:39 2011 -0700
@@ -20,11 +20,11 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 
-# If you want to configure your client to listen for multicast, uncommnet
-# this line. This should only be used for casual time keeping, like keeping
+# If you do not want to configure your client to listen for multicast, comment
+# this line out. This should only be used for casual time keeping, like keeping
 # a desktop system in sync. 
 
-#multicastclient 224.0.1.1
+multicastclient 224.0.1.1
 
 # To configure NTP servers, replace the server_name with either the IP address
 # or hostname of the server you wish to use. If you just want to keep the time
@@ -32,7 +32,9 @@
 # to a more accurate level, 3 or more is recommended. Do not choose 2, because
 # 2 servers is an unstable configuration. By the same token 3 is only acceptable
 # if all are always available, since when a single one reboots or otherwise 
-# becomes unavailable, you have just 2.
+# becomes unavailable, you have just 2. The iburst keyword specifies that 
+# multiple packets be sent at start-up to allow the system to more quickly
+# get the correct time at boot.
 #
 # For a list of Internet NTP servers see 
 # http://support.ntp.org/bin/view/Servers/WebHome
@@ -45,7 +47,9 @@
 #
 # Many ISP's also provide NTP servers for use by their customers. 
 
-server server_name iburst
+# server server_name1 iburst
+# server server_name2 iburst
+# server server_name3 iburst
 
 # Always configure the drift file. It can take days for ntpd to completely 
 # stabilize and without the drift file, it has to start over on a reboot
@@ -63,25 +67,26 @@
 
 # To track the events regarding the system clock, the protostats file can be useful
 # as well. 
+
 #filegen protostats file protostats type day enable
 
 # To see the current state of the crypto authentication protocols, enable the
 # cryptostats file.
+
 #filegen cryptostats file cryptostats type day enable
 
 # The clockstats files are only useful if a hardware reference clock is 
 # configured. See the /etc/inet/ntp.server file for more information about 
 # that.
+
 #filegen clockstats file clockstats type day enable
 
-# The sysstats and rawstats output might be useful in debugging.
+# The sysstats and rawstats output might be useful in debugging, but are 
+# not important otherwise.
+
 #filegen sysstats file sysstats type day enable
 #filegen rawstats file rawstats type day enable
 
-# The timingstats file is probably not useful at all. It is designed for
-# perfomance debugging by the developers of NTP.
-#filegen timingstats file timingstats type day enable
-
 # There are several types on authentication supported by NTP. The easiest
 # to use is a set of passwords, called "keys". They should be stored
 # the /etc/inet/ntp.keys file. Each key in the ntp.keys file can be
@@ -102,6 +107,3 @@
 # The latest leap seconds file is always available at ftp://time.nist.gov/pub
 
 #leapfile /etc/inet/ntp.leap
-
-
-
diff -r e60e527b8179 -r 4eda6f0a3346 components/ntp/Solaris/ntp.sh
--- a/components/ntp/Solaris/ntp.sh	Thu Jul 21 10:48:02 2011 -0700
+++ b/components/ntp/Solaris/ntp.sh	Wed Jul 27 08:20:39 2011 -0700
@@ -28,8 +28,6 @@
 #
 . /lib/svc/share/smf_include.sh
 
-smf_is_globalzone || exit $SMF_EXIT_OK
-
 if [ -z $SMF_FMRI ]; then
         echo "SMF framework variables are not initialized."
         exit $SMF_EXIT_ERR
@@ -53,7 +51,7 @@
 #
 shift $#
 set -- -p /var/run/ntp.pid
-# We allow a step large than the panic value of 17 minutes only 
+# We allow a step larger than the panic value of 17 minutes only 
 # once when ntpd starts up. If always_all_large_step is true, 
 # then we allow this each time ntpd starts. Otherwise, we allow
 # it only the very first time ntpd starts after a boot. We 
@@ -66,7 +64,7 @@
 fi
 
 # Auth was off by default in xntpd now the default is on. Better have a way
-# to turn it off again. Also check for the obsolete "authenitcation" keyword.
+# to turn it off again. Also check for the obsolete "authentication" keyword.
 val=`svcprop -c -p config/no_auth_required $SMF_FMRI`
 if [ ! "$val" = "true" ]; then
         val=`/usr/bin/nawk '/^[ \t]*#/{next}