[pulseaudio-commits] r2015 - /trunk/src/daemon/main.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Nov  1 12:23:45 2007
New Revision: 2015

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2015&root=pulseaudio&view=rev
Log:
make disallow-module-loading config option work again (original patch from Diego Petteno)

Modified:
    trunk/src/daemon/main.c

Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=2015&root=pulseaudio&r1=2014&r2=2015&view=diff
==============================================================================
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Thu Nov  1 12:23:45 2007
@@ -639,7 +639,6 @@
     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 @@
 #endif
 
     if (conf->daemonize)
-        c->running_as_daemon = 1;
+        c->running_as_daemon = TRUE;
 
     oil_init();
 
@@ -681,6 +680,10 @@
         r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
     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.");