From e11b8566fec2ddaf56afccdd65499dfe3f9851f2 Mon Sep 17 00:00:00 2001
From: Eric F Crist <ecrist@secure-computing.net>
Date: Tue, 2 Oct 2018 17:06:36 -0500
Subject: [PATCH] trap sig exit, too

The clean_temp() function failed to be called on a clean exit due to the
previous change (446a58f).  Also adding in the bit from die() that I
failed to remember to push in.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
---
 easyrsa3/easyrsa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 5a0559c..7fa85fa 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -230,7 +230,7 @@ die() {
 Easy-RSA error:
 
 $1" 1>&2
-	exit "${2:-1}"
+	prog_exit "${2:-1}"
 } # => die()
 
 # non-fatal warning output
@@ -1319,7 +1319,7 @@ done
 vars_setup
 
 # Register clean_temp and prog_exit on SIGHUP, SIGINT, SIGQUIT, and SIGABRT
-trap "clean_temp; prog_exit" 1 2 3 6
+trap "clean_temp; prog_exit" 0 1 2 3 6
 
 # determine how we were called, then hand off to the function responsible
 cmd="$1"