[sudo-commits] sudo changeset 8988:f3c64967fed7

[Todd C. Miller]

changeset:	8988:f3c64967fed7 in /home/hg/sudo
details:	http://www.sudo.ws/repos/sudo/rev/f3c64967fed7
user:		Todd C. Miller <Todd.Miller at courtesan.com>
date:		Sat Aug 17 06:34:09 2013 -0600

Log Message:
	When merging the PAM environment, allow environment variables set
	in PAM to override ones set by sudo as long as they do not match
	the env_keep or env_check lists.

diffstat:

 plugins/sudoers/env.c     |  32 +++++++++++++++++---------------
 plugins/sudoers/sudoers.h |   2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)