aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marie Cannie <jmc@openbsd.org>2015-07-27 17:57:06 +0000
committerJean-Marie Cannie <jmc@openbsd.org>2015-07-27 17:57:06 +0000
commit7cebe8e7e71c5ed54b1bc2cbf3e0c48c33a4b5ac (patch)
tree3db23bb9c0b07df1c46c6f7d4dd25f8e02cafd9f
parent0f16f6cdd26b00503056149c9b744508ee273b04 (diff)
downloadopendoas-7cebe8e7e71c5ed54b1bc2cbf3e0c48c33a4b5ac.tar.gz
some improvements from michael reed;
-rw-r--r--doas.13
-rw-r--r--doas.conf.512
2 files changed, 9 insertions, 6 deletions
diff --git a/doas.1 b/doas.1
index 1082c03..dd98081 100644
--- a/doas.1
+++ b/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.1,v 1.12 2015/07/26 20:47:01 espie Exp $
+.\" $OpenBSD: doas.1,v 1.13 2015/07/26 23:00:15 tedu Exp $
.\"
.\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
.\"
@@ -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/doas.conf.5 b/doas.conf.5
index 6cc58a4..d3f3110 100644
--- a/doas.conf.5
+++ b/doas.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.conf.5,v 1.10 2015/07/22 20:15:24 zhuk Exp $
+.\" $OpenBSD: doas.conf.5,v 1.11 2015/07/23 15:26:37 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 22 2015 $
+.Dd $Mdocdate: July 23 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.