From 223237ab7f154bc38dd6aeef866ec797215fe250 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Wed, 6 Apr 2022 22:59:23 +0100 Subject: [PATCH] Only assign a value to $vars if a 'vars' file is found Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 89cc9f1..82d214c 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -2074,10 +2074,11 @@ Priority should be given to your PKI vars file: " esac - # Assign vars in order of preference. - for i in "$pki_vars" "$prog_vars" "$easy_vars" "$pwd_vars"; do - vars="${vars:-"$i"}" - done + # If a vars file is found then assign $vars + [ "$f_pki_vars" ] && vars="$pki_vars" + [ "$f_prog_vars" ] && vars="$prog_vars" + [ "$f_easy_vars" ] && vars="$easy_vars" + [ "$f_pwd_vars" ] && vars="$pwd_vars" fi # If $EASYRSA_NO_VARS is defined (not blank) then do not use vars