summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile32
-rw-r--r--lib/lanplus/inc/ipmitool/ipmi_sdr.h2
-rw-r--r--lib/lanplus/lanplus.c12
-rw-r--r--lib/lanplus/lanplus_crypt_impl.c21
-rw-r--r--lib/lanplus/lanplus_defs.h3
-rw-r--r--lib/libipmiutil.pc2
6 files changed, 41 insertions, 31 deletions
diff --git a/lib/Makefile b/lib/Makefile
index f463803..78d967d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -101,13 +101,13 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -fPIC -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
OS_LFLAGS =
OTOOL =
@@ -115,9 +115,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.6
+PACKAGE_STRING = ipmiutil 2.9.7
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.6
+PACKAGE_VERSION = 2.9.7
PATH_SEPARATOR = :
PKG_DIR = /root/rpmbuild
RANLIB = ranlib
@@ -125,15 +125,15 @@ SAM2OBJ = isensor2.o ievents2.o
SED = sed
SET_MAKE =
SHELL = /bin/sh
-SHR_LINK = libipmiutil.so
+SHR_LINK = libipmiutil.so.1
STRIP = strip
SUBDIR_S = doc scripts lib util
SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.6
-abs_builddir = /usr/dev/ipmiutil-2.9.6/lib
-abs_srcdir = /usr/dev/ipmiutil-2.9.6/lib
-abs_top_builddir = /usr/dev/ipmiutil-2.9.6
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.6
+VERSION = 2.9.7
+abs_builddir = /usr/dev/ipmiutil-2.9.7/lib
+abs_srcdir = /usr/dev/ipmiutil-2.9.7/lib
+abs_top_builddir = /usr/dev/ipmiutil-2.9.7
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -161,7 +161,7 @@ host_vendor = redhat
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.6/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
libdir = $(iprefix)/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/lib/lanplus/inc/ipmitool/ipmi_sdr.h b/lib/lanplus/inc/ipmitool/ipmi_sdr.h
index 65b5a8c..b0b9a03 100644
--- a/lib/lanplus/inc/ipmitool/ipmi_sdr.h
+++ b/lib/lanplus/inc/ipmitool/ipmi_sdr.h
@@ -281,7 +281,7 @@ struct sdr_record_mask {
uint16_t settable:8;
#endif
} read;
- };
+ } mask;
} threshold;
} type;
} __attribute__ ((packed));
diff --git a/lib/lanplus/lanplus.c b/lib/lanplus/lanplus.c
index b695837..2fab966 100644
--- a/lib/lanplus/lanplus.c
+++ b/lib/lanplus/lanplus.c
@@ -153,7 +153,7 @@ static void ack_sol_packet(
static uint8_t bridgePossible = 0;
-#if defined(WIN32) || defined(SOLARIS)
+#if defined(WIN32) || defined(SOLARIS) || defined(HPUX)
struct ipmi_intf ipmi_lanplus_intf;
void ipmilanplus_init(struct ipmi_intf *intf)
{
@@ -690,7 +690,7 @@ ipmiv2_lan_ping(struct ipmi_intf * intf)
{
uint8_t * data;
int rv;
-#if defined(WIN32) || defined(SOLARIS)
+#if defined(WIN32) || defined(SOLARIS) || defined(HPUX)
struct asf_hdr asf_ping;
struct rmcp_hdr rmcp_ping;
int len = sizeof(rmcp_ping) + sizeof(asf_ping);
@@ -1763,7 +1763,7 @@ ipmi_lanplus_build_v2x_msg(
uint8_t * msg;
int len = 0;
int rv = 0;
-#if defined(WIN32) || defined(SOLARIS)
+#if defined(WIN32) || defined(SOLARIS) || defined(HPUX)
struct rmcp_hdr rmcp;
rmcp.ver = RMCP_VERSION_1;
@@ -2173,7 +2173,7 @@ ipmi_lanplus_build_v15_ipmi_cmd(
int cs, mp, len = 0, tmp;
struct ipmi_session * session = intf->session;
struct ipmi_rq_entry * entry;
-#if defined(WIN32) || defined(SOLARIS)
+#if defined(WIN32) || defined(SOLARIS) || defined(HPUX)
struct rmcp_hdr rmcp;
rmcp.ver = RMCP_VERSION_1;
@@ -3861,7 +3861,7 @@ ipmi_lanplus_open(struct ipmi_intf * intf)
#ifdef HAVE_IPV6
lan2_nodename[0] = 0;
- lprintf(LOG_ERROR,"Connected to node %s\n", session->hostname);
+ lprintf(LOG_NOTICE,"Connected to node %s\n", session->hostname);
#else
#ifdef WIN32
/* check for ws2_32.lib(getnameinfo) resolution */
@@ -3875,7 +3875,7 @@ ipmi_lanplus_open(struct ipmi_intf * intf)
}
#endif
temp = inet_ntoa(addr.sin_addr);
- lprintf(LOG_ERROR,"Connected to node %s %s\n",lan2_nodename,temp);
+ lprintf(LOG_NOTICE,"Connected to node %s %s\n",lan2_nodename,temp);
#endif
return (int)(intf->fd);
diff --git a/lib/lanplus/lanplus_crypt_impl.c b/lib/lanplus/lanplus_crypt_impl.c
index 3f9679e..d12ad9c 100644
--- a/lib/lanplus/lanplus_crypt_impl.c
+++ b/lib/lanplus/lanplus_crypt_impl.c
@@ -61,13 +61,20 @@ int lanplus_seed_prng(uint32_t bytes)
static FILE *fp = NULL;
size_t i;
randfile = RAND_file_name(buffer, sizeof buffer); /* usu C:\.rnd */
- if ((randfile != NULL) && (fp == NULL)) {
- /*first time, so open/create file*/
- fp = fopen(randfile,"w"); /*create the randfile*/
- if (fp != NULL) {
- i = fwrite(" \n",2,1,fp);
- fclose(fp);
- }
+ if ((randfile != NULL) && (fp == NULL)) {
+ fp = fopen(randfile,"r"); /*check the randfile*/
+ if (fp == NULL) { /*does not exist, create it*/
+ /*first time, so open/create file*/
+ fp = fopen(randfile,"w"); /*create the randfile*/
+ if (fp != NULL) {
+ i = fwrite(" \n",2,1,fp);
+ fclose(fp);
+ } else {
+ printf("seed_prng: cannot create %s file\n",randfile);
+ }
+ } else { /*file opened, so close it*/
+ fclose(fp);
+ }
}
if (verbose > 0)
printf("seed_prng: RAND_file_name = %s, fp=%p\n",randfile,fp);
diff --git a/lib/lanplus/lanplus_defs.h b/lib/lanplus/lanplus_defs.h
index dbce90d..2ba35b7 100644
--- a/lib/lanplus/lanplus_defs.h
+++ b/lib/lanplus/lanplus_defs.h
@@ -38,10 +38,13 @@
#if defined(HAVE_CONFIG_H)
#include "config.h"
#else
+#ifndef HPUX
+/* HPUX already has socklen_t but no #define */
#ifndef socklen_t
typedef unsigned int socklen_t;
#endif
#endif
+#endif
#if defined(MACOS)
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index c12afe1..a952285 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
Name: libipmiutil
Description: Library for ipmiutil
-Version: 2.9.6
+Version: 2.9.7
Libs: -L${libdir} -lipmi_lanplus
Cflags: -I${includedir}