openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00
Code Activity

Adapt regress tests for separate syslogd parent.

Browse Source
This commit is contained in:
bluhm
2026-06-11 16:51:14 +00:00
parent 8ba2a59033
commit a89412eb10
11 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
regress/usr.sbin/syslogd/Syslogd.pm
+2 -2
View File
@@ -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 <bluhm@openbsd.org>
# Copyright (c) 2014 Florian Riehm <mail@friehm.de>
@@ -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: $?";
regress/usr.sbin/syslogd/args-privsep.pl
+2 -1
View File
@@ -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,
},
},
regress/usr.sbin/syslogd/args-sighup-config.pl
+2 -1
View File
@@ -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,
regress/usr.sbin/syslogd/args-sighup-privsep.pl
+4 -2
View File
@@ -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,
regress/usr.sbin/syslogd/args-sighup-tcp.pl
+2 -1
View File
@@ -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 => {
regress/usr.sbin/syslogd/args-sighup-tls.pl
+2 -1
View File
@@ -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 => {
regress/usr.sbin/syslogd/args-sighup.pl
+2 -1
View File
@@ -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,
regress/usr.sbin/syslogd/args-sigpipe.pl
+2 -1
View File
@@ -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() },
},
regress/usr.sbin/syslogd/args-sigterm.pl
+2 -1
View File
@@ -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,
regress/usr.sbin/syslogd/logflush.c
+3 -3
View File
@@ -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 <bluhm@openbsd.org>
@@ -28,8 +28,8 @@
#include <syslog.h>
#include <unistd.h>
__dead void
usage()
static __dead void
usage(void)
{
fprintf(stderr, "usage: %s\n", getprogname());
exit(2);
regress/usr.sbin/syslogd/ttylog.c
+3 -4
View File
@@ -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 <bluhm@openbsd.org>
@@ -32,7 +32,6 @@
#include <util.h>
#include <utmp.h>
__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());