From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Mon, 17 Apr 2017 19:06:19 +0000 (+0200)
Subject: Restore intended behaviour and don't use mlock(2) on OpenBSD.
X-Git-Tag: 2.9~1^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F125%2Fhead;p=i3%2Fi3lock

Restore intended behaviour and don't use mlock(2) on OpenBSD.
---

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. */