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

pull/125/head
Jasper Lievisse Adriaanse 2017-04-17 21:06:19 +02:00
parent 0bed914e8e
commit ea65a5292d
1 changed files with 3 additions and 3 deletions

View File

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