summaryrefslogtreecommitdiff
path: root/usr.bin/doas
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2019-06-19 09:55:56 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2019-06-19 09:55:56 +0000
commitd5d9768b71c412999ce001c081eee54933dd7e29 (patch)
treee1748ac89aef6b240be8ce116fec8fc3c9fbf2cf /usr.bin/doas
parent290465ce9092afe8ac463b8e2d2440640c64845e (diff)
more precisely describe what happens to the environment without keepenv;
OK tedu@
Diffstat (limited to 'usr.bin/doas')
-rw-r--r--usr.bin/doas/doas.conf.512
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/doas/doas.conf.5 b/usr.bin/doas/doas.conf.5
index d96000437bd..ceac1e49685 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.37 2019/06/17 16:01:26 tedu Exp $
+.\" $OpenBSD: doas.conf.5,v 1.38 2019/06/19 09:55:55 schwarze 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: June 17 2019 $
+.Dd $Mdocdate: June 19 2019 $
.Dt DOAS.CONF 5
.Os
.Sh NAME
@@ -50,18 +50,18 @@ After the user successfully authenticates, do not ask for a password
again for some time.
.It Ic keepenv
The user's environment is maintained.
-The default is to reset the environment, except for the variables
+The default is to retain the variables
.Ev DISPLAY
and
-.Ev TERM .
-The variables
+.Ev TERM
+from the invoking process, reset
.Ev HOME ,
.Ev LOGNAME ,
.Ev PATH ,
.Ev SHELL ,
and
.Ev USER
-are always reset.
+as appropriate for the target user, and discard the rest of the environment.
.It Ic setenv { Oo Ar variable ... Oc Oo Ar variable=value ... Oc Ic }
In addition to the variables mentioned above, keep the space-separated
specified variables.