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

Merge branch 'init-vars' of ssh://github.com/nkakouros/easy-rsa into nkakouros-init-vars

Browse Source
This commit is contained in:
Richard T Bonhomme 2022-05-10 09:33:03 +01:00
commit e3d08f776f
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
easyrsa3/easyrsa
View File

@ -2717,7 +2717,8 @@ Priority should be given to your PKI vars file:
fi
# If $EASYRSA_NO_VARS is defined (not blank) then do not use vars
# if $no_pki_required then no vars is required.
# if $no_pki_required then located vars files are not required (user
# defined '--vars=file' is still respected though).
if [ "$EASYRSA_NO_VARS" ] || [ "$no_pki_required" ]; then
: # ok
else
@ -3604,13 +3605,21 @@ trap "exit 14" 15
cmd="$1"
[ -n "$1" ] && shift # scrape off command
# This avoids unnecessary warnings and notices
case "$cmd" in
init-pki|clean-all) no_pki_required=1 ;;
""|help|-h|--help|--usage) no_pki_required=1 ;;
version) no_pki_required=1 ;;
*) unset -v no_pki_required
esac
# User defined '--vars=file' or defaults
if [ "$EASYRSA_VARS_FILE" ]; then
# User defined --vars=file MUST be sourced, we trust the user knows
# better.
: # ok
else
# This avoids unnecessary warnings and notices by, among others,
# skipping locating and loading vars files.
case "$cmd" in
init-pki|clean-all) no_pki_required=1 ;;
""|help|-h|--help|--usage) no_pki_required=1 ;;
version) no_pki_required=1 ;;
*) unset -v no_pki_required
esac
fi
# Get host details
detect_host