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

Merge branch 'nkakouros-init-vars'

Browse Source 
Minor changes to original comments.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-05-10 09:41:29 +01:00
commit d7494fb73e
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
easyrsa3/easyrsa
View File

@ -2716,8 +2716,9 @@ Priority should be given to your PKI vars file:
# END: Find vars
fi
# If $EASYRSA_NO_VARS is defined (not blank) then do not use vars
# if $no_pki_required then no vars is required.
# If $EASYRSA_NO_VARS is defined (not blank) then do not use vars.
# If $no_pki_required then located vars files are not required.
# User defined '--vars=file' is respected.
if [ "$EASYRSA_NO_VARS" ] || [ "$no_pki_required" ]; then
: # ok
else
@ -3604,13 +3605,19 @@ 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, do not set no_pki_required
: # ok
else
# 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
fi
# Get host details
detect_host