svn commit: r260643 - in stable: 8/contrib/ntp/ntpd 9/contrib/ntp/ntpd

[Xin LI]

Author: delphij
Date: Tue Jan 14 19:20:41 2014
New Revision: 260643
URL: http://svnweb.freebsd.org/changeset/base/260643

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

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

Changes in other areas also in this revision:
Modified:
  stable/8/contrib/ntp/ntpd/ntp_config.c
Directory Properties:
  stable/8/contrib/ntp/   (props changed)

Modified: stable/9/contrib/ntp/ntpd/ntp_config.c
==============================================================================
--- stable/9/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:17:20 2014	(r260642)
+++ stable/9/contrib/ntp/ntpd/ntp_config.c	Tue Jan 14 19:20:41 2014	(r260643)
@@ -597,6 +597,8 @@ getconfig(
 #endif /* not SYS_WINNT */
 	}
 
+	proto_config(PROTO_MONITOR, 0, 0., NULL);
+
 	for (;;) {
 		if (tok == CONFIG_END) 
 			break;