From 5c337dcdf63495b48ca90faf1ca8d967e3fbc303 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Wed, 26 Nov 2003 16:34:14 +0000
Subject: [PATCH] fix SEL decoding for generic events

---
 ipmitool/configure.in     |  2 +-
 ipmitool/debian/changelog |  7 +++++++
 ipmitool/lib/ipmi_sel.c   | 31 +++++--------------------------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 441e95c..fecd7cf 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -2,7 +2,7 @@ dnl
 dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
-AM_INIT_AUTOMAKE([ipmitool], [1.5.5])
+AM_INIT_AUTOMAKE([ipmitool], [1.5.6])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog
index 87a4f41..64f6b25 100644
--- a/ipmitool/debian/changelog
+++ b/ipmitool/debian/changelog
@@ -1,3 +1,10 @@
+ipmitool (1.5.5) unstable; urgency=low
+
+  * Add -U option for setting LAN username
+  * Fix -v usage for plugin interfaces
+
+ -- Duncan Laurie <duncan@sun.com>  Tue, 25 Nov 2003 15:10:48 -0700
+
 ipmitool (1.5.4) unstable; urgency=low
 
   * Put interface plugin API into library
diff --git a/ipmitool/lib/ipmi_sel.c b/ipmitool/lib/ipmi_sel.c
index aa55456..f2766db 100644
--- a/ipmitool/lib/ipmi_sel.c
+++ b/ipmitool/lib/ipmi_sel.c
@@ -83,40 +83,19 @@ ipmi_get_event_type(unsigned char code)
 static const char *
 ipmi_get_event_desc(struct sel_event_record * rec)
 {
-	int class;
-	unsigned char offset = 0;
-	unsigned char code = 0;
+	unsigned char code, offset;
 	struct ipmi_event_sensor_types *evt;
 
-	class = ipmi_get_event_class(rec->event_type);
-	if (class < 0)
-		return "Invalid Class";
-
-	switch (class) {
-	case IPMI_EVENT_CLASS_DISCRETE:
-		if (rec->event_type == 0x6f)
-			evt = sensor_specific_types;
-		else
-			evt = generic_event_types;
+	if (rec->event_type == 0x6f) {
+		evt = sensor_specific_types;
 		code = rec->sensor_type;
-		break;
-	case IPMI_EVENT_CLASS_DIGITAL:
+	} else {
 		evt = generic_event_types;
-		code = rec->sensor_type;
-		break;
-	case IPMI_EVENT_CLASS_THRESHOLD:
-		evt = generic_event_types;
-		code = 0x01;
-		break;
-	default:
-		return "Unknown Class";
+		code = rec->event_type;
 	}
 
 	offset = rec->event_data[0] & 0xf;
 
-	if (verbose > 2)
-		printf("offset: 0x%02x\n", offset);
-
 	while (evt->type) {
 		if (evt->code == code && evt->offset == offset)
 			return evt->desc;