win32: remove special treatment of USERNAME

Commit 255ebaf535 (drop: adjust environment on privilege change)
added USERNAME to the variables subject to special treatment when
the shell starts or privilege is dropped.

It's been pointed out this may not be appropriate for a variable
that's Windows-specific.  Remove the special treatment of USERNAME.

Saves 40-48 bytes.

(GitHub issue #300)

2 files changed, 0 insertions, 2 deletions

diff --git a/miscutils/drop.c b/miscutils/drop.c
index 6b8e0f183..6903254c3 100644
--- a/miscutils/drop.c
+++ b/miscutils/drop.c
@@ -188,7 +188,6 @@ int drop_main(int argc, char **argv)
                         si.dwFlags = STARTF_USESTDHANDLES;
 
                         setenv_name("USER");
-                        setenv_name("USERNAME");
                         setenv_name("LOGNAME");
 
                         if (!CreateProcessAsUserA(token, exe, cmd, NULL, NULL, TRUE,
diff --git a/shell/ash.c b/shell/ash.c
index 721204c61..f7e00ee0f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -15854,7 +15854,6 @@ init(void)
                         pw = getpwuid(getuid());
                         if (pw) {
                                 xsetenv_if_unset("USER",     pw->pw_name);
-                                xsetenv_if_unset("USERNAME", pw->pw_name);
                                 xsetenv_if_unset("LOGNAME",  pw->pw_name);
                                 xsetenv_if_unset("HOME",     pw->pw_dir);
                         }