svn commit: r260641 - releng/10.0/contrib/ntp/ntpd

[Xin LI]

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;