diff -ur xrootd.orig/src/Xrd/XrdProtLoad.cc xrootd/src/Xrd/XrdProtLoad.cc --- xrootd.orig/src/Xrd/XrdProtLoad.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/Xrd/XrdProtLoad.cc 2010-12-10 19:25:41.485408000 +0100 @@ -79,7 +79,7 @@ // Obtain an instance of this protocol // if (lname) xp = getProtocol(lname, pname, parms, pi); - else xp = XrdgetProtocol(pname, parms, pi); + else xp = getProtocol("", pname, parms, pi); if (!xp) {XrdLog.Emsg("Protocol","Protocol", pname, "could not be loaded"); return 0; } @@ -126,7 +126,7 @@ // Obtain the port number to be used by this protocol // if (lname) port = getProtocolPort(lname, pname, parms, pi); - else port = XrdgetProtocolPort(pname, parms, pi); + else port = getProtocolPort("", pname, parms, pi); if (port < 0) XrdLog.Emsg("Protocol","Protocol", pname, "port number could not be determined"); return port; @@ -256,7 +256,11 @@ {XrdLog.Emsg("Protocol", "Too many protocols have been defined."); return -1; } - if (!(libhndl[i] = new XrdSysPlugin(&XrdLog, lname))) return -1; + if (!strcmp(lname, "")) + libhndl[i] = new XrdSysPlugin(&XrdLog, NULL); + else + libhndl[i] = new XrdSysPlugin(&XrdLog, lname); + if (!libhndl[i]) return -1; liblist[i] = strdup(lname); libcnt++; } diff -ur xrootd.orig/src/XrdCms/XrdCmsClientMan.cc xrootd/src/XrdCms/XrdCmsClientMan.cc --- xrootd.orig/src/XrdCms/XrdCmsClientMan.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/XrdCms/XrdCmsClientMan.cc 2010-12-10 19:25:41.534408000 +0100 @@ -33,7 +33,7 @@ /* G l o b a l s */ /******************************************************************************/ -extern XrdInet *XrdXrootdNetwork; + XrdInet *XrdXrootdNetwork = 0; XrdNetBufferQ XrdCmsClientMan::BuffQ(2048,64); diff -ur xrootd.orig/src/XrdCms/XrdCmsConfig.cc xrootd/src/XrdCms/XrdCmsConfig.cc --- xrootd.orig/src/XrdCms/XrdCmsConfig.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/XrdCms/XrdCmsConfig.cc 2010-12-10 19:25:41.536408001 +0100 @@ -135,11 +135,11 @@ // of the following symbol being non-zero. On the server side, we have no // such symbol and need to provide one initialized to zero. // - XrdSecProtocol *(*XrdXrootdSecGetProtocol) +extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) (const char *hostname, const struct sockaddr &netaddr, const XrdSecParameters &parms, - XrdOucErrInfo *einfo)=0; + XrdOucErrInfo *einfo); /******************************************************************************/ /* E x t e r n a l T h r e a d I n t e r f a c e s */ diff -ur xrootd.orig/src/XrdCms/XrdCmsSecurity.cc xrootd/src/XrdCms/XrdCmsSecurity.cc --- xrootd.orig/src/XrdCms/XrdCmsSecurity.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/XrdCms/XrdCmsSecurity.cc 2010-12-10 19:25:41.537408001 +0100 @@ -50,11 +50,11 @@ /* G l o b a l S y m b o l s */ /******************************************************************************/ -extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) +XrdSecProtocol *(*XrdXrootdSecGetProtocol) (const char *hostname, const struct sockaddr &netaddr, const XrdSecParameters &parms, - XrdOucErrInfo *einfo); + XrdOucErrInfo *einfo) = 0; /******************************************************************************/ /* S t a t i c S y m b o l s */ diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc xrootd/src/XrdXrootd/XrdXrootdConfig.cc --- xrootd.orig/src/XrdXrootd/XrdXrootdConfig.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2010-12-10 19:25:41.598408000 +0100 @@ -86,7 +86,7 @@ const char *XrdXrootdInstance; - XrdInet *XrdXrootdNetwork; +extern XrdInet *XrdXrootdNetwork; int XrdXrootdPort; diff -ur xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc --- xrootd.orig/src/XrdXrootd/XrdXrootdLoadLib.cc 2010-12-09 16:24:21.000000000 +0100 +++ xrootd/src/XrdXrootd/XrdXrootdLoadLib.cc 2010-12-10 19:25:41.599408000 +0100 @@ -37,10 +37,11 @@ /* G l o b a l S y m b o l s */ /******************************************************************************/ -XrdSecProtocol *(*XrdXrootdSecGetProtocol)(const char *hostname, +extern XrdSecProtocol *(*XrdXrootdSecGetProtocol) + (const char *hostname, const struct sockaddr &netaddr, const XrdSecParameters &parms, - XrdOucErrInfo *einfo) = 0; + XrdOucErrInfo *einfo); /******************************************************************************/ /* x r o o t d _ l o a d F i l e s y s t e m */