From e2cc94d96bc9ad9b68b4ee77f55ee7fa97e7b6c5 Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Sun, 19 Mar 2006 18:40:48 +0000
Subject: [PATCH] Add support for FreeBSD OpenIPMI-compatible driver

---
 ipmitool/ChangeLog               | 1 +
 ipmitool/configure.in            | 5 ++++-
 ipmitool/src/plugins/open/open.c | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ipmitool/ChangeLog b/ipmitool/ChangeLog
index 72a57d7..53cf512 100644
--- a/ipmitool/ChangeLog
+++ b/ipmitool/ChangeLog
@@ -9,6 +9,7 @@ version 1.8.7
 	* Support IPMIv2 SOL on older Intel boxes
 	* Display message and exit if keepalive fails during SOL
 	* Add support for setting VLAN id and priority
+	* Add support for FreeBSD OpenIPMI-compatible driver
 
 version 1.8.6
 	* Fix memory corruption when sending encrypted SOL traffic
diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 550dd12..440efeb 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -192,7 +192,10 @@ AC_ARG_WITH([kerneldir],
 AC_CHECK_HEADER([linux/ipmi.h],
 	[AC_DEFINE(HAVE_OPENIPMI_H, [1],
 	[Define to 1 if you have the <linux/ipmi.h> header file.])],
-	[echo "** Unable to find OpenIPMI header files.  Using internal version."])
+	[AC_CHECK_HEADER([sys/ipmi.h],
+		[AC_DEFINE(HAVE_FREEBSD_IPMI_H, [1],
+		[Define to 1 if you have the <sys/ipmi.h> header file.])],
+		[echo "** Unable to find OpenIPMI header files.  Using internal version."])])
 
 dnl set RPM distro tag for use in RPM name
 AC_ARG_WITH([rpm-distro],
diff --git a/ipmitool/src/plugins/open/open.c b/ipmitool/src/plugins/open/open.c
index fb21f78..eb670c0 100644
--- a/ipmitool/src/plugins/open/open.c
+++ b/ipmitool/src/plugins/open/open.c
@@ -47,9 +47,12 @@
 
 #include <config.h>
 
-#ifdef HAVE_OPENIPMI_H
+#if defined(HAVE_OPENIPMI_H)
 # include <linux/compiler.h>
 # include <linux/ipmi.h>
+#elif defined(HAVE_FREEBSD_IPMI_H)
+/* FreeBSD OpenIPMI-compatible header */
+# include <sys/ipmi.h>
 #else
 # include "open.h"
 #endif