[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test6-46-gdfe3f90

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  dc221f204b89fca85c0125e55f3afea4a807ffa7 (commit)

- Log -----------------------------------------------------------------
dfe3f90 daemon: don't override path env vars if they are already set
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/main.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------

commit dfe3f90b377a9cb2b158088c529a691086490afa
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 1 00:53:49 2009 +0200

    daemon: don't override path env vars if they are already set

diff --git a/src/daemon/main.c b/src/daemon/main.c
index b1d1109..e44892d 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -259,9 +259,14 @@ static int change_user(void) {
     pa_set_env("HOME", PA_SYSTEM_RUNTIME_PATH);
 
     /* Relevant for pa_runtime_path() */
-    pa_set_env("PULSE_RUNTIME_PATH", PA_SYSTEM_RUNTIME_PATH);
-    pa_set_env("PULSE_CONFIG_PATH", PA_SYSTEM_CONFIG_PATH);
-    pa_set_env("PULSE_STATE_PATH", PA_SYSTEM_STATE_PATH);
+    if (!getenv("PULSE_RUNTIME_PATH"))
+        pa_set_env("PULSE_RUNTIME_PATH", PA_SYSTEM_RUNTIME_PATH);
+
+    if (!getenv("PULSE_CONFIG_PATH"))
+        pa_set_env("PULSE_CONFIG_PATH", PA_SYSTEM_CONFIG_PATH);
+
+    if (!getenv("PULSE_STATE_PATH"))
+        pa_set_env("PULSE_STATE_PATH", PA_SYSTEM_STATE_PATH);
 
     pa_log_info(_("Successfully dropped root privileges."));
 

-- 
hooks/post-receive
PulseAudio Sound Server