From a96642fb40af450c6576e205fab247cdbce0b5ed Mon Sep 17 00:00:00 2001
From: anton <anton@openbsd.org>
Date: Sat, 10 Dec 2022 12:17:46 +0000
Subject: [PATCH] Make the accepted log grep pattern more strict in order to
 not pick up any log entries from sshd causing intermittent failures.

Discussed with bluhm@ back in August this year.
---
 regress/usr.sbin/syslogd/args-fdexhaustion-sighup.pl  | 2 +-
 regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl | 2 +-
 regress/usr.sbin/syslogd/args-server-tls-reconnect.pl | 2 +-
 regress/usr.sbin/syslogd/args-sighup-tcp.pl           | 2 +-
 regress/usr.sbin/syslogd/args-sighup-tls.pl           | 2 +-
 regress/usr.sbin/syslogd/args-sighup.pl               | 2 +-
 regress/usr.sbin/syslogd/args-sync-tcp.pl             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/regress/usr.sbin/syslogd/args-fdexhaustion-sighup.pl b/regress/usr.sbin/syslogd/args-fdexhaustion-sighup.pl
index 89ca9d9ee1b..4634ed7ff27 100644
--- a/regress/usr.sbin/syslogd/args-fdexhaustion-sighup.pl
+++ b/regress/usr.sbin/syslogd/args-fdexhaustion-sighup.pl
@@ -46,7 +46,7 @@ our %args = (
 	loggrep => {
 	    get_between2loggrep(),
 	    qr/Signal/ => 1,
-	    qr/Accepted/ => 1,
+	    qr/^Accepted$/ => 1,
 	},
     },
     multifile => [
diff --git a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
index 8bcb711ea03..f68f3965db1 100644
--- a/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
+++ b/regress/usr.sbin/syslogd/args-server-tcp-reconnect.pl
@@ -42,7 +42,7 @@ our %args = (
 	    $self->listen();
 	})},
 	loggrep => {
-	    qr/Accepted/ => 2,
+	    qr/^Accepted$/ => 2,
 	    qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
 	    qr/syslogd\[\d+\]: (connect .*|.*connection error): $errors/ => 1,
 	    get_between2loggrep(),
diff --git a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
index b53a9a34efd..45a514a67dd 100644
--- a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
@@ -45,7 +45,7 @@ our %args = (
 	    $self->listen();
 	})},
 	loggrep => {
-	    qr/Accepted/ => 2,
+	    qr/^Accepted$/ => 2,
 	    qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
 	    qr/syslogd\[\d+\]: .*/.
 		qr/connection error: handshake failed:/ => 1,
diff --git a/regress/usr.sbin/syslogd/args-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-sighup-tcp.pl
index 512b896d3cf..7fd335a2830 100644
--- a/regress/usr.sbin/syslogd/args-sighup-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-tcp.pl
@@ -50,7 +50,7 @@ our %args = (
 	loggrep => {
 	    get_between2loggrep(),
 	    qr/Signal/ => 1,
-	    qr/Accepted/ => 2,
+	    qr/^Accepted$/ => 2,
 	},
     },
 );
diff --git a/regress/usr.sbin/syslogd/args-sighup-tls.pl b/regress/usr.sbin/syslogd/args-sighup-tls.pl
index 7023912afd5..6290a6056eb 100644
--- a/regress/usr.sbin/syslogd/args-sighup-tls.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-tls.pl
@@ -50,7 +50,7 @@ our %args = (
 	loggrep => {
 	    get_between2loggrep(),
 	    qr/Signal/ => 1,
-	    qr/Accepted/ => 2,
+	    qr/^Accepted$/ => 2,
 	},
     },
 );
diff --git a/regress/usr.sbin/syslogd/args-sighup.pl b/regress/usr.sbin/syslogd/args-sighup.pl
index 53bbe08a126..a33a1a3d958 100644
--- a/regress/usr.sbin/syslogd/args-sighup.pl
+++ b/regress/usr.sbin/syslogd/args-sighup.pl
@@ -41,7 +41,7 @@ our %args = (
 	loggrep => {
 	    get_between2loggrep(),
 	    qr/Signal/ => 1,
-	    qr/Accepted/ => 1,
+	    qr/^Accepted$/ => 1,
 	},
     },
     check => sub {
diff --git a/regress/usr.sbin/syslogd/args-sync-tcp.pl b/regress/usr.sbin/syslogd/args-sync-tcp.pl
index e3b11811268..78ab8942426 100644
--- a/regress/usr.sbin/syslogd/args-sync-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-sync-tcp.pl
@@ -54,7 +54,7 @@ our %args = (
 		or die ref($self), " shutdown write failed: $!";
 	})},
 	loggrep => {
-	    qr/Accepted/ => 2,
+	    qr/^Accepted$/ => 2,
 	    get_between2loggrep(),
 	    get_thirdlog() => 0,
 	},
-- 
2.20.1