From owner-svn-src-stable@FreeBSD.ORG  Mon Oct  4 20:02:48 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A396106564A;
	Mon,  4 Oct 2010 20:02:48 +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 78DF28FC1C;
	Mon,  4 Oct 2010 20:02:48 +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 o94K2m9F025646;
	Mon, 4 Oct 2010 20:02:48 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o94K2mca025644;
	Mon, 4 Oct 2010 20:02:48 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201010042002.o94K2mca025644@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 4 Oct 2010 20:02:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213419 - stable/8/libexec/tftpd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Oct 2010 20:02:48 -0000

Author: marius
Date: Mon Oct  4 20:02:48 2010
New Revision: 213419
URL: http://svn.freebsd.org/changeset/base/213419

Log:
  MFC: r213102
  
  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 (commited to stable/8 in 213038)
  again.

Modified:
  stable/8/libexec/tftpd/tftpd.c
Directory Properties:
  stable/8/libexec/tftpd/   (props changed)

Modified: stable/8/libexec/tftpd/tftpd.c
==============================================================================
--- stable/8/libexec/tftpd/tftpd.c	Mon Oct  4 19:59:11 2010	(r213418)
+++ stable/8/libexec/tftpd/tftpd.c	Mon Oct  4 20:02:48 2010	(r213419)
@@ -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);
 	}