diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-07-19 21:48:35 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-07-19 21:48:35 +0000 |
| commit | a382492204ad3588c0c837e120e5bc31578df72a (patch) | |
| tree | 3b9abb372bc4f5882136be2eaa821cc7f137a4b3 /src/daemon | |
| parent | 340803b30c154ead29795454416592ff9d0e0df2 (diff) | |
* add new function pa_check_in_group()
* abstract credential APis a little bit by introducing HAVE_CREDS and a structure pa_creds
* rework credential authentication
* fix module-volume-restore and friends for usage in system-wide instance
* remove loopback= argument from moulde-*-protocol-tcp since it is a superset of listen= and usually a bad idea anyway since the user shouldn't load the TCP module at all if he doesn't want remote access
* rename a few variables in the jack modules to make sure they don't conflict with symbols defined in the system headers
* add server address for system-wide daemons to the default server list for the the client libs
* update todo
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1109 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon-conf.c | 4 | ||||
| -rw-r--r-- | src/daemon/main.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index a5a62567..2577578c 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -46,9 +46,9 @@ #endif #define DEFAULT_SCRIPT_FILE PA_DEFAULT_CONFIG_DIR PATH_SEP "default.pa" -#define DEFAULT_SCRIPT_FILE_USER ".pulse" PATH_SEP "default.pa" +#define DEFAULT_SCRIPT_FILE_USER PATH_SEP "default.pa" #define DEFAULT_CONFIG_FILE PA_DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf" -#define DEFAULT_CONFIG_FILE_USER ".pulse" PATH_SEP "daemon.conf" +#define DEFAULT_CONFIG_FILE_USER PATH_SEP "daemon.conf" #define ENV_SCRIPT_FILE "PULSE_SCRIPT" #define ENV_CONFIG_FILE "PULSE_CONFIG" diff --git a/src/daemon/main.c b/src/daemon/main.c index 4961f0ca..0449cb94 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -229,6 +229,7 @@ static int change_user(void) { /* Relevant for pa_runtime_path() */ set_env("PULSE_RUNTIME_PATH", PA_SYSTEM_RUNTIME_PATH); + set_env("PULSE_CONFIG_PATH", PA_SYSTEM_RUNTIME_PATH); pa_log_info(__FILE__": Successfully dropped root privileges."); @@ -245,8 +246,6 @@ static int create_runtime_dir(void) { return -1; } - /* Relevant for pa_runtime_path() later on */ - set_env("PULSE_RUNTIME_PATH", fn); return 0; } |