Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > 0f789f5d9b93bf583deb1f0776dc39b5 > files > 32

hplip-3.14.6-8.1.mga5.src.rpm

--- hplip-3.14.6/scan/sane/marvell.c.try_libhpmud.so.0	2014-06-05 13:53:59.292626745 +0200
+++ hplip-3.14.6/scan/sane/marvell.c	2014-06-05 13:55:17.270338062 +0200
@@ -60,11 +60,14 @@ static int bb_load(struct marvell_sessio
    int stat=1;
 
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
    {
-	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
+      if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+      {
+           BUG("unable to load restricted library: %s\n", dlerror());
            goto bugout;
-   }
+      }
+   } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
    if ((ps->math_handle = load_library("libm.so")) == NULL)
--- hplip-3.14.6/scan/sane/soap.c.try_libhpmud.so.0	2014-06-05 13:53:59.306626513 +0200
+++ hplip-3.14.6/scan/sane/soap.c	2014-06-05 13:56:51.357786348 +0200
@@ -68,11 +68,14 @@ static int bb_load(struct soap_session *
    int stat=1;
 
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-   if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
    {
-	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-           goto bugout;
-   }
+     if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+     {
+       BUG("unable to load restricted library: %s\n", dlerror());
+       goto bugout;
+     }
+   } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
    if ((ps->math_handle = load_library("libm.so")) == NULL)
--- hplip-3.14.6/scan/sane/soapht.c.try_libhpmud.so.0	2014-06-05 13:58:13.571430353 +0200
+++ hplip-3.14.6/scan/sane/soapht.c	2014-06-05 14:01:15.280438768 +0200
@@ -62,11 +62,14 @@ static int bb_load(struct soap_session *
    int stat=1;
 
    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
-   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
+   if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
    {
-	   if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
-           goto bugout;
-   }
+     if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+     {
+       BUG("unable to load restricted library: %s\n", dlerror());
+       goto bugout;
+     }
+   } 
 
    /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ 
    if ((ps->math_handle = load_library("libm.so")) == NULL)