Disable system.fgfsrc

Together with the preceding few commits, this is intended
to make security independent of the data package

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 9d24361cf5195eae0d1bce272bd105ea9964d7c1..5a2e4b46bcc859c74e6d0ca843f3b4a5df586aa3 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -1940,18 +1940,27 @@ void Options::init(int argc, char **argv, const SGPath& appDataPath)
 // setup FG_ROOT
   setupRoot(argc, argv);
   
-// system.fgfsrc handling
+// system.fgfsrc is disabled, as we no longer allow anything in fgdata to set
+// fg-root/fg-home/fg-aircraft and hence control what files Nasal can access
   if( ! hostname.empty() ) {
     config.set(globals->get_fg_root());
     config.append( "system.fgfsrc" );
     config.concat( "." );
     config.concat( hostname );
-    readConfig(config);
+    if (config.exists()) {
+      flightgear::fatalMessageBox("Unsupported configuration",
+        "You have a system.fgfsrc." + hostname +" file, which is no longer processed for security reasons",
+        "If you created this file intentionally, please move it to ~/.fgfsrc" );
+    }
   }
 
   config.set(globals->get_fg_root());
   config.append( "system.fgfsrc" );
-  readConfig(config);
+  if (config.exists()) {
+    flightgear::fatalMessageBox("Unsupported configuration",
+      "You have a system.fgfsrc file, which is no longer processed for security reasons",
+      "If you created this file intentionally, please move it to ~/.fgfsrc" );
+  }
 }
 
 void Options::initPaths()