From owner-svn-src-user@FreeBSD.ORG  Mon Nov  4 03:00:45 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 ESMTP id 56E58F85;
 Mon,  4 Nov 2013 03:00:45 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 43DE72262;
 Mon,  4 Nov 2013 03:00:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA430jVA066513;
 Mon, 4 Nov 2013 03:00:45 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA430jCQ066512;
 Mon, 4 Nov 2013 03:00:45 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201311040300.rA430jCQ066512@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 4 Nov 2013 03:00:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r257602 - user/cperciva/panicmail
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2013 03:00:45 -0000

Author: cperciva
Date: Mon Nov  4 03:00:44 2013
New Revision: 257602
URL: http://svnweb.freebsd.org/changeset/base/257602

Log:
  Change
  	local tmpfile=`mktemp` || exit 1
  into
  	local tmpfile
  	tmpfile=`mktemp` || exit 1
  since the former is parsed as "local || exit 1" and loses the exit code
  from mktemp.
  
  Submitted by:	jilles

Modified:
  user/cperciva/panicmail/panicmail

Modified: user/cperciva/panicmail/panicmail
==============================================================================
--- user/cperciva/panicmail/panicmail	Mon Nov  4 02:58:16 2013	(r257601)
+++ user/cperciva/panicmail/panicmail	Mon Nov  4 03:00:44 2013	(r257602)
@@ -37,7 +37,8 @@ stop_cmd=":"
 # Gather the data we want to include in a panic report.
 panicmail_gather()
 {
-	local tmpfile=`mktemp` || exit 1
+	local tmpfile
+	tmpfile=`mktemp` || exit 1
 
 	# We want the dump header.
 	cat "${dumpdir}/info.$1" > "${dumpdir}/panicmail.$1"
@@ -59,7 +60,8 @@ panicmail_gather()
 # Encrypt the information in the panic report.
 panicmail_encrypt()
 {
-	local tmpfile=`mktemp` || exit 1
+	local tmpfile
+	tmpfile=`mktemp` || exit 1
 
 	# Encrypt using pkesh.
 	/usr/local/bin/pkesh enc "$2" "${dumpdir}/panicmail.$1" "${tmpfile}" || exit 1