From owner-svn-src-all@FreeBSD.ORG  Fri Sep 24 14:44:05 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34C0A1065672;
	Fri, 24 Sep 2010 14:44:05 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 23E1A8FC0C;
	Fri, 24 Sep 2010 14:44:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8OEi5Mq027881;
	Fri, 24 Sep 2010 14:44:05 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OEi5hs027879;
	Fri, 24 Sep 2010 14:44:05 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201009241444.o8OEi5hs027879@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 24 Sep 2010 14:44:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213102 - head/libexec/tftpd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Sep 2010 14:44:05 -0000

Author: marius
Date: Fri Sep 24 14:44:04 2010
New Revision: 213102
URL: http://svn.freebsd.org/changeset/base/213102

Log:
  Remove the duplicate logging of failed read requests, whose error message
  also was inappropriate as it triggered for every EACCESS and ENOTFOUND, not
  just the case the -n option is intended to deal with and thus really spammed
  us with ~20 messages in the default configuration when booting a diskless
  FreeBSD client, introduced with r207608 again.
  
  MFC after:	1 week

Modified:
  head/libexec/tftpd/tftpd.c

Modified: head/libexec/tftpd/tftpd.c
==============================================================================
--- head/libexec/tftpd/tftpd.c	Fri Sep 24 14:38:54 2010	(r213101)
+++ head/libexec/tftpd/tftpd.c	Fri Sep 24 14:44:04 2010	(r213102)
@@ -604,7 +604,6 @@ tftp_rrq(int peer, char *recvbuffer, ssi
 		 */
 		if (suppress_naks && *filename != '/' && ecode == ENOTFOUND)
 			exit(0);
-		tftp_log(LOG_ERR, "Prevent NAK storm");
 		send_error(peer, ecode);
 		exit(1);
 	}