From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 26 Jul 2015 22:04:07 +0000 (+0000)
Subject: [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
X-Git-Tag: NTP_4_3_65~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccb335f9e5433225acc97f89269a754b17f8c1f8;p=thirdparty%2Fntp.git

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

bk: 55b55957qMKL4IaJkZOOtCnkt_uWqQ
---

diff --git a/ChangeLog b/ChangeLog
index 9578e78d3..f92786c69 100644
--- 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 c1267b771..40317b3fb 100644
--- 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(