nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

escape_hazard(): Rename temp-file easyrsa_vars_org -> vars_org_tmp

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-07-16 21:42:48 +01:00
parent 6edd8ce13c
commit 352d0fa8bf
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
easyrsa3/easyrsa
View File

@ -930,9 +930,9 @@ escape_hazard() {
fi fi
# Assign temp file # Assign temp file
easyrsa_vars_org="" vars_org_tmp=""
easyrsa_mktemp easyrsa_vars_org || die \ easyrsa_mktemp vars_org_tmp || die \
"escape_hazard - easyrsa_mktemp easyrsa_vars_org" "escape_hazard - easyrsa_mktemp vars_org_tmp"
# write org fields to org temp-file and escape '&' and '$' # write org fields to org temp-file and escape '&' and '$'
print "\ print "\
@ -945,17 +945,17 @@ export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\"
export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\ export EASYRSA_REQ_SERIAL=\"$EASYRSA_REQ_SERIAL\"\
" | sed -e s\`'\&'\`'\\\&'\`g \ " | sed -e s\`'\&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g \ -e s\`'\$'\`'\\\$'\`g \
> "$easyrsa_vars_org" || die "\ > "$vars_org_tmp" || die "\
escape_hazard - Failed to write temp-file" escape_hazard - Failed to write temp-file"
# Reload fields from fully escaped temp-file # Reload fields from fully escaped temp-file
# shellcheck disable=SC1090 # can't follow ... # shellcheck disable=SC1090 # can't follow ...
(. "$easyrsa_vars_org") || die "\ (. "$vars_org_tmp") || die "\
escape_hazard - Failed to source temp-file" escape_hazard - Failed to source temp-file"
verbose "escape_hazard: COMPLETED" verbose "escape_hazard: COMPLETED"
# shellcheck disable=SC1090 # can't follow ... # shellcheck disable=SC1090 # can't follow ...
. "$easyrsa_vars_org" . "$vars_org_tmp"
} # => escape_hazard() } # => escape_hazard()
# Replace environment variable names with current value # Replace environment variable names with current value