don't touch RLIMIT:MEMBLOCK by default. This should improve out-of-the-box comaptibil...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2052 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 089b12f..3d63891 100644 (file)
--- 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 f15d93e..8d224e8 100644 (file)
--- 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