From owner-svn-src-stable@FreeBSD.ORG  Mon Aug 20 14:52:44 2012
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 8F45D106566B;
	Mon, 20 Aug 2012 14:52:44 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79CC68FC15;
	Mon, 20 Aug 2012 14:52:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KEqiTU049576;
	Mon, 20 Aug 2012 14:52:44 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KEqidU049573;
	Mon, 20 Aug 2012 14:52:44 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201208201452.q7KEqidU049573@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 20 Aug 2012 14:52:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239432 - stable/9/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, 20 Aug 2012 14:52:44 -0000

Author: emaste
Date: Mon Aug 20 14:52:43 2012
New Revision: 239432
URL: http://svn.freebsd.org/changeset/base/239432

Log:
  MFC r231973: Avoid error log for transfer stop w/o error code.
  
  A number of tftp clients, including the one in Intel's pxe boot loader,
  may intentionally stop a transfer using error code 0 (i.e., EUNDEF).
  These are not real errors.  Avoid spamming log files with these by
  logging them at level LOG_DEBUG instead.
  
  Discussed on -hackers with an initial patch proposal; this change is an
  improved approach suggested by kan@.

Modified:
  stable/9/libexec/tftpd/tftp-io.c
Directory Properties:
  stable/9/libexec/tftpd/   (props changed)

Modified: stable/9/libexec/tftpd/tftp-io.c
==============================================================================
--- stable/9/libexec/tftpd/tftp-io.c	Mon Aug 20 14:49:06 2012	(r239431)
+++ stable/9/libexec/tftpd/tftp-io.c	Mon Aug 20 14:52:43 2012	(r239432)
@@ -463,7 +463,8 @@ receive_packet(int peer, char *data, int
 	}
 
 	if (pkt->th_opcode == ERROR) {
-		tftp_log(LOG_ERR, "Got ERROR packet: %s", pkt->th_msg);
+		tftp_log(pkt->th_code == EUNDEF ? LOG_DEBUG : LOG_ERR,
+		    "Got ERROR packet: %s", pkt->th_msg);
 		return (RP_ERROR);
 	}