svn commit: r260637 - head/contrib/ntp/ntpd

[Xin LI]

Author: delphij
Date: Tue Jan 14 18:59:00 2014
New Revision: 260637
URL: http://svnweb.freebsd.org/changeset/base/260637

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

Modified:
  head/contrib/ntp/ntpd/ntp_config.c

Modified: head/contrib/ntp/ntpd/ntp_config.c
==============================================================================
--- head/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 18:58:57 2014	(r260636)
+++ head/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 18:59:00 2014	(r260637)
@@ -597,6 +597,8 @@ getconfig(
 #endif /* not SYS_WINNT */
 	}
 
+	proto_config(PROTO_MONITOR, 0, 0., NULL);
+
 	for (;;) {
 		if (tok == CONFIG_END) 
 			break;