XML SAML 2.0: Mark RelayState field from SAML 2.0 deprecated

 * lasso/xml/saml-2.0/samlp2_authn_request.c,
   lasso/xml/saml-2.0/samlp2_logout_request.c,
   - (instance_init) remove initialization of relayState field

 * lasso/xml/saml-2.0/samlp2_logout_response.c:
   - (instance_init) remove empty function, since it
     only initialized relayState.
   - (lasso_samlp2_logout_reponse_get_type) remove instance_init
     from the type initialization structure.

 * lasso/xml/saml-2.0/samlp2_authn_request.h,
   lasso/xml/saml-2.0/samlp2_logout_request.h,
   lasso/xml/saml-2.0/samlp2_logout_response.h:
   - (struct _LassoSamlp2*) mark relaystate field as deprecated.

6 files changed, 11 insertions, 34 deletions

diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.c b/lasso/xml/saml-2.0/samlp2_authn_request.c
index 9d477df8..1699a8d9 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.c
@@ -100,19 +100,10 @@ static LassoNodeClass *parent_class = NULL;
 static void
 instance_init(LassoSamlp2AuthnRequest *node)
 {
-	node->Subject = NULL;
-	node->NameIDPolicy = NULL;
-	node->Conditions = NULL;
-	node->RequestedAuthnContext = NULL;
-	node->Scoping = NULL;
 	node->ForceAuthn = FALSE;
 	node->IsPassive = FALSE;
-	node->ProtocolBinding = NULL;
 	node->AssertionConsumerServiceIndex = -1;
-	node->AssertionConsumerServiceURL = NULL;
 	node->AttributeConsumingServiceIndex = -1;
-	node->ProviderName = NULL;
-	node->relayState = NULL;
 }
 
 static void
diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.h b/lasso/xml/saml-2.0/samlp2_authn_request.h
index 67350756..df9631b2 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.h
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.h
@@ -74,8 +74,9 @@ struct _LassoSamlp2AuthnRequest {
 	int AttributeConsumingServiceIndex;
 	char *ProviderName;
 
-	/* out of schema */
-	char *relayState;
+	/* This field is deprecated do not use it,
+	 * kept for ABI compatibility */
+	G_GNUC_DEPRECATED char *relayState;
 };
 
 
diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.c b/lasso/xml/saml-2.0/samlp2_logout_request.c
index 88b269c9..a4a7bb20 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_request.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_request.c
@@ -82,18 +82,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2LogoutRequest *node)
-{
-	node->BaseID = NULL;
-	node->NameID = NULL;
-	node->EncryptedID = NULL;
-	node->SessionIndex = NULL;
-	node->Reason = NULL;
-	node->NotOnOrAfter = NULL;
-	node->relayState = NULL;
-}
-
-static void
 class_init(LassoSamlp2LogoutRequestClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -120,7 +108,7 @@ lasso_samlp2_logout_request_get_type()
 			NULL,
 			sizeof(LassoSamlp2LogoutRequest),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 			NULL
 		};
 
diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.h b/lasso/xml/saml-2.0/samlp2_logout_request.h
index 4756de53..137b29f0 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_request.h
+++ b/lasso/xml/saml-2.0/samlp2_logout_request.h
@@ -66,7 +66,9 @@ struct _LassoSamlp2LogoutRequest {
 	char *Reason;
 	char *NotOnOrAfter;
 
-	char *relayState;
+	/* This field is deprecated do not use it,
+	 * kept for ABI compatibility */
+	G_GNUC_DEPRECATED char *relayState;
 };
 
 
diff --git a/lasso/xml/saml-2.0/samlp2_logout_response.c b/lasso/xml/saml-2.0/samlp2_logout_response.c
index 2493c50f..4af6d29f 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_response.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_response.c
@@ -56,12 +56,6 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoSamlp2LogoutResponse *node)
-{
-	node->relayState = NULL; /* XXX: free me sometimes */
-}
-
-static void
 class_init(LassoSamlp2LogoutResponseClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
@@ -88,7 +82,7 @@ lasso_samlp2_logout_response_get_type()
 			NULL,
 			sizeof(LassoSamlp2LogoutResponse),
 			0,
-			(GInstanceInitFunc) instance_init,
+			NULL,
 			NULL
 		};
 
diff --git a/lasso/xml/saml-2.0/samlp2_logout_response.h b/lasso/xml/saml-2.0/samlp2_logout_response.h
index dfe09a02..2759dbba 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_response.h
+++ b/lasso/xml/saml-2.0/samlp2_logout_response.h
@@ -53,8 +53,9 @@ typedef struct _LassoSamlp2LogoutResponseClass LassoSamlp2LogoutResponseClass;
 struct _LassoSamlp2LogoutResponse {
 	LassoSamlp2StatusResponse parent;
 
-	/*< public >*/
-	char *relayState;
+	/* This field is deprecated do not use it,
+	 * kept for ABI compatibility */
+	G_GNUC_DEPRECATED char *relayState;
 };