xntpd version 3.3z from UDel

5 files changed, 5 insertions, 17 deletions

diff --git a/usr.sbin/xntpd/conf/Config.CHATHAM b/usr.sbin/xntpd/conf/Config.CHATHAM
index 41e6fc2..b1f980b 100644
--- a/usr.sbin/xntpd/conf/Config.CHATHAM
+++ b/usr.sbin/xntpd/conf/Config.CHATHAM
@@ -89,9 +89,6 @@ RANLIB=		ranlib
 #	to configure the particular clock drivers you want in the
 #	CLOCKDEFS= line below.  This flag affects xntpd only.
 #
-# There is an occurance of a call to rindex() in the daemon.  You may
-#	have to include a -Drindex=strrchr to get this to load right.
-#
 # To change the location of the configuration file, use a
 #	-DCONFIG_FILE=\\"/local/etc/ntp.conf\\" or something similar.
 #
@@ -109,7 +106,7 @@ RANLIB=		ranlib
 #	(for SunOS 4.1.1) that intercepts carrier-detect transitions
 #	generated by the pps signal. Only one of these flags should be defined.
 #
-DEFS= -DUSELIBKVM -DDEBUG -DSTREAM -DREFCLOCK -DNO_SIGNED_CHAR_DECL -DPPS -DPPSDEV -DXNTP_RETROFIT_STDLIB -DHAVE_UNISTD_H
+DEFS= -DUSELIBKVM -DDEBUG -DSTREAM -DREFCLOCK -DNO_SIGNED_CHAR_DECL -DPPS -DPPSDEV -DXNTP_RETROFIT_STDLIB -DNTP_POSIX_SOURCE
 
 #
 #  Authentication types supported.  Choose from DES and MD5.  If you
diff --git a/usr.sbin/xntpd/conf/Config.MONOMOY b/usr.sbin/xntpd/conf/Config.MONOMOY
index b9e075f..18dddff 100644
--- a/usr.sbin/xntpd/conf/Config.MONOMOY
+++ b/usr.sbin/xntpd/conf/Config.MONOMOY
@@ -84,9 +84,6 @@ RANLIB=		ranlib
 #	to configure the particular clock drivers you want in the
 #	CLOCKDEFS= line below.  This flag affects xntpd only.
 #
-# There is an occurance of a call to rindex() in the daemon.  You may
-#	have to include a -Drindex=strrchr to get this to load right.
-#
 # To change the location of the configuration file, use a
 #	-DCONFIG_FILE=\\"/local/etc/ntp.conf\\" or something similar.
 #
@@ -104,7 +101,7 @@ RANLIB=		ranlib
 #	the reference clock module (only one source of PPS signal should
 #	be used)
 #
-DEFS= -DBSDI -DUSELIBKVM -DDEBUG -DREFCLOCK -DPPS -DCONFIG_FILE=\\"/usr/local/etc/xntp.conf\\" -DHAVE_UNISTD_H
+DEFS= -DBSDI -DUSELIBKVM -DDEBUG -DREFCLOCK -DPPS -DCONFIG_FILE=\\"/usr/local/etc/xntp.conf\\" -DNTP_POSIX_SOURCE
 
 #
 #  Authentication types supported.  Choose from DES and MD5.  If you
diff --git a/usr.sbin/xntpd/conf/Config.TIGER b/usr.sbin/xntpd/conf/Config.TIGER
index c757ad9..29c6cbd 100644
--- a/usr.sbin/xntpd/conf/Config.TIGER
+++ b/usr.sbin/xntpd/conf/Config.TIGER
@@ -80,9 +80,6 @@ RANLIB=		ranlib
 #	to configure the particular clock drivers you want in the
 #	CLOCKDEFS= line below.  This flag affects xntpd only.
 #
-# There is an occurance of a call to rindex() in the daemon.  You may
-#	have to include a -Drindex=strrchr to get this to load right.
-#
 # To change the location of the configuration file, use a
 #	-DCONFIG_FILE=\\"/local/etc/ntp.conf\\" or something similar.
 #
@@ -100,7 +97,7 @@ RANLIB=		ranlib
 #	the reference clock module (only one source of PPS signal should
 #	be used)
 #
-DEFS= -DREFCLOCK -DS_CHAR_DEFINED -DREADKMEM -DDEBUG -DPLL -DXNTP_RETROFIT_STDLIB -DHAVE_UNISTD_H
+DEFS= -DREFCLOCK -DS_CHAR_DEFINED -DREADKMEM -DDEBUG -DPLL -DXNTP_RETROFIT_STDLIB -DNTP_POSIX_SOURCE
 
 #
 #  Authentication types supported.  Choose from DES and MD5.  If you
diff --git a/usr.sbin/xntpd/conf/Config.TRURO b/usr.sbin/xntpd/conf/Config.TRURO
index 6caa2b8..2fc2580 100644
--- a/usr.sbin/xntpd/conf/Config.TRURO
+++ b/usr.sbin/xntpd/conf/Config.TRURO
@@ -86,9 +86,6 @@ RANLIB=	: # ar does the work of ranlib under System V
 #	to configure the particular clock drivers you want in the
 #	CLOCKDEFS= line below.  This flag affects xntpd only.
 #
-# There is an occurance of a call to rindex() in the daemon.  You may
-#	have to include a -Drindex=strrchr to get this to load right.
-#
 # To change the location of the configuration file, use a
 #	-DCONFIG_FILE=\\"/local/etc/ntp.conf\\" or something similar.
 #
@@ -109,7 +106,7 @@ RANLIB=	: # ar does the work of ranlib under System V
 #	(for SunOS 4.1.1) that intercepts carrier-detect transitions
 #	generated by the pps signal. Only one of these flags should be defined.
 #
-DEFS= -DDEBUG -DSTREAM -DREFCLOCK -DNO_SIGNED_CHAR_DECL -DSLEWALWAYS -DSOLARIS -DPPS -DSTUPID_SIGNAL -DXNTP_RETROFIT_STDLIB -DHAVE_UNISTD_H
+DEFS= -DDEBUG -DSTREAM -DREFCLOCK -DNO_SIGNED_CHAR_DECL -DSLEWALWAYS -DSOLARIS -DPPS -DSTUPID_SIGNAL -DXNTP_RETROFIT_STDLIB -DNTP_POSIX_SOURCE
 
 #
 #  Authentication types supported.  Choose from DES and MD5.  If you
diff --git a/usr.sbin/xntpd/conf/Config.local b/usr.sbin/xntpd/conf/Config.local
index 4c5095c..12a6dfe 100644
--- a/usr.sbin/xntpd/conf/Config.local
+++ b/usr.sbin/xntpd/conf/Config.local
@@ -182,7 +182,7 @@ DEFS_LOCAL= $(DEFS_OPT) -DREFCLOCK -DPPSPPS -DKERNEL_PLL
 # under Ultrix 4.2a/3. If the MX4200 is removed, all the rest compile on a DEC
 # OSF/1 Alpha.
 #
-CLOCKDEFS= -DLOCAL_CLOCK -DAS2201PPS -DCHU -DGOES -DIRIG -DMX4200PPS -DOMEGA -DPSTCLK -DTPRO -DWWVBCLK -DMSFEESPPS -DLEITCH
+CLOCKDEFS= -DLOCAL_CLOCK -DAS2201PPS -DCHUPPS -DGOES -DIRIG -DMX4200PPS -DOMEGA -DPSTCLK -DTPRO -DWWVBCLK -DMSFEESPPS -DLEITCH
 
 #
 # Directory into which binaries should be installed (default /usr/local)