Virgin import of ntpd 4.2.0

6 files changed, 24 insertions, 55 deletions

diff --git a/contrib/ntp/conf/README b/contrib/ntp/conf/README
index f06e44f..327f716 100644
--- a/contrib/ntp/conf/README
+++ b/contrib/ntp/conf/README
@@ -7,11 +7,7 @@ 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.
-
-The files Config.* are used to generate fullblown binaries suitable for
-distribution with the systems shown as suffix. While this can result
-in some degree of useless code, the degree is small compared to the
-size of the baseline code. The files *.conf are representative NTP
-run-time configuration files, which normally live in /etc/ntp.conf.
+Included also are example public key and symmetric key files produced
+by the ntp-genkeys program with names prefixed by ntpkey. These are
+ordinarily kept in /usr/local/etc and used by the Autokey scheme. See
+the authopt.htm pnd genkeys.htm ages for further information.
diff --git a/contrib/ntp/conf/baldwin.conf b/contrib/ntp/conf/baldwin.conf
index 0998a9f..1238ba1 100644
--- a/contrib/ntp/conf/baldwin.conf
+++ b/contrib/ntp/conf/baldwin.conf
@@ -1,34 +1,10 @@
 #
-# NTP configuration file (ntp.conf)
-# baldwin.udel.edu
+# NTP manycast configuration file (ntp.conf) for DCnet hosts
 #
-# 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 source 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.
+# Note that the .rnd random seed file  must pe in the root
+# directory and the public and private keys in /usr/local/etc.
 #
-server 127.127.1.0 prefer	# local clock driver
-broadcast 224.0.1.1 key 6 ttl 127
-peer rackety.udel.edu
-peer barnstable.udel.edu
-peer mizbeaver.udel.edu
-peer pogo.udel.edu
-#
-# Miscellaneous 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/etc/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
+manycastclient 239.1.1.1 autokey maxpoll 12
+manycastserver 239.1.1.1 
+crypto randfile /.rnd		# enable public key
+driftfile /etc/ntp.drift	# path for drift file
diff --git a/contrib/ntp/conf/grundoon.conf b/contrib/ntp/conf/grundoon.conf
index a26522d..eb18b3f 100644
--- a/contrib/ntp/conf/grundoon.conf
+++ b/contrib/ntp/conf/grundoon.conf
@@ -5,7 +5,7 @@
 server 127.127.11.1 prefer	# Arbiter 1088 GPS receiver
 fudge 127.127.11.1 time1 .00487 flag1 1 flag4 1
 server 127.127.22.1 minpoll 4	# PPS quick poll
-fudge 127.127.22.1		# use PLL/FLL loop
+fudge 127.127.22.1		# default use PLL/FLL loop
 
 broadcast 128.4.2.255 key 5	# brpadcast on LAN shared key
 broadcast 239.1.1.2 autokey	# multicast on WAN autokey
diff --git a/contrib/ntp/conf/malarky.conf b/contrib/ntp/conf/malarky.conf
index adf5eb3..1475e1e 100644
--- a/contrib/ntp/conf/malarky.conf
+++ b/contrib/ntp/conf/malarky.conf
@@ -4,7 +4,7 @@
 # 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
+# /usr/local/bin/ntpd -a -k /usr/local/bin/ntp.keys -m -t 3
 #
 multicastclient			# listen on default 224.0.1.1
 #
diff --git a/contrib/ntp/conf/pogo.conf b/contrib/ntp/conf/pogo.conf
index 2014fdd..0dbc58a 100644
--- a/contrib/ntp/conf/pogo.conf
+++ b/contrib/ntp/conf/pogo.conf
@@ -30,18 +30,7 @@ restrict 140.173.0.0 mask 255.255.0.0 # allow DARTnet/CAIRN clients
 #
 # Authentication stuff
 #
-# Local filesystem 
-# /etc/ntpkey -> ntpkey.3171396491
-# /etc/ntpkey.3171396491
-#
-# NFS mounted filesystem
-# /usr/local/etc/ntpkey -> /etc/ntpkey
-# /usr/local/etc/ntpkey_dh -> ntpkey_dh.3171396491
-# /usr/local/etc/ntpkey_dh.3171396491
-# /usr/local/etc/ntpkey_pogo.udel.edu -> ntpkey_pogo.udel.edu.3171396491
-# /usr/local/etc/ntpkey_pogo.udel.edu.3171396491
-#
-crypto privatekey /etc/ntpkey	# enable public key
+crypto				# enable public key
 keys /usr/local/etc/ntp.keys	# path for keys file
 trustedkey 3 4 5 14		# define trusted keys
 requestkey 14			# key (7) for accessing server variables
@@ -52,4 +41,4 @@ controlkey 14			# key (6) for accessing server variables
 driftfile /etc/ntp.drift	# path for drift file
 statsdir /var/spool/ntpstats/	# directory for statistics files
 filegen loopstats file loopstats type day enable
-
+filegen cryptostats file cryptostats type day enable
diff --git a/contrib/ntp/conf/rackety.conf b/contrib/ntp/conf/rackety.conf
index d3f231c..684e4b7 100644
--- a/contrib/ntp/conf/rackety.conf
+++ b/contrib/ntp/conf/rackety.conf
@@ -2,6 +2,14 @@
 # NTP configuration file (ntp.conf)
 # SunOS rackety.u 4.1.3 243 sun4c
 #
+# This is for a dedicated primary server connected to four reference
+# clocks and providing service via multicast, broadcast, manycast and
+# the usual suspects. It blocks previous versions and limits clients
+# per network to two and returnd a kiss-of-death packet if the
+# sender is blocked. Note that the precise fudge factors were
+# determined using the calibrate feature and that the kernel PPS
+# discipline is selected.
+#
 server 127.127.4.0 prefer 	# Spectracom GPS receiver #1
 fudge 127.127.4.0 refid GPS1 time1 -.000097 flag1 1
 server 127.127.4.1 		# Spectracom GPS receiver #2
@@ -24,7 +32,7 @@ manycastserver 239.1.1.1	# manycast
 #
 # Access controls
 #
-restrict default limited	# default limit clients per net
+restrict default limited version kod # default limit clients per net
 restrict 127.0.0.1		# allow local host
 restrict 128.4.0.0 mask 255.255.0.0 # allow DCnet clients
 restrict 128.175.0.0 mask 255.255.0.0 # allow UDELnet clients