On Sat, Jul 25, 2015 at 04:22:54PM -0400, Michael Reed wrote:
> On 07/25/15 15:01, Jason McIntyre wrote:
> > i do appreciate the mail - diffs are always welcome. but with markup i
> > just find myslef less inclined to mark up everything because i can. it's
> > only my opinion.
> >
> > jmc
>
>
> I've made a much smaller diff, including only the two bits you okay'd
> and the keepenv bit, which you said still needs confirmation from
> another developer. Thanks for all the feedback.
>
> Regards,
> Michael
>
thanks. the keepenv bit was confirmed to be correct and i've just
committed your diff.
jmc
>
>
> Index: src/usr.bin/doas/doas.1
> ===================================================================
> RCS file: /cvs/src/usr.bin/doas/doas.1,v
> retrieving revision 1.10
> diff -u -p -r1.10 doas.1
> --- src/usr.bin/doas/doas.1 21 Jul 2015 17:49:33 -0000 1.10
> +++ src/usr.bin/doas/doas.1 25 Jul 2015 20:19:59 -0000
> @@ -65,6 +65,7 @@ The password was incorrect.
> The actual program is absent or not executable.
> .El
> .Sh SEE ALSO
> +.Xr su 1 ,
> .Xr doas.conf 5
> .Sh HISTORY
> The
> Index: src/usr.bin/doas/doas.conf.5
> ===================================================================
> RCS file: /cvs/src/usr.bin/doas/doas.conf.5,v
> retrieving revision 1.11
> diff -u -p -r1.11 doas.conf.5
> --- src/usr.bin/doas/doas.conf.5 23 Jul 2015 15:26:37 -0000 1.11
> +++ src/usr.bin/doas/doas.conf.5 25 Jul 2015 20:19:59 -0000
> @@ -57,12 +57,14 @@ The default is to reset the environment,
> .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.
>
