SWIG: unplug id-wsf support in SWIG
* swig/Lasso.i: force LASSO_WSF_ENABLED to be undefined.
This commit is contained in:
parent
a2abe27a68
commit
2888e14ae6
|
@ -367,16 +367,16 @@ typedef struct {
|
|||
/* Attributes */
|
||||
|
||||
/* EncryptedResourceID */
|
||||
#define LassoDiscovery_get_encryptedResourceId(self) get_node((self)->encrypted_resource_id)
|
||||
#define LassoDiscovery_encryptedResourceId_get(self) get_node((self)->encrypted_resource_id)
|
||||
#define LassoDiscovery_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value))
|
||||
#define LassoDiscovery_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value))
|
||||
#define LassoDiscovery_get_encryptedResourceId(self) get_node((self)->EncryptedResourceID)
|
||||
#define LassoDiscovery_encryptedResourceId_get(self) get_node((self)->EncryptedResourceID)
|
||||
#define LassoDiscovery_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->EncryptedResourceID, (value))
|
||||
#define LassoDiscovery_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->EncryptedResourceID, (value))
|
||||
|
||||
/* ResourceID */
|
||||
#define LassoDiscovery_get_resourceId(self) get_node((self)->resource_id)
|
||||
#define LassoDiscovery_resourceId_get(self) get_node((self)->resource_id)
|
||||
#define LassoDiscovery_set_resourceId(self, value) set_node((gpointer *) &(self)->resource_id, (value))
|
||||
#define LassoDiscovery_resourceId_set(self, value) set_node((gpointer *) &(self)->resource_id, (value))
|
||||
#define LassoDiscovery_get_resourceId(self) get_node((self)->ResourceID)
|
||||
#define LassoDiscovery_resourceId_get(self) get_node((self)->ResourceID)
|
||||
#define LassoDiscovery_set_resourceId(self, value) set_node((gpointer *) &(self)->ResourceID, (value))
|
||||
#define LassoDiscovery_resourceId_set(self, value) set_node((gpointer *) &(self)->ResourceID, (value))
|
||||
|
||||
/* Constructors, destructors & static methods implementations */
|
||||
|
||||
|
@ -558,15 +558,6 @@ typedef struct {
|
|||
LassoServer *server;
|
||||
|
||||
/* Attributes inherited from ProfileService */
|
||||
%newobject resourceId_get;
|
||||
LassoDiscoResourceID *resourceId;
|
||||
|
||||
%newobject encryptedResourceId_get;
|
||||
LassoDiscoEncryptedResourceID *encryptedResourceId;
|
||||
|
||||
%newobject resourceData_get;
|
||||
char *resourceData;
|
||||
|
||||
|
||||
/* Constructor, Destructor & Static Methods */
|
||||
|
||||
|
@ -656,16 +647,16 @@ typedef struct {
|
|||
/* Attributes from ProfileService*/
|
||||
|
||||
/* EncryptedResourceID */
|
||||
#define LassoPersonalProfileService_get_encryptedResourceId(self) get_node(LASSO_DATA_SERVICE(self)->encrypted_resource_id)
|
||||
#define LassoPersonalProfileService_encryptedResourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->encrypted_resource_id)
|
||||
#define LassoPersonalProfileService_set_encryptedResourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->encrypted_resource_id, (value))
|
||||
#define LassoPersonalProfileService_encryptedResourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->encrypted_resource_id, (value))
|
||||
#define LassoPersonalProfileService_get_encryptedResourceId(self) get_node(LASSO_DATA_SERVICE(self)->EncryptedResourceID)
|
||||
#define LassoPersonalProfileService_encryptedResourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->EncryptedResourceID)
|
||||
#define LassoPersonalProfileService_set_encryptedResourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->EncryptedResourceID, (value))
|
||||
#define LassoPersonalProfileService_encryptedResourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->EncryptedResourceID, (value))
|
||||
|
||||
/* ResourceID */
|
||||
#define LassoPersonalProfileService_get_resourceId(self) get_node(LASSO_DATA_SERVICE(self)->resource_id)
|
||||
#define LassoPersonalProfileService_resourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->resource_id)
|
||||
#define LassoPersonalProfileService_set_resourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->resource_id, (value))
|
||||
#define LassoPersonalProfileService_resourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->resource_id, (value))
|
||||
#define LassoPersonalProfileService_get_resourceId(self) get_node(LASSO_DATA_SERVICE(self)->ResourceID)
|
||||
#define LassoPersonalProfileService_resourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->ResourceID)
|
||||
#define LassoPersonalProfileService_set_resourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->ResourceID, (value))
|
||||
#define LassoPersonalProfileService_resourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->ResourceID, (value))
|
||||
|
||||
/* resourceData */
|
||||
#define LassoPersonalProfileService_get_resourceData(self) get_xml_string(xmlCopyNode(LASSO_DATA_SERVICE(self)->resource_data, 1))
|
||||
|
@ -742,12 +733,6 @@ typedef struct {
|
|||
LassoServer *server;
|
||||
|
||||
/* Attributes */
|
||||
%newobject resourceId_get;
|
||||
LassoDiscoResourceID *resourceId;
|
||||
|
||||
%newobject encryptedResourceId_get;
|
||||
LassoDiscoEncryptedResourceID *encryptedResourceId;
|
||||
|
||||
%newobject resourceData_get;
|
||||
char *resourceData;
|
||||
|
||||
|
@ -872,16 +857,16 @@ typedef struct {
|
|||
#define LassoDataService_abstractDescription_get(self) self->abstract_description
|
||||
|
||||
/* EncryptedResourceID */
|
||||
#define LassoDataService_get_encryptedResourceId(self) get_node((self)->encrypted_resource_id)
|
||||
#define LassoDataService_encryptedResourceId_get(self) get_node((self)->encrypted_resource_id)
|
||||
#define LassoDataService_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value))
|
||||
#define LassoDataService_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value))
|
||||
#define LassoDataService_get_encryptedResourceId(self) get_node((self)->EncryptedResourceID)
|
||||
#define LassoDataService_encryptedResourceId_get(self) get_node((self)->EncryptedResourceID)
|
||||
#define LassoDataService_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->EncryptedResourceID, (value))
|
||||
#define LassoDataService_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->EncryptedResourceID, (value))
|
||||
|
||||
/* ResourceID */
|
||||
#define LassoDataService_get_resourceId(self) get_node((self)->resource_id)
|
||||
#define LassoDataService_resourceId_get(self) get_node((self)->resource_id)
|
||||
#define LassoDataService_set_resourceId(self, value) set_node((gpointer *) &(self)->resource_id, (value))
|
||||
#define LassoDataService_resourceId_set(self, value) set_node((gpointer *) &(self)->resource_id, (value))
|
||||
#define LassoDataService_get_resourceId(self) get_node((self)->ResourceID)
|
||||
#define LassoDataService_resourceId_get(self) get_node((self)->ResourceID)
|
||||
#define LassoDataService_set_resourceId(self, value) set_node((gpointer *) &(self)->ResourceID, (value))
|
||||
#define LassoDataService_resourceId_set(self, value) set_node((gpointer *) &(self)->ResourceID, (value))
|
||||
|
||||
/* resourceData */
|
||||
#define LassoDataService_get_resourceData(self) get_xml_string(xmlCopyNode(self->resource_data, 1))
|
||||
|
|
12
swig/Lasso.i
12
swig/Lasso.i
|
@ -42,7 +42,7 @@
|
|||
%include wsf-support.i
|
||||
|
||||
#if LASSO_WSF_SUPPORT == 1
|
||||
#define LASSO_WSF_ENABLED
|
||||
/* #define LASSO_WSF_ENABLED */
|
||||
#endif
|
||||
|
||||
#ifndef SWIG_PHP_RENAMES
|
||||
|
@ -60,15 +60,19 @@
|
|||
#undef PACKAGE_BUGREPORT
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
#include <lasso/lasso_config.h>
|
||||
#include <lasso/lasso.h>
|
||||
#include <lasso/xml/lib_assertion.h>
|
||||
#include <lasso/xml/saml_attribute_value.h>
|
||||
#include <lasso/xml/misc_text_node.h>
|
||||
#undef LASSO_WSF_ENABLED
|
||||
|
||||
#ifdef LASSO_WSF_ENABLED
|
||||
#include <lasso/xml/disco_resource_id.h>
|
||||
#include <lasso/xml/disco_encrypted_resource_id.h>
|
||||
#include <lasso/id-wsf/id_wsf.h>
|
||||
#include <lasso/id-wsf-2.0/id_wsf_2.h>
|
||||
#endif
|
||||
|
||||
#include "../lasso/utils.h"
|
||||
|
@ -5642,8 +5646,6 @@ LassoStringList *LassoIdentity_providerIds_get(LassoIdentity *self) {
|
|||
|
||||
#ifdef LASSO_WSF_ENABLED
|
||||
|
||||
#include <lasso/id-wsf/identity.h>
|
||||
|
||||
#define LassoIdentity_addResourceOffering lasso_identity_add_resource_offering
|
||||
#define LassoIdentity_removeResourceOffering lasso_identity_remove_resource_offering
|
||||
|
||||
|
@ -7128,12 +7130,12 @@ typedef struct {
|
|||
|
||||
%}
|
||||
|
||||
#ifdef LASSO_WSF_ENABLED
|
||||
/* #ifdef LASSO_WSF_ENABLED
|
||||
%include Lasso-wsf.i
|
||||
%include Lasso-wsf2.i
|
||||
%include id-wsf-2.0/main.h
|
||||
%include ws/main.h
|
||||
#endif
|
||||
#endif */
|
||||
|
||||
%include Lasso-saml2.i
|
||||
%include saml-2.0/main.h
|
||||
|
|
Loading…
Reference in New Issue