|
 |
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_avahi.c.dlfix nut-2.6.5/tools/nut-scanner/scan_avahi.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_avahi.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_avahi.c 2012-09-06 12:56:45.383206759 +0200
|
|
|
612ab86 |
@@ -36,7 +36,7 @@
|
|
|
612ab86 |
#include <ltdl.h>
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libavahi-client";
|
|
|
612ab86 |
+static char * libname = LIBAVAHI_CLIENT_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
|
|
|
612ab86 |
@@ -99,7 +99,7 @@ int nutscan_load_avahi_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|
|
|
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.6.5/tools/nut-scanner/scan_ipmi.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_ipmi.c 2012-09-06 12:56:55.760402197 +0200
|
|
|
612ab86 |
@@ -30,7 +30,7 @@
|
|
|
612ab86 |
#define NUT_IPMI_DRV_NAME "nut-ipmipsu"
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libfreeipmi";
|
|
|
612ab86 |
+static char * libname = LIBFREEIPMI_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
|
|
|
612ab86 |
@@ -83,7 +83,7 @@ int nutscan_load_ipmi_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|
|
|
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix nut-2.6.5/tools/nut-scanner/scan_nut.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_nut.c 2012-09-06 12:54:59.308897430 +0200
|
|
|
612ab86 |
@@ -26,7 +26,7 @@
|
|
|
612ab86 |
#include <ltdl.h>
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libupsclient";
|
|
|
612ab86 |
+static char * libname = LIBUPSCLIENT_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
|
|
|
612ab86 |
@@ -66,7 +66,7 @@ int nutscan_load_upsclient_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|
|
|
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_snmp.c.dlfix nut-2.6.5/tools/nut-scanner/scan_snmp.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_snmp.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_snmp.c 2012-09-06 12:57:16.250774817 +0200
|
|
|
612ab86 |
@@ -74,7 +74,7 @@ static int thread_count = 0;
|
|
|
612ab86 |
long g_usec_timeout ;
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libnetsnmp";
|
|
|
612ab86 |
+static char * libname = LIBNETSNMP_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
|
|
|
612ab86 |
@@ -119,7 +119,7 @@ int nutscan_load_snmp_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|
|
|
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_usb.c.dlfix nut-2.6.5/tools/nut-scanner/scan_usb.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_usb.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_usb.c 2012-09-06 12:56:34.007987045 +0200
|
|
|
612ab86 |
@@ -28,7 +28,7 @@
|
|
|
612ab86 |
#include <ltdl.h>
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libusb";
|
|
|
612ab86 |
+static char * libname = LIBUSB_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
static int (*nut_usb_close)(usb_dev_handle *dev);
|
|
|
612ab86 |
@@ -58,7 +58,7 @@ int nutscan_load_usb_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|
|
|
612ab86 |
diff -up nut-2.6.5/tools/nut-scanner/scan_xml_http.c.dlfix nut-2.6.5/tools/nut-scanner/scan_xml_http.c
|
|
|
612ab86 |
--- nut-2.6.5/tools/nut-scanner/scan_xml_http.c.dlfix 2012-07-31 19:38:58.000000000 +0200
|
|
|
612ab86 |
+++ nut-2.6.5/tools/nut-scanner/scan_xml_http.c 2012-09-06 12:57:28.617991656 +0200
|
|
|
612ab86 |
@@ -33,7 +33,7 @@
|
|
|
612ab86 |
#include <ltdl.h>
|
|
|
612ab86 |
|
|
|
612ab86 |
/* dynamic link library stuff */
|
|
|
612ab86 |
-static char * libname = "libneon";
|
|
|
612ab86 |
+static char * libname = LIBNEON_PATH;
|
|
|
612ab86 |
static lt_dlhandle dl_handle = NULL;
|
|
|
612ab86 |
static const char *dl_error = NULL;
|
|
|
612ab86 |
|
|
|
612ab86 |
@@ -64,7 +64,7 @@ int nutscan_load_neon_library()
|
|
|
612ab86 |
return 0;
|
|
|
612ab86 |
}
|
|
|
612ab86 |
|
|
|
612ab86 |
- dl_handle = lt_dlopenext(libname);
|
|
|
612ab86 |
+ dl_handle = lt_dlopen(libname);
|
|
|
612ab86 |
if (!dl_handle) {
|
|
|
612ab86 |
dl_error = lt_dlerror();
|
|
|
612ab86 |
goto err;
|