diff options
author | Ingo Bürk <admin@airblader.de> | 2017-05-06 12:25:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-06 12:25:11 +0200 |
commit | 7cf393fb7ef262e8d4cf8c9eebe954fe6d760bc1 (patch) | |
tree | 8b7ca283b05e9d383866924ae3448c65001bcd70 /i3lock.c | |
parent | 0bed914e8eccb5d62cb12de4b26541b7441c94dc (diff) | |
parent | ea65a5292d1a3a5c8018454bf0080c457e727638 (diff) |
Merge pull request #125 from jasperla/mlock
Restore intended behaviour and don't use mlock(2) on OpenBSD.
Diffstat (limited to 'i3lock.c')
-rw-r--r-- | i3lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -919,12 +919,12 @@ int main(int argc, char *argv[]) { errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret)); #endif -/* Using mlock() as non-super-user seems only possible in Linux and OpenBSD. +/* 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). - * NB: Alas, swap is encrypted by default on OpenBSD so swapping out + * Alas, swap is encrypted by default on OpenBSD so swapping out * is not necessarily an issue. */ -#if defined(__linux__) || defined(__OpenBSD__) +#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. */ |