summaryrefslogtreecommitdiff
path: root/net/ntp/files
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2019-09-20 19:39:17 +0000
committerCy Schubert <cy@FreeBSD.org>2019-09-20 19:39:17 +0000
commit561d1f9f7667a0d6e5dad09041bf66ad6bd8781c (patch)
treec8c15427bf650bf140f3fb1784f11a35d7ac8ac2 /net/ntp/files
parentUpdate to the latest att/ast github commit. (diff)
Chase src r352540:
Follow up on ports r511987 (base r352304) which disabled default mlockall() at startup. Unfortunately though the original tarball supports this in ./configure (for Linux), to fully support disabling of mlockall() by default requires a little extra help otherwise the following is logged in syslog: Cannot set RLIMIT_MEMLOCK: Operation not permitted
Notes
Notes: svn path=/head/; revision=512433
Diffstat (limited to 'net/ntp/files')
-rw-r--r--net/ntp/files/patch-ntpd_ntp.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/ntp/files/patch-ntpd_ntp.c b/net/ntp/files/patch-ntpd_ntp.c
new file mode 100644
index 000000000000..3f8187a072e4
--- /dev/null
+++ b/net/ntp/files/patch-ntpd_ntp.c
@@ -0,0 +1,11 @@
+--- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800
++++ ntpd/ntpd.c 2019-09-20 12:11:54.469651000 -0700
+@@ -999,7 +999,7 @@
+ # if defined(HAVE_MLOCKALL)
+ # ifdef HAVE_SETRLIMIT
+ ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k");
+-# ifdef RLIMIT_MEMLOCK
++# if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && DFLT_RLIMIT_MEMLOCK != -1
+ /*
+ * The default RLIMIT_MEMLOCK is very low on Linux systems.
+ * Unless we increase this limit malloc calls are likely to