From 618639623cc6fcde3cd0e11606233bbdc5cbdba5 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sun, 2 Nov 2008 11:49:58 +0000 Subject: 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. --- lasso/id-ff/provider.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 */ -- cgit