Merge lp:~siretart/lightdm/fix.877766 into lp:ubuntu/oneiric-updates/lightdm

[Reinhard Tartler]

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-03-05 18:12:21 +0000
@@ -0,0 +1,1 @@
+.pc
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-04 19:29:04 +0000
+++ debian/changelog	2012-03-05 18:12:21 +0000
@@ -1,3 +1,12 @@
+lightdm (1.0.6-0ubuntu1.5) oneiric-proposed; urgency=low
+
+  * During the login process, make sure to first drop priviledges before
+    changing to the users home directory. On machines that have user homes
+    mounted with the option 'root_squash', the root user may not have
+    permissions and the chdir(1) syscall fails. LP: #877766.
+
+ -- Reinhard Tartler <[e-mail]>  Fri, 02 Mar 2012 15:04:34 +0100
+
 lightdm (1.0.6-0ubuntu1.4) oneiric-security; urgency=low
 
   * SECURITY UPDATE: file descriptor leak to child processes (LP: #927060)
 
=== added file 'debian/patches/07_fix_877766.patch'
--- debian/patches/07_fix_877766.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_fix_877766.patch	2012-03-05 18:12:21 +0000
@@ -0,0 +1,31 @@
+=== modified file 'src/session.c'
+--- a/src/session.c
++++ b/src/session.c
+@@ -400,13 +400,6 @@ session_run (Process *process)
+ 
+     user = pam_session_get_user (session->priv->authentication);
+ 
+-    /* Change working directory */
+-    if (chdir (user_get_home_directory (user)) != 0)
+-    {
+-        g_warning ("Failed to change to home directory %s: %s", user_get_home_directory (user), strerror (errno));
+-        _exit (EXIT_FAILURE);
+-    }
+-
+     /* Change to this user */
+     if (getuid () == 0)
+     {
+@@ -429,6 +422,13 @@ session_run (Process *process)
+         }
+     }
+ 
++    /* Change working directory */
++    if (chdir (user_get_home_directory (user)) != 0)
++    {
++        g_warning ("Failed to change to home directory %s: %s", user_get_home_directory (user), strerror (errno));
++        _exit (EXIT_FAILURE);
++    }
++
+     /* Redirect output to logfile */
+     if (session->priv->log_file_as_user)
+         setup_log_file (session);
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-04 19:29:04 +0000
+++ debian/patches/series	2012-03-05 18:12:21 +0000
@@ -4,6 +4,7 @@
 04_CVE-2011-4105.patch
 05_CVE-2011-3153.patch
 06_translate_prompt_label.patch
+07_fix_877766.patch
 09_show_lang_chooser_option.patch
 10_available_languages.patch
 11_set_language_in_accountsservice.patch