summaryrefslogtreecommitdiff
path: root/usr.bin/sudo
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-02-06 15:56:28 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-02-06 15:56:28 +0000
commitfc3407ddcf245d950fc7ed68159373bbce4ca557 (patch)
tree24825065c3be865cb8703779283d17342a255be7 /usr.bin/sudo
parent28bba547e1ce2a5c0a52f6064ebd6e44bca31e44 (diff)
Fix setting of $USER when env_reset is enabled.
Diffstat (limited to 'usr.bin/sudo')
-rw-r--r--usr.bin/sudo/CHANGES2
-rw-r--r--usr.bin/sudo/env.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/sudo/CHANGES b/usr.bin/sudo/CHANGES
index f614f0b4102..928b09f77dc 100644
--- a/usr.bin/sudo/CHANGES
+++ b/usr.bin/sudo/CHANGES
@@ -1775,4 +1775,6 @@ Sudo 1.6.8p6 released.
560) Better PAM error handling and messages.
+561) Fixed setting of $USER when env_reset is enabled.
+
Sudo 1.6.8p7 released.
diff --git a/usr.bin/sudo/env.c b/usr.bin/sudo/env.c
index 3e156dde15e..9d3a7656546 100644
--- a/usr.bin/sudo/env.c
+++ b/usr.bin/sudo/env.c
@@ -69,7 +69,7 @@ static const char rcsid[] = "$Sudo: env.c,v 1.42 2004/09/08 15:57:49 millert Exp
#undef DID_LOGNAME
#define DID_LOGNAME 0x10
#undef DID_USER
-#define DID_USER 0x12
+#define DID_USER 0x20
#undef VNULL
#define VNULL (VOID *)NULL