summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@humppa.nl>2017-04-17 21:06:19 +0200
committerJasper Lievisse Adriaanse <jasper@humppa.nl>2017-04-17 21:06:19 +0200
commitea65a5292d1a3a5c8018454bf0080c457e727638 (patch)
tree8b7ca283b05e9d383866924ae3448c65001bcd70
parent0bed914e8eccb5d62cb12de4b26541b7441c94dc (diff)
Restore intended behaviour and don't use mlock(2) on OpenBSD.
-rw-r--r--i3lock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/i3lock.c b/i3lock.c
index 01f0436..87a77b1 100644
--- 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. */