From ba1b61f53ceb230c3b73fd9fd3c496bddd408783 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Tue, 2 May 2023 22:13:48 +0100 Subject: [PATCH] mutual_exclusions(): Use of --silent and --verbose is unresolvable Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index f5e7574..6335339 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -826,6 +826,9 @@ make_safe_ssl() { verify_pki_init EASYRSA_FORCE_SAFE_SSL=1 easyrsa_openssl makesafeconf + notice "\ +Safe SSL config file created at: +* $EASYRSA_SAFE_CONF" verbose "\ make_safe_ssl: NEW SSL cnf file: $easyrsa_safe_ssl_conf" } # => make_safe_ssl_copy() @@ -4353,7 +4356,8 @@ read_db() { secure_session || \ die "read_db - secure_session" if [ "$require_safe_ssl_conf" ]; then - make_safe_ssl || die "read_db - make_safe_ssl" + EASYRSA_SILENT=1 make_safe_ssl || \ + die "read_db - make_safe_ssl" fi # Interpret the db/certificate record @@ -4971,6 +4975,11 @@ To correct this problem, it is recommended that you either: " fi fi + + # Use of --silent and --verbose + if [ "$EASYRSA_SILENT" ] && [ "$EASYRSA_VERBOSE" ]; then + die "Use of --silent and --verbose is unresolvable." + fi } # => mutual_exclusions() # vars setup