Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2014 19:04:33 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r260639 - stable/10/contrib/ntp/ntpd
Message-ID:  <201401141904.s0EJ4X0x004101@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Tue Jan 14 19:04:33 2014
New Revision: 260639
URL: http://svnweb.freebsd.org/changeset/base/260639

Log:
  MFC r260637:
  
  Disable 'monitor' feature in ntpd by default.
  
  Security:	FreeBSD-SA-14:02.ntpd
  Approved by:	so

Modified:
  stable/10/contrib/ntp/ntpd/ntp_config.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/ntp/ntpd/ntp_config.c
==============================================================================
--- stable/10/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:02:14 2014	(r260638)
+++ stable/10/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:04:33 2014	(r260639)
@@ -597,6 +597,8 @@ getconfig(
 #endif /* not SYS_WINNT */
 	}
 
+	proto_config(PROTO_MONITOR, 0, 0., NULL);
+
 	for (;;) {
 		if (tok == CONFIG_END) 
 			break;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401141904.s0EJ4X0x004101>