commit 7cf393fb7ef262e8d4cf8c9eebe954fe6d760bc1
parent 0bed914e8eccb5d62cb12de4b26541b7441c94dc
Author: Ingo Bürk <admin@airblader.de>
Date: Sat, 6 May 2017 12:25:11 +0200
Merge pull request #125 from jasperla/mlock
Restore intended behaviour and don't use mlock(2) on OpenBSD.
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/i3lock.c b/i3lock.c
@@ -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. */
