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

Add 'pki_is_required', compliment of 'no_pki_required'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-05-20 09:40:25 +01:00
parent 322168bca6
commit deffb7e44f
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
easyrsa3/easyrsa
View File

@ -3204,21 +3204,16 @@ Move your vars file to your PKI folder, where it is safe!"
set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM" set_var EASYRSA_KDC_REALM "CHANGEME.EXAMPLE.COM"
# For commands which 'require a PKI' and the PKI exists # For commands which 'require a PKI' and the PKI exists
if [ ! "$no_pki_required" ] && [ -d "$EASYRSA_PKI" ]; then if [ "$pki_is_required" ] && [ -d "$EASYRSA_PKI" ]; then
# Make a safe SSL config for LibreSSL # Make a safe SSL config for LibreSSL
# Must specify 'no_pki_required' and 'require_safe_ssl_conf' here # Must specify 'no_pki_required' and 'require_safe_ssl_conf' here
# because verify_ssl_lib() has not yet run # because verify_ssl_lib() has not yet run
# sub-shell out, to change running variables, only the file is required { # Scope conditions to this single command
#( no_pki_required=1 require_safe_ssl_conf=1 \
# no_pki_required=1 easyrsa_openssl makesafeconf || \
# require_safe_ssl_conf=1 die "Failed to create safe ssl conf (vars_setup)"
# easyrsa_openssl makesafeconf } # Close scope
#) || \
# die "Failed to create safe ssl conf (vars_setup)"
# Alternate version:
no_pki_required=1 require_safe_ssl_conf=1 easyrsa_openssl makesafeconf || \
die "Failed to create safe ssl conf (vars_setup)"
# mkdir Temp dir session # mkdir Temp dir session
secure_session || die "Temporary directory secure-session failed." secure_session || die "Temporary directory secure-session failed."
@ -4015,8 +4010,9 @@ cmd="$1"
# This avoids unnecessary warnings and notices # This avoids unnecessary warnings and notices
case "$cmd" in case "$cmd" in
init-pki|clean-all|""|help|-h|--help|--usage|version) init-pki|clean-all|""|help|-h|--help|--usage|version)
no_pki_required=1 ;; unset -v pki_is_required; no_pki_required=1 ;;
*) unset -v no_pki_required *)
pki_is_required=1; unset -v no_pki_required
esac esac
# Intelligent env-var detection and auto-loading: # Intelligent env-var detection and auto-loading: