diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-10-31 02:16:14 +0100 |
| commit | c4e276edbd84cbb8c5b594c9f427b0a25a7fb2ab (patch) | |
| tree | 55c0d0f8e378e5e6fe203b250a816ea4d2d75ccb /src/daemon/daemon-conf.c | |
| parent | 9c61465c796f3369c7cc57c094489fb383216a1b (diff) | |
| parent | 2dc37e1214f20aab528ae680e9a85fc8ea143313 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/daemon/daemon-conf.c')
| -rw-r--r-- | src/daemon/daemon-conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 571faae4..bfd5c118 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -577,7 +577,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) { c->config_file = NULL; f = filename ? - fopen(c->config_file = pa_xstrdup(filename), "r") : + pa_fopen_cloexec(c->config_file = pa_xstrdup(filename), "r") : pa_open_config_file(DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER, ENV_CONFIG_FILE, &c->config_file); if (!f && errno != ENOENT) { @@ -652,7 +652,7 @@ FILE *pa_daemon_conf_open_default_script_file(pa_daemon_conf *c) { else f = pa_open_config_file(DEFAULT_SCRIPT_FILE, DEFAULT_SCRIPT_FILE_USER, ENV_SCRIPT_FILE, &c->default_script_file); } else - f = fopen(c->default_script_file, "r"); + f = pa_fopen_cloexec(c->default_script_file, "r"); return f; } |