Merge branch 'feature/upstream' into develop

35 files changed, 104 insertions, 142 deletions

diff --git a/util/ialarms.c b/util/ialarms.c
index 836ec8c..d9c6d5e 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.07";
+static char * progver   = "3.08";
 static char * progname  = "ialarms";
 static char   fdebug    = 0;
 static char   fbmctam   = 0;
diff --git a/util/icmd.c b/util/icmd.c
index 789c69d..ed89004 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.07";
+static char * progver   = "3.08";
 static char * progname  = "icmd";
 static char   fdebug    = 0;
 static char   fquiet    = 0;
diff --git a/util/iconfig.c b/util/iconfig.c
index db70075..b9da59b 100644
--- a/util/iconfig.c
+++ b/util/iconfig.c
@@ -172,7 +172,7 @@ typedef struct
 /*
  * Global variables 
  */
-static char * progver   = "3.07";
+static char * progver   = "3.08";
 static char * progname  = "iconfig";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
diff --git a/util/idcmi.c b/util/idcmi.c
index 8bf2000..f35e711 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.07";
+static char * progver   = "3.08";
 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 d07a35f..b244b68 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.07";
+static char *progver   = "3.08";
 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 3f81b3b..e410a45 100644
--- a/util/ifirewall.c
+++ b/util/ifirewall.c
@@ -64,7 +64,7 @@
 
 /* global variables */
 static char * progname  = "ifirewall";
-static char * progver   = "3.07";
+static char * progver   = "3.08";
 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 9775d7d..cc866d8 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.07";
+static char *progver   = "3.08";
 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 8b77489..0a9ac00 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.07";
+static char *progver   = "3.08";
 static char fdebug = 0;
 static char fpicmg = 0;
 static char fonlybase = 0;
diff --git a/util/igetevent.c b/util/igetevent.c
index 61abc96..1cda21c 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.07";
+static char * progver   = "3.08";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
 static char   frunonce  = 0;
diff --git a/util/ihealth.c b/util/ihealth.c
index 087fcdf..dd9be29 100644
--- a/util/ihealth.c
+++ b/util/ihealth.c
@@ -83,7 +83,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro
  * Global variables 
  */
 static char * progname  = "ihealth";
-static char * progver   = "3.07";
+static char * progver   = "3.08";
 static char   fdebug    = 0;
 static char   fipmilan  = 0;
 static char   fcanonical = 0;
diff --git a/util/ilan.c b/util/ilan.c
index e54233f..a6e91a3 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.07";
+static char * progver   = "3.08";
 static char fdebug = 0;
 static char fipmilan = 0;
 static char fIPMI10 = 0;	/* =1 if IPMI v1.0 or less */
@@ -1894,7 +1894,7 @@ GetFirstIP (uchar * ipaddr, uchar * macadr, char *ipname, char fdbg)
 }
 
 /*
- * Set BMC MAC corresponding to current BMC IP address (Windows).
+ * Get BMC MAC corresponding to current BMC IP address (Windows).
  */
 int
 GetLocalIPByMAC (uchar * macadr)
@@ -2431,9 +2431,9 @@ GetBmcEthDevice (uchar lan_parm, uchar * pchan)
       lan_ch = (uchar) j;	/*set lan channel for GetLanEntry */
       ret = GetLanEntry (5 /*MAC_ADDRESS_LAN_PARAM */ , 0, &LanRecord);
       if (ret != 0) {
-	lan_ch = (uchar) jlan;	/*restore lan_ch */
-	printf ("GetBmcEthDevice: GetLanEntry failed\n");
-	return devnum;
+         lan_ch = (uchar) jlan;	/*restore lan_ch */
+         printf ("GetBmcEthDevice: GetLanEntry(5) failed\n");
+         return devnum;
       }
       else {
 	pb = &LanRecord.data[0];
@@ -4425,7 +4425,7 @@ main(int argc, char **argv)
   if ((fsetarp == 0) && ostype == OS_WINDOWS)
     arp_ctl = 0x03;		/*grat arp & arp resp enabled */
 
-  ret = GetDeviceID (&LanRecord);
+  ret = ipmi_getdeviceid((uchar *)&LanRecord,16,fdebug);
   if (ret != 0) {
     goto do_exit;
   }
@@ -4434,29 +4434,20 @@ main(int argc, char **argv)
     ipmi_maj = LanRecord.data[4] & 0x0f;
     ipmi_min = LanRecord.data[4] >> 4;
     show_devid (LanRecord.data[2], LanRecord.data[3], ipmi_maj, ipmi_min);
-    if (ipmi_maj == 0)
-      fIPMI10 = 1;
-    else if (ipmi_maj == 1 && ipmi_min < 5)
-      fIPMI10 = 1;
-    else
-      fIPMI10 = 0;		/* >= IPMI 1.5 is ok */
-    if (ipmi_maj >= 2)
-      fIPMI20 = 1;
-    if (fIPMI20)
-      show_users = 5;
-    else
-      show_users = 3;
+    if (ipmi_maj == 0) fIPMI10 = 1; /* IPMI 1.0 is limited */
+    else if (ipmi_maj == 1 && ipmi_min < 5) fIPMI10 = 1;
+    else fIPMI10 = 0;		/* >= IPMI 1.5 is ok */
+    if (ipmi_maj >= 2) fIPMI20 = 1; /* IPMI 2.0 has more */
+    if (fIPMI20) show_users = 5;
+    else show_users = 3;
     if (fIPMI10) {
       printf ("This IPMI v%d.%d system does not support PEF records.\n",
 	      ipmi_maj, ipmi_min);
       /* Wont handle PEF, but continue and look for BMC LAN anyway */
-      // fIPMI10 = 1;
-      // ipmi_close_();
-      // exit(1);  
     }
     prod_id = LanRecord.data[9] + (LanRecord.data[10] << 8);
     vend_id = LanRecord.data[6] + (LanRecord.data[7] << 8)
-      + (LanRecord.data[8] << 16);
+              + (LanRecord.data[8] << 16);
     /* check Device ID response for Manufacturer ID = 0x0322 (NSC) */
     if (vend_id == VENDOR_NSC) {	/* NSC = 0x000322 */
       fmBMC = 1;		/*NSC miniBMC */
@@ -4999,8 +4990,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
       }				/*end for */
     }
   }				/*end if not fIPMI10 */
@@ -5345,8 +5335,10 @@ main(int argc, char **argv)
   // else lan_access = 0x04; /*Admin*/
   if (!fIPMI10) {		/* Get SOL params */
     ret = GetSerialOverLan (lan_ch, 0, 0);
-    if (ret != 0)
-      printf ("GetSOL error %d\n", ret);
+    if (ret != 0) {
+      printf ("GetSOL error %d, %s\n", ret, decode_rv(ret));
+	  ret = 0; /*does not fail entire command*/
+	}
   }
   for (i = 1; i <= show_users; i++)
     GetUser ((uchar) i, lan_ch);
@@ -5421,8 +5413,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
 	if (lan_user != 0) {
 	  j = DisableUser (lan_user, lan_ch);	/*disable this lan user */
@@ -5431,8 +5422,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = j;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
 	LanRecord.data[0] = 0x01;	/* static IP address source */
 	ret = SetLanEntry (4, &LanRecord, 1);
@@ -5441,8 +5431,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	/* clear the BMC IP address */
 	memset (&LanRecord, 0, 4);
 	ret = SetLanEntry (3, &LanRecord, 4);
@@ -5451,8 +5440,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	/* clear the gateway IP address */
 	memset (&LanRecord, 0, 4);
 	ret = SetLanEntry (12, &LanRecord, 4);
@@ -5461,8 +5449,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	/* clear the gateway MAC address */
 	memset (&LanRecord, 0, 6);
 	ret = SetLanEntry (13, &LanRecord, 6);
@@ -5471,8 +5458,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
       }
       else if (fdisableSOL) {
 	ret = SetupSerialOverLan (0);	/*disable */
@@ -5481,8 +5467,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
       }
       else {			/*fenable */
 	uchar chanctl;
@@ -5497,8 +5482,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	ret = SetChanAcc (lan_ch, 0x40, chanctl);
 	if (fdebug)
 	  printf ("SetChanAcc(lan/nonvol), ret = %d\n", ret);
@@ -5506,8 +5490,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	if (flansecure) {
 	  j = DisableUser (0, lan_ch);	/*disable the default null user */
 	  printf ("DisableUser(0), ret = %d\n", j);
@@ -5518,8 +5501,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
       }
       if (fdisable && (vend_id == VENDOR_SUPERMICROX
 		       || vend_id == VENDOR_SUPERMICRO)) {
@@ -5555,8 +5537,7 @@ main(int argc, char **argv)
 	nerrs++;
 	lasterr = ret;
       }
-      else
-	ngood++;
+      else ngood++;
 
       /* Get the values to use from Linux eth0, etc. */
       ret = Get_IPMac_Addr ();
@@ -5569,8 +5550,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	if (MacIsValid (rgmymac)) {
 	  memcpy (&LanRecord, rgmymac, 6);
 	  ret = SetLanEntry (5, &LanRecord, 6);
@@ -5584,8 +5564,7 @@ main(int argc, char **argv)
 	      nerrs++;
 	      lasterr = ret;
 	    }
-	    else
-	      ngood++;
+	    else ngood++;
 	  }
 	}
 
@@ -5611,8 +5590,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
       }
       else {			/* use static IP */
@@ -5639,8 +5617,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  memcpy (&LanRecord, rgmyip, 4);
 	  ret = SetLanEntry (3, &LanRecord, 4);
 	  printf ("SetLanEntry(3), ret = %d\n", ret);
@@ -5648,8 +5625,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  if (MacIsValid (rgmymac)) {
 	    memcpy (&LanRecord, rgmymac, 6);
 	    ret = SetLanEntry (5, &LanRecord, 6);
@@ -5668,8 +5644,7 @@ main(int argc, char **argv)
 		nerrs++;
 		lasterr = ret;
 	      }
-	      else
-		ngood++;
+	      else ngood++;
 	    }
 	  }
 	  if (!SubnetIsValid (rgsubnet))	/* not specified, use previous */
@@ -5681,8 +5656,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  if (vend_id != VENDOR_PEPPERCON) {
 	    /* may want to check bparm7 here */
 	    LanRecord.data[0] = parm7[0];	/*IPv4 header, TTL */
@@ -5694,8 +5668,7 @@ main(int argc, char **argv)
 	      nerrs++;
 	      lasterr = ret;
 	    }
-	    else
-	      ngood++;
+	    else ngood++;
 	  }
 	  /* if lan_ch == 3, gcm gets error setting grat arp (ccode=0xCD) */
 	  if (lan_ch != gcm_ch) {	/*skip if gcm */
@@ -5707,8 +5680,7 @@ main(int argc, char **argv)
 	      nerrs++;
 	      lasterr = ret;
 	    }
-	    else
-	      ngood++;
+	    else ngood++;
 	  }
 	  LanRecord.data[0] = arp_interval;	/*grat arp interval */
 	  ret = SetLanEntry (11, &LanRecord, 1);
@@ -5725,8 +5697,7 @@ main(int argc, char **argv)
 	      nerrs++;
 	      lasterr = ret;
 	    }
-	    else
-	      ngood++;
+	    else ngood++;
 	  }
 	}
 	else {			/* error, don't continue */
@@ -5775,8 +5746,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  if (!MacIsValid (rggwymac)) {	/* if gwy MAC not resolved */
 	    printf ("  Warning: Gateway MAC address was not resolved! "
 		    "Check %s interface, use -i ethN, or use -H gwymac.\n",
@@ -5792,8 +5762,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
 	if (IpIsValid (rggwy2ip)) {
 	  if (!MacIsValid (rggwy2mac))	/* if gwy2 MAC not set by user */
@@ -5806,8 +5775,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  memcpy (&LanRecord, rggwy2mac, 6);
 	  ret = SetLanEntry (15, &LanRecord, 6);
 	  printf ("SetLanEntry(15), ret = %d\n", ret);
@@ -5815,8 +5783,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
       }				/* end-else static IP */
       if (flansecure) {		/* disable cipher 0 */
@@ -5839,8 +5806,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
       }
       ret = SetupSerialOverLan (1);	/*enable */
       SELprintf ("SetupSerialOverLan: ret = %d\n", ret);
@@ -5889,8 +5855,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	/* Set Alert Destination Type */
 	LanRecord.data[0] = alertnum;	/* dest id = 1 */
 	LanRecord.data[1] = 0x00;	/* dest type = PET, no ack */
@@ -5929,8 +5894,7 @@ main(int argc, char **argv)
 	  nerrs++;
 	  lasterr = ret;
 	}
-	else
-	  ngood++;
+	else ngood++;
 	/* ChanAcc changed, so show it again */
 	j = ShowChanAcc (lan_ch);
       }
@@ -5945,8 +5909,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
 	else {			/*vlan_enable == 1, enable vlan with id */
 	  LanRecord.data[0] = (vlan_id & 0x00ff);
@@ -5957,8 +5920,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	  LanRecord.data[0] = vlan_prio;
 	  ret = SetLanEntry (21, &LanRecord, 1);
 	  printf ("SetLanEntry(21), ret = %d\n", ret);
@@ -5966,8 +5928,7 @@ main(int argc, char **argv)
 	    nerrs++;
 	    lasterr = ret;
 	  }
-	  else
-	    ngood++;
+	  else ngood++;
 	}
       }
       if (failover_enable != PARM_INIT) {
diff --git a/util/ipicmg.c b/util/ipicmg.c
index af10750..67ce69e 100644
--- a/util/ipicmg.c
+++ b/util/ipicmg.c
@@ -81,7 +81,7 @@
 
 /* Global data */
 static char * progname  = "ipicmg";
-static char * progver   = "3.07";
+static char * progver   = "3.08";
 static char   fdebug    = 0;
 static char   fset_mc   = 0;
 static uint8_t g_bus  = PUBLIC_BUS;
diff --git a/util/ipmicmd.c b/util/ipmicmd.c
index 45d6e8c..b7c8a5f 100644
--- a/util/ipmicmd.c
+++ b/util/ipmicmd.c
@@ -846,7 +846,7 @@ int ipmi_cmdraw(uchar cmd, uchar netfn, uchar sa, uchar bus, uchar lun,
 		fprintf(fpdbg,"Driver type %s, open rc = %d\n",
 			show_driver_type(fDriverTyp),rc);
         if (rc == ERR_NO_DRV && !fipmi_lan) fprintf(fperr, "%s", msg_no_drv);
-        else if (rc != 0) fprintf(fperr,"ipmi_open error = %d\n", rc);
+        else if (rc != 0) fprintf(fperr,"ipmi_open error = %d %s\n", rc,decode_rv(rc));
 	if (rc != 0) return(rc);
     }  /*endif first time*/
 
@@ -1006,7 +1006,7 @@ int ipmi_cmd(ushort icmd, uchar *pdata, int sdata, uchar *presp,
 			show_driver_type(fDriverTyp),rc);
         if (rc != 0) {
            if (rc == ERR_NO_DRV && !fipmi_lan) fprintf(fperr, "%s", msg_no_drv);
-           else fprintf(fperr,"ipmi_open error = %d\n", rc);
+           else fprintf(fperr,"ipmi_open error = %d %s\n", rc,decode_rv(rc));
            return(rc);
         }
     }  /*endif first time*/
diff --git a/util/ipmidir.c b/util/ipmidir.c
index 12b379c..0378d46 100644
--- a/util/ipmidir.c
+++ b/util/ipmidir.c
@@ -403,13 +403,13 @@ int ipmi_open_direct(int fdebugcmd)
 #endif
 	}
 
-        /* Read ipmi_if config file data, if present. */
-        status = get_ipmi_if();  
-        if (status == -1) {
+	/* Read ipmi_if config file data, if present. */
+	status = get_ipmi_if();  
+	if (status == -1) {
 	   uchar iftype, iver, sa, inc;
 	   int mybase;
-           /* Read SMBIOS to get IPMI struct */
-           status = get_IpmiStruct(&iftype,&iver,&sa,&mybase,&inc);
+	   /* Read SMBIOS to get IPMI struct */
+	   status = get_IpmiStruct(&iftype,&iver,&sa,&mybase,&inc);
 	   if (status == 0) {
 	      if (iftype == 0x04) { 
 		 g_DriverType = DRV_SMB;
@@ -427,7 +427,7 @@ int ipmi_open_direct(int fdebugcmd)
 	   } else {
 	      return ERR_NO_DRV;  /*no SMBIOS IPMI record*/
 	   }
-        }
+	}
         
 #ifndef DOS
 	/* superuser/root priv is required for direct I/Os */
@@ -438,20 +438,20 @@ int ipmi_open_direct(int fdebugcmd)
 	}
 #endif
 	/* check lock for driverless interface */
-        i = check_lock_dir();
+	i = check_lock_dir();
 	if (i != 0) {
 	    fprintf(stdout,"open_direct interface locked, %s in use\n",
 			lock_dir_file);
 	    return ERR_NO_DRV;
 	}
 
-        /* Find the SMBIOS IPMI driver type, data */
+	/* Find the SMBIOS IPMI driver type, data */
 	status = ImbInit_dir();
 	DBGP2("open_direct Init status = %d\n",status);
 	DBGP2("open_direct base=%x spacing=%d\n",BMC_base,kcs_inc);
 	if (status == 0) {
 	  fDetectedIF = 1; /*Successfully detected interface */
-          /* Send a command to the IPMI interface */
+	  /* Send a command to the IPMI interface */
 	  if (!fjustpass) 
              status = GetDeviceId(&g_bmcType,&g_ipmiVersion);
 	  if (status == 0) {
@@ -459,14 +459,13 @@ int ipmi_open_direct(int fdebugcmd)
               if (g_DriverType == DRV_SMB) typ = "smb";
               else  typ = "kcs";
               set_driver_type(typ);
-          }
-        }
+	  }
+	  /* set lock for driverless interface */
+	  i = set_lock_dir();
+	}
 	DBGP("open_direct: status=%d, %s drv, ipmi=%d\n",
 		status,BmcDesc(g_DriverType),g_ipmiVersion);
-
-	/* set lock for driverless interface */
-        i = set_lock_dir();
-        return status; 
+	return status; 
 }
 
 int ipmi_close_direct(void)
diff --git a/util/ipmiutil.c b/util/ipmiutil.c
index 9e5bc1f..3d7d91d 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.07";
+static char *progver   = "3.08";
 // static char fdebug = 0;
 /*int ipmiutil(int argc, char **argv); */
 
diff --git a/util/ireset.c b/util/ireset.c
index 36134bc..3853569 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.07";
+static char * progver   = "3.08";
 static char * progname  = "ireset";
 static uchar  ipmi_maj;
 static uchar  ipmi_min;
@@ -205,7 +205,7 @@ char *reset_str(uchar breset, uchar bopt)
         case 4:  str = "sending NMI"; break;
         case 5:  str = "shutdown/reset"; break;  
         case 6:  str = "shutdown/power_off"; break; /*via agent*/
-        case 7:  str = "cold reset"; break; 
+        case 7:  str = "cold reset BMC"; break; 
         default: str = "resetting"; break;
    }
    if (bopt > 0) 
@@ -546,7 +546,7 @@ main(int argc, char **argv)
 		    iana[1] = ((mfg & 0x00FF00) >> 8);
 		    iana[2] = (mfg & 0x0000FF);
 		    break;
-          case 'k': breset = 7;    break;  /* cold reset */
+          case 'k': breset = 7;    break;  /* cold reset to BMC */
           case 'w': fwait = 1;     break;  /* wait for ready */
           case 'y': fpersist = 1;  break;  /* yes, persist boot options */
           case 'm': /* specific MC, 3-byte address, e.g. "409600" */
@@ -672,7 +672,7 @@ main(int argc, char **argv)
        }
    }
 
-   if (breset == 7) { /*do Cold Reset */
+   if (breset == 7) { /*do Cold Reset to BMC */
       printf("%s: %s ...\n",progname,reset_str(breset,bopt));
       rslen = sizeof(rsdata);
       ret = ipmi_cmdraw( 0x02, NETFN_APP, g_sa, g_bus, g_lun,
@@ -681,9 +681,9 @@ main(int argc, char **argv)
          printf("cold_reset(%02x) ret=%d cc=%x, rslen=%d\n",g_sa,ret,cc,rslen);
       if (ret == 0) ret = cc;
       if (ret == 0) 
-  	 printf("%s: Cold_Reset ok\n",progname);
+  	 printf("%s: Cold_Reset to BMC ok\n",progname);
       else
-  	 printf("%s: Cold_Reset error %d\n",progname,ret);
+  	 printf("%s: Cold_Reset to BMC error %d\n",progname,ret);
       ipmi_close_(); 
 
    } else if (fshutdown && fipmilan && (platform == platIntel)) { /*soft reset*/
diff --git a/util/isel.c b/util/isel.c
index 925a689..ede4d52 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.07";
+static char *progver   = "3.08";
 #ifdef WIN32
 #define IDXFILE   "sel.idx"
 static char idxfile[80] = IDXFILE;
diff --git a/util/iseltime.c b/util/iseltime.c
index 0900c31..41f628b 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.07";
+static char * progver   = "3.08";
 static char * progname  = "iseltime";
 static char   fdebug    = 0;
 static char   fset      = 0;
diff --git a/util/isensor.c b/util/isensor.c
index 7418ae9..286b19d 100644
--- a/util/isensor.c
+++ b/util/isensor.c
@@ -255,7 +255,7 @@ char *decode_entity_id(int id) {
  *  Global Data
  ************************/
 static char *progname  = "isensor";
-static char *progver   = "3.07";
+static char *progver   = "3.08";
 #ifdef WIN32
 static char savefile[] = "%ipmiutildir%\\thresholds.cmd";
 #else
diff --git a/util/iserial.c b/util/iserial.c
index f8377c7..cf69129 100644
--- a/util/iserial.c
+++ b/util/iserial.c
@@ -155,7 +155,7 @@ typedef struct
 /*
  * Global variables 
  */
-static char * progver   = "3.07";
+static char * progver   = "3.08";
 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 1713ede..b8ccb1f 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.07";
+static char * progver   = "3.08";
 static char * progname  = "isol";
 static char  fdebug        = 0;
 static char  fpicmg        = 0;
diff --git a/util/itsol.c b/util/itsol.c
index 57bb1eb..6f508ef 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.07";
+static char * progver   = "3.08";
 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 fa8297c..9537f16 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.07";
+static char * progver   = "3.08";
 static char   fdebug    = 0;
 static char   fcanonical = 0;
 static char   bdelim = '|';
@@ -243,6 +243,8 @@ main(int argc, char **argv)
 
 	printf("%s ver %s\n", progname,progver);
 
+	parse_lan_options('V',"4",0);  /*default to admin priv*/
+
     while ( (c = getopt( argc, argv,"cm:T:V:J:EYF:P:N:R:U:Z:x?")) != EOF )
 	switch (c) {
           case 'c': fcanonical = 1; break;
diff --git a/util/iwdt.c b/util/iwdt.c
index d8c3c84..f73d045 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.07";
+static char * progver   = "3.08";
 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 d5861d4..6aba5ba 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.07";
+static char * progver   = "3.08";
 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 dcfe52a..9f13b12 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.07";
+static char * progver   = "3.08";
 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 9f11b19..5963df2 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.07";
+static char * progver   = "3.08";
 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 862456a..705e8ed 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.07";
+static char * progver   = "3.08";
 static char * progname  = "ihpoem";
 
 static char *redund_str(uchar b)
diff --git a/util/oem_intel.c b/util/oem_intel.c
index b8d9454..a79e73a 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.07";
+static char * progver   = "3.08";
 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 6a3964f..170a304 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.07";
+static char * progver   = "3.08";
 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 f37388f..1f23e0f 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.07";
+static char * progver   = "3.08";
 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 9ae794b..62486d8 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.07";
+static char * progver   = "3.08";
 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 ab9b105..f41e4d2 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.07";
+static char * progver   = "3.08";
 static char * progname  = "iquantaoem";
 static char fdbg = 0;
 
diff --git a/util/oem_sun.c b/util/oem_sun.c
index 9ccc905..604caa7 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.07";
+static char * progver   = "3.08";
 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 1924345..82d6647 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.07";
+static char * progver   = "3.08";
 static char * progname  = "ismcoem";
 static int verbose = 0;
 static char fdebug = 0;