*** empty log message ***

4 files changed, 40 insertions, 12 deletions

diff --git a/lasso/Attic/protocols/provider.c b/lasso/Attic/protocols/provider.c
index b4a308ef..0c111e2a 100644
--- a/lasso/Attic/protocols/provider.c
+++ b/lasso/Attic/protocols/provider.c
@@ -96,13 +96,13 @@ lasso_provider_get_soapEndpoint(LassoProvider *provider)
 void
 lasso_provider_set_public_key(LassoProvider *provider, xmlChar *public_key)
 {
-  provider->public_key = gstrdup(public_key);
+  provider->public_key = g_strdup(public_key);
 }
 
 void
 lasso_provider_set_certificate(LassoProvider *provider, xmlChar *certificate)
 {
-  provider->certificate = gstrdup(certificate);
+  provider->certificate = g_strdup(certificate);
 }
 
 /*****************************************************************************/
@@ -158,6 +158,20 @@ GType lasso_provider_get_type() {
   return this_type;
 }
 
+LassoProvider*
+lasso_provider_new(gchar *metadata_filename,
+		   gchar *public_key_filename,
+		   gchar *certificate_filename)
+{
+  LassoProvider *provider;
+  
+  provider = lasso_provider_new_metadata_filename(metadata_filename);
+  provider->public_key = public_key_filename;
+  provider->certificate = certificate_filename;
+  
+  return(provider);
+}
+
 
 LassoProvider*
 lasso_provider_new_metadata_xmlNode(xmlNodePtr metadata_xmlNode)
diff --git a/lasso/Attic/protocols/provider.h b/lasso/Attic/protocols/provider.h
index d4e56caa..4c0d802b 100644
--- a/lasso/Attic/protocols/provider.h
+++ b/lasso/Attic/protocols/provider.h
@@ -57,8 +57,14 @@ struct _LassoProviderClass {
 };
 
 LASSO_EXPORT GType          lasso_provider_get_type                         (void);
+
+LASSO_EXPORT LassoProvider *lasso_provider_new                              (gchar *metadata_filename,
+									     gchar *public_key_filename,
+									     gchar *certificate_filename);
+
 LASSO_EXPORT LassoProvider *lasso_provider_new_metadata_xmlNode             (xmlNodePtr metadata_xmlNode);
 LASSO_EXPORT LassoProvider *lasso_provider_new_metadata_filename            (xmlChar *metadata_filename);
+
 LASSO_EXPORT xmlChar       *lasso_provider_get_assertionConsumerServiceURL  (LassoProvider *provider);
 
 LASSO_EXPORT xmlChar       *lasso_provider_dump                             (LassoProvider *provider);
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 644d5838..ac7a9a88 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -73,8 +73,14 @@ lasso_server_dump(LassoServer *server)
 
 void
 lasso_server_add_provider(LassoServer *server,
-			  LassoProvider *provider)
+			  gchar       *metadata,
+			  gchar       *public_key,
+			  gchar       *certificate)
 {
+  LassoProvider *provider;
+
+  provider = lasso_provider_new(metadata, public_key, certificate);
+
   g_ptr_array_add(server->providers, provider);
 }
 
@@ -214,14 +220,14 @@ lasso_server_new_from_dump(xmlChar *dump)
 	certificate = xmlGetProp(provider_xmlNode, "Certificate");
 	
 	/* add a new provider */
-	provider = lasso_provider_new_metadata_xmlNode(metadata);
-	if(public_key){
-	  lasso_provider_set_public_key(provider, public_key);
-	}
-	if(certificate){
-	  lasso_provider_set_public_key(provider, certificate);
-	}
-	lasso_server_add_provider(server, provider);
+/* 	provider = lasso_provider_new_metadata_xmlNode(metadata); */
+/* 	if(public_key){ */
+/* 	  lasso_provider_set_public_key(provider, public_key); */
+/* 	} */
+/* 	if(certificate){ */
+/* 	  lasso_provider_set_public_key(provider, certificate); */
+/* 	} */
+/* 	lasso_server_add_provider(server, provider); */
       }
 
       provider_xmlNode = provider_xmlNode->next;
diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h
index 3e705246..351442bf 100644
--- a/lasso/id-ff/server.h
+++ b/lasso/id-ff/server.h
@@ -66,7 +66,9 @@ LASSO_EXPORT LassoServer*   lasso_server_new                    (gchar *metadata
 LASSO_EXPORT LassoServer   *lasso_server_new_from_dump          (xmlChar     *dump);
 
 LASSO_EXPORT void           lasso_server_add_provider           (LassoServer   *server,
-								 LassoProvider *provider);
+								 gchar         *metadata_filename,
+								 gchar         *public_key,
+								 gchar         *certificate);
 
 LASSO_EXPORT xmlChar       *lasso_server_dump                   (LassoServer *server);