Move check_resolver_bins again, handle double CN

When running in debugging mode, HAS_DIG and friends was
still false as check_resolver_bins() was called too late.
This amends basically bac0f66112 .

In cases where a certificate has two CNs, the output contained
a linefeed. This replaces the line feed by a space.
This commit is contained in:
Dirk Wetter 2019-11-10 12:52:12 +01:00
parent 5c39ceafe1
commit 90a1455570
1 changed files with 4 additions and 4 deletions

View File

@ -7464,7 +7464,7 @@ get_cn_from_cert() {
# for e.g. russian sites -esc_msb,utf8 works in an UTF8 terminal -- any way to check platform independent?
# see x509(1ssl):
subject="$($OPENSSL x509 -in $1 -noout -subject -nameopt multiline,-align,sname,-esc_msb,utf8,-space_eq 2>>$ERRFILE)"
echo "$(awk -F'=' '/CN=/ { print $2 }' <<< "$subject")"
echo "$(awk -F'=' '/CN=/ { print $2 }' <<< "$subject" | tr '\n' ' ')"
return $?
}
@ -19766,9 +19766,9 @@ lets_roll() {
maketempf
find_openssl_binary
choose_printf
check_resolver_bins
prepare_debug ; stopwatch parse
prepare_arrays ; stopwatch prepare_arrays
check_resolver_bins
mybanner
check_proxy
check4openssl_oldfarts