* Nix daemon: reload the configuration file after forking (NIX-100).

src/libstore/globals.cc

@@ -119,4 +119,11 @@ unsigned int queryIntSetting(const string & name, unsigned int def)
 }
 
 
+void reloadSettings()
+{
+    settingsRead = false;
+    settings.clear();
+}
+
+ 
 }

src/libstore/globals.hh

@@ -107,6 +107,8 @@ bool queryBoolSetting(const string & name, bool def);
 
 unsigned int queryIntSetting(const string & name, unsigned int def);
 
+void reloadSettings();
+
     
 }
 

src/nix-worker/nix-worker.cc

@@ -635,6 +635,10 @@ static void daemonLoop()
                     /* Restore normal handling of SIGCHLD. */
                     setSigChldAction(false);
 
+                    /* Since the daemon can be long-running, the
+                       settings may have changed.  So force a reload. */
+                    reloadSettings();
+                    
                     /* Handle the connection. */
                     from.fd = remote;
                     to.fd = remote;