mirror of
https://github.com/vgough/encfs.git
synced 2025-06-20 03:37:50 +02:00
allow "config" as top-level XML node when reading Boost serialization config.
git-svn-id: http://encfs.googlecode.com/svn/trunk@82 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
parent
a4089d4479
commit
7efdea5e17
@ -285,6 +285,14 @@ bool readV6Config( const char *configFile,
|
|||||||
|
|
||||||
XmlValuePtr serialization = rdr["boost_serialization"];
|
XmlValuePtr serialization = rdr["boost_serialization"];
|
||||||
XmlValuePtr config = (*serialization)["cfg"];
|
XmlValuePtr config = (*serialization)["cfg"];
|
||||||
|
if (!config) {
|
||||||
|
config = (*serialization)["config"];
|
||||||
|
}
|
||||||
|
if (!config) {
|
||||||
|
rError("Unable to find XML configuration in file %s", configFile);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
int version = 0;
|
int version = 0;
|
||||||
(*config)["@version"] >> version;
|
(*config)["@version"] >> version;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user