diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-09-01 00:53:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-09-01 00:53:49 +0200 |
| commit | dfe3f90b377a9cb2b158088c529a691086490afa (patch) | |
| tree | c0f049c355562918afc82662c4390c2ab4296302 /src/daemon/main.c | |
| parent | dc221f204b89fca85c0125e55f3afea4a807ffa7 (diff) | |
daemon: don't override path env vars if they are already set
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index b1d1109a..e44892da 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.")); |