From f05fdccd76feb64be737199bdeb57cea4cef2e71 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Mon, 17 Jul 2023 03:21:41 +0100 Subject: [PATCH] escape_hazard: Rename temp-file vars_org_tmp -> escape_hazard_tmp Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index e9c8fc2..aa7ea3c 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -941,9 +941,9 @@ escape_hazard() { working_safe_org_conf=1 # Assign temp-file - vars_org_tmp="" - easyrsa_mktemp vars_org_tmp || die \ - "escape_hazard - easyrsa_mktemp vars_org_tmp" + escape_hazard_tmp="" + easyrsa_mktemp escape_hazard_tmp || die \ + "escape_hazard - easyrsa_mktemp escape_hazard_tmp" # write org fields to org temp-file and escape '&' and '$' print "\ @@ -956,17 +956,17 @@ export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\" export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\ " | sed -e s\`'\&'\`'\\\&'\`g \ -e s\`'\$'\`'\\\$'\`g \ - > "$vars_org_tmp" || die "\ + > "$escape_hazard_tmp" || die "\ escape_hazard - Failed to write temp-file" # Reload fields from fully escaped temp-file # shellcheck disable=SC1090 # can't follow ... - (. "$vars_org_tmp") || die "\ + (. "$escape_hazard_tmp") || die "\ escape_hazard - Failed to source temp-file" verbose "escape_hazard: COMPLETED" # shellcheck disable=SC1090 # can't follow ... - . "$vars_org_tmp" + . "$escape_hazard_tmp" } # => escape_hazard() # Replace environment variable names with current value