[Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.

bk: 55b55957qMKL4IaJkZOOtCnkt_uWqQ

diff --git a/ChangeLog b/ChangeLog
index 9578e78d3ccdcf94257f9f6597c0d341f7c0b400..f92786c6929502697c3c15b8668f773ce9a5ab86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
 * [Bug 2849] Systems with more than one default route may never
   synchronize.  Brian Utterback.  Note that this patch might need to

diff --git a/sntp/m4/ntp_rlimit.m4 b/sntp/m4/ntp_rlimit.m4
index c1267b771374b1f29d96cd74b4163481540ec6cc..40317b3fba2215269fed4a0b1f6babaf169d7adc 100644 (file)
--- a/sntp/m4/ntp_rlimit.m4
+++ b/sntp/m4/ntp_rlimit.m4
@@ -29,7 +29,11 @@ AC_CACHE_CHECK(
 case "$ntp_cv_rlimit_memlock" in
  yes)
     AC_SUBST([HAVE_RLIMIT_MEMLOCK])
-    HAVE_RLIMIT_MEMLOCK=" memlock 32"
+    case "$host" in
+     *-*-*linux*)
+       HAVE_RLIMIT_MEMLOCK=" memlock 0"  ;;
+     *) HAVE_RLIMIT_MEMLOCK=" memlock 32" ;;
+    esac
 esac
 
 AC_CACHE_CHECK(