From 1e55f0dc6ffd3e5f7a867d5e3b2456afb19378d8 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 22 Aug 2012 20:49:10 +0200 Subject: [PATCH] only use mlock() on Linux, FreeBSD (for example) requires root --- i3lock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/i3lock.c b/i3lock.c index 35eaca6..e11bfe6 100644 --- a/i3lock.c +++ b/i3lock.c @@ -645,11 +645,16 @@ int main(int argc, char *argv[]) { if (ret != PAM_SUCCESS) errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret)); +/* Using mlock() as non-super-user seems only possible in Linux. Users of other + * operating systems should use encrypted swap/no swap (or remove the ifdef and + * run i3lock as super-user). */ +#if defined(__linux__) /* Lock the area where we store the password in memory, we don’t want it to * be swapped to disk. Since Linux 2.6.9, this does not require any * privileges, just enough bytes in the RLIMIT_MEMLOCK limit. */ if (mlock(password, sizeof(password)) != 0) err(EXIT_FAILURE, "Could not lock page in memory, check RLIMIT_MEMLOCK"); +#endif /* Initialize connection to X11 */ if ((conn = xcb_connect(NULL, &nscreen)) == NULL || -- 2.39.5