===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/doas/doas.conf.5,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/doas/doas.conf.5	2016/06/05 07:22:25	1.20
--- src/usr.bin/doas/doas.conf.5	2016/06/07 14:11:16	1.21
***************
*** 1,4 ****
! .\" $OpenBSD: doas.conf.5,v 1.20 2016/06/05 07:22:25 jmc Exp $
  .\"
  .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  .\"
--- 1,4 ----
! .\" $OpenBSD: doas.conf.5,v 1.21 2016/06/07 14:11:16 tedu Exp $
  .\"
  .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  .\"
***************
*** 13,19 ****
  .\"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 5 2016 $
  .Dt DOAS.CONF 5
  .Os
  .Sh NAME
--- 13,19 ----
  .\"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 7 2016 $
  .Dt DOAS.CONF 5
  .Os
  .Sh NAME
***************
*** 59,78 ****
  .Ev USER
  and
  .Ev USERNAME .
! .It Ic keepenv { Oo Ar variable ... Oc Ic }
  In addition to the variables mentioned above, keep the space-separated
  specified variables.
! .It Ic setenv { Oo Ar variable=value ... Oc Ic }
! Sets one or more environment variables to the specified values.
  If the first character of
  .Ar value
  is a
  .Ql $
  then the value to be set is taken from the existing environment
  variable of the same name.
- .Cm setenv
- directives override environment variables copied via
- .Cm keepenv .
  .El
  .It Ar identity
  The username to match.
--- 59,74 ----
  .Ev USER
  and
  .Ev USERNAME .
! .It Ic keepenv { Oo Ar variable ... Oc Ic Oo Ar variable=value ... Oc Ic }
  In addition to the variables mentioned above, keep the space-separated
  specified variables.
! Variables may also be set using the latter syntax.
  If the first character of
  .Ar value
  is a
  .Ql $
  then the value to be set is taken from the existing environment
  variable of the same name.
  .El
  .It Ar identity
  The username to match.
***************
*** 138,147 ****
          MULTI_PACKAGES NOMAN OKAY_FILES OWNER PKG_DBDIR \e
          PKG_DESTDIR PKG_TMPDIR PORTSDIR RELEASEDIR SHARED_ONLY \e
          SUBPACKAGE WRKOBJDIR SUDO_PORT_V1 } :wsrc
! permit nopass keepenv { ENV PS1 SSH_AUTH_SOCK } :wheel
  permit nopass tedu as root cmd /usr/sbin/procmap
  permit nopass keepenv root as root
- permit nopass setenv { PS1=$DOAS_PS1 } :staff
  .Ed
  .Sh SEE ALSO
  .Xr doas 1
--- 134,142 ----
          MULTI_PACKAGES NOMAN OKAY_FILES OWNER PKG_DBDIR \e
          PKG_DESTDIR PKG_TMPDIR PORTSDIR RELEASEDIR SHARED_ONLY \e
          SUBPACKAGE WRKOBJDIR SUDO_PORT_V1 } :wsrc
! permit nopass keepenv { ENV PS1=$DOAS_PS1 SSH_AUTH_SOCK } :wheel
  permit nopass tedu as root cmd /usr/sbin/procmap
  permit nopass keepenv root as root
  .Ed
  .Sh SEE ALSO
  .Xr doas 1