get away from G_LOG_LEVEL_ERROR since they cause abort()

2 files changed, 12 insertions, 7 deletions

diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index df585ac0..b54fcb73 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -53,13 +53,13 @@ lasso_profile_get_request_type_from_soap_msg(gchar *soap)
 
   soap_node = lasso_node_new_from_dump(soap);
   if (soap_node == NULL) {
-    message(G_LOG_LEVEL_ERROR, "Error while build node from soap msg\n");
+    message(G_LOG_LEVEL_WARNING, "Error while build node from soap msg\n");
     return(-1);
   }
 
   body_node = lasso_node_get_child(soap_node, "Body", NULL, NULL);
   if(body_node == NULL) {
-    message(G_LOG_LEVEL_ERROR, "Body node not found\n");
+    message(G_LOG_LEVEL_WARNING, "Body node not found\n");
     return(-2);
   }
 
@@ -87,7 +87,7 @@ lasso_profile_get_request_type_from_soap_msg(gchar *soap)
       type = lassoRequestTypeLecp;
     }
     else {
-      message(G_LOG_LEVEL_ERROR, "Unkown node name : %s\n", name);
+      message(G_LOG_LEVEL_WARNING, "Unkown node name : %s\n", name);
     }
     xmlFree(name);
   }
@@ -269,7 +269,7 @@ lasso_profile_set_identity_from_dump(LassoProfile *ctx,
 {
   ctx->identity = lasso_identity_new_from_dump((gchar *)dump);
   if (ctx->identity == NULL) {
-    message(G_LOG_LEVEL_ERROR, "Failed to create the identity from the identity dump\n");
+    message(G_LOG_LEVEL_WARNING, "Failed to create the identity from the identity dump\n");
     return(-1);
   }
   ctx->identity->is_dirty = FALSE;
@@ -295,7 +295,7 @@ lasso_profile_set_session_from_dump(LassoProfile *ctx,
 {
   ctx->session = lasso_session_new_from_dump((gchar *)dump);
   if (ctx->session == NULL) {
-    message(G_LOG_LEVEL_ERROR, "Failed to create the session from the session dump\n");
+    message(G_LOG_LEVEL_WARNING, "Failed to create the session from the session dump\n");
     return(-1);
   }
   ctx->session->is_dirty = FALSE;
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 23aba5f6..b19747fc 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -422,7 +422,7 @@ lasso_server_new(gchar *metadata,
     /* get ProviderID in metadata */
     providerID = lasso_node_get_attr_value(md_node, "providerID", &err);
     if (providerID == NULL) {
-      message(G_LOG_LEVEL_ERROR, err->message);
+      message(G_LOG_LEVEL_WARNING, err->message);
       g_error_free(err);
       lasso_node_destroy(md_node);
       return (NULL);
@@ -462,10 +462,15 @@ lasso_server_new_from_dump(gchar *dump)
 
   server_node  = lasso_node_new_from_dump(dump);
   if (server_node == NULL) {
-    message(G_LOG_LEVEL_ERROR, "Error while loading server dump\n");
+    message(G_LOG_LEVEL_WARNING, "Error while loading server dump\n");
     return(NULL);
   }
   server_class = LASSO_NODE_GET_CLASS(server_node);
+  if (strcmp(server_class->get_name(server_node), LASSO_SERVER_NODE) != 0) {
+    message(G_LOG_LEVEL_WARNING, "XML is not a server dump\n");
+    lasso_node_destroy(server_node);
+    return(NULL);
+  }
 
   /* providerID */
   server->providerID = lasso_node_get_attr_value(server_node, LASSO_SERVER_PROVIDERID_NODE, NULL);