From owner-svn-src-all@FreeBSD.ORG  Tue Jan 14 19:12:41 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 11D3A3A7;
 Tue, 14 Jan 2014 19:12:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F21AC15CF;
 Tue, 14 Jan 2014 19:12:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EJCeRV008014;
 Tue, 14 Jan 2014 19:12:40 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EJCedF008013;
 Tue, 14 Jan 2014 19:12:40 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201401141912.s0EJCedF008013@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 14 Jan 2014 19:12:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r260641 - releng/10.0/contrib/ntp/ntpd
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 19:12:41 -0000

Author: delphij
Date: Tue Jan 14 19:12:40 2014
New Revision: 260641
URL: http://svnweb.freebsd.org/changeset/base/260641

Log:
  MFS r260639 (MFC r260637):
  
  Disable 'monitor' feature in ntpd by default.
  
  Security:	FreeBSD-SA-14:02.ntpd
  Approved by:	re (gjb)

Modified:
  releng/10.0/contrib/ntp/ntpd/ntp_config.c
Directory Properties:
  releng/10.0/   (props changed)

Modified: releng/10.0/contrib/ntp/ntpd/ntp_config.c
==============================================================================
--- releng/10.0/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:10:38 2014	(r260640)
+++ releng/10.0/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:12:40 2014	(r260641)
@@ -597,6 +597,8 @@ getconfig(
 #endif /* not SYS_WINNT */
 	}
 
+	proto_config(PROTO_MONITOR, 0, 0., NULL);
+
 	for (;;) {
 		if (tok == CONFIG_END) 
 			break;