diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-08-27 03:31:48 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-08-27 03:31:48 +0000 |
| commit | eaca4dba5f7457742a7874f1ed84fcbffd821195 (patch) | |
| tree | ff39cc7145fb384f7afbe8c4ad6a73073d768930 | |
| parent | bfb4c298b62293bb900dbb57ac38e17bc49f3084 (diff) | |
some updates for recent changes.
not all tests passing yet since i don't really understand what's going on.
| -rw-r--r-- | regress/usr.bin/doas/t-fail-quotes.err | 6 | ||||
| -rw-r--r-- | regress/usr.bin/doas/t-fail-quotes.expected.err | 6 | ||||
| -rw-r--r-- | regress/usr.bin/doas/t-okay.conf | 2 | ||||
| -rw-r--r-- | regress/usr.bin/doas/t-run-keepenv-path.conf | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/regress/usr.bin/doas/t-fail-quotes.err b/regress/usr.bin/doas/t-fail-quotes.err index 4a8076b62b0..bc6dd393b3f 100644 --- 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 4a8076b62b0..bc6dd393b3f 100644 --- 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 08b0008492f..15f01513fb2 100644 --- 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 31a80aacec1..c2e83d97b9f 100644 --- 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 |