diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-11-02 11:49:58 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-11-02 11:49:58 +0000 |
| commit | 618639623cc6fcde3cd0e11606233bbdc5cbdba5 (patch) | |
| tree | c0b6aca948e3b4c3cd1b23966944102db8bdb209 /lasso | |
| parent | 5f163bbffdcb560b3b651f634fb3ada523e3ce0c (diff) | |
| download | lasso-618639623cc6fcde3cd0e11606233bbdc5cbdba5.tar.gz lasso-618639623cc6fcde3cd0e11606233bbdc5cbdba5.tar.xz lasso-618639623cc6fcde3cd0e11606233bbdc5cbdba5.zip | |
LassoServer init_from_xml/new_from_buffer handling
* lasso/id-ff/server.c: (init_from_xml) if load_metadata fail
try load_metadata_from_buffer instead using the content of the dumped
nodes.
Diffstat (limited to 'lasso')
| -rw-r--r-- | lasso/id-ff/provider.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index 3276f622..015737b2 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -494,7 +494,9 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode) /* Load metadata */ if (provider->metadata_filename) { - lasso_provider_load_metadata(provider, provider->metadata_filename); + if (! lasso_provider_load_metadata(provider, provider->metadata_filename)) { + lasso_provider_load_metadata_from_buffer(provider, provider->metadata_filename); + } } /* Load signing and encryption public keys */ |