summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2015-06-28 19:12:21 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2015-06-28 19:12:21 +0000
commitf261de1ed8f1d23a25b55a0d40d28ede7ebadbeb (patch)
treebdfddaa9620e25664cf092962cc2246b9ff655a6
parent2d08e3874e72e40797ec87d9c4a3cfe98b449830 (diff)
Use fstat to check that the privsep parent of syslogd closes all
internet sockets also when invoked with -u.
-rw-r--r--regress/usr.sbin/syslogd/args-client-udp.pl4
-rw-r--r--regress/usr.sbin/syslogd/args-client-udp4.pl4
-rw-r--r--regress/usr.sbin/syslogd/args-client-udp6.pl4
-rw-r--r--regress/usr.sbin/syslogd/args-only4.pl2
-rw-r--r--regress/usr.sbin/syslogd/args-only6.pl2
5 files changed, 16 insertions, 0 deletions
diff --git a/regress/usr.sbin/syslogd/args-client-udp.pl b/regress/usr.sbin/syslogd/args-client-udp.pl
index d9e495b15a4..3d33187ac63 100644
--- a/regress/usr.sbin/syslogd/args-client-udp.pl
+++ b/regress/usr.sbin/syslogd/args-client-udp.pl
@@ -14,6 +14,10 @@ our %args = (
},
syslogd => {
options => ["-u"],
+ fstat => {
+ qr/^root .* internet/ => 0,
+ qr/^_syslogd .* internet/ => 2,
+ },
},
file => {
loggrep => qr/ localhost syslogd-regress\[\d+\]: /. get_testlog(),
diff --git a/regress/usr.sbin/syslogd/args-client-udp4.pl b/regress/usr.sbin/syslogd/args-client-udp4.pl
index 1f7109e3eb5..8c19b8b63ad 100644
--- a/regress/usr.sbin/syslogd/args-client-udp4.pl
+++ b/regress/usr.sbin/syslogd/args-client-udp4.pl
@@ -15,6 +15,10 @@ our %args = (
},
syslogd => {
options => ["-u"],
+ fstat => {
+ qr/^root .* internet/ => 0,
+ qr/^_syslogd .* internet/ => 2,
+ },
},
file => {
loggrep => qr/ localhost /. get_testlog(),
diff --git a/regress/usr.sbin/syslogd/args-client-udp6.pl b/regress/usr.sbin/syslogd/args-client-udp6.pl
index 3052f61ec98..f13072a2398 100644
--- a/regress/usr.sbin/syslogd/args-client-udp6.pl
+++ b/regress/usr.sbin/syslogd/args-client-udp6.pl
@@ -15,6 +15,10 @@ our %args = (
},
syslogd => {
options => ["-u"],
+ fstat => {
+ qr/^root .* internet/ => 0,
+ qr/^_syslogd .* internet/ => 2,
+ },
},
file => {
loggrep => qr/ localhost /. get_testlog(),
diff --git a/regress/usr.sbin/syslogd/args-only4.pl b/regress/usr.sbin/syslogd/args-only4.pl
index e6993f5acfb..0b07cf963de 100644
--- a/regress/usr.sbin/syslogd/args-only4.pl
+++ b/regress/usr.sbin/syslogd/args-only4.pl
@@ -15,6 +15,8 @@ our %args = (
},
syslogd => {
fstat => {
+ qr/^root .* internet/ => 0,
+ qr/^_syslogd .* internet/ => 1,
qr/ internet6 / => 0,
},
loghost => '@127.0.0.1:$connectport',
diff --git a/regress/usr.sbin/syslogd/args-only6.pl b/regress/usr.sbin/syslogd/args-only6.pl
index 11072861020..831ff493012 100644
--- a/regress/usr.sbin/syslogd/args-only6.pl
+++ b/regress/usr.sbin/syslogd/args-only6.pl
@@ -15,6 +15,8 @@ our %args = (
},
syslogd => {
fstat => {
+ qr/^root .* internet/ => 0,
+ qr/^_syslogd .* internet/ => 1,
qr/ internet / => 0,
},
loghost => '@[::1]:$connectport',