From 5da67665fa4c20d9e1b6c0ddbf3dd60375dd9d27 Mon Sep 17 00:00:00 2001 From: Eric F Crist Date: Wed, 20 Dec 2017 21:06:04 -0600 Subject: [PATCH] Declare some additional variables Further fixes for #167 pointed out by bjoernv. Thanks! Signed-off-by: Eric F Crist --- ChangeLog | 2 ++ easyrsa3/easyrsa | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed60b70..c13f11b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Easy-RSA 3 ChangeLog * Integrate with Travis-CI (#165) * Remove "local" from variable assignment (#165) * Other changes related to Travis-CI fixes + * Assign values (even empty ones) to variables defined previously with + "local" 3.0.3 (2017-08-22) * Include mktemp windows binary diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 5023ee5..e99f6db 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -960,7 +960,8 @@ default_server_san() { # verify a file seems to be a valid req/X509 verify_file() { - format="$1" path="$2" + format="$1" + path="$2" "$EASYRSA_OPENSSL" $format -in "$path" -noout 2>/dev/null || return 1 return 0 } # => verify_file() @@ -968,7 +969,10 @@ verify_file() { # show-* command backend # Prints req/cert details in a readable format show() { - type="$1" name="$2" in_file format + type="$1" + name="$2" + in_file="" + format="" [ -n "$name" ] || die "\ Missing expected filename_base argument. Run easyrsa without commands for usage help."