Merge lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/mlockall into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Thaddaeus Tintenfisch
Status: Merged
Merged at revision: 239
Proposed branch: lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/mlockall
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 20 lines (+4/-0)
1 file modified
src/lightdm-gtk-greeter.c (+4/-0)
To merge this branch: bzr merge lp:~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/mlockall
Reviewer Review Type Date Requested Status
Sean Davis Approve
Review via email: mp+207792@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Sean Davis (bluesabre) wrote :

I see no issues with this... merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-02-22 14:52:45 +0000
3+++ src/lightdm-gtk-greeter.c 2014-02-22 15:26:35 +0000
4@@ -21,6 +21,7 @@
5 #include <gtk/gtk.h>
6 #include <glib/gi18n.h>
7 #include <cairo-xlib.h>
8+#include <sys/mman.h>
9 #include <sys/wait.h>
10 #include <X11/Xlib.h>
11 #include <X11/Xatom.h>
12@@ -2257,6 +2258,9 @@
13 GPid indicator_pid = 0, spi_pid = 0;
14 #endif
15
16+ /* Prevent memory from being swapped out, as we are dealing with passwords */
17+ mlockall (MCL_CURRENT | MCL_FUTURE);
18+
19 /* Disable global menus */
20 g_unsetenv ("UBUNTU_MENUPROXY");
21

Subscribers

People subscribed via source and target branches