[Bug 477] Linux needs larger RLIM_MEMLOCK, from Cristoph Gysin

bk: 43004bd6et0qsCzRlpMzJ9xxw4ciHg

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 2f4fa00cecf9c54cdf9c85c4ddfec7636b66a3b3..dc0b824064cc21ccef3d8c734d5fecfda50b20e9 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -691,6 +691,18 @@ service_main(
                                "Cannot adjust stack limit for mlockall: %m");
                    }
            }
+#  ifdef RLIMIT_MEMLOCK
+           /*
+            * The default RLIMIT_MEMLOCK is very low on Linux systems.
+            * Unless we increase this limit malloc calls are likely to
+            * fail if we drop root privlege.  To be useful the value
+            * has to be larger than the largest ntpd resident set size.
+            */
+           rl.rlim_cur = rl.rlim_max = 32*1024*1024;
+           if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
+               msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
+           }
+#  endif /* RLIMIT_MEMLOCK */
        }
 # endif /* HAVE_SETRLIMIT */
        /*