some updates for recent changes.

not all tests passing yet since i don't really understand what's going on.

diff --git a/regress/usr.bin/doas/t-fail-quotes.err b/regress/usr.bin/doas/t-fail-quotes.err
index 4a8076b..bc6dd39 100644 (file)
--- a/regress/usr.bin/doas/t-fail-quotes.err
+++ b/regress/usr.bin/doas/t-fail-quotes.err
@@ -1,3 +1,3 @@
-unterminated quotes in column 23 at line 1
-unterminated quotes in column 23 at line 2
-syntax error at line 2
+doas: unterminated quotes in column 23 at line 1
+doas: unterminated quotes in column 23 at line 2
+doas: syntax error at line 2

diff --git a/regress/usr.bin/doas/t-fail-quotes.expected.err b/regress/usr.bin/doas/t-fail-quotes.expected.err
index 4a8076b..bc6dd39 100644 (file)
--- a/regress/usr.bin/doas/t-fail-quotes.expected.err
+++ b/regress/usr.bin/doas/t-fail-quotes.expected.err
@@ -1,3 +1,3 @@
-unterminated quotes in column 23 at line 1
-unterminated quotes in column 23 at line 2
-syntax error at line 2
+doas: unterminated quotes in column 23 at line 1
+doas: unterminated quotes in column 23 at line 2
+doas: syntax error at line 2

diff --git a/regress/usr.bin/doas/t-okay.conf b/regress/usr.bin/doas/t-okay.conf
index 08b0008..15f0151 100644 (file)
--- a/regress/usr.bin/doas/t-okay.conf
+++ b/regress/usr.bin/doas/t-okay.conf
@@ -17,7 +17,7 @@ permit :wheel cmd echo args "" ""
 
 permit :wheel cmd echo args " args \22 "
 
-permit nopass keepenv { \
+permit nopass setenv { \
     FTPMODE PKG_CACHE PKG_PATH SM_PATH SSH_AUTH_SOCK \
     DESTDIR DISTDIR FETCH_CMD FLAVOR GROUP MAKE MAKECONF \
     MULTI_PACKAGES NOMAN OKAY_FILES OWNER PKG_DBDIR \

diff --git a/regress/usr.bin/doas/t-run-keepenv-path.conf b/regress/usr.bin/doas/t-run-keepenv-path.conf
index 31a80aa..c2e83d9 100644 (file)
--- a/regress/usr.bin/doas/t-run-keepenv-path.conf
+++ b/regress/usr.bin/doas/t-run-keepenv-path.conf
@@ -1 +1 @@
-permit nopass keepenv { PATH JUNK } nobody as root cmd echo args okay
+permit nopass setenv { PATH JUNK } nobody as root cmd echo args okay