Merge tag 'upstream/3.0.5' into feature/upstream

Upstream version 3.0.5

44 files changed, 119 insertions, 101 deletions

diff --git a/ChangeLog b/ChangeLog
index f31c20c..6099999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4261,7 +4261,7 @@ wdt.8          iwdt.8       (ipmiutil wdt)
     idiscover	(ipmiutil discover)  	 ver 1.11
     ipmi_port	(ipmi_port)  	 ver 1.4
 
-04/24/2017 ARCress ipmiutil-3.0.4  changes (iver 3.04)
+04/11/2017 ARCress ipmiutil-3.0.4  changes (iver 3.04)
   util/ievents.c        - resolve type 0xDB printf warning (support #24)
   util/iuser.c          - resolve compile warning
   util/oem_dell.c       - resolve compile warning
@@ -4270,3 +4270,8 @@ wdt.8          iwdt.8       (ipmiutil wdt)
   util/isensor.c        - add simple param to decode_sensor_supermicro
   util/AnsiTerm.cpp     - pick default instead of assert if bad SGR (#25)
 
+06/06/2017 ARCress ipmiutil-3.0.5  changes (iver 3.05)
+  util/isol.c           - set -V4 default if SUPERMICRO -a 
+  util/ihealth.c        - retry if ccode 193 in get_power_state (SuperMicro)
+  util/oem_supermicro.c - never trust SMC threshold status, check by value
+
diff --git a/configure b/configure
index dd13c7e..39bf34a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.4.
+# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.5.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ipmiutil'
 PACKAGE_TARNAME='ipmiutil'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='ipmiutil 3.0.4'
+PACKAGE_VERSION='3.0.5'
+PACKAGE_STRING='ipmiutil 3.0.5'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="util/ipmiutil.c"
@@ -1503,7 +1503,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ipmiutil 3.0.4 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 3.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ipmiutil 3.0.4:";;
+     short | recursive ) echo "Configuration of ipmiutil 3.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1683,7 +1683,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ipmiutil configure 3.0.4
+ipmiutil configure 3.0.5
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1697,7 +1697,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ipmiutil $as_me 3.0.4, which was
+It was created by ipmiutil $as_me 3.0.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2551,7 +2551,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ipmiutil'
- VERSION='3.0.4'
+ VERSION='3.0.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13943,7 +13943,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ipmiutil $as_me 3.0.4, which was
+This file was extended by ipmiutil $as_me 3.0.5, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14006,7 +14006,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ipmiutil config.status 3.0.4
+ipmiutil config.status 3.0.5
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 9ba80e9..24f99b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ipmiutil,3.0.4)
+AC_INIT(ipmiutil,3.0.5)
 AC_CONFIG_SRCDIR(util/ipmiutil.c)
 echo "ipmiutil version ${PACKAGE_VERSION}"
 AM_CONFIG_HEADER(config.h)
diff --git a/debpkg/changelog b/debpkg/changelog
index 247e8f8..139253f 100644
--- a/debpkg/changelog
+++ b/debpkg/changelog
@@ -1,3 +1,9 @@
+ipmiutil (3.0.5-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Andy Cress <arcress@users.sourceforge.net>  Tue, 06 Jun 2017 12:01:00 -0400
+
 ipmiutil (3.0.4-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/doc/Makefile b/doc/Makefile
index 0f23c85..1280f94 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -113,9 +113,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.0.4
+PACKAGE_STRING = ipmiutil 3.0.5
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.4
+PACKAGE_VERSION = 3.0.5
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 3.0.4
-abs_builddir = /usr/dev/ipmiutil-3.0.4/doc
-abs_srcdir = /usr/dev/ipmiutil-3.0.4/doc
-abs_top_builddir = /usr/dev/ipmiutil-3.0.4
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.4
+VERSION = 3.0.5
+abs_builddir = /usr/dev/ipmiutil-3.0.5/doc
+abs_srcdir = /usr/dev/ipmiutil-3.0.5/doc
+abs_top_builddir = /usr/dev/ipmiutil-3.0.5
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.5
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__include = include
@@ -159,7 +159,7 @@ host_vendor = redhat
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.4/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index eb86edc..ef89695 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.0.4
+                     VERSION 3.0.5
          An easy-to-use IPMI server management utility
 
 
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 107d3e1..9eff4b4 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.0.4
+Version: 3.0.5
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
diff --git a/lib/Makefile b/lib/Makefile
index 5cb97f6..1abff61 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-3.0.4/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -115,9 +115,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.0.4
+PACKAGE_STRING = ipmiutil 3.0.5
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.4
+PACKAGE_VERSION = 3.0.5
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 3.0.4
-abs_builddir = /usr/dev/ipmiutil-3.0.4/lib
-abs_srcdir = /usr/dev/ipmiutil-3.0.4/lib
-abs_top_builddir = /usr/dev/ipmiutil-3.0.4
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.4
+VERSION = 3.0.5
+abs_builddir = /usr/dev/ipmiutil-3.0.5/lib
+abs_srcdir = /usr/dev/ipmiutil-3.0.5/lib
+abs_top_builddir = /usr/dev/ipmiutil-3.0.5
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.5
 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-3.0.4/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.5/install-sh
 libdir = $(iprefix)/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index 0f73ef4..1d79824 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
 
 Name: libipmiutil
 Description: Library for ipmiutil
-Version: 3.0.4
+Version: 3.0.5
 Libs: -L${libdir} -lipmi_lanplus
 Cflags: -I${includedir}
diff --git a/scripts/Makefile b/scripts/Makefile
index cf2fddc..82a47a9 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.5/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -113,9 +113,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.0.4
+PACKAGE_STRING = ipmiutil 3.0.5
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.4
+PACKAGE_VERSION = 3.0.5
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 3.0.4
-abs_builddir = /usr/dev/ipmiutil-3.0.4/scripts
-abs_srcdir = /usr/dev/ipmiutil-3.0.4/scripts
-abs_top_builddir = /usr/dev/ipmiutil-3.0.4
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.4
+VERSION = 3.0.5
+abs_builddir = /usr/dev/ipmiutil-3.0.5/scripts
+abs_srcdir = /usr/dev/ipmiutil-3.0.5/scripts
+abs_top_builddir = /usr/dev/ipmiutil-3.0.5
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.5
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__include = include
@@ -159,7 +159,7 @@ host_vendor = redhat
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.4/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.5/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/util/ialarms.c b/util/ialarms.c
index 7260356..7c1ae56 100644
--- a/util/ialarms.c
+++ b/util/ialarms.c
@@ -75,7 +75,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ialarms";
 static char   fdebug    = 0;
 static char   fbmctam   = 0;
diff --git a/util/icmd.c b/util/icmd.c
index ec467e7..90d63a7 100644
--- a/util/icmd.c
+++ b/util/icmd.c
@@ -78,7 +78,7 @@ extern void ipmi_lan_set_timeout(int ipmito, int tries, int pingto);
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "icmd";
 static char   fdebug    = 0;
 static char   fquiet    = 0;
diff --git a/util/iconfig.c b/util/iconfig.c
index f7b9972..bd5d74b 100644
--- a/util/iconfig.c
+++ b/util/iconfig.c
@@ -172,7 +172,7 @@ typedef struct
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iconfig";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
diff --git a/util/idcmi.c b/util/idcmi.c
index 0cce3c0..e521606 100644
--- a/util/idcmi.c
+++ b/util/idcmi.c
@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "idcmi.h"
 
 static char * progname  = "idcmi";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 extern char   fdebug;  /*from ipmicmd.c*/
 static uchar  g_bus  = PUBLIC_BUS;
 static uchar  g_sa   = BMC_SA;
diff --git a/util/ievents.c b/util/ievents.c
index 10b665b..83ddcd8 100644
--- a/util/ievents.c
+++ b/util/ievents.c
@@ -76,7 +76,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define  SELprintf  printf  
 #define  SMS_SA   0x41
 #define  SMI_SA   0x21
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 static char *progname  = "ievents";
 static char fsensdesc = 0;   /* 1= get extended sensor descriptions*/
 static char fcanonical = 0;  /* 1= show canonical, delimited output*/
diff --git a/util/ifirewall.c b/util/ifirewall.c
index 719d2b8..66454c9 100644
--- a/util/ifirewall.c
+++ b/util/ifirewall.c
@@ -64,7 +64,7 @@
 
 /* global variables */
 static char * progname  = "ifirewall";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static uchar  g_bus  = PUBLIC_BUS;
 static uchar  g_sa   = BMC_SA;
diff --git a/util/ifru.c b/util/ifru.c
index c91fab2..2a0e496 100644
--- a/util/ifru.c
+++ b/util/ifru.c
@@ -116,7 +116,7 @@ extern int ipmi_kontronoem_main(void * intf, int  argc, char ** argv);
 #endif
 
 static char *progname  = "ifru";
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 static int  vend_id = 0; 
 static int  prod_id = 0; 
 static char fdebug = 0;
diff --git a/util/ifruset.c b/util/ifruset.c
index d24b089..47cb077 100644
--- a/util/ifruset.c
+++ b/util/ifruset.c
@@ -106,7 +106,7 @@ extern void fmt_time(time_t etime, char *buf, int bufsz); /*see ievents.c*/
 #define IPROD_OEM    7
 
 static char *progname  = "ifruset";
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 static char fdebug = 0;
 static char fpicmg = 0;
 static char fonlybase = 0;
diff --git a/util/igetevent.c b/util/igetevent.c
index 40c5e4a..110de4d 100644
--- a/util/igetevent.c
+++ b/util/igetevent.c
@@ -169,7 +169,7 @@ extern void free_sdr_cache(uchar *pret); /*see isensor.c*/
  * Global variables 
  */
 static char * progname  = "igetevent";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
 static char   frunonce  = 0;
diff --git a/util/ihealth.c b/util/ihealth.c
index 974fa95..0ba6a79 100644
--- a/util/ihealth.c
+++ b/util/ihealth.c
@@ -82,7 +82,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro
  * Global variables 
  */
 static char * progname  = "ihealth";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
 static char   fcanonical = 0;
@@ -421,9 +421,12 @@ static int get_power_state(uchar *rdata, int rlen)
 	uchar ccode;
 	int ret;
 
-        ret = ipmi_cmdraw( GET_POWER_STATE, NETFN_APP,
-			g_sa, g_bus, g_lun,
+    ret = ipmi_cmdraw( GET_POWER_STATE, NETFN_APP, g_sa, g_bus, g_lun,
+                        idata,0, rdata,&rlen,&ccode, fdebug);
+	if (ret == 0 && ccode == 193) { /*0xB7, usu. SuperMicro, retry */
+       ret = ipmi_cmdraw( GET_POWER_STATE, NETFN_APP, g_sa, g_bus, g_lun,
                         idata,0, rdata,&rlen,&ccode, fdebug);
+	}
 	if (ret == 0 && ccode != 0) ret = ccode;
 	return(ret);
 }  /*end get_power_state()*/
diff --git a/util/ilan.c b/util/ilan.c
index 6f63fe5..b73dec4 100644
--- a/util/ilan.c
+++ b/util/ilan.c
@@ -306,7 +306,7 @@ extern char *get_sensor_type_desc (uchar stype);	/*from ievents.c */
  * Global variables 
  */
 static char * progname  = "ilan";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char fdebug = 0;
 static char fipmilan = 0;
 static char fIPMI10 = 0;	/* =1 if IPMI v1.0 or less */
diff --git a/util/ipicmg.c b/util/ipicmg.c
index e463424..42cc33c 100644
--- a/util/ipicmg.c
+++ b/util/ipicmg.c
@@ -81,7 +81,7 @@
 
 /* Global data */
 static char * progname  = "ipicmg";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static char   fset_mc   = 0;
 static uint8_t g_bus  = PUBLIC_BUS;
diff --git a/util/ipmiutil.c b/util/ipmiutil.c
index ffddc86..53e1e64 100644
--- a/util/ipmiutil.c
+++ b/util/ipmiutil.c
@@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ipmiutil.h"
 
 static char *progname  = "ipmiutil";
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 // static char fdebug = 0;
 /*int ipmiutil(int argc, char **argv); */
 
diff --git a/util/ireset.c b/util/ireset.c
index 3584cb1..cf71404 100644
--- a/util/ireset.c
+++ b/util/ireset.c
@@ -108,7 +108,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ireset";
 static uchar  ipmi_maj;
 static uchar  ipmi_min;
diff --git a/util/isel.c b/util/isel.c
index 9045d62..64cf946 100644
--- a/util/isel.c
+++ b/util/isel.c
@@ -162,7 +162,7 @@ typedef struct
 #define RDATA_OFFSET    13    //byte offset to the record event data  
 
 static char *progname  = "isel";
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 #ifdef WIN32
 #define IDXFILE   "sel.idx"
 static char idxfile[80] = IDXFILE;
diff --git a/util/iseltime.c b/util/iseltime.c
index 2f5c7e1..1b16008 100644
--- a/util/iseltime.c
+++ b/util/iseltime.c
@@ -78,7 +78,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iseltime";
 static char   fdebug    = 0;
 static char   fset      = 0;
diff --git a/util/isensor.c b/util/isensor.c
index 69d901f..1f772bd 100644
--- a/util/isensor.c
+++ b/util/isensor.c
@@ -161,7 +161,7 @@ extern int decode_sensor_fujitsu(uchar *sdr,uchar *reading,char *pstring,
 extern int decode_sensor_sun(uchar *sdr,uchar *reading,char *pstring,
 				int slen);  /*see oem_sun.c*/
 extern int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring,
-				int slen, int fsimple);  /*see oem_supermicro.c*/
+				int slen, int fsimple, char fdbg);  /*see oem_supermicro.c*/
 extern int decode_sensor_quanta(uchar *sdr,uchar *reading,char *pstring,
 				int slen);  /*see oem_quanta.c*/
 extern int decode_sensor_dell(uchar *sdr,uchar *reading,char *pstring,
@@ -255,7 +255,7 @@ char *decode_entity_id(int id) {
  *  Global Data
  ************************/
 static char *progname  = "isensor";
-static char *progver   = "3.04";
+static char *progver   = "3.05";
 #ifdef WIN32
 static char savefile[] = "%ipmiutildir%\\thresholds.cmd";
 #else
@@ -1952,7 +1952,7 @@ int decode_oem_sensor(uchar *sdr,uchar *reading,char *pstring,int slen)
       case VENDOR_MAGNUM: 
       case VENDOR_SUPERMICRO: 
       case VENDOR_SUPERMICROX: 
-          rv = decode_sensor_supermicro(sdr, reading, pstring, slen, fsimple);
+          rv = decode_sensor_supermicro(sdr,reading,pstring,slen,fsimple,fdebug);
           break;
       case VENDOR_QUANTA: 
           rv = decode_sensor_quanta(sdr, reading, pstring, slen);
diff --git a/util/iserial.c b/util/iserial.c
index a087614..e183e5c 100644
--- a/util/iserial.c
+++ b/util/iserial.c
@@ -155,7 +155,7 @@ typedef struct
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iserial";
 static int    vend_id = 0;
 static int    prod_id = 0;
diff --git a/util/isol.c b/util/isol.c
index fab0994..f99b094 100644
--- a/util/isol.c
+++ b/util/isol.c
@@ -165,7 +165,7 @@ void dbglog( char *pattn, ... ); /*local prototype*/
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "isol";
 static char  fdebug        = 0;
 static char  fpicmg        = 0;
@@ -1249,7 +1249,9 @@ main(int argc, char **argv)
 	case VENDOR_DELL:  /*Dell == 0x0002A2*/
 	   max_bmc_data = MAX_DELL_DATA; /*shorter max data*/
 	   break;
+	case VENDOR_SUPERMICROX:
 	case VENDOR_SUPERMICRO:
+   		if (!fprivset) parse_lan_options('V',"4",0); /*requires admin priv*/
 	case VENDOR_LMC:
 	case VENDOR_PEPPERCON: /* 0x0028C5  Peppercon/Raritan*/
            sol_timeout = 10;  /* shorter 10 sec SOL keepalive timeout */
diff --git a/util/itsol.c b/util/itsol.c
index 6997ffe..b3f0940 100644
--- a/util/itsol.c
+++ b/util/itsol.c
@@ -98,7 +98,7 @@ int   gettimeofday(struct timeval *tv, struct timezone *tz);
 extern int verbose;
 extern char   fdebug;  /*from ipmicmd.c*/
 static char * progname  = "itsol";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static uchar  g_bus  = PUBLIC_BUS;
 static uchar  g_sa   = BMC_SA;
 static uchar  g_lun  = BMC_LUN;
diff --git a/util/iuser.c b/util/iuser.c
index e6a7b29..43ebf6e 100644
--- a/util/iuser.c
+++ b/util/iuser.c
@@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* global variables */
 static char * progname  = "iuser";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static char   fcanonical = 0;
 static char   bdelim = '|';
diff --git a/util/iwdt.c b/util/iwdt.c
index 13253b3..3ebe39b 100644
--- a/util/iwdt.c
+++ b/util/iwdt.c
@@ -100,7 +100,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iwdt";
 static char   fdebug    = 0;
 static char   fdontlog  = 0;
diff --git a/util/oem_asus.c b/util/oem_asus.c
index cd5c01e..1abd020 100644
--- a/util/oem_asus.c
+++ b/util/oem_asus.c
@@ -61,7 +61,7 @@ extern char fdebug;  /*ipmicmd.c*/
 void set_loglevel(int level);  /*prototype */
 
 static char * progname  = "iasusoem";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static int verbose = 0;
 static uchar  g_bus  = PUBLIC_BUS;
 static uchar  g_sa   = BMC_SA;
diff --git a/util/oem_dell.c b/util/oem_dell.c
index 4f9a7ab..836c9ab 100644
--- a/util/oem_dell.c
+++ b/util/oem_dell.c
@@ -132,7 +132,7 @@ char NIC_Selection_Mode_String_12g[] [50] =	{
 						"shared with failover all loms"
 						};
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "idelloem";
 static int verbose = 0;
 static char fdebug = 0;
diff --git a/util/oem_fujitsu.c b/util/oem_fujitsu.c
index 9a4783a..e5c914e 100644
--- a/util/oem_fujitsu.c
+++ b/util/oem_fujitsu.c
@@ -52,7 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* extern void get_mfgid(int *vend, int *prod);  * from ipmicmd.h*/
 /* extern int get_lan_options();  * from ipmicmd.h */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ifujitsuoem";
 static char fdebug = 0;
 static char freadok = 1;
diff --git a/util/oem_hp.c b/util/oem_hp.c
index 081ea6f..83dfaca 100644
--- a/util/oem_hp.c
+++ b/util/oem_hp.c
@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ievents.h"
 #include "isensor.h"
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ihpoem";
 
 static char *redund_str(uchar b)
diff --git a/util/oem_intel.c b/util/oem_intel.c
index bf21ec5..997d604 100644
--- a/util/oem_intel.c
+++ b/util/oem_intel.c
@@ -83,7 +83,7 @@ extern char  fdebug;   /*ipmicmd.c*/
 /*
  * Global variables 
  */
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iinteloem";
 static char  fRelayBits = 0;
 static uchar g_bus = PUBLIC_BUS;
diff --git a/util/oem_kontron.c b/util/oem_kontron.c
index b8fedf7..ec0546f 100644
--- a/util/oem_kontron.c
+++ b/util/oem_kontron.c
@@ -73,7 +73,7 @@ typedef uint32_t   socklen_t;
 #define FRU_TYPE_COMPONENT  0x01
 #define FRU_TYPE_BASEBOARD  0x07
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ikontronoem";
 const struct valstr ktc5520_post[] = {  /*from EAS*/
  { 0x0003, "Start POST Init" },
diff --git a/util/oem_lenovo.c b/util/oem_lenovo.c
index dc15a5d..0f4af57 100644
--- a/util/oem_lenovo.c
+++ b/util/oem_lenovo.c
@@ -61,7 +61,7 @@ extern uchar bitnum(ushort value);  /*isensor.c*/
 extern char fdebug;  /*ipmicmd.c*/
 void set_loglevel(int level);  /*prototype */
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ilenovooem";
 static int verbose = 0;
 static uchar  g_bus  = PUBLIC_BUS;
diff --git a/util/oem_newisys.c b/util/oem_newisys.c
index 6b21e1b..ada0f73 100644
--- a/util/oem_newisys.c
+++ b/util/oem_newisys.c
@@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ipmicmd.h"
 #include "ievents.h"
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "inewisysoem";
 static char  fdebug = 0;
 static uchar g_bus = PUBLIC_BUS;
diff --git a/util/oem_quanta.c b/util/oem_quanta.c
index a6cfd6a..efaeb5f 100644
--- a/util/oem_quanta.c
+++ b/util/oem_quanta.c
@@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 extern int decode_sensor_intel_nm(uchar *sdr,uchar *reading,
 				  char *pstring,int slen);  /*oem_intel.c*/
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "iquantaoem";
 static char fdbg = 0;
 
diff --git a/util/oem_sun.c b/util/oem_sun.c
index 8aa211b..c45f6ee 100644
--- a/util/oem_sun.c
+++ b/util/oem_sun.c
@@ -109,7 +109,7 @@ static const struct valstr sunoem_led_mode_optvals[] = {
 
 /* global variables */
 static char * progname  = "isunoem";
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char   fdebug    = 0;
 static uchar  g_bus  = PUBLIC_BUS;
 static uchar  g_sa   = BMC_SA;
diff --git a/util/oem_supermicro.c b/util/oem_supermicro.c
index a480b7f..d733213 100644
--- a/util/oem_supermicro.c
+++ b/util/oem_supermicro.c
@@ -68,7 +68,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 void set_loglevel(int level);  /*prototype */
 extern char fsm_debug;  /*mem_if.c*/
 
-static char * progver   = "3.04";
+static char * progver   = "3.05";
 static char * progname  = "ismcoem";
 static int verbose = 0;
 static char fdebug = 0;
@@ -415,7 +415,7 @@ int decode_threshold_supermicro(uchar rval, uchar *thresh)
  *    pstring = contains the sensor reading interpretation string (if rv==0)
  */
 int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen, 
-		int fsimple)
+		int fsimple, char fdbg)
 {
    int i, rv = -1;
    uchar stype, etype, snum;
@@ -428,23 +428,25 @@ int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen,
 
    if (sdr == NULL || reading == NULL) return(rv);
    if (pstring == NULL || slen == 0) return(rv);
+   fdebug = fdbg;
    bval = (reading[2] & 0x3f);
    snum = sdr[7];   /*sdr01->sens_num*/
    stype = sdr[12]; /*sensor_type*/
    etype = sdr[13]; /*sdr01->ev_type*/
    /* sdr[3] rec_type is 0x01 for Full, 0x02 for Compact */
    if ((sdr[3] == 0x01) && (etype == 0x01)) { /* full threshold sensor */
-	  if (bval == 0) return(-1); /* OK, treat it normally */
-	  /*cannot rely upon the sensor reading[2], so get thresholds and compare*/
+	  /*if Temp sensor, bits==0 would show BelowCrit, so handle normally */
+	  if ((stype == 0x01) && (bval == 0)) return(-1); 
+	  /*Cannot rely upon the sensor reading[2], so get thresholds and compare*/
 	  rv = GetSensorThresholds(snum,&thresh[0]);
 	  if (rv != 0) return(rv);
       i = decode_threshold_supermicro(reading[0],thresh);
       if (fdebug) 
-	    printf("decode_sensor_supermicro: snum=%x rdg=%x:%x thresh=%x:%x:%x:%x:%x:%x:%x i=%d rv=%d\n",
-			snum,reading[0],reading[2], thresh[0], thresh[1], thresh[2], thresh[3], 
+	    printf("decode_sensor_supermicro: snum=%x stype=%x rdg=%x:%x thresh=%x:%x:%x:%x:%x:%x:%x i=%d rv=%d\n",
+			snum,stype,reading[0],reading[2], thresh[0], thresh[1], thresh[2], thresh[3], 
 			thresh[4], thresh[5], thresh[6], i,rv);
       switch(i) {
-         case 0: pstr = "OK*";  break;
+         case 0: pstr = "OK";  break;
          case 1: pstr = "Warn-lo"; break;
          case 2: pstr = "Crit-lo"; break;
          case 3: pstr = "BelowCrit"; break;
diff --git a/util/oem_supermicro.h b/util/oem_supermicro.h
index c8f9147..7237f3c 100644
--- a/util/oem_supermicro.h
+++ b/util/oem_supermicro.h
@@ -48,7 +48,7 @@ int oem_supermicro_get_lan_port(uchar *val);
 int oem_supermicro_set_lan_port(uchar val);
 char *oem_supermicro_lan_port_string(uchar val);
 
-int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen, int fsimple);
+int decode_sensor_supermicro(uchar *sdr,uchar *reading,char *pstring, int slen, int fsimple, char fdbg);
 int decode_mem_supermicro(int prod, uchar b2, uchar b3, char *desc, int *psz);
 int decode_sel_supermicro(uchar *evt, char *outbuf, int outsz, char fdesc,
                         char fdebug);