From: bluhm <bluhm@openbsd.org>
Date: Fri, 4 Nov 2022 12:59:26 +0000 (+0000)
Subject: In ktrace execve(2) no longer shows meaningless exit code.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a6e54bb1f1917dad8d0bbbe315aa4e2576ee66ca;p=openbsd

In ktrace execve(2) no longer shows meaningless exit code.
Change regex for kdump output to execve JUSTRETURN.
from anton@
---

diff --git a/regress/usr.sbin/syslogd/args-privsep.pl b/regress/usr.sbin/syslogd/args-privsep.pl
index fe34d9eb42f..20fcbebc730 100644
--- a/regress/usr.sbin/syslogd/args-privsep.pl
+++ b/regress/usr.sbin/syslogd/args-privsep.pl
@@ -37,7 +37,7 @@ 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 \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	    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 32954e61cb3..c5b0750328a 100644
--- a/regress/usr.sbin/syslogd/args-sighup-config.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-config.pl
@@ -20,7 +20,7 @@ our %args = (
     syslogd => {
 	ktrace => {
 	    qr/syslogd  PSIG  SIGHUP caught handler/ => 1,
-	    qr/syslogd  RET   execve \d+/ => 4,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 4,
 	},
 	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 4eadf6d1b9b..0c2ba8cb245 100644
--- a/regress/usr.sbin/syslogd/args-sighup-privsep.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-privsep.pl
@@ -20,7 +20,7 @@ our %args = (
     syslogd => {
 	ktrace => {
 	    qr/syslogd  PSIG  SIGHUP caught handler/ => 2,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	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 0cabff530ec..512b896d3cf 100644
--- a/regress/usr.sbin/syslogd/args-sighup-tcp.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-tcp.pl
@@ -25,7 +25,7 @@ our %args = (
 	},
 	ktrace => {
 	    qr/syslogd  PSIG  SIGHUP caught handler/ => 1,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	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 9375666c9ed..7023912afd5 100644
--- a/regress/usr.sbin/syslogd/args-sighup-tls.pl
+++ b/regress/usr.sbin/syslogd/args-sighup-tls.pl
@@ -25,7 +25,7 @@ our %args = (
 	},
 	ktrace => {
 	    qr/syslogd  PSIG  SIGHUP caught handler/ => 1,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	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 0f2a58a0026..53bbe08a126 100644
--- a/regress/usr.sbin/syslogd/args-sighup.pl
+++ b/regress/usr.sbin/syslogd/args-sighup.pl
@@ -20,7 +20,7 @@ our %args = (
     syslogd => {
 	ktrace => {
 	    qr/syslogd  PSIG  SIGHUP caught handler/ => 1,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	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 d3c9a57b170..f3a65ef6b45 100644
--- a/regress/usr.sbin/syslogd/args-sigpipe.pl
+++ b/regress/usr.sbin/syslogd/args-sigpipe.pl
@@ -20,7 +20,7 @@ our %args = (
     syslogd => {
 	ktrace => {
 	    qr/syslogd  PSIG  SIGPIPE/ => 0,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	loggrep => { get_between2loggrep() },
     },
diff --git a/regress/usr.sbin/syslogd/args-sigterm.pl b/regress/usr.sbin/syslogd/args-sigterm.pl
index 322559ab6ae..9125bbf890d 100644
--- a/regress/usr.sbin/syslogd/args-sigterm.pl
+++ b/regress/usr.sbin/syslogd/args-sigterm.pl
@@ -20,7 +20,7 @@ our %args = (
     syslogd => {
 	ktrace => {
 	    qr/syslogd  PSIG  SIGTERM caught handler/ => 1,
-	    qr/syslogd  RET   execve \d+/ => 2,
+	    qr/syslogd  RET   execve JUSTRETURN/ => 2,
 	},
 	loggrep => {
 	    qr/syslogd: exited/ => 1,