From d8b92a591cce0b31587345a5da75b16c8e26aac4 Mon Sep 17 00:00:00 2001 From: bluhm Date: Mon, 29 Aug 2016 20:34:59 +0000 Subject: [PATCH] Syslogd tls config error messages have changed, adapt tests. --- regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl | 2 +- regress/usr.sbin/syslogd/args-tls-cert-noexist.pl | 4 ++-- regress/usr.sbin/syslogd/args-tls-key-noexist.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl index 25374a7a492..dfa8e14f599 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl @@ -13,7 +13,7 @@ our %args = ( syslogd => { loghost => '@tls://localhost:$connectport', loggrep => { - qr/syslogd: load client TLS CA failed/ => 2, + qr/syslogd: Load client TLS CA failed/ => 2, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', qr/syslogd: tls_connect_socket .*: /. qr/ssl verify memory setup failure/ => 2, diff --git a/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl b/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl index 57b83afd227..c549e887256 100644 --- a/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl +++ b/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl @@ -40,8 +40,8 @@ our %args = ( loggrep => { qr{Keyfile /etc/ssl/private/127.0.0.1.key} => 1, qr{Certfile } => 0, - qr{syslogd: tls_config_set_key_file} => 2, - qr{syslogd: tls_config_set_cert_file} => 2, + qr{syslogd: Load server TLS key failed} => 2, + qr{syslogd: Load server TLS cert failed} => 2, qr{syslogd: tls_configure server} => 2, }, }, diff --git a/regress/usr.sbin/syslogd/args-tls-key-noexist.pl b/regress/usr.sbin/syslogd/args-tls-key-noexist.pl index 0b96cf94885..0d1e32647b4 100644 --- a/regress/usr.sbin/syslogd/args-tls-key-noexist.pl +++ b/regress/usr.sbin/syslogd/args-tls-key-noexist.pl @@ -40,7 +40,7 @@ our %args = ( loggrep => { qr{Keyfile } => 0, qr{Certfile } => 0, - qr{syslogd: tls_config_set_key_file} => 4, + qr{syslogd: Load server TLS key failed} => 4, qr{syslogd: tls_configure server} => 2, }, }, -- 2.20.1