From a89412eb1004c4bbcfcb93440f0adfea9a488820 Mon Sep 17 00:00:00 2001 From: bluhm Date: Thu, 11 Jun 2026 16:51:14 +0000 Subject: [PATCH] Adapt regress tests for separate syslogd parent. --- regress/usr.sbin/syslogd/Syslogd.pm | 4 ++-- regress/usr.sbin/syslogd/args-privsep.pl | 3 ++- regress/usr.sbin/syslogd/args-sighup-config.pl | 3 ++- regress/usr.sbin/syslogd/args-sighup-privsep.pl | 6 ++++-- regress/usr.sbin/syslogd/args-sighup-tcp.pl | 3 ++- regress/usr.sbin/syslogd/args-sighup-tls.pl | 3 ++- regress/usr.sbin/syslogd/args-sighup.pl | 3 ++- regress/usr.sbin/syslogd/args-sigpipe.pl | 3 ++- regress/usr.sbin/syslogd/args-sigterm.pl | 3 ++- regress/usr.sbin/syslogd/logflush.c | 6 +++--- regress/usr.sbin/syslogd/ttylog.c | 7 +++---- 11 files changed, 26 insertions(+), 18 deletions(-) diff --git a/regress/usr.sbin/syslogd/Syslogd.pm b/regress/usr.sbin/syslogd/Syslogd.pm index e0823b7f5ef..0effa6b1b40 100644 --- a/regress/usr.sbin/syslogd/Syslogd.pm +++ b/regress/usr.sbin/syslogd/Syslogd.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Syslogd.pm,v 1.26 2021/03/09 15:16:28 bluhm Exp $ +# $OpenBSD: Syslogd.pm,v 1.27 2026/06/11 16:51:14 bluhm Exp $ # Copyright (c) 2010-2020 Alexander Bluhm # Copyright (c) 2014 Florian Riehm @@ -277,7 +277,7 @@ sub fstat { my @cmd = ("fstat"); open(my $fs, '-|', @cmd) or die ref($self), " open pipe from '@cmd' failed: $!"; - print $fh grep { /^\w+ *syslogd *\d+/ } <$fs>; + print $fh grep { /^\w+ *syslogd(-parent)? *\d+/ } <$fs>; close($fs) or die ref($self), $! ? " close pipe from '@cmd' failed: $!" : " command '@cmd' failed: $?"; diff --git a/regress/usr.sbin/syslogd/args-privsep.pl b/regress/usr.sbin/syslogd/args-privsep.pl index 20fcbebc730..3bd4b223550 100644 --- a/regress/usr.sbin/syslogd/args-privsep.pl +++ b/regress/usr.sbin/syslogd/args-privsep.pl @@ -37,7 +37,8 @@ our %args = ( qr/syslogd CALL setresuid(.*"_syslogd".*){3}/ => 1, qr/syslogd CALL setresgid(.*"_syslogd".*){3}/ => 1, qr/syslogd CALL setsid/ => 0, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, qr/\[\d\] = "-P"/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-sighup-config.pl b/regress/usr.sbin/syslogd/args-sighup-config.pl index c5b0750328a..a46818b83c2 100644 --- a/regress/usr.sbin/syslogd/args-sighup-config.pl +++ b/regress/usr.sbin/syslogd/args-sighup-config.pl @@ -20,7 +20,8 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve JUSTRETURN/ => 4, + qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd-parent RET execve JUSTRETURN/ => 2, }, loggrep => { qr/config file modified: restarting/ => 1, diff --git a/regress/usr.sbin/syslogd/args-sighup-privsep.pl b/regress/usr.sbin/syslogd/args-sighup-privsep.pl index 0c2ba8cb245..7c8cb3eead6 100644 --- a/regress/usr.sbin/syslogd/args-sighup-privsep.pl +++ b/regress/usr.sbin/syslogd/args-sighup-privsep.pl @@ -19,8 +19,10 @@ our %args = ( }, syslogd => { ktrace => { - qr/syslogd PSIG SIGHUP caught handler/ => 2, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd PSIG SIGHUP caught handler/ => 1, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent PSIG SIGHUP caught handler/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loggrep => { qr/syslogd: restarted/ => 1, diff --git a/regress/usr.sbin/syslogd/args-sighup-tcp.pl b/regress/usr.sbin/syslogd/args-sighup-tcp.pl index 7fd335a2830..7c71926bfb7 100644 --- a/regress/usr.sbin/syslogd/args-sighup-tcp.pl +++ b/regress/usr.sbin/syslogd/args-sighup-tcp.pl @@ -25,7 +25,8 @@ our %args = ( }, ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loghost => '@tcp://127.0.0.1:$connectport', loggrep => { diff --git a/regress/usr.sbin/syslogd/args-sighup-tls.pl b/regress/usr.sbin/syslogd/args-sighup-tls.pl index 6290a6056eb..cb6095c990f 100644 --- a/regress/usr.sbin/syslogd/args-sighup-tls.pl +++ b/regress/usr.sbin/syslogd/args-sighup-tls.pl @@ -25,7 +25,8 @@ our %args = ( }, ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loghost => '@tls://127.0.0.1:$connectport', loggrep => { diff --git a/regress/usr.sbin/syslogd/args-sighup.pl b/regress/usr.sbin/syslogd/args-sighup.pl index a33a1a3d958..5f539986d2c 100644 --- a/regress/usr.sbin/syslogd/args-sighup.pl +++ b/regress/usr.sbin/syslogd/args-sighup.pl @@ -20,7 +20,8 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGHUP caught handler/ => 1, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loggrep => { qr/config file changed: dying/ => 0, diff --git a/regress/usr.sbin/syslogd/args-sigpipe.pl b/regress/usr.sbin/syslogd/args-sigpipe.pl index f3a65ef6b45..e93a57a8a82 100644 --- a/regress/usr.sbin/syslogd/args-sigpipe.pl +++ b/regress/usr.sbin/syslogd/args-sigpipe.pl @@ -20,7 +20,8 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGPIPE/ => 0, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loggrep => { get_between2loggrep() }, }, diff --git a/regress/usr.sbin/syslogd/args-sigterm.pl b/regress/usr.sbin/syslogd/args-sigterm.pl index 9125bbf890d..81d20dad0a6 100644 --- a/regress/usr.sbin/syslogd/args-sigterm.pl +++ b/regress/usr.sbin/syslogd/args-sigterm.pl @@ -20,7 +20,8 @@ our %args = ( syslogd => { ktrace => { qr/syslogd PSIG SIGTERM caught handler/ => 1, - qr/syslogd RET execve JUSTRETURN/ => 2, + qr/syslogd RET execve JUSTRETURN/ => 1, + qr/syslogd-parent RET execve JUSTRETURN/ => 1, }, loggrep => { qr/syslogd: exited/ => 1, diff --git a/regress/usr.sbin/syslogd/logflush.c b/regress/usr.sbin/syslogd/logflush.c index 6cb24bcda4d..db74a957dc3 100644 --- a/regress/usr.sbin/syslogd/logflush.c +++ b/regress/usr.sbin/syslogd/logflush.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logflush.c,v 1.2 2021/10/24 21:24:21 deraadt Exp $ */ +/* $OpenBSD: logflush.c,v 1.3 2026/06/11 16:51:14 bluhm Exp $ */ /* * Copyright (c) 2021 Alexander Bluhm @@ -28,8 +28,8 @@ #include #include -__dead void -usage() +static __dead void +usage(void) { fprintf(stderr, "usage: %s\n", getprogname()); exit(2); diff --git a/regress/usr.sbin/syslogd/ttylog.c b/regress/usr.sbin/syslogd/ttylog.c index 47aa279ffcc..23e409ffd5e 100644 --- a/regress/usr.sbin/syslogd/ttylog.c +++ b/regress/usr.sbin/syslogd/ttylog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ttylog.c,v 1.8 2021/07/06 11:50:34 bluhm Exp $ */ +/* $OpenBSD: ttylog.c,v 1.9 2026/06/11 16:51:14 bluhm Exp $ */ /* * Copyright (c) 2015 Alexander Bluhm @@ -32,7 +32,6 @@ #include #include -__dead void usage(void); void redirect(void); void restore(void); void timeout(int); @@ -43,8 +42,8 @@ FILE *lg; char ptyname[16], *console, *username, *logfile, *tty; int mfd, sfd; -__dead void -usage() +static __dead void +usage(void) { fprintf(stderr, "usage: %s /dev/console|username logfile\n", getprogname());