mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
make disallow-module-loading config option work again (original patch from Diego Petteno)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2015 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
7bfd1b2f01
commit
81233c1781
1 changed files with 5 additions and 2 deletions
|
|
@ -639,7 +639,6 @@ int main(int argc, char *argv[]) {
|
|||
c->default_sample_spec = conf->default_sample_spec;
|
||||
c->default_n_fragments = conf->default_n_fragments;
|
||||
c->default_fragment_size_msec = conf->default_fragment_size_msec;
|
||||
c->disallow_module_loading = conf->disallow_module_loading;
|
||||
c->exit_idle_time = conf->exit_idle_time;
|
||||
c->module_idle_time = conf->module_idle_time;
|
||||
c->scache_idle_time = conf->scache_idle_time;
|
||||
|
|
@ -666,7 +665,7 @@ int main(int argc, char *argv[]) {
|
|||
#endif
|
||||
|
||||
if (conf->daemonize)
|
||||
c->running_as_daemon = 1;
|
||||
c->running_as_daemon = TRUE;
|
||||
|
||||
oil_init();
|
||||
|
||||
|
|
@ -682,6 +681,10 @@ int main(int argc, char *argv[]) {
|
|||
pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
|
||||
pa_xfree(s);
|
||||
|
||||
/* We completed the initial module loading, so let's disable it
|
||||
* from now on, if requested */
|
||||
c->disallow_module_loading = !!conf->disallow_module_loading;
|
||||
|
||||
if (r < 0 && conf->fail) {
|
||||
pa_log("failed to initialize daemon.");
|
||||
#ifdef HAVE_FORK
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue