fly/flightgear
1
0
Fork 0
Code Activity

- allow users to set fg-home dir via FG_HOME environment variable, but

Browse source 
- don't allow to do that from any XML file. This is to prevent malign
  code from writing a new fg-home in ~/.fgfs/autosave.xml or other files
  in ~/.fgfs/.
This commit is contained in:
mfranz 2008-06-13 10:52:47 +00:00
parent a9319336ba
commit afc5225272
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Main/fg_init.cxx
View file

@ -607,7 +607,18 @@ bool fgInitConfig ( int argc, char **argv ) {
SGPath config( homedir );
config.append( ".fgfs" );
#endif
fgSetString("/sim/fg-home", config.c_str());
const char *fg_home = getenv("FG_HOME");
if (fg_home)
config = fg_home;
// Set /sim/fg-home and don't allow malign code to override it until
// Nasal security is set up. Use FG_HOME if necessary.
SGPropertyNode *home = fgGetNode("/sim", true);
home->removeChild("fg-home", 0, false);
home = home->getChild("fg-home", 0, true);
home->setStringValue(config.c_str());
home->setAttribute(SGPropertyNode::WRITE, false);
config.append( "autosave.xml" );
SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << config.str());
try {