Syslogd's debug and error messages have changed a bit, adapt test.

diff --git a/regress/usr.sbin/syslogd/args-client-tcp-close.pl b/regress/usr.sbin/syslogd/args-client-tcp-close.pl
index 3cca393..abdb1c1 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tcp-close.pl
+++ b/regress/usr.sbin/syslogd/args-client-tcp-close.pl
@@ -26,8 +26,8 @@ our %args = (
     syslogd => {
        options => ["-T", "127.0.0.1:514"],
        loggrep => {
-           qr/syslogd: tcp logger .* accepted/ => 1,
-           qr/syslogd: tcp logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* connection close/ => 1,
        }
     },
     server => {
@@ -40,7 +40,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: tcp logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* connection close/ => 1,
        },
     },
     pipe => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-client-tcp-error.pl b/regress/usr.sbin/syslogd/args-client-tcp-error.pl
index ea1592c..427cacd 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tcp-error.pl
+++ b/regress/usr.sbin/syslogd/args-client-tcp-error.pl
@@ -28,8 +28,8 @@ our %args = (
     syslogd => {
        options => ["-T", "127.0.0.1:514"],
        loggrep => {
-           qr/syslogd: tcp logger .* accept/ => 1,
-           qr/syslogd: tcp logger .* connection error/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* accept/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* connection error/ => 1,
        },
     },
     server => {
@@ -42,7 +42,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: tcp logger .* connection error: $errors/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* connection error: $errors/ => 1,
        },
     },
     pipe => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-client-tcp.pl b/regress/usr.sbin/syslogd/args-client-tcp.pl
index b047eec..cdba2e0 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-client-tcp.pl
@@ -21,8 +21,8 @@ our %args = (
            qr/ internet6? stream tcp \w+ (127.0.0.1|\[::1\]):514$/ => 1,
        },
        loggrep => {
-           qr/syslogd: tcp logger .* accepted/ => 1,
-           qr/syslogd: tcp logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* connection close/ => 1,
        },
     },
     file => {

diff --git a/regress/usr.sbin/syslogd/args-client-tls-close.pl b/regress/usr.sbin/syslogd/args-client-tls-close.pl
index 1af4105..a53ffc9 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tls-close.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls-close.pl
@@ -26,8 +26,8 @@ our %args = (
     syslogd => {
        options => ["-S", "127.0.0.1:6514"],
        loggrep => {
-           qr/syslogd: tls logger .* accepted/ => 1,
-           qr/syslogd: tls logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection close/ => 1,
        },
     },
     server => {
@@ -40,7 +40,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: tls logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection close/ => 1,
        },
     },
     pipe => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-client-tls-error.pl b/regress/usr.sbin/syslogd/args-client-tls-error.pl
index 0ed5f64..15d8ea7 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tls-error.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls-error.pl
@@ -28,8 +28,8 @@ our %args = (
     syslogd => {
        options => ["-S", "127.0.0.1:6514"],
        loggrep => {
-           qr/syslogd: tls logger .* accept/ => 1,
-           qr/syslogd: tls logger .* connection error/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* accept/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection error/ => 1,
        },
     },
     server => {
@@ -42,8 +42,8 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: tls logger .* connection error: read failed: $errors/
-               => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection error: /.
+               qr/read failed: $errors/ => 1,
        },
     },
     pipe => { nocheck => 1, },

diff --git a/regress/usr.sbin/syslogd/args-client-tls-fake.pl b/regress/usr.sbin/syslogd/args-client-tls-fake.pl
index ad35a42..d1c46e6 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tls-fake.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls-fake.pl
@@ -33,7 +33,7 @@ our %args = (
        loggrep => {
            qr{Server CAfile fake-ca.crt} => 1,
            qr{tls logger .* accepted} => 1,
-           qr/syslogd: tls logger .* connection error: /.
+           qr/syslogd\[\d+\]: tls logger .* connection error: /.
                qr/handshake failed: error:.*:rsa routines:/.
                qr/CRYPTO_internal:/ => 1,
        },
@@ -41,13 +41,14 @@ our %args = (
     server => {
        func => sub {
            my $self = shift;
-           read_message($self, qr/syslogd: tls logger .* connection error/);
+           read_message($self, qr/tls logger .* connection error/);
        },
        loggrep => {},
     },
     file => {
        loggrep => {
-           qr/syslogd: tls logger .* connection error: handshake failed/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection error: /.
+               qr/handshake failed/ => 1,
        },
     },
     pipe => { nocheck => 1, },

diff --git a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl
index 2a23ede..3b28db4 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl
@@ -26,8 +26,8 @@ our %args = (
     syslogd => {
        options => ["-S", "127.0.0.1:6514"],
        loggrep => {
-           qr/syslogd: tls logger .* accepted/ => 1,
-           qr/syslogd: tls logger .* connection error/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection error/ => 1,
        },
     },
     server => {
@@ -40,7 +40,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: tls logger .* connection error: /.
+           qr/syslogd\[\d+\]: tls logger .* connection error: /.
                qr/handshake failed: error:.*:SSL routines:/.
                qr/ACCEPT_SR_CLNT_HELLO:unknown protocol/ => 1,
        },

diff --git a/regress/usr.sbin/syslogd/args-client-tls.pl b/regress/usr.sbin/syslogd/args-client-tls.pl
index 60f47f2..68223cd 100644 (file)
--- a/regress/usr.sbin/syslogd/args-client-tls.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls.pl
@@ -33,8 +33,8 @@ our %args = (
        loggrep => {
            qr{Keyfile /etc/ssl/private/localhost.key} => 1,
            qr{Certfile /etc/ssl/localhost.crt} => 1,
-           qr/syslogd: tls logger .* accepted/ => 1,
-           qr/syslogd: tls logger .* connection close/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* connection close/ => 1,
        },
     },
     file => {

diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
index edbde9f..1cc9e4a 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tcp.pl
@@ -54,10 +54,11 @@ our %args = (
            get_between2loggrep(),
            get_secondlog() => 1,
            get_thirdlog() => 0,
-           qr/syslogd: start/ => 1,
-           qr/syslogd: restart/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
+           qr/syslogd\[\d+\]: restart/ => 1,
            get_charlog() => '~88',
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
     file => {
@@ -65,10 +66,11 @@ our %args = (
            get_between2loggrep(),
            get_secondlog() => 1,
            get_thirdlog() => 1,
-           qr/syslogd: start/ => 1,
-           qr/syslogd: restart/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
+           qr/syslogd\[\d+\]: restart/ => 1,
            get_charlog() => 300,
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
index 187582d..af34a71 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sighup-tls.pl
@@ -55,10 +55,11 @@ our %args = (
            get_between2loggrep(),
            get_secondlog() => 1,
            get_thirdlog() => 0,
-           qr/syslogd: start/ => 1,
-           qr/syslogd: restart/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
+           qr/syslogd\[\d+\]: restart/ => 1,
            get_charlog() => '~88',
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
     file => {
@@ -66,10 +67,11 @@ our %args = (
            get_between2loggrep(),
            get_secondlog() => 1,
            get_thirdlog() => 1,
-           qr/syslogd: start/ => 1,
-           qr/syslogd: restart/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
+           qr/syslogd\[\d+\]: restart/ => 1,
            get_charlog() => 300,
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
index 380d8d4..043be17 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tcp.pl
@@ -39,8 +39,8 @@ our %args = (
            ${$self->{syslogd}}->loggrep(get_thirdlog(), 20)
                or die ref($self), " syslogd did not receive third log";
            ${$self->{syslogd}}->kill_syslogd('TERM');
-           ${$self->{syslogd}}->loggrep("syslogd: exiting", 5)
-               or die ref($self), " no 'syslogd: exiting' between logs";
+           ${$self->{syslogd}}->loggrep("syslogd: exited", 5)
+               or die ref($self), " no 'syslogd: exited' between logs";
            # syslogd has shut down, read from kernel socket buffer
            read_log($self);
        },
@@ -49,7 +49,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 0,
            get_testgrep() => 0,
-           qr/syslogd: start/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
            get_charlog() => '~88',
        },
     },
@@ -59,9 +59,10 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 1,
            get_testgrep() => 0,
-           qr/syslogd: start/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
            get_charlog() => 300,
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
     pipe => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
index 5856522..c062d4b 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-sigterm-tls.pl
@@ -40,8 +40,8 @@ our %args = (
            ${$self->{syslogd}}->loggrep(get_thirdlog(), 20)
                or die ref($self), " syslogd did not receive third log";
            ${$self->{syslogd}}->kill_syslogd('TERM');
-           ${$self->{syslogd}}->loggrep("syslogd: exiting", 5)
-               or die ref($self), " no 'syslogd: exiting' between logs";
+           ${$self->{syslogd}}->loggrep("syslogd: exited", 5)
+               or die ref($self), " no 'syslogd: exited' between logs";
            # syslogd has shut down, read from kernel socket buffer
            read_log($self);
        },
@@ -50,7 +50,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 0,
            get_testgrep() => 0,
-           qr/syslogd: start/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
            get_charlog() => '~88',
        },
     },
@@ -60,9 +60,10 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 1,
            get_testgrep() => 0,
-           qr/syslogd: start/ => 1,
+           qr/syslogd\[\d+\]: start/ => 1,
            get_charlog() => 300,
-           qr/syslogd: dropped 2[0-3][0-9] messages to remote loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped 2[0-3][0-9] messages to remote loghost/
+               => 1,
        },
     },
     pipe => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-dropped-tcp.pl b/regress/usr.sbin/syslogd/args-dropped-tcp.pl
index 38a8c36..cd3367e 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-tcp.pl
@@ -22,7 +22,7 @@ our %args = (
            write_message($self, get_thirdlog());
            ${$self->{server}}->loggrep(get_secondlog(), 5)
                or die ref($self), " server did not receive second log";
-           ${$self->{syslogd}}->loggrep(qr/syslogd: dropped \d+ messages?/, 5)
+           ${$self->{syslogd}}->loggrep(qr/: dropped \d+ messages? to/, 5)
                or die ref($self), " syslogd did not write dropped message";
        })},
     },
@@ -48,7 +48,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 0,
            get_charlog() => '~333',
-           qr/syslogd: dropped [67][0-9] messages to loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1,
        },
     },
     file => {
@@ -57,7 +57,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 1,
            get_charlog() => 400,
-           qr/syslogd: dropped [67][0-9] messages to loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-dropped-tls.pl b/regress/usr.sbin/syslogd/args-dropped-tls.pl
index a0610ca..52c1735 100644 (file)
--- a/regress/usr.sbin/syslogd/args-dropped-tls.pl
+++ b/regress/usr.sbin/syslogd/args-dropped-tls.pl
@@ -22,7 +22,7 @@ our %args = (
            write_message($self, get_thirdlog());
            ${$self->{server}}->loggrep(get_secondlog(), 5)
                or die ref($self), " server did not receive second log";
-           ${$self->{syslogd}}->loggrep(qr/syslogd: dropped \d+ messages?/, 5)
+           ${$self->{syslogd}}->loggrep(qr/: dropped \d+ messages? to/, 5)
                or die ref($self), " syslogd did not write dropped message";
        })},
     },
@@ -49,7 +49,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 0,
            get_charlog() => '~333',
-           qr/syslogd: dropped [67][0-9] messages to loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1,
        },
     },
     file => {
@@ -58,7 +58,7 @@ our %args = (
            get_secondlog() => 1,
            get_thirdlog() => 1,
            get_charlog() => 400,
-           qr/syslogd: dropped [67][0-9] messages to loghost/ => 1,
+           qr/syslogd\[\d+\]: dropped [67][0-9] messages to loghost/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-error.pl b/regress/usr.sbin/syslogd/args-error.pl
index 0a09410..b5ef1a9 100644 (file)
--- a/regress/usr.sbin/syslogd/args-error.pl
+++ b/regress/usr.sbin/syslogd/args-error.pl
@@ -21,20 +21,20 @@ our %args = (
            ), '-a', 'A'x1000, '-p', 'P'x1000, '-s', 'S'x1000
        ],
        loggrep => {
-           qr/address 127.188.42.23/ => 4,
-           qr/address ::ffff:127.188.0.0/ => 4,
-           qr/port 70000/ => 6,
-           qr/socket bind udp/ => 6,
-           qr/socket listen tcp/ => 6,
-           qr/socket listen tls/ => 2,
-           qr/CA file 'CCCC'/ => 2,
-           qr/certificate file 'cccc'/ => 2,
-           qr/CA file 'KKKK'/ => 2,
-           qr/key file 'kkkk'/ => 2,
-           qr/socket path too long: AAAA/ => 2,
-           qr/socket path too long: PPPP/ => 2,
-           qr/socket path too long: SSSS/ => 2,
-           qr/log socket failed/ => 2,
+           qr/address 127.188.42.23/ => 2,
+           qr/address ::ffff:127.188.0.0/ => 2,
+           qr/port 70000/ => 3,
+           qr/socket bind udp/ => 3,
+           qr/socket listen tcp/ => 3,
+           qr/socket listen tls/ => 1,
+           qr/CA file 'CCCC'/ => 1,
+           qr/certificate file 'cccc'/ => 1,
+           qr/CA file 'KKKK'/ => 1,
+           qr/key file 'kkkk'/ => 1,
+           qr/socket path too long "AAAA/ => 1,
+           qr/socket path too long "PPPP/ => 1,
+           qr/socket path too long "SSSS/ => 1,
+           qr/log socket PPPP/ => 1,
        }
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-fdexhaustion-tcp.pl b/regress/usr.sbin/syslogd/args-fdexhaustion-tcp.pl
index b35fed2..d4bae23 100644 (file)
--- a/regress/usr.sbin/syslogd/args-fdexhaustion-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-fdexhaustion-tcp.pl
@@ -37,11 +37,11 @@ our %args = (
        loggrep => { get_testlog() => 0 },
     },
     multifile => [
-       (map { { loggrep => qr/syslogd: accept deferred/ } } 0..13),
+       (map { { loggrep => qr/syslogd\[\d+\]: accept deferred/ } } 0..13),
        (map { { loggrep => { qr/./s => 0 } } } 14..19),
     ],
     file => {
-       loggrep => qr/syslogd: accept deferred: Too many open files/,
+       loggrep => qr/syslogd\[\d+\]: accept deferred: Too many open files/,
     },
     pipe => { nocheck => 1 },
     tty => { nocheck => 1 },

diff --git a/regress/usr.sbin/syslogd/args-maxhostlen.pl b/regress/usr.sbin/syslogd/args-maxhostlen.pl
index 3808dd1..8122f75 100644 (file)
--- a/regress/usr.sbin/syslogd/args-maxhostlen.pl
+++ b/regress/usr.sbin/syslogd/args-maxhostlen.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@'.('X'x256).':514',
        loggrep => {
-           qr/syslogd: host too long "\@X+/ => 2,
+           qr/syslogd: host too long "\@X+/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-maxloghostlen.pl b/regress/usr.sbin/syslogd/args-maxloghostlen.pl
index f38b45d..009d709 100644 (file)
--- a/regress/usr.sbin/syslogd/args-maxloghostlen.pl
+++ b/regress/usr.sbin/syslogd/args-maxloghostlen.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@'.('X'x300),
        loggrep => {
-           qr/syslogd: loghost too long "\@X+/ => 2,
+           qr/syslogd: loghost too long "\@X+/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-maxportlen.pl b/regress/usr.sbin/syslogd/args-maxportlen.pl
index 27e25a5..6ac63f4 100644 (file)
--- a/regress/usr.sbin/syslogd/args-maxportlen.pl
+++ b/regress/usr.sbin/syslogd/args-maxportlen.pl
@@ -12,7 +12,7 @@ our %args = (
     syslogd => {
        loghost => '@127.0.0.1:'.('X'x32),
        loggrep => {
-           qr/syslogd: port too long "\@127.0.0.1:X+/ => 2,
+           qr/syslogd: port too long "\@127.0.0.1:X+/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-proto-invalid.pl b/regress/usr.sbin/syslogd/args-proto-invalid.pl
index fa25101..f998ef5 100644 (file)
--- a/regress/usr.sbin/syslogd/args-proto-invalid.pl
+++ b/regress/usr.sbin/syslogd/args-proto-invalid.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@invalid://127.0.0.1',
        loggrep => {
-           qr/syslogd: bad protocol "\@invalid:\/\/127.0.0.1"/ => 2,
+           qr/syslogd: bad protocol "\@invalid:\/\/127.0.0.1"/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-proto-udp4-host6.pl b/regress/usr.sbin/syslogd/args-proto-udp4-host6.pl
index fdeef23..d702288 100644 (file)
--- a/regress/usr.sbin/syslogd/args-proto-udp4-host6.pl
+++ b/regress/usr.sbin/syslogd/args-proto-udp4-host6.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@udp4://[::1]',
        loggrep => {
-           qr/syslogd: bad hostname "\@udp4:\/\/\[::1\]"/ => 2,
+           qr/syslogd: bad hostname "\@udp4:\/\/\[::1\]"/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-proto-udp4-only6.pl b/regress/usr.sbin/syslogd/args-proto-udp4-only6.pl
index fcdb6ee..f28e26d 100644 (file)
--- a/regress/usr.sbin/syslogd/args-proto-udp4-only6.pl
+++ b/regress/usr.sbin/syslogd/args-proto-udp4-only6.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@udp4://127.0.0.1',
        loggrep => {
-           qr/syslogd: no udp4 "\@udp4:\/\/127.0.0.1/ => 2,
+           qr/syslogd: no udp4 "\@udp4:\/\/127.0.0.1/ => 1,
            get_testgrep() => 1,
        },
        options => ["-6"],

diff --git a/regress/usr.sbin/syslogd/args-proto-udp6-host4.pl b/regress/usr.sbin/syslogd/args-proto-udp6-host4.pl
index 7ffa91f..bc0f3aa 100644 (file)
--- a/regress/usr.sbin/syslogd/args-proto-udp6-host4.pl
+++ b/regress/usr.sbin/syslogd/args-proto-udp6-host4.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@udp6://127.0.0.1',
        loggrep => {
-           qr/syslogd: bad hostname "\@udp6:\/\/127.0.0.1"/ => 2,
+           qr/syslogd: bad hostname "\@udp6:\/\/127.0.0.1"/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-proto-udp6-only4.pl b/regress/usr.sbin/syslogd/args-proto-udp6-only4.pl
index 25bdeed..a863c34 100644 (file)
--- a/regress/usr.sbin/syslogd/args-proto-udp6-only4.pl
+++ b/regress/usr.sbin/syslogd/args-proto-udp6-only4.pl
@@ -11,7 +11,7 @@ our %args = (
     syslogd => {
        loghost => '@udp6://[::1]',
        loggrep => {
-           qr/syslogd: no udp6 "\@udp6:\/\/\[::1\]/ => 2,
+           qr/syslogd: no udp6 "\@udp6:\/\/\[::1\]/ => 1,
            get_testgrep() => 1,
        },
        options => ["-4"],

diff --git a/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl b/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl
index f2ca3f0..cd4d632 100644 (file)
--- a/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-rsyslog-client-tcp.pl
@@ -27,7 +27,7 @@ our %args = (
        options => ["-T", "127.0.0.1:514"],
        loggrep => {
            get_testgrep() => 1,
-           qr/syslogd: tcp logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tcp logger .* accepted/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl b/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl
index 3f970e4..1f7dbd3 100644 (file)
--- a/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl
+++ b/regress/usr.sbin/syslogd/args-rsyslog-client-tls.pl
@@ -28,7 +28,7 @@ our %args = (
        options => ["-S", "127.0.0.1"],
        loggrep => {
            get_testgrep() => 1,
-           qr/syslogd: tls logger .* accepted/ => 1,
+           qr/syslogd\[\d+\]: tls logger .* accepted/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-server-tcp-close.pl b/regress/usr.sbin/syslogd/args-server-tcp-close.pl
index 0fe137c..8f5ca5f 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tcp-close.pl
+++ b/regress/usr.sbin/syslogd/args-server-tcp-close.pl
@@ -24,7 +24,7 @@ our %args = (
        loggrep => {
            qr/Logging to FORWTCP \@tcp:\/\/127.0.0.1:\d+/ => '>=4',
            get_testgrep() => 1,
-           qr/syslogd: loghost .* connection close/ => 2,
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
        },
     },
     server => {
@@ -40,7 +40,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: loghost .* connection close/ => 1,
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-server-tcp-error.pl b/regress/usr.sbin/syslogd/args-server-tcp-error.pl
index e62e7d5..292f3cc 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tcp-error.pl
+++ b/regress/usr.sbin/syslogd/args-server-tcp-error.pl
@@ -28,7 +28,7 @@ our %args = (
        loggrep => {
            qr/Logging to FORWTCP \@tcp:\/\/127.0.0.1:\d+/ => '>=4',
            get_testgrep() => 1,
-           qr/syslogd: loghost .* connection error/ => 2,
+           qr/syslogd\[\d+\]: loghost .* connection error/ => 1,
        },
     },
     server => {
@@ -42,7 +42,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: loghost .* connection error: $errors/ => 1,
+           qr/syslogd\[\d+\]: loghost .* connection error: $errors/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
index 9cf0884..edb5211 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
+++ b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
@@ -26,7 +26,7 @@ our %args = (
        loghost => '@tcp://127.0.0.1:$connectport',
        loggrep => {
            qr/Logging to FORWTCP \@tcp:\/\/127.0.0.1:\d+/ => '>=6',
-           qr/syslogd: (connect .*|.*connection error): $errors/ => '>=2',
+           qr/syslogd\[\d+\]: (connect .*|.*connection error): $errors/ => 1,
            get_between2loggrep(),
        },
     },
@@ -49,14 +49,14 @@ our %args = (
        })},
        loggrep => {
            qr/Accepted/ => 2,
-           qr/syslogd: loghost .* connection close/ => 1,
-           qr/syslogd: (connect .*|.*connection error): $errors/ => 1,
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
+           qr/syslogd\[\d+\]: (connect .*|.*connection error): $errors/ => 1,
            get_between2loggrep(),
        },
     },
     file => {
        loggrep => {
-           qr/syslogd: (connect .*|.*connection error): $errors/ => '>=1',
+           qr/syslogd\[\d+\]: (connect .*|.*connection error): $errors/ => 1,
            get_between2loggrep(),
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl b/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
index 274091d..c58b906 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
@@ -16,9 +16,9 @@ our %args = (
        loggrep => {
            qr/ClientCertfile client.crt/ => 1,
            qr/ClientKeyfile client.key/ => 1,
-           qr/syslogd: loghost .* connection error: /.
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
                qr/handshake failed: error:.*:SSL routines:/.
-               qr/CONNECT_CR_FINISHED:tlsv1 alert decrypt error/ => 2,
+               qr/CONNECT_CR_FINISHED:tlsv1 alert decrypt error/ => 1,
            get_testgrep() => 1,
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-server-tls-close.pl b/regress/usr.sbin/syslogd/args-server-tls-close.pl
index 58b9498..9873f68 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tls-close.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-close.pl
@@ -24,7 +24,7 @@ our %args = (
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=4',
            get_testgrep() => 1,
-           qr/syslogd: loghost .* connection close/ => '>=2',
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
        },
     },
     server => {
@@ -40,7 +40,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: loghost .* connection close/ => 1,
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-server-tls-error.pl b/regress/usr.sbin/syslogd/args-server-tls-error.pl
index 620fe49..9dc0030 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tls-error.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-error.pl
@@ -28,7 +28,7 @@ our %args = (
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=4',
            get_testgrep() => 1,
-           qr/syslogd: loghost .* connection error/ => 2,
+           qr/syslogd\[\d+\]: loghost .* connection error/ => 1,
        },
     },
     server => {
@@ -42,7 +42,8 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: loghost .* connection error: read failed: $errors/ => 1,
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
+               qr/read failed: $errors/ => 1,
        },
     },
 );

diff --git a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
index 564f3f4..46df333 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
@@ -26,8 +26,9 @@ our %args = (
        loghost => '@tls://127.0.0.1:$connectport',
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=6',
-           qr/syslogd: (connect .*|.* connection error: handshake failed): /.
-               $errors => '>=2',
+           qr/syslogd\[\d+\]: /.
+               qr/(connect .*|.* connection error: handshake failed): /.
+               $errors => 1,
            get_between2loggrep(),
        },
     },
@@ -50,16 +51,18 @@ our %args = (
        })},
        loggrep => {
            qr/Accepted/ => 2,
-           qr/syslogd: loghost .* connection close/ => 1,
-           qr/syslogd: (connect .*|.* connection error: handshake failed): /.
+           qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
+           qr/syslogd\[\d+\]: /.
+               qr/(connect .*|.* connection error: handshake failed): /.
                $errors => 1,
            get_between2loggrep(),
        },
     },
     file => {
        loggrep => {
-           qr/syslogd: (connect .*|.* connection error: handshake failed): /.
-               $errors => '>=1',
+           qr/syslogd\[\d+\]: /.
+               qr/(connect .*|.* connection error: handshake failed): /.
+               $errors => 1,
            get_between2loggrep(),
        },
     },

diff --git a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl
index e6a2ada..9568431 100644 (file)
--- a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl
@@ -24,7 +24,7 @@ our %args = (
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=4',
            get_testgrep() => 1,
-           qr/syslogd: loghost .* connection error/ => 2,
+           qr/syslogd\[\d+\]: loghost .* connection error/ => 1,
        },
     },
     server => {
@@ -39,7 +39,7 @@ our %args = (
     },
     file => {
        loggrep => {
-           qr/syslogd: loghost .* connection error: /.
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
                qr/handshake failed: error:.*:SSL routines:/.
                qr/CONNECT_CR_SRVR_HELLO:wrong version number/ => 1,
        },

diff --git a/regress/usr.sbin/syslogd/args-sigterm.pl b/regress/usr.sbin/syslogd/args-sigterm.pl
index 35d637e..b38447d 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sigterm.pl
+++ b/regress/usr.sbin/syslogd/args-sigterm.pl
@@ -13,8 +13,8 @@ our %args = (
        func => sub {
            my $self = shift;
            write_message($self, get_testlog());
-           ${$self->{server}}->loggrep("syslogd: exiting", 8)
-               or die ref($self), " no 'syslogd: exiting' server log";
+           ${$self->{server}}->loggrep(qr/: exiting on signal/, 8)
+               or die ref($self), " no ': exiting on signal' server log";
        },
     },
     syslogd => {
@@ -22,16 +22,18 @@ our %args = (
            qr/syslogd  PSIG  SIGTERM caught handler/ => 1,
            qr/syslogd  RET   execve 0/ => 2,
        },
-       loggrep => qr/\[unpriv\] syslogd child about to exit/,
+       loggrep => {
+           qr/syslogd: exited/ => 1,
+       },
     },
     server => {
        func => sub {
            my $self = shift;
            read_message($self, get_testgrep());
            ${$self->{syslogd}}->kill_syslogd('TERM');
-           read_message($self, qr/syslogd: exiting/);
+           read_message($self, qr/: exiting on signal/);
        },
-       down => qr/syslogd: exiting on signal 15/,
+       down => qr/syslogd\[\d+\]: exiting on signal 15/,
     },
 );
 

diff --git a/regress/usr.sbin/syslogd/args-sync-tcp.pl b/regress/usr.sbin/syslogd/args-sync-tcp.pl
index a2d936d..19d8303 100644 (file)
--- a/regress/usr.sbin/syslogd/args-sync-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-sync-tcp.pl
@@ -24,7 +24,7 @@ our %args = (
            write_message($self, get_thirdlog());
            ${$self->{server}}->loggrep("Accepted", 5, 2)
                or die ref($self), " server did not accept second connection";
-           ${$self->{syslogd}}->loggrep(qr/syslogd: dropped \d+ messages?/, 5)
+           ${$self->{syslogd}}->loggrep(qr/: dropped \d+ messages? to/, 5)
                or die ref($self), " syslogd did not write dropped message";
        })},
     },

diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl
index cde41fd..2e28976 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl
@@ -18,9 +18,9 @@ our %args = (
        loggrep => {
            qr{CAfile /etc/ssl/cert.pem} => 1,
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: loghost .* connection error: /.
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
                qr/certificate verification failed: /.
-               qr/self signed certificate in certificate chain/ => 2,
+               qr/self signed certificate in certificate chain/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "default",

diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl b/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl
index 2f0e758..8c18b8b 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl
@@ -15,8 +15,8 @@ our %args = (
        loggrep => {
            qr/CAfile empty/ => 1,
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: tls_connect_socket .*: /.
-               qr/ssl verify memory setup failure/ => 2,
+           qr/syslogd\[\d+\]: tls_connect_socket .*: /.
+               qr/ssl verify memory setup failure/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "empty",

diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl b/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl
index 820fd95..b26a4c8 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl
@@ -15,9 +15,9 @@ our %args = (
        loggrep => {
            qr/CAfile fake-ca.crt/ => 1,
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: loghost .* connection error: /.
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
                qr/certificate verification failed: /.
-               qr/certificate signature failure/ => 2,
+               qr/certificate signature failure/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "fake-ca.crt",

diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl
index dfa8e14..8105a94 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl
@@ -13,10 +13,10 @@ our %args = (
     syslogd => {
        loghost => '@tls://localhost:$connectport',
        loggrep => {
-           qr/syslogd: Load client TLS CA failed/ => 2,
+           qr/syslogd: load client TLS CA: failed to open CA file/ => 1,
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: tls_connect_socket .*: /.
-               qr/ssl verify memory setup failure/ => 2,
+           qr/syslogd\[\d+\]: tls_connect_socket .*: /.
+               qr/ssl verify memory setup failure/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "noexist",

diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
index 6d5e364..5e1d40b 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
@@ -15,8 +15,8 @@ our %args = (
        loggrep => {
            qr/CAfile toobig/ => 1,
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: tls_connect_socket .*: /.
-               qr/ssl verify memory setup failure/ => 2,
+           qr/syslogd\[\d+\]: tls_connect_socket .*: /.
+               qr/ssl verify memory setup failure/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "toobig",

diff --git a/regress/usr.sbin/syslogd/args-tls-cert-empty.pl b/regress/usr.sbin/syslogd/args-tls-cert-empty.pl
index 703042b..c298c15 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cert-empty.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cert-empty.pl
@@ -43,7 +43,7 @@ our %args = (
        loggrep => {
            qr{Keyfile $key} => 1,
            qr{Certfile $cert} => 1,
-           qr{syslogd: tls_configure server} => 2,
+           qr{tls_configure server: failed to load certificate} => 1,
        },
     },
     server => {

diff --git a/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl b/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl
index c549e88..72c7e73 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cert-noexist.pl
@@ -40,9 +40,9 @@ our %args = (
        loggrep => {
            qr{Keyfile /etc/ssl/private/127.0.0.1.key} => 1,
            qr{Certfile } => 0,
-           qr{syslogd: Load server TLS key failed} => 2,
-           qr{syslogd: Load server TLS cert failed} => 2,
-           qr{syslogd: tls_configure server} => 2,
+           qr{load server TLS key: failed to open key file} => 1,
+           qr{load server TLS cert: failed to open certificate file} => 1,
+           qr{tls_configure server: private/public key mismatch} => 1,
        },
     },
     server => {

diff --git a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl
index 67c59f7..d574409 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl
@@ -14,9 +14,9 @@ our %args = (
        loghost => '@tls://localhost:$connectport',
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
-           qr/syslogd: loghost .* connection error: /.
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
                qr/handshake failed: error:.*:SSL routines:/.
-               qr/CONNECT_CR_SRVR_HELLO:sslv3 alert handshake failure/ => 2,
+               qr/CONNECT_CR_SRVR_HELLO:sslv3 alert handshake failure/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "ca.crt",

diff --git a/regress/usr.sbin/syslogd/args-tls-host-bad.pl b/regress/usr.sbin/syslogd/args-tls-host-bad.pl
index 71a1c90..b4a5080 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-host-bad.pl
+++ b/regress/usr.sbin/syslogd/args-tls-host-bad.pl
@@ -14,8 +14,8 @@ our %args = (
        loghost => '@tls://127.0.0.1:$connectport',
        loggrep => {
            qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=4',
-           qr/syslogd: loghost .* connection error: /.
-               qr/name `127.0.0.1' not present in server/ => '>=1',
+           qr/syslogd\[\d+\]: loghost .* connection error: /.
+               qr/name `127.0.0.1' not present in server/ => 1,
            get_testgrep() => 1,
        },
        cacrt => "ca.crt",

diff --git a/regress/usr.sbin/syslogd/args-tls-key-empty.pl b/regress/usr.sbin/syslogd/args-tls-key-empty.pl
index 72530cf..bf670bf 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-key-empty.pl
+++ b/regress/usr.sbin/syslogd/args-tls-key-empty.pl
@@ -43,7 +43,7 @@ our %args = (
        loggrep => {
            qr{Keyfile $key} => 1,
            qr{Certfile $cert} => 1,
-           qr{syslogd: tls_configure server} => 2,
+           qr{tls_configure server: failed to read private key} => 1,
        },
     },
     server => {

diff --git a/regress/usr.sbin/syslogd/args-tls-key-noexist.pl b/regress/usr.sbin/syslogd/args-tls-key-noexist.pl
index 0d1e326..b577eee 100644 (file)
--- a/regress/usr.sbin/syslogd/args-tls-key-noexist.pl
+++ b/regress/usr.sbin/syslogd/args-tls-key-noexist.pl
@@ -40,8 +40,8 @@ our %args = (
        loggrep => {
            qr{Keyfile } => 0,
            qr{Certfile } => 0,
-           qr{syslogd: Load server TLS key failed} => 4,
-           qr{syslogd: tls_configure server} => 2,
+           qr{load server TLS key: failed to open key file} => 2,
+           qr{tls_configure server: private/public key mismatch} => 1,
        },
     },
     server => {