From 15f56de8f2a10e092e11dfa3fc48ee28d2dd7e25 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Nov 2007 19:39:23 +0000
Subject: don't touch RLIMIT:MEMBLOCK by default. This should improve
 out-of-the-box comaptibility with JACK

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2052 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/daemon/daemon-conf.c  | 2 +-
 src/daemon/daemon.conf.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/daemon')

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 089b12fc..3d63891c 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -90,7 +90,7 @@ static const pa_daemon_conf default_conf = {
     , .rlimit_nproc = { .value = 0, .is_set = FALSE }
 #endif
 #ifdef RLIMIT_MEMLOCK
-    , .rlimit_memlock = { .value = 16384, .is_set = TRUE }
+    , .rlimit_memlock = { .value = 0, .is_set = FALSE }
 #endif
 #ifdef RLIMIT_NICE
     , .rlimit_nice = { .value = 31, .is_set = TRUE }     /* nice level of -11 */
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index f15d93e8..8d224e82 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -56,7 +56,7 @@
 ; rlimit-nofile = 256
 ; rlimit-stack = -1
 ; rlimit-nproc = -1
-; rlimit-memlock = 16384
+; rlimit-memlock = -1
 ; rlimit-nice = 31
 ; rlimit-rtprio = 9
 
-- 
cgit