xntp 3.4e from Dave Mills @ UDel

14 files changed, 313 insertions, 123 deletions

diff --git a/usr.sbin/xntpd/conf/Config.HP-UX b/usr.sbin/xntpd/conf/Config.HP-UX
new file mode 100644
index 0000000..ef4fa30
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.HP-UX
@@ -0,0 +1,7 @@
+#
+# Test suite for HPUX 9 (no multicast, kernel mods, disciplines, modem control)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK
+CLOCKDEFS= -DATOM -DAS2201 -DCHU -DGOES -DGPSTM -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/Config.OSF1 b/usr.sbin/xntpd/conf/Config.OSF1
new file mode 100644
index 0000000..f460e9f
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.OSF1
@@ -0,0 +1,7 @@
+#
+# Test suite for DEC OSF/1 V1.x (no disciplines)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK -DKERNEL_PLL -DMCAST
+CLOCKDEFS= -DACTS -DATOM -DAS2201 -DCHU -DDATUM -DGOES -DGPSTM -DHEATH -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/Config.SunOS b/usr.sbin/xntpd/conf/Config.SunOS
new file mode 100644
index 0000000..42fd1a5
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.SunOS
@@ -0,0 +1,7 @@
+#
+# Test suite for SunOS 4.1.x (kitchen sink)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK -DMCAST -DKERNEL_PLL -DCLK -DCHU -DPPS
+CLOCKDEFS= -DACTS -DATOM -DAS2201 -DCHU -DDATUM -DGOES -DGPSTM -DHEATH -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/Config.ULTRIX b/usr.sbin/xntpd/conf/Config.ULTRIX
new file mode 100644
index 0000000..4ead1be
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.ULTRIX
@@ -0,0 +1,7 @@
+#
+# Test suite for Ultrix 4.x (no disciplines)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK -DKERNEL_PLL -DMCAST
+CLOCKDEFS= -DACTS -DATOM -DAS2201 -DCHU -DDATUM -DGOES -DGPSTM -DHEATH -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/Config.VAX b/usr.sbin/xntpd/conf/Config.VAX
new file mode 100644
index 0000000..66b9f91
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.VAX
@@ -0,0 +1,7 @@
+#
+# Test suite for 4.3bsd  VAX tahoe (no multicast, kernel mods, disciplines)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK
+CLOCKDEFS= -DACTS -DATOM -DAS2201 -DCHU -DDATUM -DGOES -DGPSTM -DHEATH -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/Config.solaris b/usr.sbin/xntpd/conf/Config.solaris
new file mode 100644
index 0000000..5db3cd0
--- /dev/null
+++ b/usr.sbin/xntpd/conf/Config.solaris
@@ -0,0 +1,7 @@
+#
+# Test suite for SunOS 5.x (no kernel mods, disciplines)
+#
+DEFS_OPT=-DDEBUG
+DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK -DMCAST
+CLOCKDEFS= -DACTS -DATOM -DAS2201 -DCHU -DDATUM -DGOES -DGPSTM -DHEATH -DIRIG -DLEITCH -DLOCAL_CLOCK -DMSFEES -DMX4200 -DNMEA -DOMEGA -DPST -DTPRO -DTRAK -DWWVB
+BINDIR=	/usr/local/bin
diff --git a/usr.sbin/xntpd/conf/README b/usr.sbin/xntpd/conf/README
index 19dcb79..8d07591 100644
--- a/usr.sbin/xntpd/conf/README
+++ b/usr.sbin/xntpd/conf/README
@@ -6,3 +6,6 @@ obtuse configurations you may run into. They are not likely to do
 anything good if run on machines other than their native spot, so don't
 just blindly copy something and put it up. Additional information can
 be found in the ./doc directory of the base directory.
+
+See the Config.local.dist file in the base directory for an explanation
+of the defines used.
diff --git a/usr.sbin/xntpd/conf/baldwin.conf b/usr.sbin/xntpd/conf/baldwin.conf
new file mode 100644
index 0000000..baaac95
--- /dev/null
+++ b/usr.sbin/xntpd/conf/baldwin.conf
@@ -0,0 +1,40 @@
+#
+# NTP configuration file (ntp.conf)
+# baldwin.udel.edu (128.4.1.24)
+#
+# This illustrates the use of an external clock with the local clock
+# driver, as well as a multicast server. The prefer keyword on the
+# local clock driver declares an external clock and that the time of
+# this server should not be wiggled by an NTP peer, unless the
+# external clock comes unstuck. Note the use of the multicast group
+# ID assigned to NTP, 224.0.1.1, which identifies this as a multicast
+# server rather than a broadcast one. The other NTP peers are known
+# stratum-1 chimes intended as backup should the external clock croak.
+#
+peer 127.127.1.0 prefer		# KSI/Odetics TPRO IRIG interface
+fudge 127.127.1.0 stratum 0 refid GPS
+broadcast 224.0.1.1 key 6 ttl 127
+peer 128.4.1.1			# rackety.udel.edu (Sun4c/40 IPC)
+peer 128.4.1.4			# barnstable.udel.edu (Sun4c/65 SS1+)
+peer 128.4.1.2			# mizbeaver.udel.edu (Bancomm bc700LAN)
+peer 128.4.1.20			# pogo.udel.edu (Sun4c/65 SS1+)
+
+#
+# Miscellaneous stuff
+#
+enable auth monitor		# enable the good stuff
+driftfile /etc/ntp.drift        # path for drift file
+statsdir /baldwin/ntpstats/	# directory for statistics files
+filegen peerstats file peerstats type day enable
+filegen loopstats file loopstats type day enable
+filegen clockstats file clockstats type day enable
+
+#
+# Authentication stuff
+#
+keys /usr/local/bin/ntp.keys	# path for keys file
+trustedkey 3 4 5 6 14 15	# define trusted keys
+requestkey 15			# key (7) for accessing server variables
+controlkey 15			# key (6) for accessing server variables
+authdelay 0.000163		# authentication delay (SPARC4c/40 IPC MD5)
+
diff --git a/usr.sbin/xntpd/conf/dewey.conf b/usr.sbin/xntpd/conf/dewey.conf
index 523008f..2a7548c 100644
--- a/usr.sbin/xntpd/conf/dewey.conf
+++ b/usr.sbin/xntpd/conf/dewey.conf
@@ -1,38 +1,46 @@
 #
 # NTP configuration file (ntp.conf)
-# dewey.udel.edu (128.175.1.2)
 #
-# Stratum-1 peers
+# Generic configuration file for UDel NTP stratum-2 time servers. Don't
+# forget each server should have a /etc/ntp.drift and /etc/ntp.keys file.
+#
+# Stratum-1 peers. Each server should chime two different stratum-1
+# servers from the following list. Each stratum-1 server should be used
+# only once.
 #
-#peer 128.4.1.5			# dcn5.udel.edu
 #peer 128.8.10.1			# umd1.umd.edu
 #peer 18.72.0.3 version 2	# bitsy.mit.edu
-peer 192.43.244.9		# ncar-fuzz.nsf.net
-peer 132.249.16.1		# sdsc-fuzz.nsf.net
+peer 132.249.16.1		# fuzz.sdsc.edu
 peer 128.118.46.3 version 2     # otc1.psu.edu
-#peer 130.126.174.40		# truechimer.cso.uiuc.edu
 #peer 128.9.2.129		# wwvb.isi.edu
 #peer 130.43.2.2 version 2	# apple.com
+#peer 16.1.0.22			# clepsydra.dec.com
+#peer 130.105.1.156 version 2	# clock.osf.orga
+#peer 128.96.60.5 version 2	# pi.bellcore.com
+#peer 128.4.1.1			# rackety.udel.edu
+#peer 129.116.3.5		# shorty.chpc.utexas.edu
 #
-# Stratum-2 peers
+# Stratum-2 peers. Each server should chime all of the others in this
+# list except itself.
 #
-peer 128.175.1.1                # huey.udel.edu
-#peer 128.175.1.2                # dewey.udel.edu
-peer 128.175.1.3               # louie.udel.edu
-#peer 128.175.2.33               # louie.udel.edu
-#peer 128.175.7.39              # louie.udel.edu
+peer 128.175.1.1		# huey.udel.edu (VAX)
+#peer 128.175.1.2		# dewey.udel.edu (VAX)
+peer 128.175.1.3		# louie.udel.edu (SPARC)
+peer 128.175.2.15		# snow-white.ee.udel.edu (SPARC)
+peer 128.175.7.4		# sol.cis.udel.edu (SPARC)
 #
 # Miscellaneous stuff
 #
-monitor yes			# enable monitoring
-precision -7			# clock reading precision (10 msec)
-driftfile /etc/ntp.drift        # path for drift file
+enable auth monitor		# enable the good stuff
+driftfile /etc/ntp.drift	# path for drift file
 #
-# Authentication stuff
+# Authentication stuff. Note the different authentication delay on
+# VAX and SPARC.
 #
 authenticate yes		# enable authentication
 keys /etc/ntp.keys		# path for key file
 trustedkey 1 2 15		# define trusted keys
 requestkey 15			# key (7) for accessing server variables
 controlkey 15			# key (6) for accessing server variables
-authdelay 0.001501              # authentication delay (VAX 11/780)
+authdelay 0.001501		# authentication delay (VAX)
+#authdelay 0.000073		# authentication delay (SPARC)
diff --git a/usr.sbin/xntpd/conf/grundoon.conf b/usr.sbin/xntpd/conf/grundoon.conf
index c5aef6e..16003d5 100644
--- a/usr.sbin/xntpd/conf/grundoon.conf
+++ b/usr.sbin/xntpd/conf/grundoon.conf
@@ -2,43 +2,144 @@
 # NTP configuration file (ntp.conf)
 # grundoon.udel.edu (128.4.2.7)
 #
-server 127.127.6.0 prefer	# irig audio decoder
-fudge 127.127.6.0 time1 0.0005
-#pps delay -0.0004		# pps correction for CLK streams module
-server 127.127.4.1		# spectracom 8170/netclock-2 wwvb receiver
-# propagation delay: wwvb 0.0088; receiver delay 0.0173 os delay .0035
-fudge 127.127.4.1 time1 0.0035 flag4 1
-server 127.127.3.1		# pst/traconex 1020 wwv/h receiver
-# propagation delay: wwv 0.0088 wwvh 0.0281; receiver+os delay 0.0035
-fudge 127.127.3.1 time1 0.0123 time2 0.0316
-server 127.127.7.1		# scratchbuilt chu receiver/demodulator
-# propagtion delay: chu 0.0030; receiver+os delay 0.0060
-fudge 127.127.7.1 time1 0.0030 time2 0.0060
-#server 127.127.10.1		# austron 2201 gps receiver
-
-server 127.127.1.2		# local clock
-#server 127.127.12.2		# ksi/odetics tpr0-s irig-b reader
-
-#broadcast 128.4.2.255
-
-peer 128.4.1.1 key 3		# rackety.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.4			# barnstable.udel.edu (Sun4c/65 SS1+)
-#peer 128.4.1.5			# churchy.udel.edu (Bancomm bc700LAN)
-#peer 128.4.2.7	key 3		# grundoon.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.8			# bridgeport.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.20	key 3		# pogo.udel.edu (Sun4c/65 SS1+)
-peer 128.4.1.22			# malarky.udel.edu (Sun4c/50 IPX)
-peer 128.4.1.23			# beauregard.udel.edu (Sun4/40 IPC)
-peer 128.4.1.24			# baldwin.udel.edu (Sun4/40 IPC)
-peer 128.4.1.25			# albert.udel.edu (Sun4c/60 SS1)
-peer 128.4.1.27			# bunnylou.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.28			# cowbird.udel.edu (DEC 5000/240)
-peer 128.4.1.29			# porkypine.udel.edu (DEC 5000/240)
-#
-# Miscellaneous stuff
-#
-monitor yes			# enable monitoring
-precision -18			# clock reading precision (usec)
+# This machine can best be described as the kitchen sink. It has, in
+# addition to the baseboard tty ports ttya and ttyb, an 8-line
+# Serial/Parallel Interface (SPIF) with ports ttyz00 through ttyz07. The
+# configuration includes the following drivers, clock addresses and Unix
+# device names.
+#
+# Local Clock			127.127.1.0	/dev/audio
+# PST 1020 WWV/WWVH Receiver	127.127.3.1	/dev/pst1
+# Spectracom 8170 WWVB Receiver	127.127.4.1	/dev/wwvb1
+# IRIG Audio Decoder		127.127.6.0	/dev/audio
+# Scratchbuilt CHU Receiver	127.127.7.1	/dev/chu1
+# NIST ACTS modem		127.127.18.1	/dev/acts1
+# Heath GC-1000 WWV Receiver	127.127.19.1	/dev/pst1
+# PPS Clock			127.127.22.1	none
+#
+# This machine has the kernel modifications described in the README.kern
+# file, as well as the tty_clk, tty_chu and ppsclock streams modules.
+#
+# Spectracom 8170/Netclock-2 WWVB receiver. This receiver is equipped
+# with a 1-pps and IRIG outputs. The 1-pps signal is connected via the
+# ppsclock streams module and the carrier detect line of the CHU
+# receiver below (ttyb). The IRIG signal is connected via an attenuator
+# to the audio port (/dev/audio). The propagation delay computed from
+# geographical coordinates is 8.8 ms, while the receiver delay
+# calibrated at the factory is 17.3 ms, for a total delay of 26.1 ms.
+# This is confirmed within 0.1 ms at the 1-pps signal output using a
+# portable cesium clock. We add a fudge time1 of 3.5 ms so the driver
+# time agrees with the 1-pps signal to within 1 ms. The fudge flag4 is
+# set to cause the receiver to dump the quality table once each day to
+# the clockstats file. 
+
+#
+#server 127.127.4.1		# /dev/wwvb1 -> /dev/ttyz03
+#fudge 127.127.4.1 time1 0.0035 flag4 1
+#
+# IRIG Audio Decoder. The IRGI signal of the Spectracom WWVB receiver is
+# connected to the audio codec via a resistor attenuator. We add a fudge
+# time1 of 3.5 ms so the driver agrees with the calibrated 1-pps signal
+# to within 0.1 ms. We also specify a reference ID of WWVB to indicate
+# the signal origin. Note the prefer keyword in the server line, which
+# favors this driver over all others that survive the clock selection
+# algorithm. See README.refclock for further insight on this feature.
+#
+server 127.127.6.0 prefer	# /dev/audio
+fudge 127.127.6.0 time1 0.0005 refid WWVB
+
+#
+# PST/Traconex 1020 WWV/WWVH Receier. The internal DIPswitches are set
+# as near as possible to the delays to WWV (8.8 ms) and WWVH (28.1 ms),
+# as computed from geographical coordinates. We add a fudge time1 of 5.9
+# ms so the driver time agrees with the 1-pps signal to within 1 ms for
+# WWV. We also set the stratum to 1, so this receiver will not normally
+# be selected, unless the primary WWVB receiver comes unstuck.
+#
+server 127.127.3.1		# /dev/pst1 -> ttyz05
+fudge 127.127.3.1 time1 0.0059 stratum 1
+
+#
+# Scratchbuilt CHU Receiver. The audio signal from a computer controlled
+# CHU receiver is connected to a gadget box, which contains a 103A modem
+# chip and level converter operating at 300 bps. The propagation delay
+# computed from geographical coordinates is 3.0 ms, which is the value
+# of the fudge time1 parameter. We add a fudge time2 of 9.9 ms so that
+# the driver time agrees with the 1-pps signal to within a few ms,
+# ordinarily the best possible with this receiver. The fudge flag3 is
+# set because the 1-pps signal happens to be connected vit the carrier
+# detect line on this port (ttyb). We also set the stratum to 1, so this
+# receiver will not normally be selected, unless the primary WWVB
+# receiver comes unstuck.
+#
+server 127.127.7.1		# /dev/chu1 -> /dev/ttyb
+fudge 127.127.7.1 time1 0.0030 time2 0.0099 flag3 1 stratum 1
+
+#
+# NIST Automated Computer Time Service. This driver calls a special
+# telephone number in Boulder, CO, to fetch the time directly from the
+# NIST cesium farm. The details of the complicated calling program are
+# in the README.refclock file. The Practical Peripherals 9600SA modem
+# does not work correctly with the ACTS echo-delay scheme for
+# automatically calculating the propagation delay, so the fudge flag2 is
+# set to disable the feature. Instead, we add a fudge time1 of 65.0 ms
+# so that the driver time agrees with th e1-pps signal to within 1 ms.
+# The phone command specifies three alternate telephone numbers,
+# including AT modem command prefix, which will be tried one after the
+# other at each measurement attempt. In this case, a cron job is used to
+# set fudge flag1, causing a measurement attempt, every six hours.
+#
+server 127.127.18.1		# /dev/acts1 -> /dev/ttyz00
+fudge 127.127.18.1 time1 0.0650	flag2 1
+phone atdt13034944774 atdt13034944785 atdt13034944774
+
+#
+# Heath GC-1000 Most Accurate Clock. This is a WWV receiver with a
+# claimed accuracy better than 100 ms under "hi spec" conditions, but
+# such conditions are not frequent. The propagation delay DIPswitchs are
+# set to 9 ms, as close as possible to the 8.8 ms computed from
+# geographical coordinates. We add a fudge time2 of 40.0 ms so that the
+# driver time agrees with the 1-pps signal to within 50 ms, ordinarily
+# the best possible with this receiver. We also set the stratum to 1, so
+# this receiver will not normally be selected, unless the primary WWVB
+# receiver comes unstuck.
+#
+server 127.127.19.1		# /dev/heath1 -> ttyz07
+fudge 127.127.19.1 time1 0.040 stratum 1
+
+#
+# Undisciplined Local Clock. This is a fake driver intended for backup
+# and when no outside source of synchronized time is available. The
+# default stratum is usually 3, but in this case we elect to use stratum
+# 0. Since the server line does not have the prefer keyword, this driver
+# is never used for synchronization, unless no other other
+# synchronization source is available. In case the local host is
+# controlled by some external source, such as an external oscillator or
+# another protocol, the prefer keyword would cause the local host to
+# disregard all other synchronization sources, unless the kernel
+# modifications are in use and declare an unsynchronized condition.
+#
+server 127.127.1.0		# local clock
+fudge 127.127.1.0 stratum 0 
+
+#
+# PPS Clock. This driver is used to capture a 1-pps signal when the PPS
+# kernel modifications are not in use. It can be configured for the
+# tty_clk or ppsclock streams module or no module at all, assuming the
+# RS232 connector is properly wired. Normally, the 1-pps signal is
+# generated by a radio clock, in this cast the Spectracom clock
+# 127.127.4.1 also configured for this host. When used this way, the
+# associated radio clock normally has the prefer keyword in the serve
+# command line. The PPS driver then will be selected only if the prefer
+# peer is operating within nominal error bounds. See the README.refclock
+# file for further details.
+#
+#server 127.127.22.1		# pps clock
+
+#
+# Miscellaneous stuff. We enable authentication in order to prevent
+#
+enable auth monitor		# enable the good stuff
 driftfile /etc/ntp.drift	# path for drift file
 statsdir /grundoon/ntpstats/	# directory for statistics files
 filegen peerstats file peerstats type day enable
@@ -48,11 +149,9 @@ filegen clockstats file clockstats type day enable
 #
 # Authentication stuff
 #
-authenticate yes		# enable authentication
 keys /usr/local/ntp.keys	# path for keys file
-trustedkey 1 2 3 4 14 15	# define trusted keys
+trustedkey 1 2 3 4 5 6 14 15	# define trusted keys
 requestkey 15			# key (7) for accessing server variables
 controlkey 15			# key (6) for accessing server variables
-#authdelay 0.000073		# authentication delay (SPARC4c/40 IPC DES)
 authdelay 0.000163		# authentication delay (SPARC4c/40 IPC MD5)
 
diff --git a/usr.sbin/xntpd/conf/maccarony.conf b/usr.sbin/xntpd/conf/maccarony.conf
new file mode 100644
index 0000000..6bd25c7
--- /dev/null
+++ b/usr.sbin/xntpd/conf/maccarony.conf
@@ -0,0 +1,33 @@
+#
+# NTP configuration file (ntp.conf)
+#
+# This illustrates  a multicast client. All that is really needed
+# here is the multicastclient command and the authentication stuff.
+# If the monitoring option and filgen statistics were not needed,
+# this could be done without a configuration file by including the
+# following snip in the rc.local startup file or equivalent:
+#
+#if [ -f /usr/local/bin/xntpd ]; then
+#	/usr/local/bin/xntpd -m -a -k/usr/local/bin/ntp.keys -t3
+#fi
+#
+multicastclient			# listen on default 224.0.1.1
+#
+# Miscellaneous stuff
+#
+enable auth monitor		# enable the good stuff
+driftfile /etc/ntp.drift        # path for drift file
+statsdir /malarky/ntpstats/	# directory for statistics files
+filegen peerstats file peerstats type day enable
+filegen loopstats file loopstats type day enable
+filegen clockstats file clockstats type day enable
+
+#
+# Authentication stuff
+#
+keys /usr/local/bin/ntp.keys	# path for key file
+trustedkey 3 4 5 6 14 15	# define trusted keys
+requestkey 15			# key (7) for accessing server variables
+controlkey 15			# key (6) for accessing server variables
+authdelay 0.000094		# authentication delay (Sun4c/50 IPX MD5)
+
diff --git a/usr.sbin/xntpd/conf/malarky.conf b/usr.sbin/xntpd/conf/malarky.conf
index f887f83..9b1d7b2 100644
--- a/usr.sbin/xntpd/conf/malarky.conf
+++ b/usr.sbin/xntpd/conf/malarky.conf
@@ -1,26 +1,16 @@
 #
 # NTP configuration file (ntp.conf)
-# malarky.udel.edu (128.4.1.22)
-#
-peer 128.4.1.1			# rackety.udel.edu
-peer 128.4.1.4			# barnstable.udel.edu
-#peer 128.4.1.5			#churchy.udel.edu
-peer 128.4.2.7			# grundoon.udel.edu
-peer 128.4.1.8			# bridgeport.udel.edu
-peer 128.4.1.20 prefer		# pogo.udel.edu
-#peer 128.4.1.22		# malarky.udel.edu
-peer 128.4.1.23			# beauregard.udel.edu
-peer 128.4.1.24			# baldwin.udel.edu
-peer 128.4.1.25			# albert.udel.edu
-peer 128.4.1.27			# bunnylou.udel.edu
-peer 128.4.1.28			# cowbird.udel.edu
-peer 128.4.1.29			# porkypine.udel.edu
-
+#
+# This is for a broadcast/multicast client. Except for the statistics
+# stuff, this can be done with only a commmand line of the form
+#
+# /usr/local/bin/xntpd -a -k /usr/local/bin/ntp.keys -m -t 3
+#
+multicastclient			# listen on default 224.0.1.1
 #
 # Miscellaneous stuff
 #
-monitor yes			# enable monitoring
-precision -18			# clock reading precision (usec)
+enable auth monitor		# enable the good stuff
 driftfile /etc/ntp.drift        # path for drift file
 statsdir /malarky/ntpstats/	# directory for statistics files
 filegen peerstats file peerstats type day enable
@@ -30,11 +20,8 @@ filegen clockstats file clockstats type day enable
 #
 # Authentication stuff
 #
-authenticate yes		# enable authentication
 keys /usr/local/bin/ntp.keys	# path for key file
-trustedkey 1 2 3 4 14 15	# define trusted keys
-requestkey 15			# key (7) for accessing server variables
-controlkey 15			# key (6) for accessing server variables
-#authdelay 0.000047		# authentication delay (Sun4c/50 IPX DES)
+trustedkey 3 4 5 6 14		# define trusted keys
+requestkey 14			# key (7) for accessing server variables
+controlkey 14			# key (6) for accessing server variables
 authdelay 0.000094		# authentication delay (Sun4c/50 IPX MD5)
-
diff --git a/usr.sbin/xntpd/conf/pogo.conf b/usr.sbin/xntpd/conf/pogo.conf
index 94ac6c8..e557e44 100644
--- a/usr.sbin/xntpd/conf/pogo.conf
+++ b/usr.sbin/xntpd/conf/pogo.conf
@@ -2,34 +2,21 @@
 # NTP configuration file (ntp.conf)
 # pogo.udel.edu (128.4.1.20)
 #
-server 127.127.10.1 prefer	# austron 2201 gps receiver
-#server 127.127.4.1		# spectracom 8170/netclock-2 wwvb receiver
-# propagation delay: wwvb 0.0088; receiver delay 0.0017
-#fudge 127.127.4.1 time1 0.0017
-
-peer 128.4.1.1 key 3		# rackety.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.2			# mizbeaver.udel.edu
+server 127.127.10.1 prefer	# austron 2201A gps receiver
+peer 128.4.1.1			# rackety.udel.edu (Sun4c/40 IPC)
+peer 128.4.1.2			# mizbeaver.udel.edu (Bancomm bc700LAN)
 peer 128.4.1.4			# barnstable.udel.edu (Sun4c/65 SS1+)
-#peer 128.4.1.5			# churchy.udel.edu (Bancomm bc700LAN)
-peer 128.4.2.7 key 3		# grundoon.udel.edu (Sun4c/40 IPC)
 peer 128.4.1.5 maxpoll 8	# churchy.udel.edu (cisco IGS router)
-#peer 128.4.1.8			# bridgeport.udel.edu (Sun4c/40 IPC)
-#peer 128.4.1.20 key 3		# pogo.udel.edu (Sun4c/65 SS1+)
-#peer 128.4.1.22		# malarky.udel.edu (Sun4c/50 IPX)
-#peer 128.4.1.23		# beauregard.udel.edu (Sun4/40 IPC)
-peer 128.4.1.24			# baldwin.udel.edu (Sun4/40 IPC)
-#peer 128.4.1.25		# albert.udel.edu (Sun4c/60 SS1)
-#peer 128.4.1.27		# maccarony.udel.edu (Sun4c/40 IPC)
-peer 128.4.1.29			# porkypine.udel.edu
-peer 132.163.135.130 maxpoll 8	# time_A.timefreq.bldrdoc.gov (ACTS)
+peer 132.163.135.130 maxpoll 8	# time_A.timefreq.bldrdoc.gov (Cesium)
 peer 131.188.1.40 maxpoll 8	# ntps1-0.uni-erlangen.de (DCF77)
 peer 129.132.2.21 maxpoll 8	# swisstime.ethz.ch (DCF77)
-peer 130.155.98.13 maxpoll 8	# terss.ml.csiro.au (OMEGA)
+peer 130.155.98.13 maxpoll 8	# terss.ml.csiro.au (Cesium)
+peer 192.36.143.150 maxpoll 8	# Time1.Stupi.SE (Cesium)
 
 #
 # Miscellaneous stuff
 #
-monitor yes			# enable monitoring
+enable auth monitor		# enable the good stuff
 precision -18			# clock reading precision (usec)
 driftfile /etc/ntp.drift        # path for drift file
 statsdir /pogo/ntpstats/	# directory for statistics files
@@ -40,11 +27,8 @@ filegen clockstats file clockstats type day enable
 #
 # Authentication stuff
 #
-authenticate yes		# enable authentication
 keys /usr/local/bin/ntp.keys	# path for keys file
-trustedkey 1 2 3 4 14 15	# define trusted keys
+trustedkey 3 4 5 6 14		# define trusted keys
 requestkey 15			# key (7) for accessing server variables
 controlkey 15			# key (6) for accessing server variables
-#authdelay 0.000072		# authentication delay (SPARC4c/65 SS1+ DES)
 authdelay 0.000159		# authentication delay (SPARC4c/65 SS1+ MD5)
-
diff --git a/usr.sbin/xntpd/conf/rackety.conf b/usr.sbin/xntpd/conf/rackety.conf
index 1a5181c..48389dc 100644
--- a/usr.sbin/xntpd/conf/rackety.conf
+++ b/usr.sbin/xntpd/conf/rackety.conf
@@ -2,11 +2,11 @@
 # NTP configuration file (ntp.conf)
 # rackety (128.4.1.1)
 #
-server 127.127.10.1 prefer	# austron 2201 gps receiver
+server 127.127.10.1 prefer	# austron 2201A gps receiver
 fudge 127.127.10.1 flag4 1	# enable statistics
-server 127.127.4.1		# spectracom 8170/netclock-2 wwvb receiver
-#propagation delay: wwvb 0.0088; receiver delay 0.0017
-fudge 127.127.4.1 time1 0.0017 value1 2
+server 127.127.4.1 		# spectracom 8170/netclock-2 wwvb receiver
+# propagation delay: wwvb 0.0088, receiver delay 0.0173, os delay .0035
+fudge 127.127.4.1 time1 0.0035 stratum 1 flag4 1 
 
 #
 # ee vaxen
@@ -18,10 +18,11 @@ peer 128.175.1.3		# dewey.udel.edu
 #
 # munchkins (stratum-1 only)
 #
+broadcast 224.0.1.1 key 5 ttl 127 # multicast
+broadcast 128.4.1.0 key 3	# local broadcast
 peer 128.4.1.2			# mizbeaver.udel.edu
-#peer 128.4.1.5			# churchy.udel.edu
-peer 128.4.2.7 key 3		# grundoon.udel.edu
-peer 128.4.1.20 key 3		# pogo.udel.edu
+peer 128.4.1.4			# barnstable.udel.edu
+peer 128.4.1.20			# pogo.udel.edu
 
 #
 # dartnet
@@ -47,14 +48,9 @@ server 140.222.141.1 version 2	# enss141 (boulder - ncar)
 server 140.222.144.1 version 2	# enss144 (sunnyvale - nasa ames)
 
 #
-# famous players
-#
-#peer 132.163.135.130		# time_A.timefreq.bldrdoc.gov
-
-#
 # Miscellaneous stuff
 #
-monitor yes			# enable monitoring
+enable auth monitor		# enable the good stuff
 precision -18			# clock reading precision (usec)
 driftfile /etc/ntp.drift	# path for drift file
 statsdir /rackety/ntpstats/	# directory for statistics files
@@ -65,11 +61,9 @@ filegen clockstats file clockstats type day enable
 #
 # Authentication stuff
 #
-authenticate yes		# enable authentication
 keys /usr/local/bin/ntp.keys	# path for keys file
-trustedkey 1 2 3 4 14 15	# define trusted keys
-requestkey 15			# key (7) for accessing server variables
-controlkey 15			# key (6) for accessing server variables
-#authdelay 0.000073		# authentication delay (SPARC4c/40 IPC DES)
+trustedkey 3 4 5 6 14		# define trusted keys
+requestkey 14			# key (7) for accessing server variables
+controlkey 14			# key (6) for accessing server variables
 authdelay 0.000163		# authentication delay (SPARC4c/40 IPC MD5)