cleaning up

12 files changed, 21 insertions, 25 deletions

diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index ca3878b1..57f88a58 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -95,7 +95,7 @@ lasso_login_build_assertion(LassoLogin *login,
 
 	if (strcmp(login->nameIDPolicy, LASSO_LIB_NAMEID_POLICY_TYPE_ONE_TIME) == 0) {
 		/* if NameIDPolicy is 'onetime', don't use a federation */
-		nameIdentifier = LASSO_SAML_NAME_IDENTIFIER(lasso_saml_name_identifier_new());
+		nameIdentifier = lasso_saml_name_identifier_new();
 		nameIdentifier->content = lasso_build_unique_id(32);
 		nameIdentifier->NameQualifier = LASSO_PROVIDER(profile->server)->ProviderID;
 		nameIdentifier->Format = LASSO_LIB_NAME_IDENTIFIER_FORMAT_ONE_TIME;
@@ -135,9 +135,7 @@ lasso_login_build_assertion(LassoLogin *login,
 	if (profile->session == NULL) {
 		profile->session = lasso_session_new();
 	}
-	lasso_session_add_assertion(
-			profile->session,
-			profile->remote_providerID,
+	lasso_session_add_assertion(profile->session, profile->remote_providerID,
 			LASSO_SAML_ASSERTION(assertion));
 	return 0;
 }
@@ -867,11 +865,12 @@ lasso_login_build_response_msg(LassoLogin *login, gchar *remote_providerID)
 			/* get assertion in session and add it in response */
 			assertion = lasso_session_get_assertion(LASSO_PROFILE(login)->session,
 					LASSO_PROFILE(login)->remote_providerID);
-			LASSO_SAMLP_RESPONSE(LASSO_PROFILE(login)->response)->Assertion = assertion;
 			if (assertion == NULL) {
 				/* FIXME should this message output by lasso_session_get_assertion () ? */
 				message(G_LOG_LEVEL_CRITICAL, "Assertion not found in session\n");
 			}
+			LASSO_SAMLP_RESPONSE(LASSO_PROFILE(login)->response)->Assertion =
+				g_object_ref(assertion);
 		}
 	} else {
 		lasso_profile_set_response_status(LASSO_PROFILE(login),
@@ -1249,7 +1248,8 @@ lasso_login_process_request_msg(LassoLogin *login, gchar *request_msg)
 		return LASSO_ERROR_UNDEFINED;
 	}
 	/* get AssertionArtifact */
-	login->assertionArtifact = LASSO_SAMLP_REQUEST(profile->request)->AssertionArtifact;
+	login->assertionArtifact = g_strdup(
+			LASSO_SAMLP_REQUEST(profile->request)->AssertionArtifact);
 
 	return ret;
 }
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 981b5adf..4c6dd28e 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -376,7 +376,7 @@ finalize(GObject *object)
 {
 	LassoProfile *profile = LASSO_PROFILE(object);
 
-	debug("Profile object 0x%x finalized ...\n", ctx);
+	debug("Profile object 0x%x finalized ...\n", object);
 
 	g_free(profile->nameIdentifier);
 	g_free(profile->remote_providerID);
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index 091327f3..e802cfd5 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -171,7 +171,7 @@ lasso_lib_authentication_statement_new_full(const char *authenticationMethod,
 	LASSO_LIB_AUTHENTICATION_STATEMENT(statement)->ReauthenticateOnOrAfter = 
 		g_strdup(reauthenticateOnOrAfter);
 
-	LASSO_SAML_SUBJECT(subject)->NameIdentifier = new_identifier;
+	LASSO_SAML_SUBJECT(subject)->NameIdentifier = g_object_ref(new_identifier);
 
 	if (sp_identifier != NULL) {
 		/* create a new IdpProvidedNameIdentifier and use idp_identifier data to fill it */
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index 3a78a2fa..62876897 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -256,6 +256,6 @@ lasso_saml_assertion_get_type()
 LassoNode*
 lasso_saml_assertion_new()
 {
-	return LASSO_NODE(g_object_new(LASSO_TYPE_SAML_ASSERTION, NULL));
+	return g_object_new(LASSO_TYPE_SAML_ASSERTION, NULL);
 }
 
diff --git a/lasso/xml/saml_name_identifier.c b/lasso/xml/saml_name_identifier.c
index d97a3a3b..ed715281 100644
--- a/lasso/xml/saml_name_identifier.c
+++ b/lasso/xml/saml_name_identifier.c
@@ -89,7 +89,7 @@ get_xmlNode(LassoNode *node)
 
 	xmlnode = xmlNewNode(NULL, "NameIdentifier");
 	xmlSetNs(xmlnode, xmlNewNs(xmlnode, LASSO_SAML_ASSERTION_HREF, LASSO_SAML_ASSERTION_PREFIX));
-	xmlNodeSetContent(xmlnode, identifier->content);
+	xmlAddChild(xmlnode, xmlNewText(identifier->content));
 	if (identifier->Format)
 		xmlSetProp(xmlnode, "Format", identifier->Format);
 	if (identifier->NameQualifier)
diff --git a/lasso/xml/saml_subject.c b/lasso/xml/saml_subject.c
index cde9e17b..2968f3f5 100644
--- a/lasso/xml/saml_subject.c
+++ b/lasso/xml/saml_subject.c
@@ -82,13 +82,11 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 		}
 		if (strcmp(t->name, "NameIdentifier") == 0) {
 			subject->NameIdentifier = LASSO_SAML_NAME_IDENTIFIER(
-					lasso_saml_name_identifier_new());
-			lasso_node_init_from_xml(LASSO_NODE(subject->NameIdentifier), t);
+					lasso_node_new_from_xmlNode(t));
 		}
 		if (strcmp(t->name, "SubjectConfirmation") == 0) {
 			subject->SubjectConfirmation = LASSO_SAML_SUBJECT_CONFIRMATION(
-					lasso_saml_subject_confirmation_new());
-			lasso_node_init_from_xml(LASSO_NODE(subject->SubjectConfirmation), t);
+					lasso_node_new_from_xmlNode(t));
 		}
 		t = t->next;
 	}
diff --git a/lasso/xml/saml_subject_statement.c b/lasso/xml/saml_subject_statement.c
index 87b78e18..2fc851cf 100644
--- a/lasso/xml/saml_subject_statement.c
+++ b/lasso/xml/saml_subject_statement.c
@@ -96,6 +96,6 @@ lasso_saml_subject_statement_get_type()
 LassoNode*
 lasso_saml_subject_statement_new()
 {
-	return LASSO_NODE(g_object_new(LASSO_TYPE_SAML_SUBJECT_STATEMENT, NULL));
+	return g_object_new(LASSO_TYPE_SAML_SUBJECT_STATEMENT, NULL);
 }
 
diff --git a/lasso/xml/samlp_request.c b/lasso/xml/samlp_request.c
index da1997e4..48a52a35 100644
--- a/lasso/xml/samlp_request.c
+++ b/lasso/xml/samlp_request.c
@@ -130,6 +130,6 @@ lasso_samlp_request_get_type()
 LassoNode*
 lasso_samlp_request_new()
 {
-	return LASSO_NODE(g_object_new(LASSO_TYPE_SAMLP_REQUEST, NULL));
+	return g_object_new(LASSO_TYPE_SAMLP_REQUEST, NULL);
 }
 
diff --git a/lasso/xml/samlp_request.h b/lasso/xml/samlp_request.h
index c675b0f4..3979160e 100644
--- a/lasso/xml/samlp_request.h
+++ b/lasso/xml/samlp_request.h
@@ -43,16 +43,14 @@ typedef struct _LassoSamlpRequest LassoSamlpRequest;
 typedef struct _LassoSamlpRequestClass LassoSamlpRequestClass;
 
 struct _LassoSamlpRequest {
-  LassoSamlpRequestAbstract parent;
+	LassoSamlpRequestAbstract parent;
 
-  /* <element name="AssertionArtifact" type="string"/> */
-  char *AssertionArtifact;
-
-  /*< private >*/
+	/* <element name="AssertionArtifact" type="string"/> */
+	char *AssertionArtifact;
 };
 
 struct _LassoSamlpRequestClass {
-  LassoSamlpRequestAbstractClass parent;
+	LassoSamlpRequestAbstractClass parent;
 };
 
 LASSO_EXPORT GType lasso_samlp_request_get_type(void);
diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c
index cf9d29b2..0a33e3a6 100644
--- a/lasso/xml/samlp_request_abstract.c
+++ b/lasso/xml/samlp_request_abstract.c
@@ -237,5 +237,5 @@ lasso_samlp_request_abstract_get_type()
 LassoNode*
 lasso_samlp_request_abstract_new()
 {
-	return LASSO_NODE(g_object_new(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, NULL));
+	return g_object_new(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, NULL);
 }
diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c
index bbd04c32..b81c3163 100644
--- a/lasso/xml/samlp_response.c
+++ b/lasso/xml/samlp_response.c
@@ -151,7 +151,7 @@ lasso_samlp_response_new()
 	LassoSamlpStatusCode *status_code;
 	LassoSamlpStatus *status;
 
-	response = LASSO_SAMLP_RESPONSE_ABSTRACT(g_object_new(LASSO_TYPE_SAMLP_RESPONSE, NULL));
+	response = g_object_new(LASSO_TYPE_SAMLP_RESPONSE, NULL);
 
 	response->ResponseID = lasso_build_unique_id(32);
 	response->MajorVersion = LASSO_SAML_MAJOR_VERSION_N;
diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c
index b6c88640..5fc6ff0c 100644
--- a/lasso/xml/samlp_response_abstract.c
+++ b/lasso/xml/samlp_response_abstract.c
@@ -258,6 +258,6 @@ lasso_samlp_response_abstract_get_type()
 LassoNode*
 lasso_samlp_response_abstract_new()
 {
-	return LASSO_NODE(g_object_new(LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, NULL));
+	return g_object_new(LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, NULL);
 }