← Back to branch summary

~ubuntu-branches/ubuntu/natty/gdm/natty-updates

« back to all changes in this revision

Viewing changes to debian/patches/42_no_ecryptfs_autologin.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-04-08 16:35:19 UTC
  • mfrom: (1.4.48 upstream)
  • Revision ID: james.westby@ubuntu.com-20110408163519-nd6602f2j3c2n2qc
Tags: 2.32.1-0ubuntu1
* New upstream release
* debian/patches/01git_xdmcp_ipv6.patch:
* debian/patches/43_CVE-2011-0727.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/42_no_ecryptfs_autologin.patch
2
2
Author: Robert Ancell <robert.ancell@canonical.com>
3
3
Bug: http://launchpad.net/bugs/284443
4
4
 
5
 
Index: gdm-2.32.0/daemon/gdm-simple-slave.c
 
5
Index: gdm-2.32.1/daemon/gdm-simple-slave.c
6
6
===================================================================
7
 
--- gdm-2.32.0.orig/daemon/gdm-simple-slave.c   2011-04-01 17:10:36.373792974 +1100
8
 
+++ gdm-2.32.0/daemon/gdm-simple-slave.c        2011-04-01 17:17:42.063793109 +1100
9
 
@@ -567,6 +567,24 @@
 
7
--- gdm-2.32.1.orig/daemon/gdm-simple-slave.c   2011-04-08 16:34:06.801921362 +1000
 
8
+++ gdm-2.32.1/daemon/gdm-simple-slave.c        2011-04-08 16:34:24.741921372 +1000
 
9
@@ -638,6 +638,24 @@
10
10
         slave->priv->username = g_strdup (username);
11
11
 }
12
12
 
31
31
 static void
32
32
 on_session_conversation_started (GdmSession     *session,
33
33
                                  GdmSimpleSlave *slave)
34
 
@@ -599,7 +617,8 @@
 
34
@@ -670,7 +688,8 @@
35
35
 
36
36
         enabled = FALSE;
37
37
         gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
41
41
                 return;
42
42
         }
43
43
 
44
 
@@ -1224,8 +1243,7 @@
 
44
@@ -1295,8 +1314,7 @@
45
45
                 delay = 0;
46
46
                 enabled = FALSE;
47
47
                 gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
51
51
                         start_greeter (slave);
52
52
                         create_new_session (slave);
53
53
                 } else {
54
 
@@ -1233,6 +1251,7 @@
 
54
@@ -1304,6 +1322,7 @@
55
55
                         gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
56
56
                         reset_session (slave);
57
57
                 }