Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 May 2014 00:57:00 +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: r266457 - stable/10/contrib/ntp/ntpd
Message-ID:  <201405200057.s4K0v0XV082570@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Tue May 20 00:57:00 2014
New Revision: 266457
URL: http://svnweb.freebsd.org/changeset/base/266457

Log:
  MFC r265465:
  
  Don't reply monlist request when it's not enabled.

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

Modified: stable/10/contrib/ntp/ntpd/ntp_request.c
==============================================================================
--- stable/10/contrib/ntp/ntpd/ntp_request.c	Mon May 19 21:55:47 2014	(r266456)
+++ stable/10/contrib/ntp/ntpd/ntp_request.c	Tue May 20 00:57:00 2014	(r266457)
@@ -1920,7 +1920,6 @@ mon_getlist_0(
 	    printf("wants monitor 0 list\n");
 #endif
 	if (!mon_enabled) {
-		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
 		return;
 	}
 	im = (struct info_monitor *)prepare_pkt(srcadr, inter, inpkt,
@@ -1965,7 +1964,6 @@ mon_getlist_1(
 	extern int mon_enabled;
 
 	if (!mon_enabled) {
-		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
 		return;
 	}
 	im = (struct info_monitor_1 *)prepare_pkt(srcadr, inter, inpkt,



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