diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2015-07-27 17:57:07 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2015-07-27 17:57:07 +0000 |
| commit | 5d8a7fddd4ed15b1883b8d99e232a2c712ce9ce5 (patch) | |
| tree | 27d2386a9b5220c3c176ba15699d5d1675a52d00 | |
| parent | 05094eeb560cb7fa601c7ac1c50b74358f979344 (diff) | |
some improvements from michael reed;
| -rw-r--r-- | usr.bin/doas/doas.1 | 5 | ||||
| -rw-r--r-- | usr.bin/doas/doas.conf.5 | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/doas/doas.1 b/usr.bin/doas/doas.1 index c2079579517..fab1cbca451 100644 --- a/usr.bin/doas/doas.1 +++ b/usr.bin/doas/doas.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: doas.1,v 1.13 2015/07/26 23:00:15 tedu Exp $ +.\" $OpenBSD: doas.1,v 1.14 2015/07/27 17:57:06 jmc Exp $ .\" .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> .\" @@ -13,7 +13,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: July 26 2015 $ +.Dd $Mdocdate: July 27 2015 $ .Dt DOAS 1 .Os .Sh NAME @@ -89,6 +89,7 @@ The password was incorrect. The specified command was not found or is not executable. .El .Sh SEE ALSO +.Xr su 1 , .Xr doas.conf 5 .Sh HISTORY The diff --git a/usr.bin/doas/doas.conf.5 b/usr.bin/doas/doas.conf.5 index 55b0b2833a4..712996007e5 100644 --- a/usr.bin/doas/doas.conf.5 +++ b/usr.bin/doas/doas.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: doas.conf.5,v 1.11 2015/07/23 15:26:37 jmc Exp $ +.\" $OpenBSD: doas.conf.5,v 1.12 2015/07/27 17:57:06 jmc Exp $ .\" .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> .\" @@ -13,7 +13,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: July 23 2015 $ +.Dd $Mdocdate: July 27 2015 $ .Dt DOAS.CONF 5 .Os .Sh NAME @@ -57,12 +57,14 @@ The default is to reset the environment, except for the variables .Ev USER and .Ev USERNAME . -.It Ic keepenv { Oo variable names Oc Ic } -Reset the environment, but keep the space-separated specified variables. +.It Ic keepenv { Oo Ar variable ... Oc Ic } +In addition to the variables mentioned above, keep the space-separated +specified variables. .El .It Ar identity The username to match. -Groups may be specified by prepending a colon (:). +Groups may be specified by prepending a colon +.Pq Sq \&: . Numeric IDs are also accepted. .It Ic as Ar target The target user the running user is allowed to run the command as. |