svn commit: r239427 - stable/9/contrib/ntp/ntpd

[Ian Lepore]

On Mon, 2012-08-20 at 14:26 +0000, Ed Maste wrote:
> Author: emaste
> Date: Mon Aug 20 14:26:16 2012
> New Revision: 239427
> URL: http://svn.freebsd.org/changeset/base/239427
> 
> Log:
>   MFC r232844: Remove extraneous log message
>   
>     When ntp switched between PLL and FLL mode it produced a log message
>     "kernel time sync status change %04x".  This issue is reported in ntp
>     bug 452[1] which claims that this behaviour is normal and the log
>     message isn't necessary.  I'm not sure exactly when it was removed, but
>     it's gone in the latest ntp release (4.2.6p5).
>   
>     [1] http://bugs.ntp.org/show_bug.cgi?id=452
> 
> Modified:
>   stable/9/contrib/ntp/ntpd/ntp_loopfilter.c
> Directory Properties:
>   stable/9/contrib/ntp/   (props changed)
> 
> Modified: stable/9/contrib/ntp/ntpd/ntp_loopfilter.c
> ==============================================================================
> --- stable/9/contrib/ntp/ntpd/ntp_loopfilter.c	Mon Aug 20 14:14:19 2012	(r239426)
> +++ stable/9/contrib/ntp/ntpd/ntp_loopfilter.c	Mon Aug 20 14:26:16 2012	(r239427)
> @@ -646,12 +646,6 @@ local_clock(
>  			    msyslog(LOG_NOTICE,
>  			    "kernel time sync error %04x", ntv.status);
>  			ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME);
> -		} else {
> -			if ((ntv.status ^ pll_status) & ~STA_FLL)
> -				NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
> -				    msyslog(LOG_NOTICE,
> -				    "kernel time sync status change %04x",
> -				    ntv.status);
>  		}
>  		pll_status = ntv.status;
>  #ifdef STA_NANO

The other piece of this change should be to remove the "maxpoll 9" from
src/etc/ntp.conf.  It was added only to prevent the ntpd steering loop
from transitioning from PLL to FLL operation on the transition from 512
to 1024 second poll/update cycles (effectively squelching the log
spewage by preventing ntpd from operating normally).

Removing the mythology that "FreeBSD requires maxpoll 9 in ntp.conf"
from the web will be a much harder change.  :)

-- Ian