]> rtime.felk.cvut.cz Git - sojka/debian/lightdm.git/blob - debian/patches/01_set-default-path.patch
merge changes from experimental
[sojka/debian/lightdm.git] / debian / patches / 01_set-default-path.patch
1 Author: Yves-Alexis Perez <corsac@debian.org>
2 Author: Lionel Le Folgoc <mrpouit@gmail.com>
3 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
4 Description: Fix default PATH environment variable
5 --- a/src/seat.c
6 +++ b/src/seat.c
7 @@ -274,7 +274,10 @@ run_script (Seat *seat, DisplayServer *d
8          process_set_env (script, "PATH", g_getenv ("PATH"));
9      }
10      else
11 -        process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin");
12 +        if (user_get_uid (user) == 0)
13 +          process_set_env (script, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
14 +        else
15 +          process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
16  
17      if (user)
18      {
19 --- a/src/session-child.c
20 +++ b/src/session-child.c
21 @@ -354,7 +354,10 @@ session_child_run (int argc, char **argv
22          else
23          {
24              /* Set POSIX variables */
25 -            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
26 +            if (user_get_uid (user) == 0)
27 +              pam_putenv (pam_handle, "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
28 +            else
29 +              pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
30              pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
31              pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
32              pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));