From owner-svn-src-stable@freebsd.org  Fri Jun 10 15:03:20 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1DBFB71AAF;
 Fri, 10 Jun 2016 15:03:19 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3B93117C;
 Fri, 10 Jun 2016 15:03:19 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5AF3JgC055614;
 Fri, 10 Jun 2016 15:03:19 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5AF3JF1055613;
 Fri, 10 Jun 2016 15:03:19 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201606101503.u5AF3JF1055613@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 10 Jun 2016 15:03:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301795 - stable/10/etc/defaults
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2016 15:03:20 -0000

Author: cy
Date: Fri Jun 10 15:03:18 2016
New Revision: 301795
URL: https://svnweb.freebsd.org/changeset/base/301795

Log:
  MFC r301295:
  
  Enable daily_ntpd_leapfile_enable by default. Otherwise an expired
  leapfile will be ignored and ntpd will behave as if it has no
  leapfile.
  
  While here, remove an extraneous blank line.
  
  Suggested by:	ache

Modified:
  stable/10/etc/defaults/periodic.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/defaults/periodic.conf
==============================================================================
--- stable/10/etc/defaults/periodic.conf	Fri Jun 10 14:59:11 2016	(r301794)
+++ stable/10/etc/defaults/periodic.conf	Fri Jun 10 15:03:18 2016	(r301795)
@@ -139,9 +139,8 @@ daily_status_mail_rejects_logs=3			# How
 daily_status_mail_rejects_shorten="NO"			# Shorten output
 
 # 480.leapfile-ntpd
-daily_ntpd_leapfile_enable="NO"				# Fetch NTP leapfile
+daily_ntpd_leapfile_enable="YES"			# Fetch NTP leapfile
 daily_ntpd_avoid_congestion="YES"			# Avoid congesting
-							# leapfile sources
 
 # 480.status-ntpd
 daily_status_ntpd_enable="NO"				# Check NTP status