Skip to content

Commit

Permalink
Merge branch 'TinCanTech-remove-makesafeconf'
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Apr 18, 2024
2 parents a28ff0e + 3de1fd5 commit 9c030b7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,7 @@ Temporary session not preserved."
# Replace environment variable names with current value
# and write to temp-file or return error from sed
expand_ssl_config() {
if [ "$EASYRSA_FORCE_SAFE_SSL" ] || \
[ "$makesafeconf" ]
then
if [ "$EASYRSA_FORCE_SAFE_SSL" ]; then
# Always run
verbose "expand_ssl_config: FORCED"
elif [ "$working_safe_ssl_conf" ]; then
Expand Down Expand Up @@ -4889,7 +4887,6 @@ unset -v \
verify_ssl_lib_ok \
secured_session \
working_safe_ssl_conf working_safe_org_conf \
makesafeconf \
alias_days \
prohibit_no_pass \
invalid_vars \
Expand Down

0 comments on commit 9c030b7

Please sign in to comment.