xntp 3.3p from Delaware

4 files changed, 26 insertions, 3 deletions

diff --git a/usr.sbin/xntpd/scripts/Guess.sh b/usr.sbin/xntpd/scripts/Guess.sh
index c2be569..ba01e56 100755
--- a/usr.sbin/xntpd/scripts/Guess.sh
+++ b/usr.sbin/xntpd/scripts/Guess.sh
@@ -40,7 +40,11 @@ if [ -f /bin/uname -o -f /usr/bin/uname ]; then
 			guess="ultrix"
 			;;
 		hp-ux)  case "$3" in
-			*.10.*) guess="hpux10+" ;;
+			*.10.*) guess="hpux-adj" ;;
+			*.09.03) case "$5" in
+				9000/3*) guess="hpux-adj" ;;
+				*) guess="hpux" ;;
+				esac ;;
 			*) guess="hpux" ;;
 			esac
 			;;
diff --git a/usr.sbin/xntpd/scripts/README b/usr.sbin/xntpd/scripts/README
index 79f1792..7439c6c 100644
--- a/usr.sbin/xntpd/scripts/README
+++ b/usr.sbin/xntpd/scripts/README
@@ -11,7 +11,7 @@ Guess.sh        script to figure out what machine and operating system
 autoconf        awesome script swiped from Jeff Johnson (who may have
                 swiped it from GNU) which delves deep into the system
                 files to reveal dark secrets necessary to port NTP to
-                everything exceptt sewing machines. Unfinished work.
+                everything except sewing machines. Unfinished work.
 
 makeconfig.sh   shell script that calles Guess.sh and then figures out
                 what compiler is available, then builds the
diff --git a/usr.sbin/xntpd/scripts/hpadjtime.sh b/usr.sbin/xntpd/scripts/hpadjtime.sh
new file mode 100644
index 0000000..07773dc
--- /dev/null
+++ b/usr.sbin/xntpd/scripts/hpadjtime.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+val=1
+if [ -f /bin/uname -o -f /usr/bin/uname ]; then
+	set `uname -a | tr '[A-Z]' '[a-z]'`
+	case "$1" in
+		hp-ux)  case "$3" in
+			*.10.*) val=1 ;;
+			*.09.03) case "$5" in
+				9000/3*) val=1 ;;
+				*)       val=0 ;;
+				esac ;;
+			*) val=0 ;;
+			esac
+			;;
+	*)
+	esac
+fi
+exit $val
diff --git a/usr.sbin/xntpd/scripts/support/bin/monl b/usr.sbin/xntpd/scripts/support/bin/monl
index 44201d0..f0c48db 100755
--- a/usr.sbin/xntpd/scripts/support/bin/monl
+++ b/usr.sbin/xntpd/scripts/support/bin/monl
@@ -143,7 +143,8 @@ foreach $hostname (@ARGV)
     {
       chop;
       split;
-      ($host, $count, $mode, $version, $lasttime, $firsttime) = (@_[$[, $[+2 .. $[+6]);
+      ($host, $count, $mode, $version, $lasttime, $firsttime) =
+	  (@_[$[, $[+2 .. $[+4, $#_-1,$#_]);
       
       $Seen{$host, $mode} = 1;