Syslogd tls config error messages have changed, adapt tests.
authorbluhm <bluhm@openbsd.org>
Mon, 29 Aug 2016 20:34:59 +0000 (20:34 +0000)
committerbluhm <bluhm@openbsd.org>
Mon, 29 Aug 2016 20:34:59 +0000 (20:34 +0000)
regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl
regress/usr.sbin/syslogd/args-tls-cert-noexist.pl
regress/usr.sbin/syslogd/args-tls-key-noexist.pl

index 25374a7..dfa8e14 100644 (file)
@@ -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,
index 57b83af..c549e88 100644 (file)
@@ -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,
        },
     },
index 0b96cf9..0d1e326 100644 (file)
@@ -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,
        },
     },