Merge branch 'issue_478'

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2022-03-15 19:23:04 -05:00
commit 86e8feccda
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E

View File

@ -332,16 +332,9 @@ easyrsa_mktemp() {
die "Could not create temporary directory '$EASYRSA_TEMP_DIR_session'. Permission or concurrency problem?"
[ -d "$EASYRSA_TEMP_DIR_session" ] || die "Temporary directory '$EASYRSA_TEMP_DIR_session' does not exist"
template="$EASYRSA_TEMP_DIR_session/tmp.XXXXXX"
tempfile=$(mktemp "$template") || return
# win32 mktemp shipped by easyrsa returns template as file!
if [ "$template" = "$tempfile" ]; then
# but win32 mktemp -d does work
# but win32 mktemp -u does not work
tempfile=$(mktemp -du "$tempfile") || return
printf "" > "$tempfile" || return
fi
tempfile="$EASYRSA_TEMP_DIR_session/tmp.$($EASYRSA_OPENSSL rand -hex 3)" || return
printf "" > "$tempfile" || return
echo "$tempfile"
} # => easyrsa_mktemp