From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 10 Feb 2000 00:47:59 +0000 (-0000)
Subject: ChangeLog, Makefile.in, configure, configure.in, refclock_oncore.c, config.h:
X-Git-Tag: NTP_4_0_99_E~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4454bb8bf9166268c5277180cb99e09a0e099da;p=thirdparty%2Fntp.git

ChangeLog, Makefile.in, configure, configure.in, refclock_oncore.c, config.h:
  * ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
  From: Carl Byington <carl@five-ten-sg.com>
  * configure.in: Disable kernel_fll_bug for Generic_105181-17 under
  Solaris-2.6
  From: Juergen Georgi <georgi@belwue.de>

bk: 38a20abf6HSQfD79ab-WgCY0al8nMg
---

diff --git a/ChangeLog b/ChangeLog
index 32d68f8f7..eabe2dea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2000-02-09  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
+	From: Carl Byington <carl@five-ten-sg.com>
+
+	* configure.in: Disable kernel_fll_bug for Generic_105181-17 under
+	Solaris-2.6
+	From: Juergen Georgi <georgi@belwue.de>
+
 2000-02-07  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* configure.in: 4.0.99d
+
 	* html/Oncore-SHMEM.htm: New document
 	* html/driver30.htm: Cleanup and improvements
 	From: Reg Clemens <reg@dwf.com>
diff --git a/Makefile.in b/Makefile.in
index 761c3cf7d..decac23d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,10 +143,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
 DIST_SOURCES = 
-DIST_COMMON =  README ./config.guess ./config.sub ./stamp-h.in ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
-config.guess config.h.in config.sub configure configure.in depcomp \
-install-sh missing mkinstalldirs
+DIST_COMMON =  README ./stamp-h.in ChangeLog INSTALL Makefile.am \
+Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \
+config.sub configure configure.in depcomp install-sh missing \
+mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/configure b/configure
index e2af8463e..fb79e2991 100755
--- a/configure
+++ b/configure
@@ -1088,7 +1088,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99c
+VERSION=4.0.99d
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -10714,7 +10714,13 @@ if test "${enable_kernel_fll_bug+set}" = set; then
 else
       case "$target" in
      *-*-solaris2.6)
-	 ans=yes
+	 case "`uname -v`" in
+	  Generic_105181-17)
+	     ans=no
+	     ;;
+	  *) ans=yes
+	     ;;
+	 esac
 	 ;;
      *-*-solaris2.7)
 	 case "`uname -v`" in
diff --git a/configure.in b/configure.in
index 8673a4f0b..e176765c9 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99c)
+AM_INIT_AUTOMAKE(ntp, 4.0.99d)
 AC_PREREQ(2.14)
 
 ac_cv_var_oncore_ok=no
@@ -2943,7 +2943,13 @@ AC_CACHE_CHECK(if we should avoid kernel FLL bug, ac_cv_var_kernel_fll_bug,
     [changequote(<<, >>)dnl
     case "$target" in
      *-*-solaris2.6)
-	 ans=yes
+	 case "`uname -v`" in
+	  Generic_105181-17)
+	     ans=no
+	     ;;
+	  *) ans=yes
+	     ;;
+	 esac
 	 ;;
      *-*-solaris2.7)
 	 case "`uname -v`" in
diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index b0df60967..7b05507cb 100644
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -802,20 +802,16 @@ oncore_read_config(
 		if (!*cc)
 			continue;
 
-		/* Lowercase the command and find the arg */
+		/* Uppercase the command and find the arg */
 		for (ca = cc; *ca; ca++) {
 			if (isascii((int)*ca) && islower((int)*ca)) {
 				*ca = toupper(*ca);
-			} else if (isascii((int)*ca) && isspace((int)*ca)) {
+			} else if (isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')))
 				break;
-			} else if (*ca == '=') {
-				*ca = ' ';
-				break;
-			}
 		}
 		
-		/* Remove space leading the arg */
-		for (; *ca && isascii((int)*ca) && isspace((int)*ca); ca++)
+		/* Remove space (and possible =) leading the arg */
+		for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
 			continue;
 
 		if (!strncmp(cc, "STATUS", 6)) {
diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index eeacee386..4421a5d59 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -27,9 +27,9 @@
 # define CLOCK_LOCAL			/* from ntpd.mak */
 //# define CLOCK_PARSE 
 /* # define CLOCK_ATOM */
-/* # define CLOCK_SHM	*/		 /* from ntpd.mak */																
+/* # define CLOCK_SHM	*/		 /* from ntpd.mak */
 # define CLOCK_NMEA
-# define CLOCK_PALISADE		 * from ntpd.mak */																
+# define CLOCK_PALISADE		 /* from ntpd.mak */
 # define CLOCK_DUMBCLOCK
 # define CLOCK_TRIMBLEDC
 # define CLOCK_TRIMTSIP 1