Merge branch 'master' of https://github.com/i3/i3lock

i3lock.c

@@ -1246,12 +1246,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. */