Don't set USERNAME

diff --git a/NEWS b/NEWS
index a376bc5154a8ad527377ad47afc52e03cc210bcb..a10fc8f072d1a505382f83902c52593a71d908d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Overview of changes in lightdm 1.1.1
       annoying kernel audit messages for privileges that we definitively do not
       want to grant.
     * Set LOGNAME environment variable
+    * Don't set USERNAME environment variable - this is not specified in POSIX,
+      please report if this causes any major problems.
 
 Overview of changes in lightdm 1.1.0
 

diff --git a/src/seat.c b/src/seat.c
index acc8338b77e0a74c964fdfdefac4447d9fcfbb12..10b2ebcc3a67e88cce700d12fbdeab1f471652c1 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -264,9 +264,6 @@ run_script (Seat *seat, Display *display, const gchar *script_name, User *user)
         process_set_env (script, "USER", user_get_name (user));
         process_set_env (script, "LOGNAME", user_get_name (user));
         process_set_env (script, "HOME", user_get_home_directory (user));
-
-        /* Set other common environment variables */
-        process_set_env (script, "USERNAME", user_get_name (user));
     }
     else
         process_set_env (script, "HOME", "/");

diff --git a/src/session.c b/src/session.c
index d5b89f77de7a7ac947cc64aa396fd8664859265b..b8fe3ab2fa09996d84df8fc0fe6ae7e4b2422996 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -257,8 +257,6 @@ session_start (Session *session)
     session_set_env (session, "HOME", user_get_home_directory (user));
     session_set_env (session, "SHELL", user_get_shell (user));
 
-    session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required?
-
     return SESSION_GET_CLASS (session)->start (session);
 }