Skip to content

Commit cb29348

Browse files
committed
PKI lock-file: Move possible creation to sub-function request_lock_file()
Signed-off-by: Richard T Bonhomme <[email protected]>
1 parent dc5e69d commit cb29348

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

easyrsa3/easyrsa

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5789,10 +5789,8 @@ change these values.
57895789
${unexpected_error}"
57905790
} # => validate_default_vars()
57915791

5792-
# Verify working environment
5793-
verify_working_env() {
5794-
verbose "verify_working_env: BEGIN"
5795-
5792+
# Create PKI lock-file, as necessary
5793+
request_lock_file() {
57965794
# Create lock-file
57975795
create_lock_file_error=
57985796
if [ -d "${EASYRSA_PKI}" ]; then
@@ -5838,12 +5836,20 @@ lock-file removed - Please try running the easyrsa command again."
58385836
else
58395837
verbose "verify_working_env: lock-file not required."
58405838
fi
5839+
} # => request_lock_file()
5840+
5841+
# Verify working environment
5842+
verify_working_env() {
5843+
verbose "verify_working_env: BEGIN"
58415844

58425845
# For commands which 'require a PKI' and PKI exists
58435846
if [ "$require_pki" ]; then
58445847
# Verify PKI is initialised
58455848
verify_pki_init
58465849

5850+
# Lock the PKI
5851+
request_lock_file
5852+
58475853
# Temp dir session and throw-away temp-file
58485854
secure_session
58495855
easyrsa_mktemp test_temp_file

0 commit comments

Comments
 (0)