diff -ur xrootd-3.0.3.orig/src/XrdSecssl/libsslGridSite/Makefile.am xrootd-3.0.3/src/XrdSecssl/libsslGridSite/Makefile.am
--- xrootd-3.0.3.orig/src/XrdSecssl/libsslGridSite/Makefile.am	2011-04-23 08:41:53.482604721 +0200
+++ xrootd-3.0.3/src/XrdSecssl/libsslGridSite/Makefile.am	2011-04-23 08:42:14.352038375 +0200
@@ -1,23 +1,6 @@
-
-
 noinst_LTLIBRARIES = libsslGridSite.la
-INCLUDES = ${OPENSSL_INCDIR} -I. ${XML2_INCDIR}
-
-libsslGridSite_la_CFLAGS = -DOPENSSL_NO_KRB5 -U_FORTIFY_SOURCE ${CFLAGS}
+INCLUDES = $(OPENSSL_INCDIR) -I. $(XML2_INCDIR)
 
 libsslGridSite_la_SOURCES = \
-	grst_err.c  \
-	grst_asn1.c \
-	grst_x509.c \
-	grst_gacl.c \
-	grst_xacml.c \
-	grst_http.c \
 	grst_verifycallback.c \
-	grst_verifycallback.h \
-	gridsite.h
-
-
-
-
-
-
+	grst_verifycallback.h
diff -ur xrootd-3.0.3.orig/src/XrdSecssl/Makefile.am xrootd-3.0.3/src/XrdSecssl/Makefile.am
--- xrootd-3.0.3.orig/src/XrdSecssl/Makefile.am	2011-04-23 08:41:53.482604721 +0200
+++ xrootd-3.0.3/src/XrdSecssl/Makefile.am	2011-04-23 09:14:57.188690281 +0200
@@ -14,38 +14,39 @@
 
 lib_LTLIBRARIES = libXrdSecssl.la
 
+noinst_LTLIBRARIES = libXrdSecsslUtil.la
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
-	-I${XROOTD_INCDIR}/ \
 	-IlibsslGridSite    \
-	${OPENSSL_INCDIR}   \
-	${XML2_INCDIR}
+	$(OPENSSL_INCDIR)   \
+	$(XML2_INCDIR)
 
-libXrdSecssl_la_SOURCES = \
+libXrdSecsslUtil_la_SOURCES = \
 	XrdSecProtocolssl.cc      \
 	XrdSecProtocolssl.hh      \
 	XrdSecProtocolsslTrace.hh \
 	XrdSecProtocolsslProc.cc  \
 	XrdSecProtocolsslProc.hh
+libXrdSecsslUtil_la_LIBADD = \
+	libsslGridSite/libsslGridSite.la -lgridsite
 
-libXrdSecssl_la_LIBADD  =
-libXrdSecssl_la_LDFLAGS = \
-	-L${XROOTD_LIBDIR}/ \
-	../XrdSec/libXrdSec.la \
-	../XrdSys/libXrdSys.la \
+libXrdSecssl_la_SOURCES =
+nodist_EXTRA_libXrdSecssl_la_SOURCES = dummy.cpp
+libXrdSecssl_la_LIBADD = \
+	libXrdSecsslUtil.la \
+	../XrdSec/libXrdSecTLayer.la \
 	../XrdOuc/libXrdOuc.la \
-	../XrdNet/libXrdNet.la \
-	${SSLLINKLIB}          \
-	libsslGridSite/libsslGridSite.la \
-	${OPENSSL_LIBDIR} \
-	-lcrypto -lssl \
-	${XML2_LIBDIR} -lxml2 \
-	-module
-
-libXrdSecssl_la_CXXFLAGS = ${CXXFLAGS}
+	$(OPENSSL_LIBDIR) -lssl -lcrypto
+libXrdSecssl_la_LDFLAGS = -module
 
 xrdsecssltest_SOURCES = XrdSecProtocolsslTest.cc
-xrdsecssltest_LDADD   = ${OPENSSL_LIBDIR} libXrdSecssl.la ../XrdNet/libXrdNetUtil.la ../XrdOuc/libXrdOuc.la -lssl -lcrypto
+xrdsecssltest_LDADD = \
+	libXrdSecsslUtil.la \
+	../XrdSec/libXrdSecTLayer.la \
+	../XrdNet/libXrdNet.la \
+	../XrdOuc/libXrdOuc.la \
+	$(OPENSSL_LIBDIR) -lssl -lcrypto
 xrdsecssltest_LDFLAGS = -static
 
 
diff -ur xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.cc xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.cc
--- xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.cc	2011-04-23 08:41:53.481604703 +0200
+++ xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.cc	2011-04-23 08:42:14.397038308 +0200
@@ -692,7 +692,7 @@
 }
 
 /*----------------------------------------------------------------------------*/
-void MyGRSTerrorLogFunc (char *lfile, int lline, int llevel, char *fmt, ...) {
+int MyGRSTerrorLogFunc (char *lfile, int lline, int llevel, char *fmt, ...) {
   EPNAME("grst");
   va_list args;
   char fullmessage[4096];
@@ -713,6 +713,7 @@
   } else {
     DEBUG(" ("<< lfile << ":" << lline <<"): " << sfullmessage);
   }
+  return 0;
 }
 
 /*----------------------------------------------------------------------------*/
diff -ur xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.hh xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.hh
--- xrootd-3.0.3.orig/src/XrdSecssl/XrdSecProtocolssl.hh	2011-04-23 08:41:53.481604703 +0200
+++ xrootd-3.0.3/src/XrdSecssl/XrdSecProtocolssl.hh	2011-04-23 08:42:14.399038382 +0200
@@ -52,7 +52,7 @@
 #include "XrdSecssl/XrdSecProtocolsslTrace.hh"
 #include "XrdSecssl/XrdSecProtocolsslProc.hh"
 #include "libsslGridSite/grst_verifycallback.h"
-#include "libsslGridSite/gridsite.h"
+#include "gridsite.h"
 
 #define EXPORTKEYSTRENGTH 10