diff -Nru gdm-3.0.4/debian/changelog gdm-3.0.4/debian/changelog --- gdm-3.0.4/debian/changelog 2013-07-09 10:44:10.000000000 +0000 +++ gdm-3.0.4/debian/changelog 2013-12-03 11:05:03.000000000 +0000 @@ -1,3 +1,10 @@ +gdm (3.0.4-0ubuntu15.3) precise; urgency=low + + * debian/patches/42_no_ecryptfs_autologin.patch: + - don't try to get infos on null usernames (lp: #805154) + + -- Ryan Tandy Mon, 25 Nov 2013 13:33:30 -0800 + gdm (3.0.4-0ubuntu15.2) precise; urgency=low * Merge changes from lightdm to fix plymouth race (LP: #982889) diff -Nru gdm-3.0.4/debian/patches/42_no_ecryptfs_autologin.patch gdm-3.0.4/debian/patches/42_no_ecryptfs_autologin.patch --- gdm-3.0.4/debian/patches/42_no_ecryptfs_autologin.patch 2012-01-31 16:48:01.000000000 +0000 +++ gdm-3.0.4/debian/patches/42_no_ecryptfs_autologin.patch 2013-12-03 11:04:37.000000000 +0000 @@ -1,12 +1,11 @@ Description: Don't autologin if using ecryptfs - if you do then the home directory is empty as you need the password entered via PAM to decrypt it. This is not a perfect solution as the home directory may not be mounted yet. Author: Robert Ancell Bug: http://launchpad.net/bugs/284443 - -Index: gdm-3.0.0/daemon/gdm-simple-slave.c +Index: gdm-3.0.4/daemon/gdm-simple-slave.c =================================================================== ---- gdm-3.0.0.orig/daemon/gdm-simple-slave.c 2011-06-07 12:25:54.047631144 +0200 -+++ gdm-3.0.0/daemon/gdm-simple-slave.c 2011-06-07 12:26:15.497631154 +0200 -@@ -629,6 +629,38 @@ +--- gdm-3.0.4.orig/daemon/gdm-simple-slave.c 2012-07-06 12:07:26.021078442 +0200 ++++ gdm-3.0.4/daemon/gdm-simple-slave.c 2012-07-06 12:07:26.093078445 +0200 +@@ -629,6 +629,41 @@ slave->priv->username = g_strdup (username); } @@ -18,6 +17,9 @@ + struct passwd *info; + int r; + ++ if (username == NULL) ++ return FALSE; ++ + info = getpwnam (username); + if (!info) + return FALSE; @@ -45,7 +47,7 @@ static void on_session_conversation_started (GdmSession *session, GdmSimpleSlave *slave) -@@ -661,7 +693,8 @@ +@@ -661,7 +696,8 @@ enabled = FALSE; gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); @@ -55,7 +57,7 @@ return; } -@@ -1385,6 +1418,8 @@ +@@ -1388,6 +1424,8 @@ if (res) { gboolean enabled; int delay; @@ -64,7 +66,7 @@ /* FIXME: handle wait-for-go */ -@@ -1393,7 +1428,8 @@ +@@ -1396,7 +1434,8 @@ delay = 0; enabled = FALSE; gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, &delay); @@ -74,7 +76,7 @@ start_greeter (slave); create_new_session (slave); } else { -@@ -1401,6 +1437,7 @@ +@@ -1404,6 +1443,7 @@ gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME); reset_session (slave); }