Merge branch 'hotfixes-2.3.5'

15 files changed, 28 insertions, 10 deletions

diff --git a/bindings/ghashtable.h b/bindings/ghashtable.h
index ef9133f1..a41a59f2 100644
--- a/bindings/ghashtable.h
+++ b/bindings/ghashtable.h
@@ -34,7 +34,7 @@ static gboolean return_true(G_GNUC_UNUSED gpointer a, G_GNUC_UNUSED gpointer b,
 	return TRUE;
 }
 
-static void
+G_GNUC_UNUSED static void
 g_hash_table_remove_all (GHashTable *hash_table)
 {
     lasso_return_if_fail(hash_table != NULL);
@@ -46,7 +46,7 @@ g_hash_table_remove_all (GHashTable *hash_table)
    * (as this function is useful but new in 2.14) */
 
 
-static GList *
+G_GNUC_UNUSED static GList *
 g_hash_table_get_keys (GHashTable *hash_table)
 {
   GHashNode *node;
@@ -63,7 +63,7 @@ g_hash_table_get_keys (GHashTable *hash_table)
   return retval;
 }
 
-static GList *
+G_GNUC_UNUSED static GList *
 g_hash_table_get_values (GHashTable *hash_table)
 {
     GHashNode *node;
diff --git a/bindings/perl/ghashtable_handling.c b/bindings/perl/ghashtable_handling.c
index 541041d8..8479a59e 100644
--- a/bindings/perl/ghashtable_handling.c
+++ b/bindings/perl/ghashtable_handling.c
@@ -119,6 +119,6 @@ get_hash_of_objects(GHashTable *hash)
 	HV *hv;
 
 	hv = newHV();
-	g_hash_table_foreach(hash, __ht_foreach_get_hos, hv);
+	g_hash_table_foreach(hash, __ht_foreach_get_hoo, hv);
 	return hv;
 }
diff --git a/bindings/php5/tests/Makefile.am b/bindings/php5/tests/Makefile.am
index b2d8549e..bb20cf01 100644
--- a/bindings/php5/tests/Makefile.am
+++ b/bindings/php5/tests/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 if PHP5_ENABLED
-TESTS_ENVIRONMENT=env "SRCDIR=$(srcdir)/"
+TESTS_ENVIRONMENT=env "SRCDIR=$(srcdir)/" "PHP5=$(PHP5)"
 TESTS = profile_tests.sh binding_tests.sh
 endif
 
diff --git a/bindings/php5/tests/binding_tests.sh b/bindings/php5/tests/binding_tests.sh
index 3bfad5d6..0971ab2b 100755
--- a/bindings/php5/tests/binding_tests.sh
+++ b/bindings/php5/tests/binding_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php5 -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}binding_tests.php
+${PHP5:?PHP5 variable is not defined} -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}binding_tests.php
diff --git a/bindings/php5/tests/profile_tests.sh b/bindings/php5/tests/profile_tests.sh
index 08a53fac..f7298079 100755
--- a/bindings/php5/tests/profile_tests.sh
+++ b/bindings/php5/tests/profile_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php5 -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}profile_tests.php
+${PHP5:?PHP5 variable is not defined} -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}profile_tests.php
diff --git a/bindings/python/tests/binding_tests.py b/bindings/python/tests/binding_tests.py
index 89039d2e..ba732f37 100755
--- a/bindings/python/tests/binding_tests.py
+++ b/bindings/python/tests/binding_tests.py
@@ -28,6 +28,9 @@
 import unittest
 import sys
 import os
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')
diff --git a/bindings/python/tests/idwsf1_tests.py b/bindings/python/tests/idwsf1_tests.py
index cf47f46a..9ace6200 100755
--- a/bindings/python/tests/idwsf1_tests.py
+++ b/bindings/python/tests/idwsf1_tests.py
@@ -25,6 +25,9 @@
 import os
 import unittest
 import sys
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')
diff --git a/bindings/python/tests/idwsf2_tests.py b/bindings/python/tests/idwsf2_tests.py
index cadb605f..6d43a428 100755
--- a/bindings/python/tests/idwsf2_tests.py
+++ b/bindings/python/tests/idwsf2_tests.py
@@ -29,6 +29,9 @@ import os
 import unittest
 import sys
 from StringIO import StringIO
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 872909c2..74982292 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -41,6 +41,7 @@
 #endif
 
 #include "identityprivate.h"
+#include "../lasso_config.h"
 
 /*****************************************************************************/
 /* public methods                                                            */
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index b605aff5..ecd87360 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -268,6 +268,7 @@
 #include "identityprivate.h"
 #include "loginprivate.h"
 #include "../saml-2.0/loginprivate.h"
+#include "../lasso_config.h"
 
 #ifdef LASSO_WSF_ENABLED
 #include "../id-wsf/id_ff_extensions_private.h"
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index ee0d10f8..c1c86daa 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -53,6 +53,7 @@
 #include "../xml/idwsf_strings.h"
 #include "../xml/id-wsf-2.0/idwsf2_strings.h"
 #endif
+#include "../lasso_config.h"
 
 /*****************************************************************************/
 /* public functions                                                          */
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index b40ee5b2..22f253fe 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -40,6 +40,7 @@
 #include "../saml-2.0/serverprivate.h"
 #include "../utils.h"
 #include "../debug.h"
+#include "../lasso_config.h"
 #ifdef LASSO_WSF_ENABLED
 #include "../id-wsf/id_ff_extensions_private.h"
 #include "../id-wsf-2.0/serverprivate.h"
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 3e60c015..a64f3798 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -29,6 +29,7 @@
  **/
 
 #include "../xml/private.h"
+#include "../lasso_config.h"
 #include "session.h"
 #include "sessionprivate.h"
 #include "../xml/saml_assertion.h"
diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
index 4f9192d5..35beeaa9 100644
--- a/lasso/saml-2.0/provider.c
+++ b/lasso/saml-2.0/provider.c
@@ -127,8 +127,10 @@ xsdIsFalse(xmlChar *value)
 
 static gboolean
 xsdUnsignedShortParse(xmlChar *value, int *out) {
-	int l = strtol((char*)value, NULL, 10);
+	int l = 0;
 
+	errno = 0;
+	l = strtol((char*)value, NULL, 10);
 	if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) ||
 			errno == EINVAL || l < 0 || l >= 65535) {
 		return FALSE;
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 5504c3fc..f4895316 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -54,8 +54,10 @@
 #include "../debug.h"
 #include "./soap-1.1/soap_envelope.h"
 #include "./soap-1.1/soap_body.h"
-#if LASSO_WSF_ENABLED
+#include "../lasso_config.h"
+#ifdef LASSO_WSF_ENABLED
 #include "./idwsf_strings.h"
+#include "./id-wsf-2.0/idwsf2_strings.h"
 #endif
 
 static void lasso_node_build_xmlNode_from_snippets(LassoNode *node, xmlNode *xmlnode,
@@ -2062,7 +2064,7 @@ static const char *
 prefix_from_href_and_nodename(const xmlChar *href, G_GNUC_UNUSED const xmlChar *nodename) {
 	char *prefix = NULL;
 #ifdef LASSO_WSF_ENABLED
-	char *tmp = NULL
+	char *tmp = NULL;
 #endif
 
 	if (strcmp((char*)href, LASSO_LASSO_HREF) == 0)