shl_load() also needs to load along a path given through an

[openssl.git] / crypto / dso / dso_dl.c

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 43078604afc632e37a2dc62995e8e4a7bdbb79e1..4dbb51fb8c13295868775c3b6c1884d13f6c4b39 100644 (file)
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -126,7 +126,7 @@ static int dl_load(DSO *dso)
                DSOerr(DSO_F_DL_LOAD,DSO_R_NO_FILENAME);
                goto err;
                }
-       ptr = shl_load(filename, BIND_IMMEDIATE, NULL);
+       ptr = shl_load(filename, BIND_IMMEDIATE|DYNAMIC_PATH, NULL);
        if(ptr == NULL)
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);
@@ -234,9 +234,14 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
 
 /* This function is identical to the one in dso_dlfcn.c, but as it is highly
  * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
- * same time, there's no great duplicating the code. Figuring out an elegant way
- * to share one copy of the code would be more difficult and would not leave the
- * implementations independant. */
+ * same time, there's no great duplicating the code. Figuring out an elegant 
+ * way to share one copy of the code would be more difficult and would not
+ * leave the implementations independant. */
+#if defined(__hpux)
+static const char extension[] = ".sl";
+#else
+static const char extension[] = ".so";
+#endif
 static char *dl_name_converter(DSO *dso, const char *filename)
        {
        char *translated;
@@ -246,8 +251,8 @@ static char *dl_name_converter(DSO *dso, const char *filename)
        rsize = len + 1;
        transform = (strstr(filename, "/") == NULL);
                {
-               /* We will convert this to "%s.so" or "lib%s.so" */
-               rsize += 3;     /* The length of ".so" */
+               /* We will convert this to "%s.s?" or "lib%s.s?" */
+               rsize += strlen(extension);/* The length of ".s?" */
                if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
                        rsize += 3; /* The length of "lib" */
                }
@@ -261,9 +266,9 @@ static char *dl_name_converter(DSO *dso, const char *filename)
        if(transform)
                {
                if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
-                       sprintf(translated, "lib%s.so", filename);
+                       sprintf(translated, "lib%s%s", filename, extension);
                else
-                       sprintf(translated, "%s.so", filename);
+                       sprintf(translated, "%s%s", filename, extension);
                }
        else
                sprintf(translated, "%s", filename);