summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2011-12-16 10:02:14 +0100
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2011-12-16 11:39:19 +0100
commit591a47002d9d759256b4b29e56a1e1303a421167 (patch)
tree644be17e60c31c3fda8776b725efd88f7d2cee35
parented9c981989f007a124dc22dcde28284395053764 (diff)
downloadlasso-591a47002d9d759256b4b29e56a1e1303a421167.tar.gz
lasso-591a47002d9d759256b4b29e56a1e1303a421167.tar.xz
lasso-591a47002d9d759256b4b29e56a1e1303a421167.zip
[xml] change saml_advice.h to declarer the real node type
It also needed a change to bindings.py to parse struct as well as typedef node classes.
-rw-r--r--bindings/bindings.py3
-rw-r--r--lasso/xml/saml_advice.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/bindings/bindings.py b/bindings/bindings.py
index def735e7..0caf114a 100644
--- a/bindings/bindings.py
+++ b/bindings/bindings.py
@@ -483,6 +483,9 @@ def parse_header(header_file):
pass
else:
# TODO: Add parsing of OFTYPE
+ # Transform struct to typedef
+ # example: "struct _LassoAssertion" -> "LassoAssertion"
+ line = re.sub('\s+struct _', ' ', line)
member_match = re.match('\s+(\w+)\s+(\*?\w+)', line)
if member_match:
member_type, member_name = normalise_var(member_match.group(1), member_match.group(2))
diff --git a/lasso/xml/saml_advice.h b/lasso/xml/saml_advice.h
index 82b0ecc2..8216e9de 100644
--- a/lasso/xml/saml_advice.h
+++ b/lasso/xml/saml_advice.h
@@ -52,8 +52,7 @@ struct _LassoSamlAdvice {
/* <element ref="saml:AssertionIDReference"/> */
GList *AssertionIDReference; /* of LassoNode */
/* <element ref="saml:Assertion"/> */
- LassoNode *Assertion; /* actually LassoSamlAssertion* but it recurses */
-
+ struct _LassoSamlAssertion *Assertion;
};
struct _LassoSamlAdviceClass {