reviewed code marked with XXX

7 files changed, 7 insertions, 19 deletions

diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c
index 9c3f4d5c..ecedef11 100644
--- a/lasso/xml/lib_authn_request.c
+++ b/lasso/xml/lib_authn_request.c
@@ -92,13 +92,14 @@ static struct XmlSnippet schema_snippets[] = {
 		G_STRUCT_OFFSET(LassoLibAuthnRequest, ProtocolProfile) },
 	{ "AssertionConsumerServiceID", SNIPPET_CONTENT, 
 		G_STRUCT_OFFSET(LassoLibAuthnRequest, AssertionConsumerServiceID) },
-	/* XXX: RequestAuthnContext */
+	{ "RequestAuthnContext", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, RequestAuthnContext) },
 	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, RelayState) },
 	{ "ForceAuthn", SNIPPET_CONTENT | SNIPPET_BOOLEAN,
 		G_STRUCT_OFFSET(LassoLibAuthnRequest, ForceAuthn) },
 	{ "IsPassive", SNIPPET_CONTENT | SNIPPET_BOOLEAN,
 		G_STRUCT_OFFSET(LassoLibAuthnRequest, IsPassive) },
-	/* XXX: Scoping */
+	{ "Scoping", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibAuthnRequest, Scoping) },
 	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibAuthnRequest, consent) },
 	{ NULL, 0, 0}
 };
diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c
index 0b2f660d..58d4b551 100644
--- a/lasso/xml/lib_logout_request.c
+++ b/lasso/xml/lib_logout_request.c
@@ -61,6 +61,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
+ 	/* TODO: <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */
 	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, ProviderID) },
 	{ "NameIdentifier", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibLogoutRequest, NameIdentifier) },
 	{ "SessionIndex", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, SessionIndex) },
@@ -82,8 +83,6 @@ build_query(LassoNode *node)
 	s = g_string_new(str);
 	g_free(str);
 
-	/* XXX Extension */
-
 	if (request->ProviderID) {
 		t = xmlURIEscapeStr(request->ProviderID, NULL);
 		g_string_append_printf(s, "&ProviderID=%s", t);
@@ -165,7 +164,6 @@ init_from_query(LassoNode *node, char **query_fields)
 static void
 instance_init(LassoLibLogoutRequest *node)
 {
-	node->Extension = NULL;
 	node->ProviderID = NULL;
 	node->NameIdentifier = NULL;
 	node->SessionIndex = NULL;
diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h
index e9d3626a..0915a7c2 100644
--- a/lasso/xml/lib_logout_request.h
+++ b/lasso/xml/lib_logout_request.h
@@ -52,17 +52,11 @@ typedef struct _LassoLibLogoutRequestClass LassoLibLogoutRequestClass;
 
 struct _LassoLibLogoutRequest {
 	LassoSamlpRequestAbstract parent;
-	/* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */
-	char *Extension;
-	/* <xs:element ref="ProviderID"/> */
+
 	char *ProviderID;
-	/* <xs:element ref="saml:NameIdentifier"/> */
 	LassoSamlNameIdentifier *NameIdentifier;
-	/* <xs:element name="SessionIndex" type="xs:string" minOccurs="0"/> */
 	char *SessionIndex;
-	/* <xs:element ref="RelayState" minOccurs="0"/> */
 	char *RelayState;
-	/* <xs:attribute ref="consent" use="optional"/> */
 	char *consent;
 };
 
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index 9d66d0fc..cace603b 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -64,6 +64,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
+	/* TODO: <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */
 	{ "ProviderID", SNIPPET_CONTENT,
 		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, ProviderID) },
 	{ "IDPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER,
@@ -92,8 +93,6 @@ build_query(LassoNode *node)
 	s = g_string_new(str);
 	g_free(str);
 
-	/* XXX Extension */
-
 	if (request->ProviderID) {
 		t = xmlURIEscapeStr(request->ProviderID, NULL);
 		g_string_append_printf(s, "&ProviderID=%s", t);
diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h
index ecda0c48..54c8463c 100644
--- a/lasso/xml/lib_register_name_identifier_request.h
+++ b/lasso/xml/lib_register_name_identifier_request.h
@@ -56,8 +56,6 @@ typedef struct _LassoLibRegisterNameIdentifierRequestClass \
 struct _LassoLibRegisterNameIdentifierRequest {
 	LassoSamlpRequestAbstract parent;
 
-	/* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */
-	LassoNode *Extension; /* TODO */
 	/* <xs:element ref="ProviderID"/> */
 	char *ProviderID;
 	/* <xs:element ref="IDPProvidedNameIdentifier"/> */
diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c
index 04c4be22..dbd3f918 100644
--- a/lasso/xml/lib_status_response.c
+++ b/lasso/xml/lib_status_response.c
@@ -58,6 +58,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
+	/* TODO <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */
 	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, ProviderID) },
 	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibStatusResponse, Status) },
 	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, RelayState) },
@@ -77,7 +78,6 @@ build_query(LassoNode *node)
 	s = g_string_new(str);
 	g_free(str);
 
-	/* XXX Extension */
 	if (response->ProviderID) {
 		t = xmlURIEscapeStr(response->ProviderID, NULL);
 		g_string_append_printf(s, "&ProviderID=%s", t);
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 30d7a2ac..6fce84ce 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -742,8 +742,6 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 	char *xsitype;
 	int rc;
 
-	/* XXX I'm not sure I can access ->ns like this */
-
 	if (xmlnode == NULL || xmlnode->ns == NULL) {
 		message(G_LOG_LEVEL_CRITICAL, "Impossible to build LassoNode from xml node");
 		return NULL;