From owner-svn-src-head@FreeBSD.ORG  Tue May  6 21:34:02 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6013BB84;
 Tue,  6 May 2014 21:34:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DD1C836;
 Tue,  6 May 2014 21:34:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46LY2F3046065;
 Tue, 6 May 2014 21:34:02 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46LY2pv046064;
 Tue, 6 May 2014 21:34:02 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201405062134.s46LY2pv046064@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 6 May 2014 21:34:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265465 - head/contrib/ntp/ntpd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 21:34:02 -0000

Author: delphij
Date: Tue May  6 21:34:01 2014
New Revision: 265465
URL: http://svnweb.freebsd.org/changeset/base/265465

Log:
  Don't reply monlist request when it's not enabled.
  
  No objection from:	roberto (but all bugs are mine)
  MFC after:	2 weeks

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

Modified: head/contrib/ntp/ntpd/ntp_request.c
==============================================================================
--- head/contrib/ntp/ntpd/ntp_request.c	Tue May  6 21:30:58 2014	(r265464)
+++ head/contrib/ntp/ntpd/ntp_request.c	Tue May  6 21:34:01 2014	(r265465)
@@ -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,