summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2009-08-26 15:13:59 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2009-08-26 15:13:59 +0000
commiteacb57905caa3d4ca86eeece0403c8864db1f6a5 (patch)
tree912d70ff7a8218979fa8f8eb9dc938204800a070
parentfbfbe5553dfb00af22c4d7bb3f4c62c9a129c3a9 (diff)
downloadlasso-eacb57905caa3d4ca86eeece0403c8864db1f6a5.tar.gz
lasso-eacb57905caa3d4ca86eeece0403c8864db1f6a5.tar.xz
lasso-eacb57905caa3d4ca86eeece0403c8864db1f6a5.zip
Core: SOAP is also used by SAML bindings
* extract_symbols.py, extract_types.py: export SOAP types whatever the value of the flag --enable-wsf. It still worked because constructor for GObject calls get_type, but there is a race condition: if you receive a SOAP message before sending one, it fails. Only soap_binding types must be removed.
-rw-r--r--lasso/extract_symbols.py2
-rw-r--r--lasso/extract_types.py2
-rw-r--r--lasso/xml/Makefile.am20
3 files changed, 12 insertions, 12 deletions
diff --git a/lasso/extract_symbols.py b/lasso/extract_symbols.py
index 95e3f06d..f0e5fa9b 100644
--- a/lasso/extract_symbols.py
+++ b/lasso/extract_symbols.py
@@ -25,7 +25,7 @@ for header_file in glob.glob('%s/*/*.h' % srcdir) + glob.glob('%s/*.h' % srcdir)
wsf = ['lasso_disco_', 'lasso_dst_', 'lasso_is_', 'lasso_profile_service_',
'lasso_discovery', 'lasso_wsf', 'lasso_interaction_', 'lasso_utility_',
- 'lasso_sa_', 'lasso_soap_', 'lasso_authentication', 'lasso_wsse_',
+ 'lasso_sa_', 'lasso_soap_binding', 'lasso_authentication', 'lasso_wsse_',
'lasso_sec_', 'lasso_idwsf2', 'lasso_wsf2', 'lasso_wsa_',
'lasso_wsu_']
if enable_wsf:
diff --git a/lasso/extract_types.py b/lasso/extract_types.py
index 36f1fdc8..9f73a68a 100644
--- a/lasso/extract_types.py
+++ b/lasso/extract_types.py
@@ -18,7 +18,7 @@ else:
wsf = ['lasso_disco_', 'lasso_dst_', 'lasso_is_', 'lasso_profile_service_',
'lasso_discovery', 'lasso_wsf', 'lasso_interaction_', 'lasso_utility_',
- 'lasso_sa_', 'lasso_soap_', 'lasso_authentication', 'lasso_wsse_',
+ 'lasso_sa_', 'lasso_soap_binding', 'lasso_authentication', 'lasso_wsse_',
'lasso_sec_', 'lasso_idwsf2', 'lasso_wsf2', 'lasso_wsa_',
'lasso_wsu_']
if enable_wsf:
diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index bce38549..1823d4e0 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -69,11 +69,6 @@ WSF_C_FILES = \
soap_binding_ext_credentials_context.c \
soap_binding_ext_service_instance_update.c \
soap_binding_ext_timeout.c \
- soap_body.c \
- soap_detail.c \
- soap_fault.c \
- soap_envelope.c \
- soap_header.c \
soap_binding.c \
utility_status.c \
wsse_security.c
@@ -135,11 +130,6 @@ WSF_H_FILES = \
soap_binding_ext_credentials_context.h \
soap_binding_ext_service_instance_update.h \
soap_binding_ext_timeout.h \
- soap_body.h \
- soap_detail.h \
- soap_fault.h \
- soap_envelope.h \
- soap_header.h \
soap_binding.c \
utility_status.h \
wsse_security.h
@@ -197,6 +187,11 @@ liblasso_xml_la_SOURCES = \
samlp_response_abstract.c \
samlp_status.c \
samlp_status_code.c \
+ soap_body.c \
+ soap_detail.c \
+ soap_fault.c \
+ soap_envelope.c \
+ soap_header.c \
$(WSF_C_FILES)
liblassoinclude_HEADERS = \
@@ -251,6 +246,11 @@ liblassoinclude_HEADERS = \
samlp_response_abstract.h \
samlp_status.h \
samlp_status_code.h \
+ soap_body.h \
+ soap_detail.h \
+ soap_fault.h \
+ soap_envelope.h \
+ soap_header.h \
xml_enc.h \
$(WSF_H_FILES)