Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > c91f0991796e9b0692397f569aba867f > files > 4

xrootd-3.0.3-2.fc13.src.rpm

diff -ur xrootd-3.0.3.orig/src/XrdCrypto/XrdCryptoFactory.cc xrootd-3.0.3/src/XrdCrypto/XrdCryptoFactory.cc
--- xrootd-3.0.3.orig/src/XrdCrypto/XrdCryptoFactory.cc	2011-04-11 13:24:37.000000000 +0200
+++ xrootd-3.0.3/src/XrdCrypto/XrdCryptoFactory.cc	2011-04-22 13:07:25.146104405 +0200
@@ -378,7 +378,7 @@
 
    //
    // Form library name
-   snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s", LT_MODULE_EXT);
+   snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s%s", factoryid, LT_MODULE_EXT);
    libfn[sizeof(libfn)-1] = '\0';
 
    //
@@ -397,32 +397,8 @@
    //
    // Get the factory object creator
    if (!(efact = (XrdCryptoFactory *(*)())dlsym(libhandle, factobjname))) {
-
-      //
-      // Try also specific library name
-      snprintf(libfn, sizeof(libfn)-1, "libXrdCrypto%s%s", factoryid, LT_MODULE_EXT);
-      libfn[sizeof(libfn)-1] = '\0';
-      
-      //
-      // Determine path
-      libloc = libfn;
-      DEBUG("loading " <<factoryid <<" crypto factory object from " <<libloc);
-      
-      //
-      // Try opening the crypto module
-      if (!(libhandle = dlopen(libloc, RTLD_NOW))) {
-         DEBUG("problems opening shared library " << libloc
-                << "(error: "<< dlerror() << ")");
-         return 0;
-      }
-
-
-      //
-      // Get the factory object creator
-      if (!(efact = (XrdCryptoFactory *(*)())dlsym(libhandle, factobjname))) {
-         DEBUG("problems finding crypto factory object creator " << factobjname);
-         return 0;
-      }
+      DEBUG("problems finding crypto factory object creator " << factobjname);
+      return 0;
    }
 
    //