merge from branch_RC31_3

diff --git a/org.glite.security.gss/interface/glite_gss.h b/org.glite.security.gss/interface/glite_gss.h
index 4b62c17..27aa4da 100644 (file)
--- a/org.glite.security.gss/interface/glite_gss.h
+++ b/org.glite.security.gss/interface/glite_gss.h
@@ -8,6 +8,7 @@ extern "C" {
 #endif
 
 #include <stdlib.h>
+#include <openssl/err.h>
 
 enum {
   EDG_WLL_GSS_OK               =  0,  /* no GSS errors */

diff --git a/org.glite.security.gss/test/test_gss.cpp b/org.glite.security.gss/test/test_gss.cpp
index d8be4d6..28739c2 100644 (file)
--- a/org.glite.security.gss/test/test_gss.cpp
+++ b/org.glite.security.gss/test/test_gss.cpp
@@ -166,7 +166,7 @@ void GSSTest::errorTest()
        char *                  msg = NULL;
 
 
-       err = edg_wll_gss_connect(my_cred, "xxx.porno.net", port, &timeout, &conn, &stat);
+       err = edg_wll_gss_connect(my_cred, "xxx.example.net", port, &timeout, &conn, &stat);
        if (err) edg_wll_gss_get_error(&stat, "gss_connect()", &msg);
        CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_get_error()", msg);
 }