From ed0f68500feda99fdfd5e636047dad62379e6d3b Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 17:22:19 +0000
Subject: ipmitool-1.8.18 base


---

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..9589d87
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,5 @@
+Duncan Laurie <duncan@iceblink.org>
+Fredrik �hrn <ohrn@chl.chalmers.se>
+Jon Cassorla <jon.cassorla@newisys.com>
+Jeremy Ellington <jeremy@jeremye.net>
+Petter Reinholdtsen <pere@hungry.com>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..b332da7
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,30 @@
+Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistribution of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistribution in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+Neither the name of Sun Microsystems, Inc. or the names of
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any kind.
+ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..ee25801
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,970 @@
+version 1.8.18 2016-10-08
+	* Add mac2str() and str2mac() to print/parse MAC address
+	* Change formatting, remove commented-out code in
+	src/plugins/imb/imbapi.c
+	* Export find_lan_channel() as global
+	* Expose _ipmi_get_channel_info()
+	* Extend buf2str to allow separator
+	* Fix indentation of #define in src/plugins/imb/imbapi.c
+	* Fix missing `goto out_free;` when ipmi_parse_hex() returns (-1)
+	* Fix warning for buf2str argument
+	* ID 408 - fix sel list last X listing
+	* ID: 38 - Protocol violating SOL retries when talking to
+	SIMSO-HTC
+	* ID: 459 - Fix reading FRU on Artesyn (Emerson) shelf manager,
+	MF105.
+	* ID: 464 - ipmievd crash fix in log_event
+	* ID:230 - check return value of malloc() in lib/ipmi_ekanalyzer.c
+	* ID:261 - Fix err. output consistency for % ipmitool chassis
+	INV_PARAM;
+	* ID:287 - Fix print-out of DDR3 SDRAM Serial Number
+	* ID:287 - Remove trailing white-spaces from dimm_spd.c
+	* ID:289 - bmx-snmp-proxy: PEF alerting does not work for
+	multiple destinations
+	* ID:312 - BREAKING CHANGE - Re-design of PEF user interface
+	* ID:312 - Fix bitmask in _ipmi_set_pef_policy_entry()
+	* ID:335 - Check return value of fseek(), prevent segfault
+	* ID:335 - Check return value of fseek(), prevent segfault
+	* ID:355 - Comment out statement without effect in lib/ipmi_sel.c
+	* ID:355 - Fix 'missing initializer' in struct lan_param
+	* ID:355 - Fix ``warning: ISO C forbids zero-size array 'data'''
+	* ID:355 - Fix different pointer type in lib/ipmi_picmg.c
+	* ID:355 - Fix missing struct initializers in lib/ipmi_firewall.c
+	* ID:355 - Fix printf format in lib/ipmi_sunoem.c
+	* ID:355 - Fix printf() related warnings in lib/ipmi_delloem.c
+	* ID:355 - Fix signedness warnings in lib/ipmi_sdr.c
+	* ID:355 - Fix statements without effect in lib/ipmi_ekanalyzer.c
+	* ID:355 - Move section_id from ipmi_fru. to ipmi_fru.c
+	* ID:355 - Replace DEBUG() macro with lprintf(LOG_DEBUG, ...)
+	* ID:375 - Add lan6 subcommand to handle IPv6 LAN parameters
+	* ID:400 - Add support for VITA-specific sensor types and events.
+	* ID:441 - Add support for HMAC_MD5 and HMAC_SHA256
+	* ID:443 - Disable USB driver by default on non-Linux systems
+	* ID:444 - Cleanup of defaults in configure.ac
+	* ID:445 - Fix of compilation on FreeBSD
+	* ID:446 - Fix broken firewall reset iterator
+	* ID:447 - Fix access beyond array limits in serial_terminal
+	* ID:449 - ipmitool close console session for sol deactivate
+	command
+	* ID:451 - Modify the memory ecc error display of SEL for new
+	supermicro motherboards.
+	* ID:452 - Add PICMG extension 5.x for PICMG extension check
+	* ID:454 - Add support for PICMG 3.1 R2.0 Link Types and Link
+	Classes.
+	* ID:456 - Unable to disable the VLAN ID using ipmitool
+	* ID:457 - Display User ID enable/disable status
+	* ID:463 - Removal of Nokia Siemens Networks
+	* ID:465 - Supermicro memory ecc Modify the memory ecc error
+	display of SEL for new supermicro boards.
+	* Moved ipmi_parse_hex() to helper.c
+	* Re-work ipmi_mc_get_guid() and turn it into reusable code
+	* Revert "ID:335 - Check return value of fseek(), prevent
+	segfault"
+	* Rewrite code with the notion that Kg is binary data, not string
+
+version 1.8.17 2016-05-01
+	* Add INSTALL and NEWS, mandated by autoconf
+	* Added missing ipmi_sel_supermicro.h to template Makefile.am
+	* Check rsp->data_len in ipmi_sel_get_info()
+	* Fix "redirecting incorrect #include <sys/poll.h> to <poll.h>"
+	warning with musl libc
+	* Fix automake compatibility warnings
+	* Fix implicit declaration of function
+	'get_nic_selection_mode_12g' in lib/ipmi_delloem.c
+	* Fix implicit declaration of function 'ipmi_get_oem' in
+	src/plugins/imb/imb.c
+	* Fix implicit declaration of function 'ipmi_get_oem' in
+	src/plugins/lanplus/lanplus.c
+	* Fix implicit declaration of function 'ipmi_get_oem' in
+	src/plugins/open/open.c
+	* Fix implicit declarations of functions 'HpmfwupgPreUpgradeCheck'
+	and 'ipmi_intf_get_max_request_data_size' in lib/ipmi_hpmfwupg.c
+	* Fix implicit declarations of functions
+	'ipmi_intf_set_max_request_data_size' and
+	'ipmi_intf_set_max_response_data_size' in lib/hpm2.c
+	* Fix implicit function declaration of
+	ipmi_intf_get_max_response_data_size in lib/ipmi_sdr.c
+	* Fix several implicit declarations of functions in
+	lib/ipmi_main.c
+	* Fix several implicit function declarations in lib/ipmi_fru.c
+	* Fix warning: suggest parentheses around '+' inside '<<'
+	in lib/ipmi_main.c
+	* Fix warning: suggest parentheses around arithmetic in operand of
+	'|' in include/ipmitool/hpm2
+	* Get rid of old INCLUDES macro, use AM_CPPFLAGS instead.
+	* ID 440 - Fix 'unknown type name fd_set" error.
+	* ID 440 - remove obsolete headers from lib/ipmi_sunoem.c
+	* ID:322 - let 'ekanalyzer frushow' run without a working
+	IPMI target
+	* ID:355 - Add #include <strings.h> to lib/ipmi_sel.c
+	* ID:355 - Add macros and #include and reduce number of warnings
+	* ID:355 - Change CFLAG -std=c99 to -std=gnu99
+	* ID:355 - Move Super Micro stuff into dedicated header file
+	* ID:355 - Remove declared, but not used variables
+	* ID:404 - Edit FRU information update problem
+	* ID:405 - Use meaningful Generator ID for "ipmitool sel add"
+	* ID:407 - Avoid assert on mismatched session ID
+	* ID:409 - Fix IPv6 socket creation on Windows/Cygwin.
+	* ID:410 - Disable USB interface for Windows/Cygwin by default.
+	* ID:410 - Enable/disable USB interface by "auto"
+	* ID:411 - Fix HPM.2 revision check for R1.1 and subsequent
+	specification revisions.
+	* ID:412 - Check errors when setting a user password.
+	* ID:413 - Print new line chne character when setting user
+	privilege.
+	* ID:414 - ekanalyzer frushow fails to show 'Product Info'
+	correctly
+	* ID:417 - Fix some typos
+	* ID:418 - Fix Compiling under Mac OS X
+	* ID:419 - List dummy.h in Makefile.am, so it gets included in
+	a release tarball
+	* ID:421 - Fix memleak for sol output
+	* ID:423 - Don't assume internal use area is present in ekanalyzer
+	* ID:424 - Update dimm_spd.c with data from the latest JEDEC List
+	* ID:425 - Disable USB interface for OS X/darwin
+	* ID:426 - Fallback to run-time detection of PAGESIZE if
+	compile-time detection is not supported
+	* ID:426 - Include sys/socket.h instead of asm/socket.h
+	* ID:426 - Include wchar.h instead of defining wchar_t ourselves
+	* ID:427 - Cleanup comment in ipmi_sdr_get_header()
+	* ID:427 - The first two bytes of dumped raw SDR data is wrong.
+	* ID:428 - Update IANA numbers / Product Name for IBM and ADLINK
+	* ID:430 - Change Nokia Siemens Networks to Nokia Solutions
+	and Networks
+	* ID:431 - Fix correct interpretation of led states
+	* ID:437 - sel: Fix "sel time set <time>"
+	* Make bootstrap script part of dist packages
+	* Remove #if 0 code aka not-compiled-in
+	* Remove trailing white-spaces in lib/log.c
+	* git-ignore autoconf-generated files
+
+version 1.8.16 2015-11-22
+	* Add _ipmi_get_channel_access() and _ipmi_get_channel_info()
+	* Add _ipmi_get_user_access() and _ipmi_set_user_access()
+	* Add _ipmi_get_user_name()
+	* Add _ipmi_set_channel_access() function
+	* Add _ipmi_set_user_password() function
+	* Add limits check in get_cmdline_macaddr()
+	* Change expression in ipmi_pef_get_info() in order to silence Coverity
+	* Change expression in ipmi_pef_list_policies() in order to silence Coverity
+	* Code cleanup in ipmi_user_main()
+	* Create ask_password() and re-use code
+	* Delete dead code from ipmi_sunoem_echo() - CID#1261338
+	* Don't output pidfile before parsing command line arguments
+	* Don't use tmp variable since it's not necessary in ipmi_user_test()
+	* Fix 'user help' output
+	* Fix Assign instead of compare in KfwumGetDeviceInfo() - CID#1149034
+	* Fix Identical code for different branches in ipmi_tsol_main() -
+	  CID#1261346
+	* Fix big parameter passed by value in ipmi_sel_oem_match() - CID#1261347
+	* Fix dead code in ipmi_firewall_reset() - CID#1261342
+	* Fix eval logic in ipmi_user_priv()
+	* Fix file descriptor leak in ipmi_exec_main() - CID#1149040
+	* Fix identical code for diff branches in DellOEM - CID#1261326
+	* Fix memory leak in get_supermicro_evt_desc()
+	* Fix memory leak in ipmi_ek_display_board_info_area() - CID#1149051
+	* Fix missing return in ipmi_kontronoem_main() - CID#1261317
+	* Fix of previous commit - memset() expects pointer
+	* Fix out-of-bound-reads in get_supermicro_evt_desc()
+	* Fix resource leak in fru_area_print_board() - CDI#1149048
+	* Fix resource leak in fru_area_print_chassis() - CID#1149047
+	* Fix resource leak in fru_area_print_product() - CID#1149046
+	* Fix resource leak in ipmi_kontron_set_serial_number() - CID#1149041
+	* Fix typo vlan->VLAN in ipmi_lan_set_vlan_id() and
+	  ipmi_lan_set_vlan_priority()
+	* Fix uninitialized struct in ipmi_fru_upg_ekeying() - CID#1149065
+	* Fix user input validation in Channel and User sub-commands
+	* Fix wrong size argument in ipmi_sdr_list_cache_fromfile() - CID#1149056
+	* Fix/remove pointer cast in _ipmi_set_user_access()
+	* Hook functions in ipmi_user to _ipmi_set_user_password()
+	* Hook ipmi_get_channel_info() to _ipmi_get_*()
+	* Hook ipmi_get_channel_medium() to new _ipmi_get_*() functions
+	* Hook ipmi_lan_set_password() to _ipmi_set_user_password()
+	* Hook ipmi_print_user_list() and friends to _ipmi_* functions
+	* Hook ipmi_set_alert_enable() to _ipmi_*()
+	* Hook ipmi_set_user_access() to _ipmi_set_user_access()
+	* Hook ipmi_user_priv() to _ipmi_set_user_access()
+	* ID:307 - Intel I82751 super pass through mode fixup
+	* ID:355 - Fix compiler warnings for Dummy Interface
+	* ID:380 - raw commands override retry and timeout values
+	* ID:319 - Interface safe re-open
+	* ID:320 - Add VITA 46.11 support
+	* ID:333 - Set read timeout to 15s in OpenIPMI interface
+	* ID:336 - ipmitool does not fall back to IPv4 for IPMI v2 / RMCP+ sessions
+	* ID:343 - Print actual sensor thresholds in 'sensors' comand
+	* ID:343 - Remove AC_FUNC_MALLOC
+	* ID:344 - Fix HPM.2 long message support
+	* ID:345 - Do not do several close session retries when catching SIGINT
+	* ID:346 - lib/ipmi_sdradd.c ipmi_sdr_read_record has a file descriptor leak
+	* ID:347 - Incorrect reserved channel number
+	* ID:348 - Add support for the "System Firmware Version"
+	* ID:349 - user set password - add option to choose 16/20 byte password
+	* ID:354 - Replace obsolete u_int with uint32_t in dimm_spd.c
+	* ID:354 - Replace obsolete u_int[0-9]+_t with standardized types in Free
+	  iface
+	* ID:354 - forcefully switch to C99 and more strict CFLAGS
+	* ID:354 - replace/drop caddr_t in IMB
+	* ID:354 - struct member h_addr has been replaced
+	* ID:354 - uint8_t >= 0 is always true, don't test it
+	* ID:355 - Fix Enumeration value not handled in ipmi_get_event_desc()
+	* ID:355 - Fix ``ISO C forbids omitting the middle term of a ?: expression''
+	* ID:355 - Fix ``obsolete use of designated initializer with �:�'' warning
+	* ID:355 - Fix comparison of unsigned expression
+	* ID:355 - Fix compiler warnings
+	* ID:355 - Fix compiler warnings in dimm_spd.c
+	* ID:355 - Fix couple compiler warnings in ipmi_lanp.h
+	* ID:355 - Fix formatting warning in get_cmdline_ipaddr()
+	* ID:355 - Fix zero-length format string warning in
+	  get_supermicro_evt_desc()
+	* ID:355 - Remove defined but unused variable in _set_command_enables()
+	* ID:355 - remove unused variables from ipmi_dcmi.c
+	* ID:357 - out-of-bound access in DDR4 code ID:356 -  DIMM4 Die Count is
+	  unreachable
+	* ID:357 - out-of-bound access in DDR4 code
+	* ID:358 - check data length in else branch of ipmi_spd_print()
+	* ID:361 - Add a OEM IANA information
+	* ID:363 - Node Manager feature patch.
+	* ID:363 - fix Coverity issues in NM implementation
+	* ID:364 - Fix for serial-basic interface bridging
+	* ID:365 - Fix for ipmitool crash when using serial-terminal interface
+	* ID:366 - Properly clean LAN and LAN+ interfaces on close
+	* ID:367 - Fix building of non-bridged LAN interface commands
+	* ID:368 - Fix handling of bridging-related parameters
+	* ID:369 - Fix lanplus interface bridging and response matching
+	* ID:370 - add anonymous union support in CFLAGS for older gcc
+	* ID:371 - add ericsson oem
+	* ID:373 - Fix compilation of IMB on Windows
+	* ID:374 - Check/set LED Duration correctly
+	* ID:376 - Add means to configure "Bad Password Threshold"
+	* ID:381 - Script to log installation status as SEL events
+	* ID:382 - Fix memcpy() params in HpmFwupgActionUploadFirmware()
+	* ID:383 - Fix compile-time error in src/plugins/lan/lan.c
+	* ID:384 - Fix compilation under cygwin64
+	* ID:388 - Fix Error message always printed if BMC does not support VITA
+	* ID:388 - Handle ccode 0xCC as well in VITA discovery
+	* ID:388 - Turn all messages into LOG_INFO in VITA discovery
+	* ID:389 - Add on of Advantech IANA number
+	* ID:390 - Support for new Communication Interface (USB Medium)
+	* ID:391 - changing data_len from 17 to 16 according to ipmi spec 22.29,
+	  first byte is completion code
+	* ID:392 - _ipmi_get_user_name() work-around for some BMCs
+	* ID:393 - ipmitool man page addition for Node Manager support.
+	* ID:394 - close fp if isn't NULL and set it NULL afterwards in USB plugin
+	* ID:394 - plugins/usb: Fix probe for SCSI devices
+	* ID:395 - Fix fru string without resizing it
+	* ID:396 - Fixed invalid length check in picmg led cap command.
+	* ID:397 - Fixed picmg policy set command.
+	* ID:398 - Fixed channel setaccess command.
+	* ID:399 - Fixed channel getciphers command.
+	* ID:401 - Fixed 30 second delay when activating SOL on 'dumb' Intel MACs.
+	* ID:402 - Misguiding error print-out when using some 'lan' commands.
+	* Init user_access_t struct in ipmi_user_priv()
+	* Make user User Privilege Limit is within range
+	* Node Manager Feature, correct 1268194 missing break.
+	* Output pidfile only in verbose mode
+	* Print error message to STDERR in ipmi_channel.c
+	* Re-work 'channel getaccess' and 'channel setaccess'
+	* Re-work ccode eval in ipmi_get_channel_medium()
+	* Remove commented-out code in ipmi_picmg_clk_set() - CID#1261339
+	* Remove dead code - rsp can't be NULL at this point - CID#1149005
+	* Remove dead code in fru_area_print_board() - CID#1149001
+	* Remove dead code in fru_area_print_chassis() - CID#1149000
+	* Remove dead code in fru_area_print_product() - CID#1148999
+	* Remove dead(duplicate) code from ipmi_sol_main() - CID#1148996
+	* Remove get_channel_access_rsp and get_channel_info_rsp structs
+	* Remove ipmi_user_set_password()
+	* Remove length checks in get_supermicro_evt_desc()
+	* Remove redundant user-input conversion from ipmi_sel_delete()
+	* Remove trailing white-spaces in ipmi_user.c
+	* Remove trailing white-spaces in ipmi_user.c
+	* Remove trailing white-spaces in src/plugins/dummy/dummy.c
+	* Remove unused variable from ipmi_get_channel_cipher_suites()
+	* Replace deprecated bzero() with memset()
+	* Replace s6_addr16 with s6_addr since Mac OS X does not have it
+	* Rewrite ipmi_set_channel_access()
+	* Split ipmi_user_main() into smaller functions
+	* ipmi_print_user_summary() to utilize _ipmi_get_user_access()
+	* ipmitool delloem: ipmitool delloem extension always return success - fix
+	  it
+
+version 1.8.15 2014-11-24
+	* ID: 340 - ipmitool sol session improperly closes on packet retry
+	* ID: 277 - support for hostnames longer than 64 chars
+	* ID: 313 - ipmitool doesn't support hostname long than 64 symbols
+	* ID: 277 - Minor issue with ipmi_intf_session_set_hostname()
+	* ID: 247 - 'sensor thresh' help output is wrong
+	* ID: 324 - conflicting declaration write_fru_area()
+	* ID: 337 - Add support for 13G Dell PowerEdge
+	* ID: 325 - DDR4 DIMM Decoding Logic
+	* ID: 328 - HPM.2 fixes
+	* ID: 329 - hpm.1 upgrade fixes
+	* ID: 103 - picmg discover messages should be DEBUG, not INFO
+	* ID: 331 - Passwords provided in file (-f option) truncated on space
+	* ID: 318 - ipmi_tsol.c: fix buffer overflow
+	* ID: 306 - "fru print" command prints the FRU #0 twice
+	* ID: 305 - HPM.1 deferred activation support fixup
+	* ID: 317 - ipmi_fwum.c: fix typo
+	* ID: 315 - buildsystem: configure.in is deprecated
+	* ID: 316 - Directory debian is outdated
+	* ID: 103 - 'lib/ipmi_ekanalyzer.c' needs a re-work
+	* ID: 46 - SEL OEM record corner case
+
+version 1.8.14 2014-05-05
+	* ID: 299 - openipmi plugin writes zero to wrong byte
+	* ID: 301 - Add OS/Hypervisor installation status events
+	* ID: 298 - fix LANplus retry
+	* ID: 295 - inform user if SOL session disconnected
+	* ID: 297 - don't print-out SEL entry if ID not present
+	* ID: 296 - Fix PSD size decoding
+	* ID: 293 - Use of uninitialized variable in ipmi_main()
+	* ID: 278 - Error in sol looptest
+	* ID: 290 - ipmi_sol.c needs a clean-up
+	* ID: 85 - Supermicro memory ECC error display
+	* ID: 290 - ipmi_sol.c needs a clean-up
+	* ID: 286 - Open session retries hit assert in ipmi_lanplus_send_payload
+	* ID: 285 - Fix SEGV in ipmi_lanplus_open_session
+	* ID: 284 - Fix SEGV in ipmi_main
+	* ID: 283 - ipmi_intf_socket_connect fails with IPv4 hosts
+	* ID: 46 -  ipmi_fwum needs some re-work
+	* ID: 50 - ipmi_hpmfwupg needs a clean up
+	* ID: 279 - ipmitool sdr list broken
+	* ID: 44 - dummy interface support - fake-ipmistack project
+	* ID: 48 - Remove hard-coded FRU inventory access length restriction
+	* ID: 276 - HPM.1 upgrade combined patch
+	* ID: 90 - Add options to chassis bootparam set bootflag
+	* ID: 292 -Properly handle plugin non-zero target adddress with -t
+	* Numerous Fixes based on running Coverity
+	* Use TIOCFLUSH if TCFLSH is missing to get the serial plugin building on
+	  Hurd.
+	* Disable imb and open plugins by default on Hurd.  The platform lack
+	  the required kernel support.
+	* Change serial plugin to only try to disable the IUCLC serial line flag on
+	  platforms supporting it.  Fixes build problem on Hurd and FreeBSD.
+	* PA: 83 -  Revised IPv6 patch
+	* FR: 24 -  Exchange OS Name Hostname BMC URL during startup
+	* ID: 304 - Incorect byteswap in SOL maximum payload
+	* ID: 303 - Fix build error in HPM.2 code
+	* ID: 300 - new sunoem functionality
+	* ID: 144 - Fix 'dcmi power set_limit action <value>'
+	* ID: 302 - HPM.2 long message support
+	* ID: 309 - Add new SEL entries for ipmi 2.0 rev 1.1
+	* ID: 280 - man page cleanup
+	* ID: 311 - man page update for new sunoem commands
+
+version 1.8.13 2013-09-09
+	* ID: 3611905 - Direct Serial Basic/Terminal Mode Interface drivers
+	* ID: 3577766 - configure's knobs and switches don't work
+	* ID: 3611253 - do not override OS-default values for interfaces
+	* ID: 65 - Fixes for configure.in for cross compilation
+	* ID: 3571153 - OpenIPMI/ipmievd fails to compile on Solaris
+	* numerous ipmitool man page updates
+	* ID: 3611226 - Bridging support for PICMG Platforms
+	* Add support for getsysinfo/setsysinfo commands to ipmi mc
+	* Cleanup Dell OEM code to use new sysinfo interface
+	* ID: 93 - str-to-int conversion is weak
+	* ID: 3582307 - ipmi_fru - ipmi_fru_main() return codes
+	* ID: 3582310 - ipmi_fru - ipmi_fru_main() - misuse of printf()
+	* ID: 3576213 - ipmi_fru - unused variable
+	* ID: 3578276 - ipmi_fru - free() on freed memory possible
+	* ID: 3578275 - ipmi_fru - memory leaks
+	* ID: 3528271 - ipmi_fru - possible *flow via FRUID
+	* ID: 3578277 - ipmi_fru - possible NULL pointer
+	* ID: 3612372 - Recognize Broadcom IANA number and BCM5725 product
+	* ID: 3608758 - add IPMI_NETFN_OEM
+	* ID: 143 - Reversed 'channel authcap' capabilities
+		Fixes reversed IPMIv1.5/2.0 'channel authcap' capabilities
+	* ID: 3587318 - "dcmi discover" is not DCMI 1.5 compatible
+	* ID: 3608757 - ipmi_fru - various fixes
+	* ID: 3598203 - 'mc getsysinfo|setsysinfo' needs a bit of re-work
+	* ID: 3597782 - ipmi_mc - sysinfo_param() has two consecutive returns
+	* ID: 3597781 - 'mc getsysinfo|setsysinfo' help has typos
+	* ID: 3608763 - ipmi_sdr - code cleanup & output display cleanup
+	* ID: 3610286 - ipmi_sdr - ipmi_sdr_print_type - incorrect eval
+	* ID: 3600930 - ipmi_sdr - code cleanup
+	* ID: 3602439 - ipmi_sdr - memory leaks
+	* ID: 3595199 - ipmi_sdr - Add support for 'ipmitool sdr <list|elist> help'
+	* ID: 3592773 - 'ipmitool sdr info'; prints incorrect info
+	* ID: 3592770 - 'ipmitool sdr list|elist INV_INPUT' return code
+	* ID: 3577159 - ipmi_sdr - uint32_t cast to uint8_t and back
+	* ID: 3528368 - ipmi_sdr - possible int *flow
+	* ID: 226 - ipmi_sdradd - typo
+	* ID: 258 - ipmi_sdradd - error printed on STDOUT
+	* Fixed ipmievd start under systemd.
+	* ID: 3608760 - Add bswap.h to ipmi_chassis.c and ipmi_pef.c
+	* ID: 3564701 - ipmitool 1.8.12 doesn't build on big endian architectures
+	* ID: 3600907 - defined value for "Chassis may not support Force Identify"
+	* ID: 256 - ipmitool could crash when IPv6 address is returned
+	* ID: 211 - 'lib/ipmi_dcmi.c' - typo & error printed on STDOUT
+	* ID: 3612237 - If DCMI command fails, incorrect completion code is printed
+	* ID: 3608149 - ipmitool - set pointer to NULL after free()
+	* ID: 3603419 - DCMI - waste of resources
+	* ID: 3600908 - DMCI - crash in ipmi_print_sensor_info(), NULL ref
+	* ID: 3609985 - delloem : Wrong MAC returned when flex addressing is enabled
+	* ID: 113 - delloem exec file won't handle more than one command
+	* ID: 28 - delloem - clean up the code
+	* ID: 3608261 - delloem - code formatting
+	* ID: 3528247 - delloem - fix possible *int flows
+	* ID: 3600910 - delloem - code cleanup
+	* ID: 3576211 - delloem - unused variable
+	* ID: 3578022 - delloem - fix typos
+	* ID: 263 - ipmi_ek* - cleanup
+	* ID: 3308765 - ipmi_ek* - cleanup
+	* ID: 3586228 - ipmi_ek* - ipmi_ekanalyzer_usage() rework
+	* ID: 3528388 - ipmi_ek* - a typo in error message
+	* ID: 3576212 - ipmi_event - better rsp handling
+	* ID: 3607393 - ipmi_event - redundant '\n' in error message
+	* ID: 153 - ipmi_firewall - printf() used instead of lprintf()
+	* ID: 3608003 - ipmi_fru - atol() should be replaced with str2*()
+	* ID: 3600911 - ipmi_fru - fix multiple increments in args to printf
+	* ID: 3600914 - no more crash on no response. allow more send/recv loops of waiting.
+	* ID: 70 - Fixes and updates for ipmitool hpm
+	* ID: 3528308 - ipmi_hpmfwupg - possible int *flow
+	* ID: 3608762 - ipmi_hpmfwup - Fixed help messages for hpm command
+	* ID: 3607981 - ipmi_lanp - replace atoi() calls
+	* ID: 3607320 - ipmi_lanp - possible NULL reference
+	* ID: 3600926 - ipmi_lanp - code cleanup
+	* ID: 3613575 - memory leak - ipmi_password_file_read()
+	* ID: 3522740 - reading password from file is limited to 16byte passwords
+	* ID: 3613605 - ipmi_main - call free() on pointer to static data
+	* ID: 3608761 - ipmi_main - PICMG Get Device Locator was never run
+	* ID: 3577155 - ipmi_main' - memory leaks
+	* ID: 239 - typo in 'mc selftest', add details
+	* ID: 3597471 - ipmi_mc - needs a bit of re-work - rc, inv. options
+	* ID: 3597468 - ipmi_mc - print_mc_usage() prints to STDOUT
+	* ID: 3597469 - 'mc watchdog off' prints on STDERR, should be STDOUT
+	* ID: 3597470 - 'mc watchdog reset' prints on STDERR, should be STDOUT
+	* ID: 3611254 - OEM handle for Intel 82751 in SPT mode
+	* ID: 3600927 - change eval order of input param in ipmi_oem_setup()
+	* ID: 3600928 - ipmi_pef - code cleanup
+	* ID: 3592732 - ipmi_picmg.c - printf() misuse
+	* ID: 3528310 - ipmi_picmg.c - NULL reference
+	* ID: 3528347 - ipmi_raw.c - possible int *flow
+	* ID: 3587913 - Command % ipmitool raw help; returns 1
+	* Added code to support sensors on other luns (On behalf of Kontron Germany)
+	* ID: 3611912 - Add missing newlines when cvs output is specified
+	* ID: 244 - ipmi_sel - "0.0" displayed for unspecified threshold values
+	* ID: 3612371 - Typo in impi_sel debug output
+	* ID: 3016359 - ipmi_sel - Get SEL Alloc Information is incorrect
+	* ID: 3568976 - 'sel set time' behaviour is inconsistent
+	* ID: 3528371 - ipmi_sensor - possible int *flow
+	* ID: 3601265 - 'ipmitool sensor get' leaks memory
+	* ID: 3601106 - 'ipmitool sensor get NACname' output incorrect/inconsistent
+	* ID: 3608007 - ipmi_session - typo in error message
+	* ID: 101 - ipmi_sol - possible int *flow
+	* ID: 3600933 - ipmi_sol - use of deprecated bzero()
+	* ID: 3609472 - ipmi_sol - Add the instance to the SOL commands
+	* ID: 3588726 - 'ipmitool sol payload status ...;'segfaults on no rsp
+	* ID: 3522731 - ipmi_sol - ipmi_get_sol_info() returns always 0
+	* ID: 3613042 - add missing Entity IDs
+	* ID: 3611306 - ipmi_tsol - fix always fail in case of error
+	* ID: 259 - ipmi_user - memory leak
+	* ID: 260 - ipmi_user - replace atoi() call
+	* ID: 2871903 - ipmitool user priv incorrectly sets Link Auth
+	* ID: 3600960 - check the copy of password exists
+	* ID: 3609473 - Add assertion/deassertion to threshold events
+	* ID: 104 - ipmishell - possible int *flow
+	* ID: 262 - 'set' segfaults when no IPMI inf present
+	* ID: 257 ipmitool exec segfaults if invalid input given
+	* ID: 254 - Fix retry of authentication capabilities retrieval
+	* ID: 3611303 - lan - error check is missing braces
+	* ID: 253 - Fix lanplus retransmission
+	* ID: 212 - 'lib/ipmi_dcmi.c' - possible int *flow
+	* ID: 264 - incorrect array index in get_lan_param_select()
+	* ID: 269 - Fixes for configure.in for cross compilation
+	* ID: 267 - Corruption in "lan alert print" output
+	* ID: 41 - ipmi_sel_interpret() - clean up formatting, indentation
+	* ID: 242 - Incorrect DCMI Power Reading "IPMI timestamp" interpretation
+	* ID: 229 - 'lib/ipmi_ekanalyzer.c' - a typo ``Too few argument!''
+	* ID: 266 - file descriptor leak in ipmi_fwum and ipmi_ekanalyzer
+	* ID: 99 - 'lib/ipmi_sel.c' - possible int *flow
+	* ID: 222 - 'lib/ipmi_sdr.c' - a typo 'Not Reading' -> 'No Reading'
+	* ID: 35 - Script to setup redirection of SNMP to/from BMC
+	* ID: 273 - Reduce SOL Input buffer size by SOL header size
+
+
+version 1.8.12 released 2012-08-09
+	* Added IPMB dual bridge support (no need for driver support)
+	* Enable compiler warnings and resolve all compiler warning so that
+		ipmitool compiles and links with no warning or error messages
+	* add ipmishell line to configure
+	* fail configure when no curses or readline is found
+	* support sensor bridging in free interface
+	* applied fix for issue #2865160 (AIX build)
+	* Document the ipmitool dcmi commands in the ipmitool man page
+	* Document that some commands are blocked by OpenIPMI.   ID 2962306
+	* Document the -N and -R options per tracker ID 3489643
+	* fix manpage misdocumentation on cipher suite privilige configuration
+	* Add build support for Dell OEM commands
+	* Add new Dell OEM commands and update man page
+	* added hpm and fwum in man page
+	* man page update for fwum and hpm commands
+	* Added documentation for 'ime' operating mode, used to update Intel ME.
+	* add new -Y option to prompt user to enter kgkey
+	* Add DCMI module (Data Center Management Interface)
+	* fixed oem/iana data type to allow 24 bits definition
+	* Fixed AMC point-to-point record parsing in FRU
+	* Fixed detection of packing support in GCC
+	* Added packing support detection magic on all packed structures
+		in project
+	* Dell specific mac sub command is updated to support the latest 12G
+		Dell servers.  Support for virtual mac is also implemented.
+	* Use consistent netfn/cmd for getsysinfo command
+	* Add Dell OEM network commands
+	* Resolve incorect Board Mfg Data due to incorrect date constant
+	* Update ipmi_fru.h to SMBIOS spec 2.6.1 - ID 2916398
+	* Support for analog readings in discrete sensors on HP platforms.
+	* Change device id mask (IPM_DEV_DEVICE_ID_REV_MASK) 0x07 for 0x0F.
+		As per in IPMI spec V2:
+	* Added PICMG clock e-keying and bused resource control identifiers
+	* Added PICMG major version (ATCA/AMC/uTCA) identifiers
+	* Correct Threshold/Discrete Sensor Display - Patch Tracker ID 3508759
+	* Sensor units now handle percentage units - ID 3014014
+	* Fixes ID 3421347 Sensor list command should use channel field from SDR
+	* Added packing directive for ARM cross compile with GCC 3.4.5,
+		otherwise the sdr structures gets padded and the pointer cast
+		result in incorrect alignement
+	* Added 'sdr fill sensors nosats' support to speed up SDR discovery
+	* Added SDR name display during discovery (with -v)
+	* Added support for sensor types - Processor related sensor
+		type 0x07, system incharectorization 0x20, Memory sensor type.
+	* Give more description for SEL which is generated for Uncorrectable
+		ECC and errors with respect to each Memory Bank,Card or DIMM.
+		The Sensor type supporting this are 0x0C and 0x10.
+	* Add more details about Version Change event (source of
+		firmware update)
+	* enhanced PICMG fru control
+	* Integrated Andy Wray's DDR3 SPD parser patch
+	* Adds function str2uint() to convert from string to uint32_t with
+		checks for valid input.
+	* Fix possible buffer overflow in buf2str()
+	* Fixes ID 3485004 - misuse of strtol()
+	* Replaces calls to strtol() with str2uchar() calls and adds error
+		messages if invalid input is given.
+	* Don't overwite the iflags bits prior to setting the boot parameters.
+		This fixes ipmitool so that
+		chassis bootdev bios clear-cmos=yes
+		will correctly clear the bios cmos.
+	* Clarify DCMI get limit activation (add if activate or not).
+	* Bug fixes for delloem lan command. This includes the support for 12G
+		Dell license and 12G LAN Specific command.
+	* delloem commands should not be executed before parsing command line.
+	* Fix stack overflow in delloem setled
+	* Fix delloem powermonitor on big-endian platforms.
+	* ipmitool delloem powermonitor command should convert data from
+		network-format to the native one, otherwise it shows garbage
+		on ppc/ppc64 platform.
+	* Add ipmi_getsysinfo command
+	* Add support for drive backplane SetLED functionality
+	* Fix for Platform Event Message incorrect Generator ID
+	* Fix fru print so that it will display FRU info from satellite
+		controllers.
+	* Add support for AMC type 17h record.
+	* Fix in fru edit.   It is now possible to edit field 0 of sections
+	* New FRU get OEM record command
+	* fixed segfault for fru edit when "field id" is not supported and
+		added user feedback for string substitution(success or failure)
+	* Improvement to hpm upgrade during activation. This resolves issue
+		where activation seems to have failed because ipmitool received
+		an unsupported completion code.
+	* hpm Fixes for multi-platform support.
+	* hpm Fix for timeouts during firmware rollback. If completion code
+		is C3, wait till timeout has expired before reporting it.
+	* hpm During manual rollback, code now gets target capabilities
+		instead of using a default timeout of 60 seconds.
+	* Added firmware auxilliary bytes to hpm outputs
+	* hpm Add support for BIG Buffer (Use when -z option is used)
+	* Fix the case where ipmitool loses the iol connection during the upload
+		block process.  Once IPMITool was successfully sent the first
+		byte, IPMITool will not resize the block size.
+	* Fix the problem when we try to upgrade specific component and the
+		component is already updated,
+	* updated HPM firmware agent to version 1.04
+	* Fix exit code to return zero on '-o list' or '-o help' option
+	* limit length of user name and password that can be supplied by user.
+		Password is limited to 16 bytes, resp. 20 bytes, for LAN, resp.
+		LAN+, interface. User name is limited to 16 bytes, no interface
+		limitations.  ID 3184687, ID 3001519
+	* Add retry / timeout options for LAN
+	* Changed default cipher suite to 1 instead of 3 for iol20
+	* added fix for tracker ID 2849300 "Incorrect Firmware Revision"
+	* avoid reopening the interface when already opened
+	* Remove message for unsupported PEF capabilities that return valid
+		CC (80h)
+	* Added OEM byte (47) to verbose output
+	* Add option to provide a list when filling sdr repository
+	* SDR discovery speedups
+	* Added support for Dell specific sensors
+	* Fix segmentation fault on unrecognize OEM events.
+	* changed SEL timestamp formatting for 'preinit' SEL entries, allowing
+		the number of seconds to be displayed.
+	* Added sensor raw data in verbose mode. Useful for OEM sensor type.
+	* Add sensor hysteresis (positive & negative) to the following command
+	    ipmitool sensor -v
+	* Fixes bug ID 3484936 - missing user input validation
+	* Add missing RMCP+ auth type strings
+	* Add new Kontron Product in ipmi_strings for product ID.  Kontron
+		KTC5520/EATX Server Motherboard with integrated iBMC/KVM/VM
+		added identification support for Kontron AT8050 ATCA board
+	* Constrain setting of the username to no greater than 16 characters
+		per the IPMI specification.   ID 3001519
+	* Constrain User ID between 1 and 63.  ID 3519225
+	* Fixes ID 3485340 - user input not handled in 'lib/ipmi_user.c'
+	* Fixes ignorance of existing daemon PID file which results in PID being
+		overwritten.  Adds proper umask() before writing PID file.
+	* applied fix for ID 2865111 (AIX build)
+	* Fix a proplem when using bridged IPMI commands on the lanplus
+		interface (-I lanplus with -b -t or -m switches)  resulting in
+		"Close Session command failure".
+	* Add fix with usage of CFh (duplicate request).  Usefull for
+		slow commands
+	* Fix issue with sequence number. (Speed up transfer)
+
+version 1.8.11 released 2009-02-25
+	* Fix new GCC compilation issues in regards to Packing
+	* Fix Tracker bug #1642710 - ipmi_kcs_drv being loaded/unloaded
+		for 2.4 kernel instead of ipmi_si_drv driver module
+	* New -y option added to allow specification of kg keys with
+		non-printable characters
+	* New -K option added to allow kgkey settings via environmental
+		variable IPMI_KGKEY
+	* Generic device support added for EEPROM with SDR Type 10h (gendev)
+	* Fix to lan-bridging for a double-bridging crash and to fix
+		an issue with bridging multiple concurrent requests and
+		erroneous handling of raw Send Message
+	* Lanplus fix for commands like 'sensor list' without the -t option
+		causing wrong double bridged requests of a sensor is located
+		on another satellite controller
+	* Fix lan and lanplus request list entry removal bugs
+	* Fix non-working issue when trying to send a bridge message with
+		Cipher 3
+	* Change bridge message handling to reuse command ipmi_lan_poll_recv
+	* Added PICMG 2.0 and 2.3 support
+	* Fix PICMG (ATCA) extension verification and reversal of BCD encoded
+		values for "major" and "minor" fields
+	* Add IANA support for Pigeon Point
+	* Add OEM SW/FW Record identification
+	* Fix to include I2C and LUN addresses so sensors are correctly managed
+	* Patch ID 1990560 to get readings from non-linear analog sensors
+	* Add support for SOL payload status command
+	* SOL set parameter range checking added
+	* Fixed SOL activate options usage 
+	* Fixed crashes when parsing 'sol payload' and 'tsol' cmds (#216967)
+	* Added retries to SOL keepalive
+	* Fixed wrong mask values for Front Panel disable/enable status
+	* Add support to access fru internal use area
+	* Add support for new PICMG 3.0 R3.0 (March 24, 2008) to allow
+		blocks of data within the FRU storage area to be write
+		protected.
+	* Fix node reporting in GUID; Tracker bug #2339675
+	* Fix watchdog use/action print strings
+	* Fix endian bug in SDR add from file; Tracker bug #2075258
+	* Fix crash when dumping SDRs in a file and there's an error
+		getting an SDR; improve algorithm for optimal packet size
+	* Fix occasional SDR dump segfault; #1793076
+	* Allow ipmitool sel delete to accept hex list entry numbers
+	* Fix SEL total space reporting.
+	* Fix for garbage sensor threshold values reported when none 
+		returned.  Tracker Bug #863748
+	* ipmievd change to Monitor %used in SEL buffer and log warnings when
+		the buffer is 80% and 100% full
+
+version 1.8.10 released 2008-08-08
+	* Added support for BULL IANA number.
+	* Fixed contrib build so the oem_ibm_sel_map file gets included in 
+		rpm builds again.
+	* Added support for Debian packages to be built from CVS
+	* Fix for sdr and sel timestamp reporting issues
+	* Fix for discrete sensor state print routines to address state
+		bits 8-14
+	* Change ipmi_chassis_status() to non-static so it can be used
+		externally
+	* Added retries to SOL keepalive
+	* Fix to stop sensor list command from reporting a failure due 
+		to missing sensor
+	* Fix bug in sdr free space reporting
+	* Add support for IANA number to vendor name conversion for many
+		vendors 
+	* Fix segfault bug in lan set command
+	* Fix bug in population of raw i2c wdata buffer
+	* Fix bug in ipmb sensor reading
+	* Fix misspellings, typos, incorrect strncmp lengths, white space
+	* Update/fix printed help and usages for many commands
+	* Add and update support for all commands in ipmitool man page
+	* Fix for lanplus session re-open when the target becomes unavailable
+		following a fw upgrade activation
+	* Add support for watchdog timer shutoff, reset, and get info
+	* Add support for more ibm systems in oem_ibm_sel_map
+	* Add more JEDEC support info for DIMMs; decrease request size
+		for DIMM FRU info to 16 bytes at a time to allow more
+		DIMM FRUs to respond.
+	* Fix to change hpmfwupg to version 1.02; fix to reduce hpmfwupg 
+		buffer length more aggressively when no response from iol
+	* Fix HPM firmware activation via IOL; fake a timeout after IOL
+		session re-open to force get upgrade status retry;
+		Added retries on 0xD3 completion code
+	* Add support for freeipmi 0.6.0; adjust autoconf for changes
+	* Fix for oemval2str size
+	* Add support for product name resolution in mc info
+	* Fix FRU display format
+	* Added PICMG ekeying analyzer module support (ekanalyzer); 
+		display point to point physical connectivity and power 
+		supply information between carriers and AMC modules; 
+		display matched results of ekeying match between an 
+		on-carrier device and AMC module or between 2 AMC modules 
+	* Fix AMC GUID display support
+	* Improved amcportstate operations
+	* Added resolution for new sensor types
+	* Fix segfault in SOL
+	* Fix bug that caused infinite loop on BMCs with empty SDRs
+	* Fix to move out Kontron OEM sensor resolution for other OEMs
+		which could lead to bad event descriptions
+	* Add new FRU edit mode thereby allowing serial numbers, etc. to be
+		changed; improvements to OEM edit mode
+	* Added SPD support for parms: channel number, max read size
+	* Add SDR support for adding SDR records from a dumped file,
+		clearing SDR, adding partial SDR records
+	* Add updates and fixes to hpmfwupg: upload block size to 32 bytes 
+		for KCS, handle long response option, implement rollback 
+		override, garbage output fix
+	* Add double bridge lan support , fix bridging issue
+	* Add HPM support to pre-check which components need to be skipped
+	* Fix autodetection of maximum packet size when using IPMB
+	* Add new Kontron OEM command to set the BIOS boot option sequence
+	* Add support for dual-bridge/ dual send message
+	* Add auto-detect for local IPMB address using PICMG 2.X extension
+	* Add support for HPM.1 1.0 specification compliance
+	* Fix for improper lan/lanplus addressing
+	* Added transit_channel and transit_addr to ipmi_intf struct
+	* Fix bad password assertion bug due to rakp2 HMAC not being checked
+		properly
+	* Added ability to interpret PPS shelf manager clia sel dump
+	* Corrected PICMG M7 state event definition macros
+	* Added FRU parsing enhancements
+	* Added "isol info", "isol set" and "isol activate" commands
+		to support Intel IPMI v1.5 SOL functionality. Removed
+		"isol setup" command.
+	* Fix bug in ipmi_lan_recv_packet() in lan and lanplus interfaces.
+	* Fix bug in "chassis poh" command.
+	* Fix HPM.1 upgrade to apply to only given component when instructed
+		to do so
+	* Added configure auto-detection if dual bridge extension
+		is supported by OpenIPMI
+
+version 1.8.9 released 2007-03-06
+	* Added initial AMC ekey query operation support
+	* Improvements to ekeying support (PICMG 3.x only)
+	* Added initial interactive edition support for multirec; added IANA
+		verification before interpreting PICMG records.
+	* Added edit support for AMC activation "Maximum Internal Current"
+	* Fix bug generating garbage on the screen when handling GetDeviceId
+		and sol traffic occurs
+	* Added ability to map OEM sensor types to OEM description string using 
+		IANA number; moved IANA number table
+	* Fix lan set access command to use value already saved within
+		parameters for PEF and authentication
+	* Fix bug in cmd ipmitool lan stats get 1
+	* Add support to allow ipmitool/ipmievd to target specific device
+		nodes on multi-BMC systems
+	* Add support for name+privilege lookup for lanplus sessions
+	* Fix time_t conversion bug for 64-bit OS
+	* Added prefix of hostname on sel ipmievd sessions
+	* Fixed FWUM Get Info
+	* Fix ipmievd fd closing bug
+	* Add set-in-progress flag support to chassis bootdev
+	* Added new chassis bootdev options
+	* Add sol payload enable/disable comman
+	* Fix SOL set errors when commit-write not supported
+	* Fix reset of session timeout for lanplus interface
+	* Fixed lan interface accessibility timeout handling
+	* Fix bug with Function Get Channel Cipher Suites command when 
+		more than 1 page used.
+	* Fix missing firmware firewall top-level command
+	* Fix bug in SOL keepalive functionality
+	* Fix SOLv2 NACK and retry handling for Intel ESB2 BMC
+	* Added ipmi_sel_get_oem_sensor* APIs
+	* Added HPM.1 support 
+	* Fix segfault when incorrect oem option supplied
+	* Fix bus problem with spd command
+	* Fix segfault in SOL when remote BMC does not return packet
+	* Adjust packet length for AMC.0 retricting IPMB packets to 32 bytes
+	* Added lan packet size reduction mechanism
+	* Fix bug with sendMessage of bad length with different target
+	* Fix for big endian (PPC) architecture
+	* NetBSD fixes
+	* Fix segfault and channel problem with user priv command
+	* Add support for bus/chan on i2c raw command
+	* Add freeipmi interface support
+	* Add remote spd printing
+	* Add better detection of linux/compiler.h to config
+	* Makefile changes to fix makedistcheck, etc. 
+
+version 1.8.8
+	* Fix segfaults in sensor data repository list
+	* Fix ipmievd to open interface before daemonizing
+	* Fix IPMIv1.5 authtype NONE to ignore supplied password
+	* Fix cipher suite display bug in lan print
+	* Fix typo in IPMIv2 SOL output when sending break
+	* Fix improper LUN handling with Tyan SOL
+	* Add LUN support to OpenIPMI interface
+	* Add support for Kontron OEM commands
+	* Update to Kontron Firmware Update command
+
+version 1.8.7
+	* Remove nuclear clause from license
+	* Add Sun OEM command for blades
+	* Increase argument size for raw commands in shell/exec
+	* Fix handling of LUNs for LAN interfaces
+	* Add IPMIv2 SOL loopback test
+	* Add support for IBM OEM SEL messages
+	* Disable file paranoia checks on read files by default
+	* 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
+	* Add support for IPMIv2 Firmware Firewall
+	* Fix gcc4 compile warnings
+	* Make ipmievd generate pidfile
+	* Add initscripts for ipmievd
+
+version 1.8.6
+	* Fix memory corruption when sending encrypted SOL traffic
+	* Add keepalive timer to IPMIv2 SOL sessions
+
+version 1.8.5
+	* Add support for settable SOL escape character with -e option
+	* Add support for Kg BMC key for IPMIv2 authentication with -k option
+	* Add support for Tyan IPMIv1.5 SOL with tsol command
+	* Add support for PICMG devices
+	* Add support for OEM SEL event parsing
+	* Add support for command bridging over lan and lanplus interfaces
+	* New 'chassis selftest' command
+	* Many bufxies and patches from contributors
+
+version 1.8.3
+	* Add support for 'sel readraw' and 'sel writeraw' commands.
+	* Add support for entering NetFn as a string for RAW commands.
+	* Add support for appending distro tag to integrated RPM builds.
+	* Fix LAN parameter printing to handle Invalid Data Field response
+	without errors.
+	* Add 5ms delay to IPMIv2 SOL retry packets
+	* IPMIv2 interface will now correctly set session privilege level
+	to requested level after session is opened.
+
+version 1.8.2 (released May 18 2005)
+	* Fix FRU reading for large (>255 bytes) areas.
+	* Overhaul to ipmievd to support SEL polling in addition to OpenIPMI.
+	* Fix LAN parameter segfault when no Ciphers supported by BMC.
+	* Fix IPMIv2 support on Intel v2 BMCs (use -o intelplus).
+	* Separate option parsing code from main ipmitool source file.
+	* Add raw I2C support with IPMI Master Read-Write command.
+	* Add support for new 'sdr elist' extended output format.
+	* Add support for listing sensors by type with 'sdr type' command.
+	* Add support for new 'sel elist' extended output format that
+	  cross-references events with sensors.
+	* Add support for sending dynamically generated platform events
+	  based on existing sensor information.
+	* New '-S' argument to read local SDR cache created with 'sdr dump'.
+	* Updated manpage for ipmitool and ipmievd.
+
+version 1.8.1
+	* ipmievd installs in /usr/sbin
+
+version 1.8.0
+	* Fix IPMIv2.0 issues
+	* Fix chassis boot parameter support
+	* Add support for linear sensors
+
+version 1.7.1
+	* Update bmc plugin to work with new Solaris bmc driver (new ioctl
+	  for interface detection and new STREAMS message-based interface)
+
+version 1.7.0
+	* Propogate errors correctly so exit status will be useful
+	* More consistent display of errors including completion code text
+	* Errors and debug is send to stderr now
+	* New "sel get" command that will print details about SEL entry
+	  and corresponding SDR records as well as FRUs via entity association
+	* Improved event generator, now supports reading events from text file
+	* New "-o oemtype" option for specifying OEM boards
+	  exsting types are "supermicro" and "intelwv2"
+	* New PEF subsystem from Tim Murphy at Dell
+	* New "bmc" plugin for Solaris 10 x86
+	* Many bugfixes and contributed patches
+
+version 1.6.2
+	* Support for Supermicro BMC OEM authentication method
+
+version 1.6.1
+	* Fix minor problem with LAN parameter setting
+
+version 1.6.0
+	* Add a README file
+	* Add Solaris x86 interface plugin
+	* Add support for building Solaris packages
+	* Fix segfault when doing "sel list" (from Matthew Braithwaite)
+	* Fix "chassis identify" on some BMCs (from ebrower@sourceforge)
+	* Add command "bmc info" and related output (from ebrower@sourceforge)
+	* Add support for IPMIv2 and Serial-over-LAN from Jeremy at Newisys
+	* Add support for building RPMs as non-root user
+	* Add new "shell" and "exec" commands
+	* Lots of other contributed patches
+
+version 1.5.9
+	* Add ability to get a particular sensor by name
+	* Add ability to set a particular sensor threshold
+	* Add support for displaying V2 channel authentication levels
+	* Add README for rrdtool scripts in contrib directory
+	* Improve lan interface retry handling
+	* Support prompting for password or reading from environment
+	* Move chaninfo command into channel subcommand
+	* Fix reservation ID handling when two sessions open to BMC
+	* Fix reading of large FRU data
+	* Add configure option for changing binary to ipmiadm for Solaris
+	* Fix compile problem on Solaris 8
+
+version 1.5.8
+	* Enable static compilation of interfaces
+	* Fix types to be 64-bit safe
+	* Fix compilation problems on Solaris
+	* Fix multiple big-endian problems for Solaris/SPARC
+	* Fix channel access to save settings to NVRAM
+	* Set channel privilege limit to ADMIN during "access on"
+	* Enable gratuitous ARP in bmcautoconf.sh
+	* Add support for Linux kernel panic messages in SEL output
+	* Add support for type 3 SDR records
+
+version 1.5.7
+	* Add IPMIv1.5 eratta fixes
+	* Additions to FRU printing and FRU multirecords
+	* Better handling of SDR printing
+	* Contrib scripts for creating rrdtool graphs
+
+version 1.5.6
+	* Fix SEL event decoding for generic events
+	* Handle empty SEL gracefully when doing "sel list"
+	* Fix sdr handling of sensors that do not return a reading
+	* Fix for CSV display of sensor readings/units from Fredrik �hrn
+
+version 1.5.5
+	* Add -U option for setting LAN username
+	* Fix -v usage for plugin interfaces
+
+version 1.5.4
+	* Put interface plugin API into library
+	* Fix ipmievd
+
+version 1.5.3
+	* Add -g option to work with grizzly bmc
+
+version 1.5.2
+	* Add support for setting gratuitous arp interval
+
+version 1.5.1
+	* Better SEL support
+	* Fix display bug in SDR list
+
+version 1.5.0
+	* More robust UDP packet handling
+	* Add Intel IMB driver support
+	* Use autoconf/automake/libtool
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..2099840
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..c809131
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,79 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+DOCDIR = $(datadir)/doc/$(PACKAGE)
+DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog
+
+EXTRA_DIST = $(DOCLIST) bootstrap
+
+AUTOMAKE_OPTIONS = dist-bzip2
+
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
+	mkinstalldirs config.h.in stamp-h.in \
+	$(distdir).tar.gz $(distdir).tar.bz2
+
+SUBDIRS = lib src include doc contrib control
+
+dist-hook:
+	cp control/ipmitool.spec $(distdir)
+
+install-data-local:
+	mkdir -p $(DESTDIR)$(DOCDIR)
+	$(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR)
+
+uninstall-local:
+	-rm -rf $(DESTDIR)$(DOCDIR)
+
+.PHONY: pkg
+pkg: PKG := ipmitool-@VERSION@-@OS@-@ARCH@
+pkg: control/pkginfo
+	$(STRIP) src/ipmitool
+	$(STRIP) src/ipmitool
+	(cd control ; pkgmk -o -d /tmp)
+	pkgtrans -s /tmp $(PKG) ipmitool
+	gzip -c /tmp/$(PKG) > $(PKG).gz
+	-rm -rf /tmp/ipmitool /tmp/$(PKG)
+
+BUILDDIR = ${shell cd $(top_builddir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
+SRCDIR   = ${shell cd $(top_srcdir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
+RPMDIR   = $(BUILDDIR)/rpmbuild
+
+.PHONY: rpm
+rpm: control/ipmitool.spec dist
+	mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp}
+	cp control/ipmitool.spec $(RPMDIR)/SPECS
+	BUILDDIR=$(RPMDIR) CONFIGDIR=$(BUILDDIR)/control \
+	  @RPMBUILD@ -ba --rcfile $(SRCDIR)/control/rpmrc \
+	  $(RPMDIR)/SPECS/ipmitool.spec
+
+.PHONY: clean-rpm
+clean-rpm:
+	-rm -rf $(RPMDIR)
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..8074d84
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,906 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+	README compile config.guess config.sub depcomp install-sh \
+	missing ltmain.sh
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+DIST_TARGETS = dist-bzip2 dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DOCDIR = $(datadir)/doc/$(PACKAGE)
+DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog
+EXTRA_DIST = $(DOCLIST) bootstrap
+AUTOMAKE_OPTIONS = dist-bzip2
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
+	config.guess config.sub depcomp install-sh ltmain.sh missing \
+	mkinstalldirs config.h.in stamp-h.in \
+	$(distdir).tar.gz $(distdir).tar.bz2
+
+SUBDIRS = lib src include doc contrib control
+BUILDDIR = ${shell cd $(top_builddir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
+SRCDIR = ${shell cd $(top_srcdir) ; pwd | sed -e 's,^[^:\\/]:[\\/],/,'}
+RPMDIR = $(BUILDDIR)/rpmbuild
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-data-local
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-local
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-data-local install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am uninstall-local
+
+
+dist-hook:
+	cp control/ipmitool.spec $(distdir)
+
+install-data-local:
+	mkdir -p $(DESTDIR)$(DOCDIR)
+	$(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR)
+
+uninstall-local:
+	-rm -rf $(DESTDIR)$(DOCDIR)
+
+.PHONY: pkg
+pkg: PKG := ipmitool-@VERSION@-@OS@-@ARCH@
+pkg: control/pkginfo
+	$(STRIP) src/ipmitool
+	$(STRIP) src/ipmitool
+	(cd control ; pkgmk -o -d /tmp)
+	pkgtrans -s /tmp $(PKG) ipmitool
+	gzip -c /tmp/$(PKG) > $(PKG).gz
+	-rm -rf /tmp/ipmitool /tmp/$(PKG)
+
+.PHONY: rpm
+rpm: control/ipmitool.spec dist
+	mkdir -p $(RPMDIR)/{BUILD,RPMS,SRPMS,SOURCES,SPECS,tmp}
+	cp control/ipmitool.spec $(RPMDIR)/SPECS
+	BUILDDIR=$(RPMDIR) CONFIGDIR=$(BUILDDIR)/control \
+	  @RPMBUILD@ -ba --rcfile $(SRCDIR)/control/rpmrc \
+	  $(RPMDIR)/SPECS/ipmitool.spec
+
+.PHONY: clean-rpm
+clean-rpm:
+	-rm -rf $(RPMDIR)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/README b/README
new file mode 100644
index 0000000..7494f80
--- /dev/null
+++ b/README
@@ -0,0 +1,414 @@
+
+                              ipmitool
+                            Duncan Laurie
+                ipmitool-devel@lists.sourceforge.net
+
+Overview
+========
+ipmitool is a utility for managing and configuring devices that support
+the Intelligent Platform Management Interface.  IPMI is an open standard
+for monitoring, logging, recovery, inventory, and control of hardware
+that is implemented independent of the main CPU, BIOS, and OS.  The
+service processor (or Baseboard Management Controller, BMC) is the brain
+behind platform management and its primary purpose is to handle the
+autonomous sensor monitoring and event logging features.
+
+The ipmitool program provides a simple command-line interface to this BMC.
+It features the ability to read the sensor data repository (SDR) and print
+sensor values, display the contents of the System Event Log (SEL), print
+Field Replaceable Unit (FRU) inventory information, read and set LAN
+configuration parameters, and perform remote chassis power control.
+
+
+Background
+==========
+I originally wrote ipmitool while between projects and employeed at Sun
+Microsystems.  Sun had just embarked on a new line of general-purpose x86
+servers that included an OEM Intel board with an IPMIv1.5 BMC on board.
+It started with an idea that remote chassis power control would be a handy
+feature for my systems in the lab and from there it grew into a multi-
+purpose tool that lots of people found useful.  I decided to release it
+under a BSD license and give others the chance to make use of it.
+
+ipmitool was not written to provide large-scale (aka Enterprise) management
+application functionality.  The functionality that ipmitool proivides is
+easily accomplished by sending simple IPMI request messages and parsing
+the returned response.  It is intended to be used by system administrators
+who like the simplicity and scriptability of command-line utilities, as
+well as those debugging or developing their own BMC implementations.
+
+
+Requirements
+============
+Obviously the largest requirement is hardware with a service processor
+that supports the IPMI specification.  Many x86-based servers are now
+comming with IPMI support, check with your preferred hardware vendor
+about available prodcuts.
+
+Once you are certain you have the required hardware, you then need to
+decide how you want to access the BMC.  The most common case involve
+access through the System Interface or over the LAN.  (or serial, but
+currently ipmitool does not support the serial interface)
+
+
+System Interface
+----------------
+There are multiple types of system interfaces, but they are all similar
+enough to allow a single well-designed driver to support them all.  
+Different types of system interfaces include Keyboard Controller Style
+(KCS), Block Transfer (BT), System Management Interface Chip (SMIC) and
+SMBus.  Different hardware vendors will have different preference and
+implementations.
+
+On Linux the OpenIPMI kernel driver should support all of these system
+interfaces and it should be a simple matter of loading the right
+kernel modules and setting up the device node to use it.  The driver
+module names vary slightly in different kernel versions, but for all
+releases you need these two modules:
+
+  ipmi_msghandler: incoming and outgoing message handler
+  ipmi_devintf: character device interface to IPMI driver
+
+For 2.4.x and early 2.6.x kernels you need to choose a module based on
+the type of system interface your hardware supports.  For example:
+
+  ipmi_kcs_drv: Keyboard Controller Style driver
+
+More recent 2.6.x kernels have combined these into a single module:
+
+  ipmi_si: a universal IPMI system interface driver
+
+See the documentation that comes with your distribution and/or kernel
+for more information on what kernel modules are required.  Once the
+required modules are loaded and the driver has found a suitable system
+interface to the BMC then you need to ensure the device node at
+/dev/ipmi0 is pointing at the correct major number.
+
+This is because OpenIPMI is given a dynamically assigned major number
+when it is loaded, but depending on what other modules are present
+this number may be anywhere from 254 on down.  The easiest way to tell
+is to check the output of /proc/devices and see what major number the
+"ipmidev" device is assigned to.
+
+There is a sample script included with ipmitool called ipmi.init that
+can be used to automate this process at bootup.
+
+
+LAN Interface
+-------------
+This is often referred to as "IPMI-over-LAN" and defines how IPMI messages
+can be sent to and from the BMC encapsulated in Remote Management Control
+Protocol (RMCP) packets which are then transferred as UDP datagrams.
+
+IPMI-over-LAN is only supported with version 1.5 and higher of the IPMI
+specification.  The RMCP packet format is defined by the Alert Standard
+Forum, and it has been followed up with the RMCP+ protocol that adds
+encryption and payload support.  The IPMIv2 specification was updated
+accordingly to to support the RMCP+ protocol and brings with it enhanced
+security with encryption as well as support for Serial over LAN.
+
+There are different types of LAN interfaces as well.  Some systems have
+shared management networks where the NIC will intercept UDP packets to
+port 623 and redirect them to the BMC over SMBUS.  This type of LAN
+interface requires that the BMC be configured with the same settings that
+the system uses.  It also suffers from an increased security risk just by
+the nature of sharing that interface with normal traffic.
+
+I have also seen bugs in some implementations that have rendered the
+IPMI-over-LAN feature "dangerous" to enable in some situations.  (in
+particular there can be an issue with RPC because it will sometimes choose
+to use port 623 and you will lose response packets...)
+
+There is a sample shell script included with ipmitool called bmclanconf
+that can be used to simplify the LAN settings configuration process using
+the System Interface to configure the settings.  In some cases the
+hardware will come with a utility (often a DOS bootable CD) for configuring
+enabling the LAN interface as well.
+
+In order to support the IPMIv2.0 interface you must have an OpenSSL library
+with the required encrytion functions.  Recent distributions should have
+no problems.  The IPMIv1.5 interface will attempt to use OpenSSL for MD5
+hash function at compile time but if that is not found it will use an
+internal library.
+
+IPMB Dual Bridging in  IPMITOOL
+-------------------------------
+
+IPMI offers a standard messaging interface.
+
+The following concepts are related to this messaging interface:
+
+Channel type     : Communication channel type (SMS/KCS, IPMB, LAN) 
+Channel number   : Channel descriptor
+Requester        : Address of the requester
+Responder        : Address of the responder
+NetFN            : The logical function  for the request/response.
+Command          : The command number 
+Sequence         : An ID identifiying the request/response pair
+Message tracking : The ability to match request/response pair.
+
+When a communication is issued through any of the channels, an application 
+formats a request and expect a response. 
+
+Direct Command
+--------------
+The simplest form of communication is a "direct command" using SMS/KCS
+
+Example:
+ ipmitool raw 6 4
+  55 00
+
+This send raw command 4 (selftest) from netfn 6(application) to KCS, the driver 
+takes care of 'message tracking' and provides the answer.
+
+Hopefully, the application also includes a "human readable" instance of the API:
+ ipmitool mc selftest
+ Selftest: passed
+
+Bridged Command
+---------------
+One slightly more complicated communication mode is the so-called 
+"bridged command" using IPMB. 
+
+Example:
+ ipmitool -m 0x94 -t 0x9a raw 6 4
+ 55 00
+ 
+ or
+ 
+ ipmitool -m 0x94 -t 0x9a mc selftest
+ Selftest: passed
+ 
+
+This still sends the same command  4 (selftest) from netfn 6(application) to 
+the target. However, to do so, the command is encapsulated (by the driver) and
+sent using the command 0x34 (send message) from netfn 6(application) to KCS. 
+Then KCS is polled by the driver until a message has been received, then the
+driver uses command 0x33 (get message). The driver also tracks the message 
+and makes sure the response matches the request. Then it decapsultates the
+message and gives the response back to the application.
+
+Dual Bridged Command
+--------------------
+Things get a little more ugly when the application needs to reach a management
+controller sitting on an interface (or channel) not directly connected to the 
+BMC/IPMC. In the case the application must encapsulate its message itself and 
+request the IPMC to deal with message tracking itself.
+
+Its been working well with IPMITOOL on the LAN interface with:
+ ipmitool -H <ip> -U <user> -P <password> -B 0 -T 0x8a  -m 0x20 -t 0x7a -b 7  
+    mc selftest
+
+However, trying to dual bridge commands locally with :
+ ipmitool -B 0 -T 0x9a -m 0x94 -t 0x7a -b 7 mc selftest didn't work 
+ (it returned the same data as  ipmitool -m 0x20 -t 0x7a -b 7 mc selftest )
+ 
+The reason was that the "openipmi" interface pluging didn't 
+encapsulate/decapsulate the message and didn't even detect the intent
+to double bridge the request.
+
+ ./src/ipmitool -B 0 -T 0x8a -m 0x94 -t 0x7a -b 7 mc selftest
+ 
+-B    0  : transit channel for first bridge level (channel 0: IPMB-0) 
+-T 0x8a  : transit destination address (remote IPMC address)
+-m 0x94  : source address (local IPMC address on IPMB-0)
+-t 0x7a  : remote target (AMC IPMB-L address)
+-b    7  : remote channel (channel 7: IPMB-L)
+
+The transit source address (remote IPMC address on remote channel) is 
+automatically assigned by the remote IPMC.
+
+Payload Size Limit
+------------------
+Because some commands return a lot of data (fru read/get sdr) and because 2 
+levels of encapsulation are used, some command will fail.
+
+For instance this works.
+
+ipmitool -H <ip> -U <user> -P <password>  -B 0 -T 0x8a  -m 0x94 -t 0x7a -b 7 
+    mc selftest
+
+but this does not:
+    
+ipmitool -H <ip> -U <user> -P <password>  -B 0 -T 0x8a  -m 0x94 -t 0x7a -b 7 
+    fru print.
+
+
+
+Usage
+=====
+All invocations of ipmitool require specifying an interface to use, unless
+you want to use the default interface as set at compile time.  Each call
+must also specify a command to run.  You can see the list of supported
+interfaces and which is default as well as a list of top level commands in
+the usage output available with the -h option:
+
+usage: ipmitool [options...] <command>
+
+   -h            This help
+   -V            Show version information
+   -v            Verbose (can use multiple times)
+   -c            Display output in comma separated format
+   -I intf       Interface to use
+   -H hostname   Remote host name for LAN interface
+   -p port       Remote RMCP port [default=623]
+   -L level      Remote session privilege level [default=USER]
+   -A authtype   Force use of authtype NONE, PASSWORD, MD2 or MD5
+   -U username   Remote session username
+   -P password   Remote session password
+   -f file       Read remote session password from file
+   -a            Prompt for remote password
+   -E            Read password from IPMI_PASSWORD environment variable
+   -m address    Set local IPMB address
+   -t address    Bridge request to remote target address
+
+Interfaces:
+    open         Linux OpenIPMI Interface [default]
+    imb          Intel IMB Interface
+    lan          IPMI v1.5 LAN Interface
+    lanplus      IPMI v2.0 RMCP+ LAN Interface
+
+Commands:
+    raw          Send a RAW IPMI request and print response
+    lan          Configure LAN Channels
+    chassis      Get chassis status and set power state
+    event        Send pre-defined events to BMC
+    bmc          Print BMC status and configure global enables
+    sdr          Print Sensor Data Repository entries and readings
+    sensor       Print detailed sensor information
+    fru          Print built-in FRU and scan SDR for FRU locators
+    sel          Print System Evelnt Log
+    sol          Configure IPMIv2.0 Serial-over-LAN
+    user         Configure BMC users
+    channel      Configure BMC channels
+    session      Print session information
+    shell        Launch interactive IPMI shell
+    exec         Run list of commands from file
+    set          Set runtime variable for shell and exec
+
+
+Commands
+========
+More help on the supported commands can be found by running them with the
+help argument, for example "chassis help".  There are a few commands with
+special meaning:
+
+> shell:  This command will launch an shell interface to the ipmitool
+  command set.  You can use this for interactively entering commands to
+  monitor system status.  An example session:
+
+# ipmitool -I open shell
+ipmitool> chassis status
+System Power         : off
+Power Overload       : false
+Power Interlock      : inactive
+Main Power Fault     : false
+Power Control Fault  : false
+Power Restore Policy : always-off
+Last Power Event     : command
+Chassis Intrusion    : active
+Front-Panel Lockout  : inactive
+Drive Fault          : false
+Cooling/Fan Fault    : false
+ipmitool> user list 7
+ID  Name             Callin  Link Auth  IPMI Msg   Channel Priv Limit
+1                    true    false      true       ADMINISTRATOR
+ipmitool> exit
+
+> exec:  This command will read a text file and execute ipmitool commands
+  in sequence.  It can be used for scriptable commands:
+
+# cat lansetup.scr
+lan set 7 ipsrc static
+lan set 7 ipaddr 10.1.1.10
+lan set 7 netmask 255.255.255.0
+lan set 7 defgw ipaddr 10.1.1.254
+# ipmitool -I open exec lansetup.scr
+Setting LAN IP Address to 10.1.1.10
+Setting Lan Subnet Mask to 255.255.255.0
+Setting Lan Default Gateway IP to 10.1.1.254
+
+> set:  This command can be used by the shell and exec modes to configure
+  various session parameters:
+
+  hostname <host>        Session hostname
+  username <user>        Session username
+  password <pass>        Session password
+  privlvl <level>        Session privilege level force
+  authtype <type>        Authentication type force
+  localaddr <addr>       Local IPMB address
+  targetaddr <addr>      Remote target IPMB address
+  port <port>            Remote RMCP port
+  csv [level]            enable output in comma separated format
+  verbose [level]        Verbose level
+
+# cat getstatus.scr
+set hostname sf-v20z-1
+set password admin
+chassis status
+# ipmitool -I lan exec getstatus.scr
+Set session hostname to lx50
+Set session password
+System Power         : off
+Power Overload       : false
+Power Interlock      : inactive
+Main Power Fault     : false
+Power Control Fault  : false
+Power Restore Policy : always-off
+Last Power Event     : command
+Chassis Intrusion    : active
+Front-Panel Lockout  : inactive
+Drive Fault          : false
+Cooling/Fan Fault    : false
+
+
+ipmievd
+=======
+Included with ipmitool is another utility called ipmievd that is a daemon
+which will listen for events from the BMC that are being sent to the SEL
+and also log those messages to syslog.  By default when run (as root) with
+no arguments it will daemonize and poll on the OpenIPMI device waiting for
+an event notification.  Upon receipt of an event it will log it to syslog
+with the LOG_LOCAL4 facility.  You can test ipmievd by sending test events
+over the LAN interface with ipmitool:
+
+remote# ipmievd
+
+local$ ipmitool -I lan -H lx50 -P admin event help
+usage: event <num>
+   1 : Temperature - Upper Critical - Going High
+   2 : Voltage Threshold - Lower Critical - Going Low
+   3 : Memory - Correctable ECC
+local$ ipmitool -I lan -H lx50 -P admin event 1
+Sending Temperature - Upper Critical - Going High event to BMC
+local$ ipmitool -I lan -H lx50 -P admin event 2
+Sending Voltage Threshold - Lower Critical - Going Low event to BMC
+local$ ipmitool -I lan -H lx50 -P admin event 3
+Sending Memory - Correctable ECC event to BMC
+
+remote# tail /var/log/messages   (timestamps removed)
+ipmievd: Waiting for events...
+ipmievd: Temperature Sensor 30 - Upper Critical - going high
+ipmievd: Voltage Sensor 60 - Lower Critical - going low
+ipmievd: Memory Sensor 01 - Correctable ECC
+
+
+Resources
+=========
+IPMItool homepage
+http://ipmitool.sourceforge.net
+
+IPMItool manpage
+http://ipmitool.sourceforge.net/manpage.html
+
+IPMItool overview paper from Linux.conf.au 2004
+http://ipmitool.sourceforge.net/lca2004_ipmitool.pdf
+
+Intelligent Platform Management Interface specification
+http://www.intel.com/design/servers/ipmi/spec.htm
+
+OpenIPMI project: Linux IPMI kernel driver and userland library
+http://openipmi.sourceforge.net
+
+IPMItool commit archive
+https://lists.sourceforge.net/lists/listinfo/ipmitool-cvs
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..b58e5e4
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,9780 @@
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
+
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.14'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.14.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..6347427
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,42 @@
+#!/bin/sh -x
+#
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+aclocal
+libtoolize --automake --copy
+
+autoheader
+automake --foreign --add-missing --copy
+
+aclocal
+autoconf
+automake --foreign
+
diff --git a/compile b/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.guess b/config.guess
new file mode 100755
index 0000000..1f5c50c
--- /dev/null
+++ b/config.guess
@@ -0,0 +1,1420 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-03-23'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..c955c6e
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,249 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 to enable all command line options. */
+#undef ENABLE_ALL_OPTIONS
+
+/* Define to 1 for extra file security. */
+#undef ENABLE_FILE_SECURITY
+
+/* Define to 1 to enable OpenIPMI interface dual bridge support */
+#undef ENABLE_INTF_OPEN_DUAL_BRIDGE
+
+/* Define to 1 if you have the `alarm' function. */
+#undef HAVE_ALARM
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+#undef HAVE_BYTESWAP_H
+
+/* Define to 1 if libcrypto supports MD2. */
+#undef HAVE_CRYPTO_MD2
+
+/* Define to 1 if libcrypto supports MD5. */
+#undef HAVE_CRYPTO_MD5
+
+/* Define to 1 if libcrypto supports SHA256. */
+#undef HAVE_CRYPTO_SHA256
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <sys/ipmi.h> header file. */
+#undef HAVE_FREEBSD_IPMI_H
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#undef HAVE_GETHOSTBYNAME
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#undef HAVE_GETIFADDRS
+
+/* Define to 1 if you have the `getpassphrase' function. */
+#undef HAVE_GETPASSPHRASE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <linux/compiler.h> header file. */
+#undef HAVE_LINUX_COMPILER_H
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
+
+/* Define to 1 if you have the <linux/ipmi.h> header file. */
+#undef HAVE_OPENIPMI_H
+
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
+/* Define to 1 if you need to use #pragma pack instead of __attribute__
+   ((packed)) */
+#undef HAVE_PRAGMA_PACK
+
+/* Define to 1 if readline present. */
+#undef HAVE_READLINE
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
+
+/* Define to 1 if you have the `socket' function. */
+#undef HAVE_SOCKET
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/byteorder.h> header file. */
+#undef HAVE_SYS_BYTEORDER_H
+
+/* Define to 1 if you have the <sys/ioccom.h> header file. */
+#undef HAVE_SYS_IOCCOM_H
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have <sys/termios.h>. */
+#undef HAVE_SYS_TERMIOS_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <termios.h>. */
+#undef HAVE_TERMIOS_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 to enable Solaris 10 BMC interface. */
+#undef IPMI_INTF_BMC
+
+/* Define to 1 to enable Dummy interface. */
+#undef IPMI_INTF_DUMMY
+
+/* Define to 1 to enable FreeIPMI interface. */
+#undef IPMI_INTF_FREE
+
+/* Define to 1 for FreeIPMI 0.3.0. */
+#undef IPMI_INTF_FREE_0_3_0
+
+/* Define to 1 for FreeIPMI 0.4.0. */
+#undef IPMI_INTF_FREE_0_4_0
+
+/* Define to 1 for FreeIPMI 0.5.0. */
+#undef IPMI_INTF_FREE_0_5_0
+
+/* Define to 1 for FreeIPMI 0.6.0. */
+#undef IPMI_INTF_FREE_0_6_0
+
+/* Define to 1 to enable FreeIPMI Bridging Support. */
+#undef IPMI_INTF_FREE_BRIDGING
+
+/* Define to 1 to enable Intel IMB interface. */
+#undef IPMI_INTF_IMB
+
+/* Define to 1 to enable LAN IPMIv1.5 interface. */
+#undef IPMI_INTF_LAN
+
+/* Define to 1 to enable LAN+ IPMIv2 interface. */
+#undef IPMI_INTF_LANPLUS
+
+/* Define to 1 to enable Solaris 9 LIPMI interface. */
+#undef IPMI_INTF_LIPMI
+
+/* Define to 1 to enable Linux OpenIPMI interface. */
+#undef IPMI_INTF_OPEN
+
+/* Define to 1 to enable serial interface. */
+#undef IPMI_INTF_SERIAL
+
+/* Define to 1 to enable USB interface. */
+#undef IPMI_INTF_USB
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to the type of arg 1 for `select'. */
+#undef SELECT_TYPE_ARG1
+
+/* Define to the type of args 2, 3 and 4 for `select'. */
+#undef SELECT_TYPE_ARG234
+
+/* Define to the type of arg 5 for `select'. */
+#undef SELECT_TYPE_ARG5
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
diff --git a/config.sub b/config.sub
new file mode 100755
index 0000000..bba4efb
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,1799 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
+
+timestamp='2014-09-11'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2014 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/configure b/configure
new file mode 100755
index 0000000..95ed7a5
--- /dev/null
+++ b/configure
@@ -0,0 +1,16410 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for ipmitool 1.8.18.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='ipmitool'
+PACKAGE_TARNAME='ipmitool'
+PACKAGE_VERSION='1.8.18'
+PACKAGE_STRING='ipmitool 1.8.18'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="src/ipmitool.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+IPMITOOL_INTF_LIB
+INTF_DUMMY_LIB
+INTF_DUMMY
+INTF_BMC_LIB
+INTF_BMC
+INTF_LIPMI_LIB
+INTF_LIPMI
+INTF_IMB_LIB
+INTF_IMB
+INTF_OPEN_LIB
+INTF_OPEN
+RPM_RELEASE
+DISTRO
+INTF_FREE_LIB
+INTF_FREE
+INTF_SERIAL_LIB
+INTF_SERIAL
+INTF_LANPLUS_LIB
+INTF_LANPLUS
+INTF_USB_LIB
+INTF_USB
+INTF_LAN_LIB
+INTF_LAN
+BASEDIR
+PSTAMP
+OS
+ARCH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+LIBTOOL
+LIBOBJS
+POW_LIB
+EGREP
+GREP
+CPP
+SED
+RPMBUILD
+LN_S
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+ac_configure_args
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_solaris_opt
+enable_internal_md5
+enable_intf_lan
+enable_intf_usb
+enable_intf_lanplus
+enable_intf_serial
+with_kerneldir
+enable_intf_free
+with_rpm_distro
+with_rpm_release
+enable_intf_open
+enable_intf_imb
+enable_intf_lipmi
+enable_intf_bmc
+enable_intf_dummy
+enable_ipmishell
+enable_buildcheck
+enable_file_security
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+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 ipmitool 1.8.18 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/ipmitool]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ipmitool 1.8.18:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-solaris-opt    enable all options for Solaris [default=no]
+  --enable-internal-md5   enable internal MD5 library [default=no]
+  --enable-intf-lan       enable IPMIv1.5 LAN interface [default=yes]
+  --enable-intf-usb       enable IPMI USB interface [default=auto]
+  --enable-intf-lanplus   enable IPMIv2.0 RMCP+ LAN interface [default=auto]
+  --enable-intf-serial    enable direct Serial Basic/Terminal mode interface
+                          [default=yes]
+  --enable-intf-free      enable FreeIPMI IPMI interface [default=auto]
+  --enable-intf-open      enable Linux OpenIPMI interface [default=auto]
+  --enable-intf-imb       enable Intel IMB driver interface [default=auto]
+  --enable-intf-lipmi     enable Solaris 9 x86 IPMI interface [default=no]
+  --enable-intf-bmc       enable Solaris 10 x86 IPMI interface [default=auto]
+  --enable-intf-dummy     enable Dummy(test) interface [default=no]
+  --enable-ipmishell      enable IPMI shell interface [default=auto]
+  --enable-buildcheck     enable -Wall -Werror for build testing [default=no]
+  --enable-file-security  enable extra security checks on files opened for
+                          read [default=no]
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
+  --with-kerneldir=DIR    set kernel include path to DIR
+  --with-rpm-distro=DISTRO
+                          set Linux distribution tag for use in RPM version
+                          string
+  --with-rpm-release=RELEASE
+                          set release number for RPM release field
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+ipmitool configure 1.8.18
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+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 ipmitool $as_me 1.8.18, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+am__api_version='1.14'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='ipmitool'
+ VERSION='1.8.18'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+# Extract the first word of "rpmbuild", so it can be a program name with args.
+set dummy rpmbuild; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RPMBUILD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RPMBUILD"; then
+  ac_cv_prog_RPMBUILD="$RPMBUILD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RPMBUILD="rpmbuild"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_RPMBUILD" && ac_cv_prog_RPMBUILD="rpm"
+fi
+fi
+RPMBUILD=$ac_cv_prog_RPMBUILD
+if test -n "$RPMBUILD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5
+$as_echo "$RPMBUILD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "sed", so it can be a program name with args.
+set dummy sed; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$SED"; then
+  ac_cv_prog_SED="$SED" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_SED="sed"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+SED=$ac_cv_prog_SED
+if test -n "$SED"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in sys/byteorder.h byteswap.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this sort of thing.  */
+  typedef int charset[2];
+  const charset cs = { 0, 0 };
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+for ac_header in sys/select.h sys/socket.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
+$as_echo_n "checking types of arguments for select... " >&6; }
+if ${ac_cv_func_select_args+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
+ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
+  for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
+int
+main ()
+{
+extern int select ($ac_arg1,
+					    $ac_arg234, $ac_arg234, $ac_arg234,
+					    $ac_arg5);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+ done
+done
+# Provide a safe default value.
+: "${ac_cv_func_select_args=int,int *,struct timeval *}"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
+$as_echo "$ac_cv_func_select_args" >&6; }
+ac_save_IFS=$IFS; IFS=','
+set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
+IFS=$ac_save_IFS
+shift
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG1 $1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG234 ($2)
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define SELECT_TYPE_ARG5 ($3)
+_ACEOF
+
+rm -f conftest*
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+$as_echo_n "checking for working strtod... " >&6; }
+if ${ac_cv_func_strtod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_strtod=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+$ac_includes_default
+#ifndef strtod
+double strtod ();
+#endif
+int
+main()
+{
+  {
+    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
+    char *string = " +69";
+    char *term;
+    double value;
+    value = strtod (string, &term);
+    if (value != 69 || term != (string + 4))
+      return 1;
+  }
+
+  {
+    /* Under Solaris 2.4, strtod returns the wrong value for the
+       terminating character under some conditions.  */
+    char *string = "NaN";
+    char *term;
+    strtod (string, &term);
+    if (term != string && *(term - 1) == 0)
+      return 1;
+  }
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_strtod=yes
+else
+  ac_cv_func_strtod=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+$as_echo "$ac_cv_func_strtod" >&6; }
+if test $ac_cv_func_strtod = no; then
+  case " $LIBOBJS " in
+  *" strtod.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
+ ;;
+esac
+
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = xyes; then :
+
+fi
+
+if test $ac_cv_func_pow = no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if ${ac_cv_lib_m_pow+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pow ();
+int
+main ()
+{
+return pow ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_pow=yes
+else
+  ac_cv_lib_m_pow=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = xyes; then :
+  POW_LIB=-lm
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+fi
+
+fi
+
+fi
+
+for ac_func in alarm gethostbyname getaddrinfo getifaddrs socket select
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in memmove memset strchr strdup strerror
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in getpassphrase
+do :
+  ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
+if test "x$ac_cv_func_getpassphrase" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPASSPHRASE 1
+_ACEOF
+
+fi
+done
+
+
+CFLAGS="$CFLAGS -Wall -Wextra -std=gnu99 -pedantic -Wformat -Wformat-nonliteral"
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	link_all_deplibs=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+LIBTOOL="$LIBTOOL --silent"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_gethostbyname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_gethostbyname+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_gethostbyname+:} false; then :
+
+else
+  ac_cv_search_gethostbyname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
+ac_res=$ac_cv_search_gethostbyname
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
+$as_echo_n "checking for library containing getaddrinfo... " >&6; }
+if ${ac_cv_search_getaddrinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getaddrinfo ();
+int
+main ()
+{
+return getaddrinfo ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_getaddrinfo=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_getaddrinfo+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_getaddrinfo+:} false; then :
+
+else
+  ac_cv_search_getaddrinfo=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
+$as_echo "$ac_cv_search_getaddrinfo" >&6; }
+ac_res=$ac_cv_search_getaddrinfo
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getifaddrs" >&5
+$as_echo_n "checking for library containing getifaddrs... " >&6; }
+if ${ac_cv_search_getifaddrs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getifaddrs ();
+int
+main ()
+{
+return getifaddrs ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_getifaddrs=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_getifaddrs+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_getifaddrs+:} false; then :
+
+else
+  ac_cv_search_getifaddrs=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getifaddrs" >&5
+$as_echo "$ac_cv_search_getifaddrs" >&6; }
+ac_res=$ac_cv_search_getifaddrs
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' socket; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_socket=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_socket+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_socket+:} false; then :
+
+else
+  ac_cv_search_socket=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
+ac_res=$ac_cv_search_socket
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnsl" >&5
+$as_echo_n "checking for socket in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl -lsocket $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nsl_socket=yes
+else
+  ac_cv_lib_nsl_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_socket" >&5
+$as_echo "$ac_cv_lib_nsl_socket" >&6; }
+if test "x$ac_cv_lib_nsl_socket" = xyes; then :
+  LIBS="$LIBS -lsocket -lnsl"
+fi
+
+fi
+
+
+if test "x$prefix" = "xNONE"; then
+	prefix="$ac_default_prefix"
+fi
+
+if test "x$exec_prefix" = "xNONE"; then
+	exec_prefix="$prefix"
+fi
+
+
+xenable_all_options=yes
+xenable_intf_bmc=no
+xenable_intf_dummy=no
+xenable_intf_imb=yes
+xenable_intf_lipmi=yes
+xenable_intf_open=yes
+#xenable_intf_serial=yes
+xenable_intf_usb=no
+xenable_ipmishell=yes
+
+case "$host_os" in
+solaris*)
+	MAKE=gmake
+	STRIP=gstrip
+	LD=gld
+	AR=gar
+	# openssl libs are in /usr/sfw/lib on solaris 10
+	LIBS="$LIBS -R/usr/sfw/lib"
+	# disable the linux-specific interfaces
+	xenable_intf_bmc=yes
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	xenable_ipmishell=no
+	xenable_all_options=no
+	;;
+*cygwin*)
+	# disable the linux and solaris-specific interfaces
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	;;
+*darwin*|aix*)
+	# disable the linux and solaris-specific interfaces
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	xenable_ipmishell=no
+	;;
+*freebsd*)
+	xenable_intf_imb=no
+	xenable_intf_lipmi=no
+	CFLAGS="$CFLAGS -D__BSD_VISIBLE"
+	;;
+*netbsd*)
+	xenable_intf_imb=no
+	xenable_intf_lipmi=no
+	xenable_intf_open=no
+	;;
+gnu*)
+	# disable the linux and solaris-specific interfaces on Hurd
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_usb=yes
+	;;
+esac
+
+ARCH=$host_cpu
+
+OS=$host_os
+
+PSTAMP=$host
+
+BASEDIR=$prefix
+
+
+# Check whether --enable-solaris-opt was given.
+if test "${enable_solaris_opt+set}" = set; then :
+  enableval=$enable_solaris_opt; xenable_solaris_opt=$enableval
+else
+  xenable_solaris_opt=no
+fi
+
+if test "x$xenable_all_options" = "xyes" || test "x$xenable_solaris_opt" = "xyes"; then
+
+$as_echo "#define ENABLE_ALL_OPTIONS 1" >>confdefs.h
+
+fi
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+
+int
+main ()
+{
+
+	struct test {
+		union {
+			int a;
+			unsigned int b;
+		};
+	} test;
+
+	printf("a is %d", test.a);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_need_fms_extension=no
+else
+  ac_need_fms_extension=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "x$ac_need_fms_extension" = "xyes"; then
+       CFLAGS="$CFLAGS -fms-extensions"
+
+fi
+
+# Check whether --enable-internal-md5 was given.
+if test "${enable_internal_md5+set}" = set; then :
+  enableval=$enable_internal_md5; xenable_internal_md5=$enableval
+else
+  xenable_internal_md5=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_cbc in -lcrypto" >&5
+$as_echo_n "checking for EVP_aes_128_cbc in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_EVP_aes_128_cbc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EVP_aes_128_cbc ();
+int
+main ()
+{
+return EVP_aes_128_cbc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_EVP_aes_128_cbc=yes
+else
+  ac_cv_lib_crypto_EVP_aes_128_cbc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_aes_128_cbc" >&5
+$as_echo "$ac_cv_lib_crypto_EVP_aes_128_cbc" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_aes_128_cbc" = xyes; then :
+  if test "x$xenable_internal_md5" != "xyes"; then
+	    have_crypto=yes; LIBS="$LIBS -lcrypto"
+	fi
+else
+  have_crypto=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_sha256 in -lcrypto" >&5
+$as_echo_n "checking for EVP_sha256 in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_EVP_sha256+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EVP_sha256 ();
+int
+main ()
+{
+return EVP_sha256 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_EVP_sha256=yes
+else
+  ac_cv_lib_crypto_EVP_sha256=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_sha256" >&5
+$as_echo "$ac_cv_lib_crypto_EVP_sha256" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_sha256" = xyes; then :
+  if test "x$xenable_internal_sha256" != "xyes"; then
+		if test "x$have_crypto" != "xyes"; then
+			LIBS="$LIBS -lcrypto"
+		have_sha256=yes
+		fi
+
+$as_echo "#define HAVE_CRYPTO_SHA256 1" >>confdefs.h
+
+	fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5_Init in -lcrypto" >&5
+$as_echo_n "checking for MD5_Init in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_MD5_Init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD5_Init ();
+int
+main ()
+{
+return MD5_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_MD5_Init=yes
+else
+  ac_cv_lib_crypto_MD5_Init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5_Init" >&5
+$as_echo "$ac_cv_lib_crypto_MD5_Init" >&6; }
+if test "x$ac_cv_lib_crypto_MD5_Init" = xyes; then :
+  if test "x$xenable_internal_md5" != "xyes"; then
+	    if test "x$have_crypto" != "xyes"; then
+	        LIBS="$LIBS -lcrypto"
+	        have_md5=yes
+	    fi
+
+$as_echo "#define HAVE_CRYPTO_MD5 1" >>confdefs.h
+
+	fi
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD2_Init in -lcrypto" >&5
+$as_echo_n "checking for MD2_Init in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_MD2_Init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD2_Init ();
+int
+main ()
+{
+return MD2_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypto_MD2_Init=yes
+else
+  ac_cv_lib_crypto_MD2_Init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD2_Init" >&5
+$as_echo "$ac_cv_lib_crypto_MD2_Init" >&6; }
+if test "x$ac_cv_lib_crypto_MD2_Init" = xyes; then :
+  if test "x$xenable_internal_md5" != "xyes"; then
+	    if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
+	        LIBS="$LIBS -lcrypto"
+	        have_md2=yes
+	    fi
+
+$as_echo "#define HAVE_CRYPTO_MD2 1" >>confdefs.h
+
+	fi
+fi
+
+
+# Check whether --enable-intf-lan was given.
+if test "${enable_intf_lan+set}" = set; then :
+  enableval=$enable_intf_lan; xenable_intf_lan=$enableval
+else
+  xenable_intf_lan=yes
+fi
+
+if test "x$xenable_intf_lan" = "xstatic" || test "x$xenable_intf_lan" = "xplugin"; then
+	xenable_intf_lan=yes
+fi
+if test "x$xenable_intf_lan" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_LAN 1" >>confdefs.h
+
+	INTF_LAN=lan
+
+	INTF_LAN_LIB=libintf_lan.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lan/libintf_lan.la"
+fi
+
+# Check whether --enable-intf-usb was given.
+if test "${enable_intf_usb+set}" = set; then :
+  enableval=$enable_intf_usb; xenable_intf_usb=$enableval
+else
+  xenable_intf_usb=$xenable_intf_usb
+fi
+
+if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
+   xenable_intf_usb=yes
+fi
+if test "x$xenable_intf_usb" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_USB 1" >>confdefs.h
+
+	INTF_USB=usb
+
+	INTF_USB_LIB=libintf_usb.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB usb/libintf_usb.la"
+fi
+
+# Check whether --enable-intf-lanplus was given.
+if test "${enable_intf_lanplus+set}" = set; then :
+  enableval=$enable_intf_lanplus; xenable_intf_lanplus=$enableval
+else
+  xenable_intf_lanplus=$have_crypto
+fi
+
+if test "x$xenable_intf_lanplus" = "xstatic" || test "x$xenable_intf_lanplus" = "xplugin"; then
+	xenable_intf_lanplus=yes
+fi
+if test "x$xenable_intf_lanplus" != "xno" && test "x$have_crypto" != "xyes"; then
+	echo "** The lanplus interface requires an SSL library with EVP_aes_128_cbc defined."
+	xenable_intf_lanplus=no
+fi
+if test "x$xenable_intf_lanplus" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_LANPLUS 1" >>confdefs.h
+
+	INTF_LANPLUS=lanplus
+
+	INTF_LANPLUS_LIB=libintf_lanplus.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lanplus/libintf_lanplus.la"
+else
+	xenable_intf_lanplus=no
+fi
+
+ORIG_CPPFLAGS=$CPPFLAGS
+
+# Check whether --enable-intf-serial was given.
+if test "${enable_intf_serial+set}" = set; then :
+  enableval=$enable_intf_serial; xenable_intf_serial=$enableval
+else
+  xenable_intf_serial=yes
+fi
+
+if test "x$enable_intf_serial" = "xstatic" || test "x$enable_intf_serial" = "xplugin"; then
+   xenable_intf_serial=yes
+fi
+if test "x$xenable_intf_serial" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_SERIAL 1" >>confdefs.h
+
+    INTF_SERIAL=serial
+
+    INTF_SERIAL_LIB=libintf_serial.la
+
+    IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB serial/libintf_serial.la"
+else
+	xenable_intf_serial=no
+fi
+
+
+# Check whether --with-kerneldir was given.
+if test "${with_kerneldir+set}" = set; then :
+  withval=$with_kerneldir; if test "x$with_kerneldir" = "xyes"; then
+	    with_kerneldir="/lib/modules/`uname -r`/build"
+	fi
+	CFLAGS="$CFLAGS -I ${with_kerneldir}/include"
+
+	CPPFLAGS="$CPPFLAGS -I ${with_kerneldir}/include"
+
+	if test -s ${with_kerneldir}/include/linux/version.h ; then
+	    kernelver=`grep UTS_RELEASE ${with_kerneldir}/include/linux/version.h | \
+	        sed 's/^\#define UTS_RELEASE \"\(2\.[0-9]\)\..*/\1/'`
+	    if test "x$kernelver" = "x2.6"; then
+	        CPPFLAGS="$CPPFLAGS -D__user="
+
+	    fi
+	fi
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux/compiler.h" >&5
+$as_echo_n "checking for linux/compiler.h... " >&6; }
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <linux/compiler.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+$as_echo "#define HAVE_LINUX_COMPILER_H 1" >>confdefs.h
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+CPPFLAGS=$ORIG_CPPFLAGS
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/ioccom.h" "ac_cv_header_sys_ioccom_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioccom_h" = xyes; then :
+
+$as_echo "#define HAVE_SYS_IOCCOM_H 1" >>confdefs.h
+
+fi
+
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "linux/ipmi.h" "ac_cv_header_linux_ipmi_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_ipmi_h" = xyes; then :
+
+$as_echo "#define HAVE_OPENIPMI_H 1" >>confdefs.h
+
+else
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/ipmi.h" "ac_cv_header_sys_ipmi_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ipmi_h" = xyes; then :
+
+$as_echo "#define HAVE_FREEBSD_IPMI_H 1" >>confdefs.h
+
+else
+  echo "** Unable to find OpenIPMI header files.  Using internal version."
+fi
+
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipmi_open_inband in -lfreeipmi" >&5
+$as_echo_n "checking for ipmi_open_inband in -lfreeipmi... " >&6; }
+if ${ac_cv_lib_freeipmi_ipmi_open_inband+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfreeipmi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ipmi_open_inband ();
+int
+main ()
+{
+return ipmi_open_inband ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_freeipmi_ipmi_open_inband=yes
+else
+  ac_cv_lib_freeipmi_ipmi_open_inband=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeipmi_ipmi_open_inband" >&5
+$as_echo "$ac_cv_lib_freeipmi_ipmi_open_inband" >&6; }
+if test "x$ac_cv_lib_freeipmi_ipmi_open_inband" = xyes; then :
+  have_free=yes
+else
+  have_free=no
+fi
+
+if test "x$have_free" != "xyes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipmi_ctx_open_inband in -lfreeipmi" >&5
+$as_echo_n "checking for ipmi_ctx_open_inband in -lfreeipmi... " >&6; }
+if ${ac_cv_lib_freeipmi_ipmi_ctx_open_inband+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfreeipmi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ipmi_ctx_open_inband ();
+int
+main ()
+{
+return ipmi_ctx_open_inband ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_freeipmi_ipmi_ctx_open_inband=yes
+else
+  ac_cv_lib_freeipmi_ipmi_ctx_open_inband=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeipmi_ipmi_ctx_open_inband" >&5
+$as_echo "$ac_cv_lib_freeipmi_ipmi_ctx_open_inband" >&6; }
+if test "x$ac_cv_lib_freeipmi_ipmi_ctx_open_inband" = xyes; then :
+  have_free=yes
+else
+  have_free=no
+fi
+
+fi
+# Check whether --enable-intf-free was given.
+if test "${enable_intf_free+set}" = set; then :
+  enableval=$enable_intf_free; xenable_intf_free=$enableval
+else
+  xenable_intf_free=$have_free
+fi
+
+if test "x$xenable_intf_free" = "xstatic" || test "x$xenable_intf_free" = "xplugin"; then
+	xenable_intf_free=yes
+fi
+if test "x$xenable_intf_free" != "xno" && test "x$have_free" != "xyes"; then
+	echo "** Unable to build FreeIPMI interface support!"
+	xenable_intf_free=no
+fi
+if test "x$xenable_intf_free" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfreeipmi version 0.3.0" >&5
+$as_echo_n "checking for libfreeipmi version 0.3.0... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+
+int
+main ()
+{
+
+    ipmi_device_t dev;
+    dev = ipmi_open_inband(IPMI_DEVICE_KCS,
+                           0,
+                           0,
+                           0,
+                           NULL,
+                           0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_free_version_0_3_0=yes
+else
+  ac_free_version_0_3_0=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_free_version_0_3_0" >&5
+$as_echo "$ac_free_version_0_3_0" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfreeipmi version 0.4.0" >&5
+$as_echo_n "checking for libfreeipmi version 0.4.0... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+
+int
+main ()
+{
+
+    ipmi_device_t dev = NULL;
+    int rv;
+    dev = ipmi_device_create();
+    rv = ipmi_open_inband(dev,
+                          IPMI_DEVICE_KCS,
+                          0,
+                          0,
+                          0,
+                          NULL,
+                          0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_free_version_0_4_0=yes
+else
+  ac_free_version_0_4_0=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_free_version_0_4_0" >&5
+$as_echo "$ac_free_version_0_4_0" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfreeipmi version 0.5.0" >&5
+$as_echo_n "checking for libfreeipmi version 0.5.0... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+
+int
+main ()
+{
+
+    ipmi_device_t dev = NULL;
+    int rv;
+    dev = ipmi_device_create();
+    rv = ipmi_open_inband(dev,
+                          IPMI_DEVICE_KCS,
+                          0,
+                          0,
+                          0,
+                          NULL,
+                          0,
+                          0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_free_version_0_5_0=yes
+else
+  ac_free_version_0_5_0=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_free_version_0_5_0" >&5
+$as_echo "$ac_free_version_0_5_0" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfreeipmi version 0.6.0" >&5
+$as_echo_n "checking for libfreeipmi version 0.6.0... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+
+int
+main ()
+{
+
+    ipmi_ctx_t ctx = NULL;
+    int rv;
+    ctx = ipmi_ctx_create();
+    rv = ipmi_ctx_open_inband(ctx,
+                              IPMI_DEVICE_KCS,
+                              0,
+                              0,
+                              0,
+                              NULL,
+                              0,
+                              0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_free_version_0_6_0=yes
+else
+  ac_free_version_0_6_0=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_free_version_0_6_0" >&5
+$as_echo "$ac_free_version_0_6_0" >&6; }
+
+    if test "x$ac_free_version_0_3_0" = "xyes" \
+       || test "x$ac_free_version_0_4_0" = "xyes" \
+       || test "x$ac_free_version_0_5_0" = "xyes" \
+       || test "x$ac_free_version_0_6_0" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_FREE 1" >>confdefs.h
+
+       INTF_FREE=free
+
+       INTF_FREE_LIB=libintf_free.la
+
+       IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB free/libintf_free.la"
+       if test "x$ac_free_version_0_3_0" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_FREE_0_3_0 1" >>confdefs.h
+
+       fi
+       if test "x$ac_free_version_0_4_0" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_FREE_0_4_0 1" >>confdefs.h
+
+       fi
+       if test "x$ac_free_version_0_5_0" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_FREE_0_5_0 1" >>confdefs.h
+
+       fi
+       if test "x$ac_free_version_0_6_0" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_FREE_0_6_0 1" >>confdefs.h
+
+       fi
+    else
+       xenable_intf_free=no
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipmi_cmd_raw_ipmb in -lfreeipmi" >&5
+$as_echo_n "checking for ipmi_cmd_raw_ipmb in -lfreeipmi... " >&6; }
+if ${ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfreeipmi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ipmi_cmd_raw_ipmb ();
+int
+main ()
+{
+return ipmi_cmd_raw_ipmb ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb=yes
+else
+  ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb" >&5
+$as_echo "$ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb" >&6; }
+if test "x$ac_cv_lib_freeipmi_ipmi_cmd_raw_ipmb" = xyes; then :
+
+$as_echo "#define IPMI_INTF_FREE_BRIDGING 1" >>confdefs.h
+
+fi
+
+fi
+
+ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_termios_h" = xyes; then :
+
+$as_echo "#define HAVE_TERMIOS_H 1" >>confdefs.h
+
+else
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/termios.h" "ac_cv_header_sys_termios_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_termios_h" = xyes; then :
+
+$as_echo "#define HAVE_SYS_TERMIOS_H 1" >>confdefs.h
+
+else
+  echo "** Unable to find termios header file."
+fi
+
+
+fi
+
+
+
+
+# Check whether --with-rpm-distro was given.
+if test "${with_rpm_distro+set}" = set; then :
+  withval=$with_rpm_distro; DISTRO=$with_rpm_distro
+
+fi
+
+
+
+# Check whether --with-rpm-release was given.
+if test "${with_rpm_release+set}" = set; then :
+  withval=$with_rpm_release;
+else
+  with_rpm_release=1
+fi
+
+RPM_RELEASE=$with_rpm_release
+
+
+# Check whether --enable-intf-open was given.
+if test "${enable_intf_open+set}" = set; then :
+  enableval=$enable_intf_open; xenable_intf_open=$enableval
+fi
+
+if test "x$xenable_intf_open" = "xstatic" || test "x$xenable_intf_open" = "xplugin"; then
+	xenable_intf_open=yes
+fi
+if test "x$xenable_intf_open" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_OPEN 1" >>confdefs.h
+
+	INTF_OPEN=open
+
+	INTF_OPEN_LIB=libintf_open.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB open/libintf_open.la"
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenIPMI dual bridge support" >&5
+$as_echo_n "checking for OpenIPMI dual bridge support... " >&6; }
+	have_openipmi_dual_bridge=no
+	ORIG_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS -Isrc/plugins/open -DENABLE_INTF_OPEN_DUAL_BRIDGE"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#if defined(HAVE_OPENIPMI_H)
+			# if defined(HAVE_LINUX_COMPILER_H)
+			#  include <linux/compiler.h>
+			# endif
+			# include <linux/ipmi.h>
+			#elif defined(HAVE_FREEBSD_IPMI_H)
+			# include <sys/ipmi.h>
+			#else
+			# include "open.h"
+			#endif
+
+int
+main ()
+{
+
+			struct ipmi_ipmb_addr a;
+			a.transit_slave_addr = 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  have_openipmi_dual_bridge=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	if test x"$have_openipmi_dual_bridge" = x"yes"; then
+
+$as_echo "#define ENABLE_INTF_OPEN_DUAL_BRIDGE 1" >>confdefs.h
+
+	fi
+	CPPFLAGS="$ORIG_CPPFLAGS"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_openipmi_dual_bridge" >&5
+$as_echo "$have_openipmi_dual_bridge" >&6; }
+fi
+
+# Check whether --enable-intf-imb was given.
+if test "${enable_intf_imb+set}" = set; then :
+  enableval=$enable_intf_imb; xenable_intf_imb=$enableval
+fi
+
+if test "x$xenable_intf_imb" = "xstatic" || test "x$xenable_intf_imb" = "xplugin"; then
+	xenable_intf_imb=yes
+fi
+if test "x$xenable_intf_imb" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_IMB 1" >>confdefs.h
+
+	INTF_IMB=imb
+
+	INTF_IMB_LIB=libintf_imb.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB imb/libintf_imb.la"
+fi
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/lipmi/lipmi_intf.h" "ac_cv_header_sys_lipmi_lipmi_intf_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_lipmi_lipmi_intf_h" = xyes; then :
+  have_lipmi=yes
+else
+  have_lipmi=no
+fi
+
+
+# Check whether --enable-intf-lipmi was given.
+if test "${enable_intf_lipmi+set}" = set; then :
+  enableval=$enable_intf_lipmi; xenable_intf_lipmi=$enableval
+fi
+
+if test "x$xenable_intf_lipmi" = "xstatic" || test "x$xenable_intf_lipmi" = "xplugin"; then
+	xenable_intf_lipmi=yes
+fi
+if test "x$xenable_intf_lipmi" != "xno" && test "x$have_lipmi" != "xyes"; then
+	echo "** Unable to build Solaris 9 x86 IPMI interface support!"
+	xenable_intf_lipmi=no
+fi
+if test "x$xenable_intf_lipmi" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_LIPMI 1" >>confdefs.h
+
+	INTF_LIPMI=lipmi
+
+	INTF_LIPMI_LIB=libintf_lipmi.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lipmi/libintf_lipmi.la"
+fi
+
+# Check whether --enable-intf-bmc was given.
+if test "${enable_intf_bmc+set}" = set; then :
+  enableval=$enable_intf_bmc; xenable_intf_bmc=$enableval
+else
+  xenable_intf_bmc=no
+fi
+
+if test "x$xenable_intf_bmc" = "xstatic" || test "x$xenable_intf_bmc" = "xplugin"; then
+	xenable_intf_bmc=yes
+fi
+if test "x$xenable_intf_bmc" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_BMC 1" >>confdefs.h
+
+	INTF_BMC=bmc
+
+	INTF_BMC_LIB=libintf_bmc.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB bmc/libintf_bmc.la"
+fi
+
+# Check whether --enable-intf-dummy was given.
+if test "${enable_intf_dummy+set}" = set; then :
+  enableval=$enable_intf_dummy; xenable_intf_dummy=$enableval
+else
+  xenable_intf_dummy=no
+fi
+
+if test "x$xenable_intf_dummy" = "xyes"; then
+
+$as_echo "#define IPMI_INTF_DUMMY 1" >>confdefs.h
+
+	INTF_DUMMY=dummy
+
+	INTF_DUMMY_LIB=libintf_dummy.la
+
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB dummy/libintf_dummy.la"
+fi
+
+
+
+if test "x$xenable_ipmishell" = "xyes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+$as_echo_n "checking for library containing tgetent... " >&6; }
+if ${ac_cv_search_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' tinfo ncurses curses readline termcap; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_tgetent=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_tgetent+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_tgetent+:} false; then :
+
+else
+  ac_cv_search_tgetent=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
+$as_echo "$ac_cv_search_tgetent" >&6; }
+ac_res=$ac_cv_search_tgetent
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5
+$as_echo_n "checking for library containing initscr... " >&6; }
+if ${ac_cv_search_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ncurses curses; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_initscr=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_initscr+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_initscr+:} false; then :
+
+else
+  ac_cv_search_initscr=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5
+$as_echo "$ac_cv_search_initscr" >&6; }
+ac_res=$ac_cv_search_initscr
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_curses=yes
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
+$as_echo_n "checking for library containing readline... " >&6; }
+if ${ac_cv_search_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+int
+main ()
+{
+return readline ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' readline edit; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_readline=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_readline+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_readline+:} false; then :
+
+else
+  ac_cv_search_readline=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5
+$as_echo "$ac_cv_search_readline" >&6; }
+ac_res=$ac_cv_search_readline
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_readline=yes
+fi
+
+	if test "x$have_curses" != "xyes" || test "x$have_readline" != "xyes"; then
+		xenable_ipmishell=no
+	fi
+fi
+
+# Check whether --enable-ipmishell was given.
+if test "${enable_ipmishell+set}" = set; then :
+  enableval=$enable_ipmishell; xenable_ipmishell=$enableval
+fi
+
+if test "x$xenable_ipmishell" = "xyes"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+$as_echo_n "checking for library containing tgetent... " >&6; }
+if ${ac_cv_search_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' tinfo ncurses curses readline termcap; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_tgetent=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_tgetent+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_tgetent+:} false; then :
+
+else
+  ac_cv_search_tgetent=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
+$as_echo "$ac_cv_search_tgetent" >&6; }
+ac_res=$ac_cv_search_tgetent
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5
+$as_echo_n "checking for library containing initscr... " >&6; }
+if ${ac_cv_search_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' ncurses curses; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_initscr=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_initscr+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_initscr+:} false; then :
+
+else
+  ac_cv_search_initscr=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5
+$as_echo "$ac_cv_search_initscr" >&6; }
+ac_res=$ac_cv_search_initscr
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_curses=yes
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
+$as_echo_n "checking for library containing readline... " >&6; }
+if ${ac_cv_search_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+int
+main ()
+{
+return readline ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' readline edit; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_readline=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_readline+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_readline+:} false; then :
+
+else
+  ac_cv_search_readline=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5
+$as_echo "$ac_cv_search_readline" >&6; }
+ac_res=$ac_cv_search_readline
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_readline=yes
+fi
+
+	if test "x$have_curses" != "xyes"; then
+		as_fn_error $? "** Unable to find curses required by ipmishell." "$LINENO" 5
+	fi
+	if test "x$have_readline" != "xyes"; then
+		as_fn_error $? "** Unable to find readline required by ipmishell." "$LINENO" 5
+	fi
+
+$as_echo "#define HAVE_READLINE 1" >>confdefs.h
+
+fi
+
+# Check whether --enable-buildcheck was given.
+if test "${enable_buildcheck+set}" = set; then :
+  enableval=$enable_buildcheck; xenable_buildcheck=$enableval
+else
+  xenable_buildcheck=no
+fi
+
+if test "x$xenable_buildcheck" != "xno"; then
+	CFLAGS="$CFLAGS -Wall -Werror -Wpointer-arith -Wstrict-prototypes"
+fi
+
+
+# Check whether --enable-file-security was given.
+if test "${enable_file_security+set}" = set; then :
+  enableval=$enable_file_security; xenable_file_security=$enableval
+else
+  xenable_file_security=no
+fi
+
+if test "x$xenable_file_security" != "xno"; then
+
+$as_echo "#define ENABLE_FILE_SECURITY 1" >>confdefs.h
+
+fi
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+	#include <stdio.h>
+
+	struct packstruct {
+		unsigned char t0       :5;
+		unsigned char t1       :5;
+		unsigned char t2       :5;
+		unsigned char t3       :5;
+		unsigned char t4       :4;
+	} __attribute__ ((packed));
+
+	int
+	main(int argc, char ** argv)
+	{
+	if(sizeof(struct packstruct) != 3)
+	return(1);
+	else
+	return(0);
+	}
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+
+$as_echo "#define HAVE_PRAGMA_PACK 1" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+ac_config_files="$ac_config_files Makefile doc/Makefile contrib/Makefile control/Makefile control/pkginfo control/prototype control/rpmmacros control/ipmitool.spec lib/Makefile include/Makefile include/ipmitool/Makefile src/Makefile src/plugins/Makefile src/plugins/lan/Makefile src/plugins/lanplus/Makefile src/plugins/open/Makefile src/plugins/free/Makefile src/plugins/imb/Makefile src/plugins/bmc/Makefile src/plugins/usb/Makefile src/plugins/lipmi/Makefile src/plugins/serial/Makefile src/plugins/dummy/Makefile"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by ipmitool $as_me 1.8.18, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+ipmitool config.status 1.8.18
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+    "control/Makefile") CONFIG_FILES="$CONFIG_FILES control/Makefile" ;;
+    "control/pkginfo") CONFIG_FILES="$CONFIG_FILES control/pkginfo" ;;
+    "control/prototype") CONFIG_FILES="$CONFIG_FILES control/prototype" ;;
+    "control/rpmmacros") CONFIG_FILES="$CONFIG_FILES control/rpmmacros" ;;
+    "control/ipmitool.spec") CONFIG_FILES="$CONFIG_FILES control/ipmitool.spec" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+    "include/ipmitool/Makefile") CONFIG_FILES="$CONFIG_FILES include/ipmitool/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
+    "src/plugins/lan/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/lan/Makefile" ;;
+    "src/plugins/lanplus/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/lanplus/Makefile" ;;
+    "src/plugins/open/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/open/Makefile" ;;
+    "src/plugins/free/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/free/Makefile" ;;
+    "src/plugins/imb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/imb/Makefile" ;;
+    "src/plugins/bmc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bmc/Makefile" ;;
+    "src/plugins/usb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/usb/Makefile" ;;
+    "src/plugins/lipmi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/lipmi/Makefile" ;;
+    "src/plugins/serial/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/serial/Makefile" ;;
+    "src/plugins/dummy/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dummy/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=""
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ipmitool $VERSION" >&5
+$as_echo "ipmitool $VERSION" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Interfaces" >&5
+$as_echo "Interfaces" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   lan     : $xenable_intf_lan" >&5
+$as_echo "  lan     : $xenable_intf_lan" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   lanplus : $xenable_intf_lanplus" >&5
+$as_echo "  lanplus : $xenable_intf_lanplus" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   open    : $xenable_intf_open" >&5
+$as_echo "  open    : $xenable_intf_open" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   free    : $xenable_intf_free" >&5
+$as_echo "  free    : $xenable_intf_free" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   imb     : $xenable_intf_imb" >&5
+$as_echo "  imb     : $xenable_intf_imb" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   bmc     : $xenable_intf_bmc" >&5
+$as_echo "  bmc     : $xenable_intf_bmc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   usb     : $xenable_intf_usb" >&5
+$as_echo "  usb     : $xenable_intf_usb" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   lipmi   : $xenable_intf_lipmi" >&5
+$as_echo "  lipmi   : $xenable_intf_lipmi" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   serial  : $xenable_intf_serial" >&5
+$as_echo "  serial  : $xenable_intf_serial" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   dummy   : $xenable_intf_dummy" >&5
+$as_echo "  dummy   : $xenable_intf_dummy" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Extra tools" >&5
+$as_echo "Extra tools" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   ipmievd   : yes" >&5
+$as_echo "  ipmievd   : yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   ipmishell : $xenable_ipmishell" >&5
+$as_echo "  ipmishell : $xenable_ipmishell" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..f2fe1f3
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,692 @@
+dnl
+dnl autoconf for ipmitool
+dnl
+AC_INIT([ipmitool], [1.8.18])
+AC_CONFIG_SRCDIR([src/ipmitool.c])
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
+AC_PREREQ(2.50)
+AC_SUBST(ac_configure_args)
+
+dnl check for requirements
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm])
+AC_CHECK_PROG([SED], [sed], [sed])
+
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h])
+AC_CHECK_HEADERS([sys/byteorder.h byteswap.h])
+
+AC_C_CONST
+AC_C_INLINE
+AC_C_BIGENDIAN
+
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([alarm gethostbyname getaddrinfo getifaddrs socket select])
+AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
+AC_CHECK_FUNCS([getpassphrase])
+
+CFLAGS="$CFLAGS -Wall -Wextra -std=gnu99 -pedantic -Wformat -Wformat-nonliteral"
+
+AM_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+
+AC_SEARCH_LIBS([gethostbyname], [nsl])
+AC_SEARCH_LIBS([getaddrinfo], [nsl])
+AC_SEARCH_LIBS([getifaddrs], [nsl])
+AC_SEARCH_LIBS([socket], [socket], [],
+	[AC_CHECK_LIB([nsl], [socket],
+		[LIBS="$LIBS -lsocket -lnsl"], [], [-lsocket])])
+
+if test "x$prefix" = "xNONE"; then
+	prefix="$ac_default_prefix"
+fi
+
+if test "x$exec_prefix" = "xNONE"; then
+	exec_prefix="$prefix"
+fi
+
+dnl
+dnl set default option values
+dnl
+
+xenable_all_options=yes
+xenable_intf_bmc=no
+xenable_intf_dummy=no
+xenable_intf_imb=yes
+xenable_intf_lipmi=yes
+xenable_intf_open=yes
+#xenable_intf_serial=yes
+xenable_intf_usb=no
+xenable_ipmishell=yes
+
+dnl set some things so we build with GNU tools on Solaris
+case "$host_os" in
+solaris*)
+	MAKE=gmake
+	STRIP=gstrip
+	LD=gld
+	AR=gar
+	# openssl libs are in /usr/sfw/lib on solaris 10
+	LIBS="$LIBS -R/usr/sfw/lib"
+	# disable the linux-specific interfaces
+	xenable_intf_bmc=yes
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	xenable_ipmishell=no
+	xenable_all_options=no
+	;;
+*cygwin*)
+	# disable the linux and solaris-specific interfaces
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	;;
+*darwin*|aix*)
+	# disable the linux and solaris-specific interfaces
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_lipmi=no
+	xenable_ipmishell=no
+	;;
+*freebsd*)
+	xenable_intf_imb=no
+	xenable_intf_lipmi=no
+	CFLAGS="$CFLAGS -D__BSD_VISIBLE"
+	;;
+*netbsd*)
+	xenable_intf_imb=no
+	xenable_intf_lipmi=no
+	xenable_intf_open=no
+	;;
+gnu*)
+	# disable the linux and solaris-specific interfaces on Hurd
+	xenable_intf_imb=no
+	xenable_intf_open=no
+	xenable_intf_usb=yes
+	;;
+esac
+
+AC_SUBST(ARCH, $host_cpu)
+AC_SUBST(OS, $host_os)
+AC_SUBST(PSTAMP, $host)
+AC_SUBST(BASEDIR, $prefix)
+
+dnl allow solaris builds to include all options
+AC_ARG_ENABLE([solaris-opt],
+	[AC_HELP_STRING([--enable-solaris-opt],
+			[enable all options for Solaris [default=no]])],
+	[xenable_solaris_opt=$enableval],
+	[xenable_solaris_opt=no])
+if test "x$xenable_all_options" = "xyes" || test "x$xenable_solaris_opt" = "xyes"; then
+	AC_DEFINE(ENABLE_ALL_OPTIONS, [1], [Define to 1 to enable all command line options.])
+fi
+
+dnl Determine anonymous union/structure support in GCC
+AC_TRY_COMPILE([
+#include <stdio.h>
+	], [
+	struct test {
+		union {
+			int a;
+			unsigned int b;
+		};
+	} test;
+
+	printf("a is %d", test.a);
+        ], ac_need_fms_extension=no, ac_need_fms_extension=yes)
+if test "x$ac_need_fms_extension" = "xyes"; then
+       CFLAGS="$CFLAGS -fms-extensions"
+       AC_SUBST(CFLAGS)
+fi
+
+dnl check for OpenSSL functionality
+AC_ARG_ENABLE([internal-md5],
+	[AC_HELP_STRING([--enable-internal-md5],
+			[enable internal MD5 library [default=no]])],
+	[xenable_internal_md5=$enableval],
+	[xenable_internal_md5=no])
+
+AC_CHECK_LIB([crypto], [EVP_aes_128_cbc],
+	[if test "x$xenable_internal_md5" != "xyes"; then
+	    have_crypto=yes; LIBS="$LIBS -lcrypto"
+	fi],
+	[have_crypto=no], [-lcrypto])
+
+AC_CHECK_LIB([crypto], [EVP_sha256],
+	[if test "x$xenable_internal_sha256" != "xyes"; then
+		if test "x$have_crypto" != "xyes"; then
+			LIBS="$LIBS -lcrypto"
+		have_sha256=yes
+		fi
+		AC_DEFINE(HAVE_CRYPTO_SHA256, [1], [Define to 1 if libcrypto supports SHA256.])
+	fi],
+	[], [-lcrypto])
+
+AC_CHECK_LIB([crypto], [MD5_Init],
+	[if test "x$xenable_internal_md5" != "xyes"; then
+	    if test "x$have_crypto" != "xyes"; then
+	        LIBS="$LIBS -lcrypto"
+	        have_md5=yes
+	    fi
+	    AC_DEFINE(HAVE_CRYPTO_MD5, [1], [Define to 1 if libcrypto supports MD5.])
+	fi],
+	[], [-lcrypto])
+
+AC_CHECK_LIB([crypto], [MD2_Init],
+	[if test "x$xenable_internal_md5" != "xyes"; then
+	    if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
+	        LIBS="$LIBS -lcrypto"
+	        have_md2=yes
+	    fi
+	    AC_DEFINE(HAVE_CRYPTO_MD2, [1], [Define to 1 if libcrypto supports MD2.])
+	fi],
+	[], [-lcrypto])
+
+dnl enable IPMIv1.5 LAN interface
+AC_ARG_ENABLE([intf-lan],
+	[AC_HELP_STRING([--enable-intf-lan],
+			[enable IPMIv1.5 LAN interface [default=yes]])],
+	[xenable_intf_lan=$enableval],
+	[xenable_intf_lan=yes])
+if test "x$xenable_intf_lan" = "xstatic" || test "x$xenable_intf_lan" = "xplugin"; then
+	xenable_intf_lan=yes
+fi
+if test "x$xenable_intf_lan" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_LAN, [1], [Define to 1 to enable LAN IPMIv1.5 interface.])
+	AC_SUBST(INTF_LAN, [lan])
+	AC_SUBST(INTF_LAN_LIB, [libintf_lan.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lan/libintf_lan.la"
+fi
+
+dnl enable IPMI USB interface
+AC_ARG_ENABLE([intf-usb],
+	[AC_HELP_STRING([--enable-intf-usb],
+			[enable IPMI USB interface [default=auto]])],
+		[xenable_intf_usb=$enableval],
+		[xenable_intf_usb=$xenable_intf_usb])
+if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
+   xenable_intf_usb=yes
+fi
+if test "x$xenable_intf_usb" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_USB, [1], [Define to 1 to enable USB interface.])
+	AC_SUBST(INTF_USB, [usb])
+	AC_SUBST(INTF_USB_LIB, [libintf_usb.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB usb/libintf_usb.la"
+fi
+
+dnl enable IPMIv2.0 RMCP+ LAN interface
+AC_ARG_ENABLE([intf-lanplus],
+	[AC_HELP_STRING([--enable-intf-lanplus],
+			[enable IPMIv2.0 RMCP+ LAN interface [default=auto]])],
+	[xenable_intf_lanplus=$enableval],
+	[xenable_intf_lanplus=$have_crypto])
+if test "x$xenable_intf_lanplus" = "xstatic" || test "x$xenable_intf_lanplus" = "xplugin"; then
+	xenable_intf_lanplus=yes
+fi
+if test "x$xenable_intf_lanplus" != "xno" && test "x$have_crypto" != "xyes"; then
+	echo "** The lanplus interface requires an SSL library with EVP_aes_128_cbc defined."
+	xenable_intf_lanplus=no
+fi
+if test "x$xenable_intf_lanplus" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_LANPLUS, [1], [Define to 1 to enable LAN+ IPMIv2 interface.])
+	AC_SUBST(INTF_LANPLUS, [lanplus])
+	AC_SUBST(INTF_LANPLUS_LIB, [libintf_lanplus.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lanplus/libintf_lanplus.la"
+else
+	xenable_intf_lanplus=no
+fi
+
+ORIG_CPPFLAGS=$CPPFLAGS
+
+dnl enable serial interface
+AC_ARG_ENABLE([intf-serial],
+	[AC_HELP_STRING([--enable-intf-serial],
+			[enable direct Serial Basic/Terminal mode interface [default=yes]])],
+	[xenable_intf_serial=$enableval], [xenable_intf_serial=yes])
+if test "x$enable_intf_serial" = "xstatic" || test "x$enable_intf_serial" = "xplugin"; then
+   xenable_intf_serial=yes
+fi
+if test "x$xenable_intf_serial" = "xyes"; then
+    AC_DEFINE(IPMI_INTF_SERIAL, [1], [Define to 1 to enable serial interface.])
+    AC_SUBST(INTF_SERIAL, [serial])
+    AC_SUBST(INTF_SERIAL_LIB, [libintf_serial.la])
+    IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB serial/libintf_serial.la"
+else
+	xenable_intf_serial=no
+fi
+
+dnl look for OpenIPMI header files
+AC_ARG_WITH([kerneldir],
+	[AC_HELP_STRING([--with-kerneldir=DIR],
+			[set kernel include path to DIR])],
+	[if test "x$with_kerneldir" = "xyes"; then
+	    with_kerneldir="/lib/modules/`uname -r`/build"
+	fi
+	CFLAGS="$CFLAGS -I ${with_kerneldir}/include"
+	AC_SUBST(CFLAGS)
+	CPPFLAGS="$CPPFLAGS -I ${with_kerneldir}/include"
+	AC_SUBST(CPPFLAGS)
+	if test -s ${with_kerneldir}/include/linux/version.h ; then
+	    kernelver=`grep UTS_RELEASE ${with_kerneldir}/include/linux/version.h | \
+	        sed 's/^\#define UTS_RELEASE \"\(2\.[0-9]\)\..*/\1/'`
+	    if test "x$kernelver" = "x2.6"; then
+	        CPPFLAGS="$CPPFLAGS -D__user="
+	        AC_SUBST(CPPFLAGS)
+	    fi
+	fi])
+
+AH_TEMPLATE([HAVE_LINUX_COMPILER_H], [])
+AC_MSG_CHECKING([for linux/compiler.h])
+
+m4_version_prereq([2.68],
+	[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <linux/compiler.h>]])],
+		[AC_DEFINE(HAVE_LINUX_COMPILER_H, [1],
+			[Define to 1 if you have the <linux/compiler.h> header file.])
+		AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])])],
+	[AC_PREPROC_IFELSE([#include <linux/compiler.h>],
+		[AC_DEFINE(HAVE_LINUX_COMPILER_H, [1],
+		[Define to 1 if you have the <linux/compiler.h> header file.])
+		AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([no])])])
+
+CPPFLAGS=$ORIG_CPPFLAGS
+AC_SUBST(CPPFLAGS)
+
+AC_CHECK_HEADER([sys/ioccom.h],
+	[AC_DEFINE(HAVE_SYS_IOCCOM_H, [1],
+	[Define to 1 if you have the <sys/ioccom.h> header file.])])
+
+AC_CHECK_HEADER([linux/ipmi.h],
+	[AC_DEFINE(HAVE_OPENIPMI_H, [1],
+	[Define to 1 if you have the <linux/ipmi.h> header file.])],
+	[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 look for FreeIPMI files
+AC_CHECK_LIB(freeipmi, ipmi_open_inband, [have_free=yes], [have_free=no])
+if test "x$have_free" != "xyes"; then
+	AC_CHECK_LIB(freeipmi, ipmi_ctx_open_inband, [have_free=yes], [have_free=no])
+fi
+AC_ARG_ENABLE([intf-free],
+	[AC_HELP_STRING([--enable-intf-free],
+		[enable FreeIPMI IPMI interface [default=auto]])],
+	[xenable_intf_free=$enableval],
+	[xenable_intf_free=$have_free])
+if test "x$xenable_intf_free" = "xstatic" || test "x$xenable_intf_free" = "xplugin"; then
+	xenable_intf_free=yes
+fi
+if test "x$xenable_intf_free" != "xno" && test "x$have_free" != "xyes"; then
+	echo "** Unable to build FreeIPMI interface support!"
+	xenable_intf_free=no
+fi
+if test "x$xenable_intf_free" = "xyes"; then
+dnl Determine if you got the right FreeIPMI version  
+    AC_MSG_CHECKING([for libfreeipmi version 0.3.0])
+    AC_TRY_COMPILE([
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+    ], [
+    ipmi_device_t dev;
+    dev = ipmi_open_inband(IPMI_DEVICE_KCS,
+                           0,
+                           0,
+                           0,
+                           NULL,
+                           0);
+    ], ac_free_version_0_3_0=yes, ac_free_version_0_3_0=no)
+    AC_MSG_RESULT($ac_free_version_0_3_0)
+    AC_MSG_CHECKING([for libfreeipmi version 0.4.0])
+    AC_TRY_COMPILE([
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+    ], [
+    ipmi_device_t dev = NULL;
+    int rv;
+    dev = ipmi_device_create();
+    rv = ipmi_open_inband(dev,
+                          IPMI_DEVICE_KCS,
+                          0,
+                          0,
+                          0,
+                          NULL,
+                          0);
+    ], ac_free_version_0_4_0=yes, ac_free_version_0_4_0=no)
+    AC_MSG_RESULT($ac_free_version_0_4_0)
+    AC_MSG_CHECKING([for libfreeipmi version 0.5.0])
+    AC_TRY_COMPILE([
+#include <sys/types.h>	/* For size_t */
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+#include <freeipmi/udm/ipmi-udm.h>
+    ], [
+    ipmi_device_t dev = NULL;
+    int rv;
+    dev = ipmi_device_create();
+    rv = ipmi_open_inband(dev,
+                          IPMI_DEVICE_KCS,
+                          0,
+                          0,
+                          0,
+                          NULL,
+                          0,
+                          0);
+    ], ac_free_version_0_5_0=yes, ac_free_version_0_5_0=no)
+    AC_MSG_RESULT($ac_free_version_0_5_0)
+
+    AC_MSG_CHECKING([for libfreeipmi version 0.6.0])
+    AC_TRY_COMPILE([
+#include <stdio.h>	/* For NULL */
+#include <freeipmi/freeipmi.h>
+    ], [
+    ipmi_ctx_t ctx = NULL;
+    int rv;
+    ctx = ipmi_ctx_create();
+    rv = ipmi_ctx_open_inband(ctx,
+                              IPMI_DEVICE_KCS,
+                              0,
+                              0,
+                              0,
+                              NULL,
+                              0,
+                              0);
+    ], ac_free_version_0_6_0=yes, ac_free_version_0_6_0=no)
+    AC_MSG_RESULT($ac_free_version_0_6_0)
+
+    if test "x$ac_free_version_0_3_0" = "xyes" \
+       || test "x$ac_free_version_0_4_0" = "xyes" \
+       || test "x$ac_free_version_0_5_0" = "xyes" \
+       || test "x$ac_free_version_0_6_0" = "xyes"; then
+       AC_DEFINE(IPMI_INTF_FREE, [1], [Define to 1 to enable FreeIPMI interface.])
+       AC_SUBST(INTF_FREE, [free])
+       AC_SUBST(INTF_FREE_LIB, [libintf_free.la])
+       IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB free/libintf_free.la"
+       if test "x$ac_free_version_0_3_0" = "xyes"; then
+          AC_DEFINE(IPMI_INTF_FREE_0_3_0, [1], [Define to 1 for FreeIPMI 0.3.0.])
+       fi
+       if test "x$ac_free_version_0_4_0" = "xyes"; then
+          AC_DEFINE(IPMI_INTF_FREE_0_4_0, [1], [Define to 1 for FreeIPMI 0.4.0.])
+       fi
+       if test "x$ac_free_version_0_5_0" = "xyes"; then
+          AC_DEFINE(IPMI_INTF_FREE_0_5_0, [1], [Define to 1 for FreeIPMI 0.5.0.])
+       fi
+       if test "x$ac_free_version_0_6_0" = "xyes"; then
+          AC_DEFINE(IPMI_INTF_FREE_0_6_0, [1], [Define to 1 for FreeIPMI 0.6.0.])
+       fi
+    else
+       xenable_intf_free=no
+    fi
+
+    AC_CHECK_LIB(freeipmi,
+      ipmi_cmd_raw_ipmb, 
+      AC_DEFINE(IPMI_INTF_FREE_BRIDGING, [1],
+        [Define to 1 to enable FreeIPMI Bridging Support.]))
+fi
+
+dnl look for termios header file
+AC_CHECK_HEADER([termios.h],
+	[AC_DEFINE(HAVE_TERMIOS_H, [1], [Define to 1 if you have <termios.h>.])],
+	[AC_CHECK_HEADER([sys/termios.h],
+		[AC_DEFINE(HAVE_SYS_TERMIOS_H, [1], [Define to 1 if you have <sys/termios.h>.])],
+		[echo "** Unable to find termios header file."])])
+
+dnl set RPM distro tag for use in RPM name
+AC_ARG_WITH([rpm-distro],
+	[AC_HELP_STRING([--with-rpm-distro=DISTRO],
+			[set Linux distribution tag for use in RPM version string])],
+	[AC_SUBST(DISTRO, $with_rpm_distro)])
+
+dnl set RPM release tag
+AC_ARG_WITH([rpm-release],
+	[AC_HELP_STRING([--with-rpm-release=RELEASE],
+			[set release number for RPM release field])],
+	[], [with_rpm_release=1])
+AC_SUBST(RPM_RELEASE, $with_rpm_release)
+
+dnl enable Linux OpenIPMI interface
+AC_ARG_ENABLE([intf-open],
+	[AC_HELP_STRING([--enable-intf-open],
+			[enable Linux OpenIPMI interface [default=auto]])],
+	[xenable_intf_open=$enableval],
+	[])
+if test "x$xenable_intf_open" = "xstatic" || test "x$xenable_intf_open" = "xplugin"; then
+	xenable_intf_open=yes
+fi
+if test "x$xenable_intf_open" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_OPEN, [1], [Define to 1 to enable Linux OpenIPMI interface.])
+	AC_SUBST(INTF_OPEN, [open])
+	AC_SUBST(INTF_OPEN_LIB, [libintf_open.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB open/libintf_open.la"
+
+	dnl Check for dual bridge support in OpenIPMI
+	AC_MSG_CHECKING([for OpenIPMI dual bridge support])
+	have_openipmi_dual_bridge=no
+	ORIG_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS -Isrc/plugins/open -DENABLE_INTF_OPEN_DUAL_BRIDGE"
+	AC_TRY_COMPILE([
+			#if defined(HAVE_OPENIPMI_H)
+			# if defined(HAVE_LINUX_COMPILER_H)
+			#  include <linux/compiler.h>
+			# endif
+			# include <linux/ipmi.h>
+			#elif defined(HAVE_FREEBSD_IPMI_H)
+			# include <sys/ipmi.h>
+			#else
+			# include "open.h"
+			#endif
+		], [
+			struct ipmi_ipmb_addr a;
+			a.transit_slave_addr = 0;
+		], [have_openipmi_dual_bridge=yes])
+	if test x"$have_openipmi_dual_bridge" = x"yes"; then
+		AC_DEFINE(ENABLE_INTF_OPEN_DUAL_BRIDGE, [1],
+			[Define to 1 to enable OpenIPMI interface dual bridge support])
+	fi
+	CPPFLAGS="$ORIG_CPPFLAGS"
+	AC_MSG_RESULT([$have_openipmi_dual_bridge])
+fi
+
+dnl enable Intel IMB interface
+AC_ARG_ENABLE([intf-imb],
+	[AC_HELP_STRING([--enable-intf-imb],
+			[enable Intel IMB driver interface [default=auto]])],
+	[xenable_intf_imb=$enableval],
+	[])
+if test "x$xenable_intf_imb" = "xstatic" || test "x$xenable_intf_imb" = "xplugin"; then
+	xenable_intf_imb=yes
+fi
+if test "x$xenable_intf_imb" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_IMB, [1], [Define to 1 to enable Intel IMB interface.])
+	AC_SUBST(INTF_IMB, [imb])
+	AC_SUBST(INTF_IMB_LIB, [libintf_imb.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB imb/libintf_imb.la"
+fi
+
+dnl enable Solaris LIPMI interface
+AC_CHECK_HEADER([sys/lipmi/lipmi_intf.h], [have_lipmi=yes], [have_lipmi=no])
+AC_ARG_ENABLE([intf-lipmi],
+	[AC_HELP_STRING([--enable-intf-lipmi],
+			[enable Solaris 9 x86 IPMI interface [default=no]])],
+	[xenable_intf_lipmi=$enableval],
+	[])
+if test "x$xenable_intf_lipmi" = "xstatic" || test "x$xenable_intf_lipmi" = "xplugin"; then
+	xenable_intf_lipmi=yes
+fi
+if test "x$xenable_intf_lipmi" != "xno" && test "x$have_lipmi" != "xyes"; then
+	echo "** Unable to build Solaris 9 x86 IPMI interface support!"
+	xenable_intf_lipmi=no
+fi
+if test "x$xenable_intf_lipmi" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_LIPMI, [1], [Define to 1 to enable Solaris 9 LIPMI interface.])
+	AC_SUBST(INTF_LIPMI, [lipmi])
+	AC_SUBST(INTF_LIPMI_LIB, [libintf_lipmi.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB lipmi/libintf_lipmi.la"
+fi
+
+dnl enable Solaris BMC interface
+AC_ARG_ENABLE([intf-bmc],
+	[AC_HELP_STRING([--enable-intf-bmc],
+			[enable Solaris 10 x86 IPMI interface [default=auto]])],
+	[xenable_intf_bmc=$enableval],
+	[xenable_intf_bmc=no])
+if test "x$xenable_intf_bmc" = "xstatic" || test "x$xenable_intf_bmc" = "xplugin"; then
+	xenable_intf_bmc=yes
+fi
+if test "x$xenable_intf_bmc" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_BMC, [1], [Define to 1 to enable Solaris 10 BMC interface.])
+	AC_SUBST(INTF_BMC, [bmc])
+	AC_SUBST(INTF_BMC_LIB, [libintf_bmc.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB bmc/libintf_bmc.la"
+fi
+
+dnl enable Dummy interface for testing
+AC_ARG_ENABLE([intf-dummy],
+	[AC_HELP_STRING([--enable-intf-dummy],
+			[enable Dummy(test) interface [default=no]])],
+	[xenable_intf_dummy=$enableval], [xenable_intf_dummy=no])
+if test "x$xenable_intf_dummy" = "xyes"; then
+	AC_DEFINE(IPMI_INTF_DUMMY, [1], [Define to 1 to enable Dummy interface.])
+	AC_SUBST(INTF_DUMMY, [dummy])
+	AC_SUBST(INTF_DUMMY_LIB, [libintf_dummy.la])
+	IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB dummy/libintf_dummy.la"
+fi
+
+AC_SUBST(IPMITOOL_INTF_LIB)
+
+if test "x$xenable_ipmishell" = "xyes"; then
+	AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses readline termcap])
+	AC_SEARCH_LIBS([initscr], [ncurses curses], [have_curses=yes])
+	AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes])
+	if test "x$have_curses" != "xyes" || test "x$have_readline" != "xyes"; then
+		xenable_ipmishell=no
+	fi
+fi
+
+dnl check for readline library to enable ipmi shell
+AC_ARG_ENABLE([ipmishell],
+	[AC_HELP_STRING([--enable-ipmishell],
+			[enable IPMI shell interface [default=auto]])],
+	[xenable_ipmishell=$enableval],
+	[])
+if test "x$xenable_ipmishell" = "xyes"; then
+	AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses readline termcap])
+	AC_SEARCH_LIBS([initscr], [ncurses curses], [have_curses=yes])
+	AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes])
+	if test "x$have_curses" != "xyes"; then
+		AC_MSG_ERROR([** Unable to find curses required by ipmishell.])
+	fi
+	if test "x$have_readline" != "xyes"; then
+		AC_MSG_ERROR([** Unable to find readline required by ipmishell.])
+	fi
+	AC_DEFINE(HAVE_READLINE, [1], [Define to 1 if readline present.])
+fi
+
+dnl Enable -Wall -Werror
+AC_ARG_ENABLE([buildcheck],
+	[AC_HELP_STRING([--enable-buildcheck],
+			[enable -Wall -Werror for build testing [default=no]])],
+	[xenable_buildcheck=$enableval],
+	[xenable_buildcheck=no])
+if test "x$xenable_buildcheck" != "xno"; then
+	CFLAGS="$CFLAGS -Wall -Werror -Wpointer-arith -Wstrict-prototypes"
+fi
+AC_SUBST(CFLAGS)
+
+dnl Enable extra file security paranoia
+AC_ARG_ENABLE([file-security],
+	[AC_HELP_STRING([--enable-file-security],
+			[enable extra security checks on files opened for read [default=no]])],
+	[xenable_file_security=$enableval],
+	[xenable_file_security=no])
+if test "x$xenable_file_security" != "xno"; then
+	AC_DEFINE(ENABLE_FILE_SECURITY, [1], [Define to 1 for extra file security.])
+fi
+
+
+AC_TRY_COMPILE([],[
+	#include <stdio.h>
+	
+	struct packstruct {
+		unsigned char t0       :5;
+		unsigned char t1       :5;
+		unsigned char t2       :5;
+		unsigned char t3       :5;
+		unsigned char t4       :4;
+	} __attribute__ ((packed));
+	
+	int
+	main(int argc, char ** argv)
+	{
+	if(sizeof(struct packstruct) != 3)
+	return(1);
+	else
+	return(0);
+	}
+	],
+	[],
+	[AC_DEFINE(HAVE_PRAGMA_PACK,[1],
+		[Define to 1 if you need to use #pragma pack instead of __attribute__ ((packed))])]
+)
+
+
+dnl Generate files for build
+AC_CONFIG_FILES([Makefile
+		doc/Makefile
+		contrib/Makefile
+		control/Makefile
+		control/pkginfo
+		control/prototype
+		control/rpmmacros
+		control/ipmitool.spec
+		lib/Makefile
+		include/Makefile
+		include/ipmitool/Makefile
+		src/Makefile
+		src/plugins/Makefile
+		src/plugins/lan/Makefile
+		src/plugins/lanplus/Makefile
+		src/plugins/open/Makefile
+		src/plugins/free/Makefile
+		src/plugins/imb/Makefile
+		src/plugins/bmc/Makefile
+		src/plugins/usb/Makefile
+		src/plugins/lipmi/Makefile
+		src/plugins/serial/Makefile
+		src/plugins/dummy/Makefile])
+
+AC_OUTPUT
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([ipmitool $VERSION])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([Interfaces])
+AC_MSG_RESULT([  lan     : $xenable_intf_lan])
+AC_MSG_RESULT([  lanplus : $xenable_intf_lanplus])
+AC_MSG_RESULT([  open    : $xenable_intf_open])
+AC_MSG_RESULT([  free    : $xenable_intf_free])
+AC_MSG_RESULT([  imb     : $xenable_intf_imb])
+AC_MSG_RESULT([  bmc     : $xenable_intf_bmc])
+AC_MSG_RESULT([  usb     : $xenable_intf_usb])
+AC_MSG_RESULT([  lipmi   : $xenable_intf_lipmi])
+AC_MSG_RESULT([  serial  : $xenable_intf_serial])
+AC_MSG_RESULT([  dummy   : $xenable_intf_dummy])
+AC_MSG_RESULT([])
+AC_MSG_RESULT([Extra tools])
+AC_MSG_RESULT([  ipmievd   : yes])
+AC_MSG_RESULT([  ipmishell : $xenable_ipmishell])
+AC_MSG_RESULT([])
+
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 0000000..98cec70
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,41 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+dist_pkgdata_DATA = oem_ibm_sel_map
+
+EXTRA_DIST = README \
+	bmclanconf ipmi.init.basic ipmi.init.redhat \
+	exchange-bmc-os-info.init.redhat exchange-bmc-os-info.service.redhat \
+	exchange-bmc-os-info.sysconf log_bmc.sh\
+	ipmievd.init.redhat ipmievd.init.suse ipmievd.init.debian \
+	collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh \
+	bmc-snmp-proxy bmc-snmp-proxy.service bmc-snmp-proxy.sysconf
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
new file mode 100644
index 0000000..868dd15
--- /dev/null
+++ b/contrib/Makefile.in
@@ -0,0 +1,550 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = contrib
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_pkgdata_DATA) README
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(dist_pkgdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+dist_pkgdata_DATA = oem_ibm_sel_map
+EXTRA_DIST = README \
+	bmclanconf ipmi.init.basic ipmi.init.redhat \
+	exchange-bmc-os-info.init.redhat exchange-bmc-os-info.service.redhat \
+	exchange-bmc-os-info.sysconf log_bmc.sh\
+	ipmievd.init.redhat ipmievd.init.suse ipmievd.init.debian \
+	collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh \
+	bmc-snmp-proxy bmc-snmp-proxy.service bmc-snmp-proxy.sysconf
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign contrib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_pkgdataDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_pkgdataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_pkgdataDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_pkgdataDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/README b/contrib/README
new file mode 100644
index 0000000..22fc83e
--- /dev/null
+++ b/contrib/README
@@ -0,0 +1,95 @@
+
+Graphs for ipmitool
+-------------------
+
+This is a set of shell-scripts to quickly create a webpage with pretty graphs!
+
+Prerequisites are a webserver with cgi-bin support and RRDtool, a data
+collection and graphing utility you can get here:
+
+http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+
+
+First, decide on a directory where to store the RRDtool database files and make
+sure it exists. The user that will run the cronjob to collect updates must have
+write permissions in this dir.
+
+Next, you'll need to edit some variables at the top of each script.
+
+Common to all scripts:
+
+hostname	Override this if you are collecting data from a remote host,
+		or if the $HOSTNAME variable is incorrect. 
+
+ipmi_cmd	Command line used to call ipmitool. Default is to collect
+		data from the local server using OpenIPMI.
+
+		If you want to collect data from a remote host, add the
+		-I lan, -H, -U and -P options as necessary.
+
+		BIG NOTE! I do not recommend using remote data collection since
+		you'll have to store the password in the script. If you do,
+		make sure unauthorized people can't read or execute the scripts
+		or they'll be able to wreak havoc on your server.
+
+rrd_dir		Enter the dir where to store the RRDtool database here.
+
+
+Now you can get the data collection going. Run create_rrds.sh to create the
+RDDtool database, you'll find one .rrd file per sensor in the designated dir.
+Add a line to your crontab that executes collect_data.sh every 5 minutes.
+
+Something like this:
+*/5 * * * * /usr/local/bin/collect_data.sh
+
+If you are a Solaris user you'll have to write the more verbose:
+0,5,10,15,20,25,30,35,40,45,50,55 * * * * /usr/local/bin/collect_data.sh
+
+
+Finally it's time to create the webpage, begin with editing some more variables
+in the create_webpage.sh and/or create_webpage_compact.sh scripts:
+
+rrdcgi		Full path to the rrdcgi executable.
+
+img_dir		Directory to store the graph images. This path must be within
+		the document root and writable by the web server user.
+
+		Example: /usr/local/apache2/htdocs/images/graphs
+
+web_dir		Relative path of the URL where the images will show up
+		on the web server.
+
+		Example: With the img_dir path above the corresponding web_dir
+		would be /images/graphs
+
+graph_width	Size of the graph area in pixels (excluding title, legends etc.)
+graph_height
+
+graph_daily	Decide which of daily, weekly and monthly graphs you want
+graph_weekly	included on the page.
+graph_monthly
+
+
+Finally run the create webpage script and store the output as a cgi-script and
+don't forget to make it executable.
+
+Example:
+
+create_webpage.sh > /usr/local/apache2/cgi-bin/my_ipmi_graphs.cgi
+chmod 755 /usr/local/apache2/cgi-bin/my_ipmi_graphs.cgi
+
+Now you can surf to http://my.server.com/cgi-bin/my_ipmi_graphs.cgi and enjoy!
+
+
+The difference between create_webpage.sh and create_webpage_compact.sh is that
+the first script displays sensor thresholds in the graphs. The second script
+collects all sensors that measure the same unit into the same graph thus
+producing a lot fewer graphs.
+
+Note, RRDtool sometimes scales the graphs such that the sensor thresholds
+fall outside the visible area.
+
+
+Happy graphing!
+
+
diff --git a/contrib/bmc-snmp-proxy b/contrib/bmc-snmp-proxy
new file mode 100644
index 0000000..fcb2ab8
--- /dev/null
+++ b/contrib/bmc-snmp-proxy
@@ -0,0 +1,403 @@
+#!/bin/sh
+#############################################################################
+#
+# bmc-snmp-proxy:	Set SNMP proxy to BMC (Baseboard Management Controller)
+#
+# version:	0.62
+#
+# Authors:	Charles Rose <charles_rose@dell.com>
+#		Jordan Hargrave <jordan_hargrave@dell.com>
+#
+# Description:  Script to set snmp proxy to the BMC for certain OID
+#		See here for details:
+#		https://fedoraproject.org/wiki/Features/AgentFreeManagement
+#
+# Assumptions:  This script will work only when /etc/snmp/ is writable.
+#
+#############################################################################
+# GLOBALS
+#############################################################################
+SYSCONF_DIR="/etc/sysconfig"
+CONFIG="${SYSCONF_DIR}/bmc-snmp-proxy"
+
+SNMPD_BMC_CONF_DIR="/etc/snmp/bmc"
+SNMPD_BMC_CONF="${SNMPD_BMC_CONF_DIR}/snmpd.local.conf"
+TRAPD_BMC_CONF="${SNMPD_BMC_CONF_DIR}/snmptrapd.local.conf"
+
+TRAPD_CONF="/etc/snmp/snmptrapd.conf"
+
+LOCKFILE="/var/lock/subsys/bmc-snmp-proxy"
+BMC_INFO="/var/run/bmc-info"
+
+IPMITOOL=`which ipmitool`
+
+#Default config
+BMC_COMMUNITY="public"
+BMC_OID=".1.3.6.1.4.1.674.10892.2"  # Dell iDRAC
+TRAP_FORWARD="no"
+RELOAD_SERVICES="yes"
+
+#############################################################################
+
+#TODO: Use inotify and daemonize when $BMC_INFO changes
+
+# source config
+[ -r ${CONFIG} ] && . ${CONFIG}
+
+. gettext.sh
+
+SCRIPT_NAME=$(basename $0)
+RETVAL=0
+
+# Check if bmc-info created by exchange-bmc-os-info
+bmc_info_exists()
+{
+	if [ -r "${BMC_INFO}" ]; then
+		. ${BMC_INFO}
+	else
+		RETVAL=2
+	fi
+
+	return $RETVAL
+}
+
+check_snmp()
+{
+	if [ ! -d /etc/snmp ] || [ ! -x /usr/sbin/snmpd ]; then
+		RETVAL=12
+	fi
+
+	return $RETVAL
+}
+
+#############################################################################
+# configure SNMP proxy
+#############################################################################
+write_snmp_conf()
+{
+	# SNMPv3 security: bmcview, bmc_ctx, bmc_sec, bmc_grp, bmc_cmty
+	printf "###############################################\n"
+	printf "# Automatically created by %s #\n" "${SCRIPT_NAME}"
+	printf "###############################################\n"
+	printf "#view bmcview included %s 80\n" "${BMC_OID}"
+	printf "#com2sec -Cn bmc_ctx bmc_sec default bmc_cmty\n"
+	printf "#group bmc_grp v1 bmc_sec\n"
+	printf "#access bmc_grp bmc_ctx any noauth exact bmcview none none\n"
+	printf "#proxy -Cn bmc_ctx -v 1 %s\n" "${PROXY_TOKEN}"
+	printf "proxy -v 1 %s\n" "${PROXY_TOKEN}"
+	printf "###############################################\n"
+}
+
+valid_ip()
+{
+        #Thanks to mkyong.com
+        octet="([01]?[[:digit:]][[:digit:]]?|2[0-4][[:digit:]]|25[0-5])"
+
+        printf -- "%s" "${1}"| grep -Eq \
+		"^${octet}\\.${octet}\\.${octet}\\.${octet}$"
+
+        return $?
+}
+
+check_vars()
+{
+	[ -z ${BMC_COMMUNITY} ] && BMC_COMMUNITY="public"
+	[ -z ${BMC_OID} ] && return 1
+
+	if [ -n "${BMC_IPv4}" ] && valid_ip ${BMC_IPv4}; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+set_snmp_proxy()
+{
+	if check_vars; then
+		PROXY_TOKEN="-c ${BMC_COMMUNITY} ${BMC_IPv4} ${BMC_OID}"
+
+		if [ -d ${SNMPD_BMC_CONF_DIR} ]; then
+			write_snmp_conf > ${SNMPD_BMC_CONF} || RETVAL=4
+		fi
+	else
+		RETVAL=3
+	fi
+}
+
+set_snmpd_conf_path()
+{
+	if [ ! -d ${SNMPD_BMC_CONF_DIR} ]; then
+		mkdir ${SNMPD_BMC_CONF_DIR} || RETVAL=7
+	fi
+
+	# We need SNMPCONFPATH set for both snmpd and snmptrapd
+	for sysconf in ${SYSCONF_DIR}/snmp*d;
+	do
+		if ! grep -q "^SNMPCONFPATH.*${SNMPD_BMC_CONF_DIR}" \
+			"${sysconf}" > /dev/null 2>&1; then
+			printf "SNMPCONFPATH=/etc/snmp:%s\n" \
+				"${SNMPD_BMC_CONF_DIR}" >> ${sysconf} || \
+				RETVAL=7
+		fi
+	done
+
+	return $RETVAL
+}
+
+disable_snmp_proxy()
+{
+	if [ -f ${SNMPD_BMC_CONF} ]; then
+		rm -f ${SNMPD_BMC_CONF} || RETVAL=5
+	fi
+}
+#############################################################################
+# Trap Forwarding
+#############################################################################
+
+pick_alert_dest()
+{
+	test_ip="$1"
+	# We have 4 IPv4 and 4 IPv6 alert dest. We will set IPv4 for now.
+	for ALERT_DEST in `seq 1 4`
+	do
+		temp_ip=$(${IPMITOOL} lan alert print ${CHANNEL} ${ALERT_DEST}\
+			2>/dev/null| sed -n "s#^Alert IP Address.*: ##p")
+
+		[ "${temp_ip}" = "${test_ip}" ] && return 0
+	done
+	return 1
+}
+
+set_alert_dest_ip()
+{
+	${IPMITOOL} lan alert set ${CHANNEL} ${ALERT_DEST} ipaddr ${1} \
+		retry 4 type pet >/dev/null 2>&1 || RETVAL=8
+}
+
+config_bmc_alert_dest()
+{
+	# call with enable|disable
+	# Pick the first active LAN channel
+        for CHANNEL in `seq 1 14`
+        do
+                [ $(${IPMITOOL} -I open channel info ${CHANNEL} 2>/dev/null \
+                        | grep -q "802\.3") ] || break
+        done
+
+	# If TRAPD_IP is already set as an alert dest,
+	if pick_alert_dest "${TRAPD_IP}"; then
+		# disable: reset it if we are called with disable
+		[ "${1}" = "disable" ] && \
+			set_alert_dest_ip "0.0.0.0"
+	# else, find the next free alert dest,
+	elif pick_alert_dest "0.0.0.0"; then
+		[ "${1}" = "disable" ] && \
+			return $RETVAL
+		# set: the TRAPD_IP
+		set_alert_dest_ip "${TRAPD_IP}"
+	else
+		# No free alert destinations
+		RETVAL=9
+	fi
+
+	return $RETVAL
+}
+
+set_ipmi_pef()
+{
+	# Needs ipmitool-1.8.13 + patches
+	${IPMITOOL} pef policy set ${ALERT_DEST} "${1}" >/dev/null 2>&1 || \
+		RETVAL=10
+}
+
+get_host_ip()
+{
+	# Get host's IP that the BMC can reach. This is at best a hack.
+	IFACE=$(/usr/sbin/ip -o -f inet address |awk '!/: lo/ {print $2}')
+
+	for dev in ${IFACE}
+	do
+		temp_ping=$(ping -c 1 -I ${dev} ${BMC_IPv4})
+		[ $? -ne 0 ] && continue
+
+		printf -- "%s" "$temp_ping"| awk 'NR==1{print $5}' && break
+	done
+}
+
+config_bmc_alert()
+{
+	# Do two things
+	# Set/Reset TRAP IP in BMC
+	# Enable/Disable PEF alerting in BMC for TRAP
+
+	# Get Host's IP that the BMC can send traps to
+	TRAPD_IP=$(get_host_ip)
+
+	# Set Host's IP as the alert destination in the BMC
+	valid_ip ${TRAPD_IP} && config_bmc_alert_dest "${ACTION}"
+
+	# Enable/Disable alerting on the LAN channel
+	[ $RETVAL -eq 0 ] && set_ipmi_pef "${ACTION}"
+
+	return $RETVAL
+}
+
+write_trapd_conf()
+{
+	printf "###############################################\n"
+	printf "# Automatically created by %s #\n" "${SCRIPT_NAME}"
+	printf "forward default %s\n" "${FORWARD_HOST}"
+	printf "###############################################\n"
+}
+
+config_trapd()
+{
+	# Proceed only if snmptrapd is available on the system
+	if [ -f ${TRAPD_CONF} ]; then
+		write_trapd_conf > ${TRAPD_BMC_CONF} || RETVAL=11
+	else
+		RETVAL=11
+	fi
+}
+
+trap_sink_exists()
+{
+	# TODO: We only set the first match. We should be able to set
+	# multiple
+	FORWARD_HOST=$(awk '/^trap.*sink/{print $2}; /^informsink/{print $2}' \
+			/etc/snmp/snmpd*conf | head -1)
+
+	if [ -z "${FORWARD_HOST}" ]; then
+		# there is no trapsink setup.
+		return 1
+	else
+		return 0
+	fi
+}
+
+# Forward SNMP traps from the BMC to trapsink.
+trap_forward()
+{
+	NO_TRAP=0
+	ACTION=${1} # enable or disable
+
+	if [ "${ACTION}" = "enable" ]; then
+		# Get trapd config,
+		if trap_sink_exists; then
+			config_bmc_alert && config_trapd
+		else
+			# exit silently if there is no sink
+			NO_TRAP=1
+		fi
+	else
+		if [ -f ${TRAPD_BMC_CONF} ]; then
+			rm -f ${TRAPD_BMC_CONF} >/dev/null 2>&1
+			config_bmc_alert
+		else
+			NO_TRAP=1
+		fi
+	fi
+}
+
+#############################################################################
+service_reload()
+{
+	#TODO: do this in systemd
+	if [ ${RETVAL} -eq 0 ] && [ "${RELOAD_SERVICES}" = "yes" ]; then
+		service $1 reload
+		[ $? -ne 0 ] && RETVAL=6
+	fi
+}
+
+#############################################################################
+start()
+{
+	if bmc_info_exists && check_snmp; then
+		touch ${LOCKFILE}
+
+		set_snmpd_conf_path && set_snmp_proxy
+		[ $RETVAL -eq 0 ] && service_reload snmpd
+
+		if [ "${TRAP_FORWARD}" = "yes" ]; then
+			trap_forward "enable"
+			[ $RETVAL -eq 0 ] && [ $NO_TRAP -eq 0 ] && \
+				service_reload snmptrapd
+		fi
+	fi
+}
+
+#############################################################################
+stop()
+{
+	[ ! -f ${LOCKFILE} ] && return
+	if bmc_info_exists && check_snmp; then
+		disable_snmp_proxy
+		[ $RETVAL -eq 0 ] && service_reload snmpd
+
+		if [ "${TRAP_FORWARD}" = "yes" ]; then
+			trap_forward "disable"
+			[ $RETVAL -eq 0 ] && [ $NO_TRAP -eq 0 ] && \
+				service_reload snmptrapd
+		fi
+
+		rm -f ${LOCKFILE}
+	fi
+}
+
+#############################################################################
+status()
+{
+	eval_gettext "${SCRIPT_NAME}: snmp proxy to BMC is "
+	# Checking for lockfile is better.
+	#if grep -q "^proxy" "${SNMPD_BMC_CONF}" > /dev/null 2>&1 ; then
+	if [ -f ${LOCKFILE} ]; then
+		eval_gettext "set"
+	else
+		eval_gettext "not set"
+	fi
+
+	echo
+	RETVAL=0
+}
+
+#############################################################################
+usage()
+{
+	eval_gettext "Usage: $0 {start|stop|status}"; echo 1>&2
+	RETVAL=1
+}
+
+#############################################################################
+# MAIN
+#############################################################################
+case "$1" in
+	start) start ;;
+	stop)  stop ;;
+	status)	status ;;
+	*) usage ;;
+esac
+
+case "$RETVAL" in
+	0|1) ;;
+	2) eval_gettext "${SCRIPT_NAME}: failed to read ${BMC_INFO} " 1>&2 ;;
+	3) eval_gettext "${SCRIPT_NAME}: failed to get proxy config." 1>&2 ;;
+	4) eval_gettext "${SCRIPT_NAME}: failed to set ${SNMPD_BMC_CONF}." 1>&2 ;;
+	5) eval_gettext "${SCRIPT_NAME}: failed to disable snmp proxy." 1>&2 ;;
+	6) eval_gettext "${SCRIPT_NAME}: failed to reload snmpd." 1>&2 ;;
+	7) eval_gettext "${SCRIPT_NAME}: failed to set snmpd config." 1>&2 ;;
+	8) eval_gettext "${SCRIPT_NAME}: failed to set IPMI alert dest." 1>&2 ;;
+	9) eval_gettext "${SCRIPT_NAME}: no free IPMI alert dest." 1>&2 ;;
+	10) eval_gettext "${SCRIPT_NAME}: failed to set IPMI PEF." 1>&2 ;;
+	11) eval_gettext "${SCRIPT_NAME}: failed to write snmptrapd.conf." 1>&2 ;;
+	12) eval_gettext "${SCRIPT_NAME}: snmpd not found." 1>&2 ;;
+	*) eval_gettext "${SCRIPT_NAME}: unknown error." 1>&2 ;;
+esac
+
+if [ ${RETVAL} -gt 1 ]; then
+        eval_gettext " Return code: ${RETVAL}"; echo
+fi
+
+exit ${RETVAL}
+#############################################################################
+# end of file
+#############################################################################
diff --git a/contrib/bmc-snmp-proxy.service b/contrib/bmc-snmp-proxy.service
new file mode 100644
index 0000000..247137a
--- /dev/null
+++ b/contrib/bmc-snmp-proxy.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Setup SNMP proxy to BMC
+
+After=exchange-bmc-os-info.service
+Requires=exchange-bmc-os-info.service
+PartOf=exchange-bmc-os-info.service
+
+ConditionPathExists=/var/run/bmc-info
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+ExecStart=/usr/libexec/bmc-snmp-proxy start
+ExecStop=/usr/libexec/bmc-snmp-proxy stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/bmc-snmp-proxy.sysconf b/contrib/bmc-snmp-proxy.sysconf
new file mode 100644
index 0000000..30bf62c
--- /dev/null
+++ b/contrib/bmc-snmp-proxy.sysconf
@@ -0,0 +1,48 @@
+# bmc-snmp-proxy
+#
+# Config file to control SNMP redirection between
+# the OS and Service Processor/Baseboard Management Controller (BMC)
+#
+# bmc-snnmp-proxy helps redirect certain SNMP requests (to this host)
+# destined to the Service Processor. We will need the Service Processor's
+# SNMP community string and the OID of the Service Processor's SNMP agent.
+#
+# For redirecting Traps from the Service Processor to the trap sink
+# configured in the host (this system), we will have to set
+# TRAP_FORWARD below.
+#
+# See here for details
+#    https://fedoraproject.org/wiki/Features/AgentFreeManagement
+
+### Configure SNMP proxy to BMC/Service Processor ###
+
+### Service Processor/BMC SNMP Community String. 
+# Name: BMC_COMMUNITY
+# Description: Set community string of the Service Processor (BMC)'s
+# 		SNMP agent.
+# Default: public
+#
+BMC_COMMUNITY="public"
+
+### OEM Specific OID of Service Processor
+# Name: BMC_OID
+# Description: SNMP OID that we would like to redirect to the Service
+# 		Processor (BMC). This can be unique to each OEM.
+# Default: ".1.3.6.1.4.1.674.10892.2"
+BMC_OID=".1.3.6.1.4.1.674.10892.2"  # Dell iDRAC
+
+### Forward Traps from the Service Processor to trap sink
+# Name: TRAP_FORWARD
+# Description: Enabling this will allow traps from the Service Processor
+# 		to be directed to this system and configure snmptrapd
+# Note: This option will have no effect if trap sink on the system is
+# 	not configured
+# Default: "no"
+TRAP_FORWARD="yes"
+
+### Reload snmpd and snmptrapd
+# Name: RELOAD_SERVICES
+# Description: Reload snmpd and snmptrapd after making changes to their config
+# 		files.
+# Default: "yes"
+RELOAD_SERVICES="yes"
diff --git a/contrib/bmclanconf b/contrib/bmclanconf
new file mode 100755
index 0000000..253afd4
--- /dev/null
+++ b/contrib/bmclanconf
@@ -0,0 +1,308 @@
+#!/bin/bash
+#
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+# This script is designed for Sun Fire LX50, V60x and V65x systems.
+# It may work with other setups as long as you use the correct channel
+# and interface settings.  It can be used on the V20z as long as you
+# specify network settings on the command line.
+#
+# If the wrong channel is used you could lose network access to the
+# box because your BMC will be sending out bad Gratuitous ARP packets
+# with the wrong MAC address.  You will need to use a console or
+# override your local ARP cache with the correct addr.
+
+usage ()
+{
+    echo "
+usage: $0 -c <chan> -i <interface> [options]
+       $0 -c <chan> [-v|w|x|y|z address] [options]
+
+    -c channel     Which BMC channel to configure [-c help for more info]
+    -i interface   Auto-configure BMC based on interface network settings
+    -v address     Use specified IP address
+    -w address     Use specified Netmask address
+    -x address     Use specified MAC address
+    -y address     Use specified Gateway IP address
+    -z address     Use specified Gateway MAC address
+    -m interface   Which IPMI interface to use [default linux=open solaris=lipmi]
+    -p password    Set BMC channel password
+    -s string      Set SNMP community string
+    -a interval    Set Gratuitous ARP interval, off=0, default=4
+    -r             Reset BMC channel, zero all network settings, disable
+    -d             Debug mode, does not make any changes
+"
+    exit 0;
+}
+
+channel_usage ()
+{
+    echo "
+ Sun Fire V60x and V65x - Linux 2.4
+   eth0 = channel 6, top
+   eth1 = channel 7, bottom
+
+ Sun Fire V60x and V65x - Linux 2.6
+   eth0 = channel 7, bottom
+   eth1 = channel 6, top
+
+ Sun Fire V60x and V65x - Solaris x86
+   e1000g0 = channel 7, bottom
+   e1000g1 = channel 6, top
+
+ Sun LX50 - Linux
+   eth0 = channel 7, bottom
+   eth1 = channel 6, top
+
+ Sun LX50 - Solaris x86
+   le0 = channel 7, bottom
+   le1 = channel 6, top
+
+ Sun Fire V20z (-i option does not apply)
+   channel 1
+"
+    exit 0
+}
+
+hex_to_ip ()
+{
+    test $# -ge 1 || return;
+    local HEX B1 B2 B3 B4;
+    HEX=`echo $1 | tr '[:lower:]' '[:upper:]'`;
+    H1=`echo $HEX | cut -c1-2`
+    H2=`echo $HEX | cut -c3-4`
+    H3=`echo $HEX | cut -c5-6`
+    H4=`echo $HEX | cut -c7-8`
+    B1=`echo 10 o 16 i $H1 p | dc`
+    B2=`echo 10 o 16 i $H2 p | dc`
+    B3=`echo 10 o 16 i $H3 p | dc`
+    B4=`echo 10 o 16 i $H4 p | dc`
+    echo "$B1.$B2.$B3.$B4"
+}
+
+ipmitool_lan_set ()
+{
+    [ $# -lt 1 ] && return
+    local PARAM=$1
+    local VALUE=
+    [ $# -ge 2 ] && VALUE=$2
+
+    if [ $DEBUG -gt 0 ]; then
+	echo "Setting LAN parameter $PARAM $VALUE"
+	echo "$IPMITOOL -I $IPMIINTF lan set $CHANNEL $PARAM $VALUE"
+	return
+    fi
+
+    $IPMITOOL -I $IPMIINTF lan set $CHANNEL $PARAM $VALUE
+}
+
+ipmitool_lan_reset ()
+{
+    ipmitool_lan_set "ipsrc" "static"
+    ipmitool_lan_set "ipaddr" "0.0.0.0"
+    ipmitool_lan_set "netmask" "0.0.0.0"
+    ipmitool_lan_set "macaddr" "00:00:00:00:00:00"
+    ipmitool_lan_set "defgw ipaddr" "0.0.0.0"
+    ipmitool_lan_set "defgw macaddr" "00:00:00:00:00:00"
+    ipmitool_lan_set "password"
+    ipmitool_lan_set "snmp" "public"
+    ipmitool_lan_set "arp generate" "off"
+    ipmitool_lan_set "access" "off"
+    exit 0
+}
+
+DEBUG=0
+LINUX=0
+SOLARIS=0
+CHANNEL=0
+IFACE=
+PASSWORD=
+SNMP=
+GRATARP=8
+PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin
+
+case `uname -s` in
+    Linux)
+	IPMIINTF=open
+	IPMITOOL=ipmitool
+	PING=ping
+	IFCONFIG=ifconfig
+	ARP=arp
+	ROUTE=route
+	;;
+    SunOS)
+	IPMIINTF=lipmi
+	IPMITOOL=ipmiadm
+	PING=ping
+	IFCONFIG=ifconfig
+	ARP=arp
+	ROUTE=route
+	;;
+    *)
+	echo "Invalid OS!"
+	exit 1
+esac
+
+while getopts "dhri:c:m:p:s:a:v:w:x:y:z:" OPTION ; do
+    case "$OPTION" in
+	i) IFACE=$OPTARG ;;
+	c) CHANNEL=$OPTARG ; test X$CHANNEL = Xhelp && channel_usage ;;
+	m) IPMIINTF=$OPTARG ;;
+	p) PASSWORD=$OPTARG ;;
+	s) SNMP=$OPTARG ;;
+	a) GRATARP=$OPTARG ;;
+	d) DEBUG=1 ;;
+	v) IP_ADDRESS=$OPTARG ;;
+	w) IP_NETMASK=$OPTARG ;;
+	x) MAC_ADDRESS=$OPTARG ;;
+	y) GATEWAY_IP=$OPTARG ;;
+	z) GATEWAY_MAC=$OPTARG ;;
+	r) ipmitool_lan_reset ;;
+	h) usage ;;
+	*) echo "Ignoring invalid option : -$OPTARG" ;;
+    esac
+done
+
+if [ ! -x `which $IPMITOOL` ]; then
+    echo "Error: unable to find $IPMITOOL"
+    exit 1
+fi
+
+if [ $CHANNEL -eq 0 ]; then
+    echo
+    echo "Error: you must specify a channel with -c"
+    echo
+    exit 1
+fi
+
+if [ "$IFACE" ]; then
+    if ! $IFCONFIG $IFACE 2>/dev/null | grep "inet " >/dev/null 2>&1 ; then
+	echo
+	echo "Error: unable to find interface $IFACE"
+	echo
+	exit 1
+    fi
+    echo "Auto-configuring $IFACE (channel $CHANNEL)"
+fi
+
+case `uname -s` in
+    SunOS)
+	if [ X$IFACE != X ]; then
+	    if [ X$IP_ADDRESS = X ]; then
+		IP_ADDRESS=`$IFCONFIG $IFACE | grep inet | awk '{print $2}'`
+	    fi
+	    if [ X$IP_NETMASK = X ]; then
+		HEX_NETMASK=`$IFCONFIG $IFACE | grep netmask | awk '{print $4}'`
+		IP_NETMASK=`hex_to_ip $HEX_NETMASK`
+	    fi
+	    if [ X$MAC_ADDRESS = X ]; then
+		MAC_ADDRESS=`$IFCONFIG $IFACE | grep ether | awk '{print $2}'`
+	    fi
+	    if [ X$GATEWAY_IP = X ]; then
+		GATEWAY_IP=`$ROUTE -n get default | grep gateway: | awk '{print $2}'`
+	    fi
+	    if [ X$GATEWAY_MAC = X ]; then
+		$PING -i $IFACE $GATEWAY_IP 1 >/dev/null 2>&1
+		GATEWAY_MAC=`$ARP $GATEWAY_IP | awk '{print $4}'`
+		if [ X$GATEWAY_MAC = Xno ]; then
+		    GATEWAY_MAC=
+		fi
+	    fi
+	fi
+	;;
+
+    Linux)
+	if [ X$IFACE != X ]; then
+	    if [ X$IP_ADDRESS = X ]; then
+		IP_ADDRESS=`$IFCONFIG $IFACE | grep "inet addr" | awk -F"[:[:space:]]+" '{print $4}'`
+	    fi
+	    if [ X$IP_NETMASK = X ]; then
+		IP_NETMASK=`$IFCONFIG $IFACE | grep Bcast | awk -F"[:[:space:]]+" '{print $8}'`
+	    fi
+	    if [ X$MAC_ADDRESS = X ]; then
+		MAC_ADDRESS=`$IFCONFIG $IFACE | grep HWaddr | awk '{print $5}'`
+	    fi
+	    if [ X$GATEWAY_IP = X ]; then
+		GATEWAY_IP=`$ROUTE -n | awk '/^0.0.0.0/ {print $2}'`
+	    fi
+	    if [ X$GATEWAY_MAC = X ]; then
+		$PING -q -c1 $GATEWAY_IP >/dev/null 2>&1
+		GATEWAY_MAC=`$ARP -an | grep "$GATEWAY_IP[^0-9]" | awk '{print $4}'`
+	    fi
+	fi
+	;;
+esac
+
+if [ X$IP_ADDRESS != X ]; then
+    ipmitool_lan_set "ipsrc" "static"
+    ipmitool_lan_set "ipaddr" "$IP_ADDRESS"
+fi
+
+if [ X$IP_NETMASK != X ]; then
+    ipmitool_lan_set "netmask" "$IP_NETMASK"
+fi
+
+if [ X$MAC_ADDRESS != X ]; then
+    ipmitool_lan_set "macaddr" "$MAC_ADDRESS"
+fi
+
+if [ X$GATEWAY_IP != X ]; then
+    ipmitool_lan_set "defgw ipaddr" "$GATEWAY_IP"
+fi
+
+if [ X$GATEWAY_MAC != X ]; then
+    ipmitool_lan_set "defgw macaddr" "$GATEWAY_MAC"
+fi
+
+if [ X$PASSWORD != X ]; then
+    ipmitool_lan_set "password" "$PASSWORD"
+fi
+
+if [ X$SNMP != X ]; then
+    ipmitool_lan_set "snmp" "$SNMP"
+fi
+
+if [ "$GRATARP" -ne 0 ]; then
+    ipmitool_lan_set "arp generate" "on"
+    ipmitool_lan_set "arp interval" "$GRATARP"
+else
+    ipmitool_lan_set "arp generate" "off"
+fi
+
+echo "Setting channel authentication capabilities"
+ipmitool_lan_set "auth callback,user,operator,admin" "md2,md5"
+
+echo "Enabling channel $CHANNEL"
+ipmitool_lan_set "access" "on"
+ipmitool_lan_set "user"
+
+exit 0
diff --git a/contrib/collect_data.sh b/contrib/collect_data.sh
new file mode 100755
index 0000000..c0a5099
--- /dev/null
+++ b/contrib/collect_data.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+# 
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# No need to edit below this point.
+
+IFS="
+"
+
+for line in `eval $ipmi_cmd -c sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+
+	rrdupdate "$file" "N:${split[1]}"
+done
diff --git a/contrib/create_rrds.sh b/contrib/create_rrds.sh
new file mode 100755
index 0000000..7298e1a
--- /dev/null
+++ b/contrib/create_rrds.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+#
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# No need to edit below this point.
+
+IFS="
+"
+
+for line in `eval $ipmi_cmd -c -v sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+
+	if [ -e "$file" ] ; then
+		echo "Skipping existing file $file"
+		continue
+	fi
+
+	echo "Creating file $file"
+
+	rrdtool create "$file" \
+		--step 300 DS:var:GAUGE:900:${split[16]}:${split[17]} \
+		RRA:AVERAGE:0.5:1:288 \
+		RRA:AVERAGE:0.5:6:336 \
+		RRA:AVERAGE:0.5:12:720
+done
diff --git a/contrib/create_webpage.sh b/contrib/create_webpage.sh
new file mode 100755
index 0000000..7152b3d
--- /dev/null
+++ b/contrib/create_webpage.sh
@@ -0,0 +1,211 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003-2004 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+#
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# Full path to the rrdcgi executable.
+rrdcgi=/usr/local/bin/rrdcgi
+
+# Where should rrdcgi store the graphs? This path must be within the
+# document root and writable by the webserver user.
+img_dir=/usr/local/apache2/htdocs/images/graphs
+
+# Where will the graphs show up on the webserver?
+web_dir=/images/graphs
+
+# Size of graph area (excluding title, legends etc.)
+graph_width=500
+graph_height=150
+
+# Graphs to include on page
+graph_daily=1
+graph_weekly=1
+graph_monthly=0
+
+
+# No need to edit below this point.
+
+color[0]="2020FF"
+color[1]="20FF20"
+color[2]="FF2020"
+color[3]="FF21FF"
+color[4]="21FFFF"
+color[5]="FFFF21"
+color[6]="8F21FF"
+color[7]="21FF8F"
+color[8]="FF8F21"
+color[9]="FF2190"
+color[10]="2190FF"
+color[11]="90FF21"
+
+cat << EOF
+#!$rrdcgi
+<html>
+<head>
+<title>$hostname</title>
+<RRD::GOODFOR 300>
+<body>
+<h2>$hostname</h2>
+EOF
+
+
+IFS="
+"
+
+i=0
+groups=
+
+for line in `eval $ipmi_cmd -c -v sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+	group=`echo "${split[2]} ${split[*]:10:6}" | tr ' .-' ___`
+
+	group_color=${group}_color
+
+	if [ -z "${!group}" ] ; then
+		groups="$groups $group"
+
+		declare $group_color=0
+
+		group_unit=${group}_unit
+		declare $group_unit="${split[2]}"
+
+		group_title=${group}_title
+		declare $group_title="${split[5]} / ${split[6]}"
+
+		group_thres=${group}_thres
+		declare $group_thres="${split[10]},${split[11]},${split[12]},${split[13]},${split[14]},${split[15]}"
+	fi
+
+	declare $group="${!group}
+  DEF:var$i=\"$file\":var:AVERAGE LINE1:var$i#${color[${!group_color}]}:\"${split[0]}\""
+
+	declare $group_color=$[ ${!group_color} + 1 ]
+
+	c=$[ c + 1 ]
+	i=$[ i + 1 ]
+done
+
+IFS=" "
+
+for group in $groups ; do
+
+	group_unit=${group}_unit
+	group_title=${group}_title
+	group_thres=${group}_thres
+
+	IFS=,
+
+	split=(${!group_thres})
+
+	thres=
+
+	if [ -n "${split[0]}" ] ; then
+		if [ -n "${split[3]}" ] ; then
+			thres="
+  HRULE:${split[0]}#000000
+  HRULE:${split[3]}#000000:\"Upper & lower non-recoverable thresholds\""
+		else
+			thres="
+  HRULE:${split[0]}#000000:\"Upper non-recoverable threshold\""
+		fi
+	else
+		if [ -n "${split[3]}" ] ; then
+			thres="
+  HRULE:${split[3]}#000000:\"Lower non-recoverable threshold\""
+		fi
+	fi
+
+	if [ -n "${split[1]}" ] ; then
+		if [ -n "${split[4]}" ] ; then
+			thres="$thres
+  HRULE:${split[1]}#FF0000
+  HRULE:${split[4]}#FF0000:\"Upper & lower critical thresholds\""
+		else
+			thres="$thres
+  HRULE:${split[1]}#FF0000:\"Upper critical threshold\""
+		fi
+	else
+		if [ -n "${split[4]}" ] ; then
+			thres="$thres
+  HRULE:${split[4]}#FF0000:\"Lower critical threshold\""
+		fi
+	fi
+
+	if [ -n "${split[2]}" ] ; then
+		if [ -n "${split[5]}" ] ; then
+			thres="$thres
+  HRULE:${split[2]}#FFCC00
+  HRULE:${split[5]}#FFCC00:\"Upper & lower warning thresholds\""
+		else
+			thres="$thres
+  HRULE:${split[2]}#FFCC00:\"Upper warning threshold\""
+		fi
+	else
+		if [ -n "${split[5]}" ] ; then
+			thres="$thres
+  HRULE:${split[5]}#FFCC00:\"Lower warning threshold\""
+		fi
+	fi
+
+	echo "<h3>${!group_title}</h3>"
+
+	if [ "$graph_daily" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-daily.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --vertical-label "${!group_unit}"
+  --title "Daily graph"
+  --height $graph_height
+  --width $graph_width ${!group} $thres
+>
+EOF
+	fi
+
+	if [ "$graph_weekly" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-weekly.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --start -7d
+  --vertical-label "${!group_unit}"
+  --title "Weelky graph"
+  --height $graph_height
+  --width $graph_width ${!group} $thres
+>
+EOF
+	fi
+
+	if [ "$graph_monthly" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-monthly.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --start -30d
+  --vertical-label "${!group_unit}"
+  --title "Monthly graph"
+  --height $graph_height
+  --width $graph_width ${!group} $thres
+>
+EOF
+	fi
+done
+
+cat << EOF
+</body>
+</html>
+EOF
diff --git a/contrib/create_webpage_compact.sh b/contrib/create_webpage_compact.sh
new file mode 100755
index 0000000..d8df05b
--- /dev/null
+++ b/contrib/create_webpage_compact.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+#
+#  Copyright (c) 2003-2004 Fredrik Ohrn.  All Rights Reserved.
+#
+#  See the included COPYING file for license details.
+#
+
+# Edit the variables
+
+hostname=$HOSTNAME
+
+ipmi_cmd="/usr/local/bin/ipmitool -I open"
+rrd_dir="/some/dir/rrd"
+
+# Full path to the rrdcgi executable.
+rrdcgi=/usr/local/bin/rrdcgi
+
+# Where should rrdcgi store the graphs? This path must be within the
+# document root and writable by the webserver user.
+img_dir=/usr/local/apache2/htdocs/images/graphs
+
+# Where will the graphs show up on the webserver?
+web_dir=/images/graphs
+
+# Size of graph area (excluding title, legends etc.)
+graph_width=500
+graph_height=150
+
+# Graphs to include on page
+graph_daily=1
+graph_weekly=1
+graph_monthly=0
+
+
+# No need to edit below this point.
+
+color[0]="2020FF"
+color[1]="20FF20"
+color[2]="FF2020"
+color[3]="FF21FF"
+color[4]="21FFFF"
+color[5]="FFFF21"
+color[6]="8F21FF"
+color[7]="21FF8F"
+color[8]="FF8F21"
+color[9]="FF2190"
+color[10]="2190FF"
+color[11]="90FF21"
+
+cat << EOF
+#!$rrdcgi
+<html>
+<head>
+<title>$hostname</title>
+<RRD::GOODFOR 300>
+<body>
+<h2>$hostname</h2>
+EOF
+
+
+IFS="
+"
+
+i=0
+groups=
+
+for line in `eval $ipmi_cmd -c -v sdr list full` ; do
+
+	IFS=,
+
+	split=($line)
+
+	file="$rrd_dir/$hostname-${split[0]}.rrd"
+	group=`echo "${split[2]}" | tr ' .-' ___`
+
+	group_color=${group}_color
+
+	if [ -z "${!group}" ] ; then
+		groups="$groups $group"
+
+		declare $group_color=0
+
+		group_unit=${group}_unit
+		declare $group_unit="${split[2]}"
+	fi
+
+	declare $group="${!group}
+  DEF:var$i=\"$file\":var:AVERAGE LINE1:var$i#${color[${!group_color}]}:\"${split[0]}\""
+
+	declare $group_color=$[ ${!group_color} + 1 ]
+
+	c=$[ c + 1 ]
+	i=$[ i + 1 ]
+done
+
+IFS=" "
+
+for group in $groups ; do
+
+	group_unit=${group}_unit
+
+	IFS=,
+
+	echo "<h3>${!group_unit}</h3>"
+
+	if [ "$graph_daily" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-daily.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --vertical-label "${!group_unit}"
+  --title "Daily graph"
+  --height $graph_height
+  --width $graph_width ${!group}
+>
+EOF
+	fi
+
+	if [ "$graph_weekly" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-weekly.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --start -7d
+  --vertical-label "${!group_unit}"
+  --title "Weelky graph"
+  --height $graph_height
+  --width $graph_width ${!group}
+>
+EOF
+	fi
+
+	if [ "$graph_monthly" -ne 0 ] ; then
+		cat << EOF
+<RRD::GRAPH "$img_dir/$hostname-$group-monthly.gif"
+  --imginfo "<img src="$web_dir/%s" width="%lu" height="%lu">"
+  --lazy
+  --start -30d
+  --vertical-label "${!group_unit}"
+  --title "Monthly graph"
+  --height $graph_height
+  --width $graph_width ${!group}
+>
+EOF
+	fi
+done
+
+cat << EOF
+</body>
+</html>
+EOF
diff --git a/contrib/exchange-bmc-os-info.init.redhat b/contrib/exchange-bmc-os-info.init.redhat
new file mode 100644
index 0000000..b7ec43f
--- /dev/null
+++ b/contrib/exchange-bmc-os-info.init.redhat
@@ -0,0 +1,326 @@
+#!/bin/sh
+#############################################################################
+#
+# exchange-bmc-os-info: Set OS and BMC (Baseboard Management Controller)
+#			 parameters during system startup.
+#
+# version:	0.72
+#
+# Authors:	Charles Rose <charles_rose@dell.com>
+#		Jordan Hargrave <jordan_hargrave@dell.com>
+#
+# Description:  Script to set OS information in the BMC; fetch BMC IP/URL
+#		and set in the OS for use by other scripts/user.
+#
+#		BMC IP and URL are made available in /var/run/bmc-info
+#
+#		Example to launch BMC web-interface:
+#		# . /var/run/bmc-info
+#		# xdg-open $BMC_URL
+#
+#		See here for details:
+#		https://fedoraproject.org/wiki/Features/AgentFreeManagement
+#
+# OEM Specific: OEM specific ipmi commands go in:
+#		'oem_set_os_version' and 'oem_get_bmc_url'
+#############################################################################
+#
+# chkconfig: 345 99 00
+# description: Set OS name, hostname in BMC; make BMC IP/URL available in OS
+# processname: exchange-bmc-os-info
+# config:      /etc/sysconfig/exchange-bmc-os-info
+#
+### BEGIN INIT INFO
+# Provides:          exchange-bmc-os-info
+# Required-Start:    ipmi
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+
+
+#############################################################################
+# GLOBALS
+#############################################################################
+CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info
+IPMI_TOOL=/usr/bin/ipmitool
+BMC_INFO=/var/run/bmc-info
+
+# BMC Manufacturer ID used in 'oem_set_os_version' and 'oem_get_bmc_url'
+DELL="674"
+#OTHER_OEM="123"
+
+# Defaults for ${CONFIGFILE}
+SET_OS_INFO="yes"
+RESET_OS_INFO="no"
+SET_BMC_INFO="yes"
+
+# getsysinfo and setsysinfo commands
+IPMI_SET_SYSINFO="${IPMI_TOOL} mc setsysinfo"
+IPMI_GET_SYSINFO="${IPMI_TOOL} mc getsysinfo"
+#############################################################################
+SCRIPT_NAME=$(basename $0)
+
+# source config
+[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
+
+RETVAL=0
+
+if [ -f /bin/gettext.sh ]; then
+	GETTEXT=1
+	. /bin/gettext.sh
+	OUTPUT="eval_gettext"
+else
+	GETTEXT=0
+	OUTPUT="echo"
+fi
+
+#############################################################################
+# Get Vendor ID of BMC for use in 'oem_set_os_version' and 'oem_get_bmc_url'
+#
+get_bmc_vendor_id()
+{
+	BMC_VENDOR=$(${IPMI_TOOL} mc info 2>/dev/null | \
+		sed -n "s#^Manufacturer ID.*: ##p")
+	[ -z "${BMC_VENDOR}" ] && RETVAL=4
+}
+
+check_ipmitool()
+{
+	if [ -x ${IPMI_TOOL} ]; then
+	# v1.8.12 plus patches are required for set/getsysinfo support
+	# http://sourceforge.net/mailarchive/message.php?msg_id=29647222
+		[ ! ${IPMI_GET_SYSINFO} >/dev/null 2>&1 ] && \
+			RETVAL=3
+	else
+		RETVAL=2
+	fi
+}
+
+bmc_exists()
+{
+	check_ipmitool
+	[ $RETVAL -eq 0 ] && get_bmc_vendor_id
+	return $RETVAL
+}
+#############################################################################
+
+get_os_info()
+{
+	OS_HOSTNAME=$(hostname)
+	KERNEL_VERSION=$(uname -r -m)
+
+	if  [ -e /etc/lsb-release ] ; then
+		. /etc/lsb-release
+		NAME=${DISTRIB_ID}
+		VERSION="${DISTRIB_RELEASE} ${DISTRIB_CODENAME}"
+	fi
+
+	# we prefer systemd's /etc/os-release over other sources
+	[ -e /etc/os-release ] && . /etc/os-release
+
+	OS_NAME=${NAME}
+	OS_VERSION="${VERSION} kernel ${KERNEL_VERSION}"
+}
+
+oem_set_os_version()
+{
+	# OS Version setting is not standard yet
+	# we need per vendor oem commands
+	case "${BMC_VENDOR}" in
+		$DELL) ${IPMI_SET_SYSINFO} delloem_os_version \
+				"${OS_VERSION}" > /dev/null 2>&1
+			return $?
+			;;
+# Add OEM specific commands.
+# Example:
+#		$OTHER_OEM) ${IPMI_SET_SYSINFO} otheroem_os_version \
+#				"${OS_VERSION}" > /dev/null 2>&1
+#			return $?
+#			;;
+		*) 	return 0
+			;;
+	esac
+}
+
+set_os_info()
+{
+	# Set and reset OS info in the BMC
+	if [ "$1" = "reset" ]; then
+		OS_NAME=""
+		OS_HOSTNAME=""
+		OS_VERSION=""
+	fi
+
+	${IPMI_SET_SYSINFO} os_name "${OS_NAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	${IPMI_SET_SYSINFO} primary_os_name "${OS_NAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	${IPMI_SET_SYSINFO} system_name "${OS_HOSTNAME}" >/dev/null 2>&1 \
+		|| RETVAL=6
+	oem_set_os_version || RETVAL=6
+}
+
+#############################################################################
+valid_url()
+{
+	url="(https?|http)://[a-z0-9-]+(\.[a-z0-9-]+)+([/?].*)?"
+	printf -- "%s" "${TMP_URL}"| grep -Eq "^${url}"
+	return $?
+}
+
+oem_get_bmc_url()
+{
+	# BMC URL is not standard yet
+	# we need per vendor oem commands
+	case "$BMC_VENDOR" in
+		$DELL)	TMP_URL=$(${IPMI_GET_SYSINFO} delloem_url 2> /dev/null)
+				;;
+# Add OEM specific commands
+# Example:
+#		$OTHER_OEM)
+#			TMP_URL=$(${IPMI_GET_SYSINFO} otheroem_url 2> /dev/null)
+#				;;
+		*)  TMP_URL=""	;;
+	esac
+
+	valid_url && BMC_URL=${TMP_URL} || BMC_URL=""
+}
+
+valid_ip()
+{
+	#Thanks to mkyong.com
+	octet="([01]?[[:digit:]][[:digit:]]?|2[0-4][[:digit:]]|25[0-5])"
+
+	printf -- "%s" "${TMP_IPv4}"| grep -Eq "^${octet}\\.${octet}\\.${octet}\\.${octet}$"
+	return $?
+}
+
+get_bmc_ip()
+{
+	#Thanks to http://ingvar.blog.redpill-linpro.com
+	for CHANNEL in `seq 1 14`
+	do
+		[ $(${IPMI_TOOL} lan print ${CHANNEL} 2>/dev/null \
+			| grep -q "^Set") ] || break
+	done
+
+	# Get BMC_IPv4 and BMC_URL from BMC
+	TMP_IPv4=$(${IPMI_TOOL} lan print ${CHANNEL} 2>/dev/null \
+			| sed -n "s#^IP Address  .*: ##p")
+
+	valid_ip && BMC_IPv4=${TMP_IPv4} || BMC_IPv4=""
+}
+
+get_bmc_info()
+{
+	get_bmc_ip
+	if [ -z "${BMC_IPv4}" ] || [ "${BMC_IPv4}" = "0.0.0.0" ]; then
+		BMC_IPv4=""
+		RETVAL=5
+	else
+		# URL makes sense only if there is an IP
+		oem_get_bmc_url
+	fi
+}
+
+set_bmc_info()
+{
+	if [ ! $(touch "${BMC_INFO}" && chmod 600 "${BMC_INFO}") ]; then
+		printf "BMC_IPv4=%s\n" "${BMC_IPv4}" > "${BMC_INFO}"
+		[ -n "${BMC_URL}" ] && \
+			printf "BMC_URL=%s\n" "${BMC_URL}" >> "${BMC_INFO}"
+	else
+		RETVAL=5
+	fi
+}
+
+unset_bmc_info()
+{
+	[ -f ${BMC_INFO} ] && rm -f ${BMC_INFO} > /dev/null 2>&1
+}
+
+#############################################################################
+start()
+{
+	if bmc_exists; then
+		[ "${SET_OS_INFO}" = "yes" ] && \
+			get_os_info && set_os_info
+
+		if [ "${SET_BMC_INFO}" = "yes" ]; then
+			get_bmc_info
+			if [ ${RETVAL} -eq 0 ]; then
+				set_bmc_info
+			fi
+		fi
+	fi
+}
+
+#############################################################################
+stop()
+{
+	if bmc_exists; then
+		# reset OS info while system reboots
+		# aids with debugging OS boot-up issues
+		if [ "${RESET_OS_INFO}" = "yes" ]; then
+			set_os_info reset
+		fi
+		unset_bmc_info
+	fi
+}
+
+#############################################################################
+restart()
+{
+	stop
+	[ $RETVAL -eq 0 ] && start
+}
+
+#############################################################################
+status()
+{
+	[ -r ${BMC_INFO} ] && \
+		grep -q "BMC_IPv4" "${BMC_INFO}" >/dev/null 1>&2 && \
+			BMC_STATUS="ok" || BMC_STATUS="inactive"
+	${OUTPUT} "${SCRIPT_NAME}: ${BMC_STATUS}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+}
+
+#############################################################################
+usage()
+{
+	${OUTPUT} "Usage: ${SCRIPT_NAME} {start|stop|restart|status}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+	RETVAL=1
+}
+
+#############################################################################
+# MAIN
+#############################################################################
+case "$1" in
+	start) start ;;
+	stop)  stop ;;
+	restart) restart ;;
+	status)	status ;;
+	*) usage ;;
+esac
+
+case "$RETVAL" in
+	0|1) ;;
+	2) ${OUTPUT} "${SCRIPT_NAME}: ipmitool(1) not found." 1>&2 ;;
+	3) ${OUTPUT} "${SCRIPT_NAME}: this version of ipmitool does not support getsysinfo." 1>&2 ;;
+	4) ${OUTPUT} "${SCRIPT_NAME}: failed to communicate with BMC." 1>&2 ;;
+	5) ${OUTPUT} "${SCRIPT_NAME}: failed to set OS information in BMC." 1>&2 ;;
+	6) ${OUTPUT} "${SCRIPT_NAME}: failed to get BMC information." 1>&2 ;;
+	*) ${OUTPUT} "${SCRIPT_NAME}: unexpected error." 1>&2 ;;
+esac
+
+if [ ${RETVAL} -gt 1 ]; then
+	${OUTPUT} " Return code: ${RETVAL}" 1>&2
+	[ ${GETTEXT} -eq 1 ] && echo
+fi
+
+
+exit ${RETVAL}
+
+#############################################################################
+# end of file
+#############################################################################
diff --git a/contrib/exchange-bmc-os-info.service.redhat b/contrib/exchange-bmc-os-info.service.redhat
new file mode 100644
index 0000000..100493b
--- /dev/null
+++ b/contrib/exchange-bmc-os-info.service.redhat
@@ -0,0 +1,13 @@
+[Unit]
+Description=Exchange Information between BMC and OS
+After=ipmi.service network.target
+Requires=ipmi.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/exchange-bmc-os-info start
+ExecStop=/usr/libexec/exchange-bmc-os-info stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/exchange-bmc-os-info.sysconf b/contrib/exchange-bmc-os-info.sysconf
new file mode 100644
index 0000000..2f0e675
--- /dev/null
+++ b/contrib/exchange-bmc-os-info.sysconf
@@ -0,0 +1,26 @@
+# exchange-bmc-os-info
+#
+# Config file to control Exchange of information between
+# the OS and Service Processor/Baseboard Management Controller (BMC)
+#
+# See here for details
+#    https://fedoraproject.org/wiki/Features/AgentFreeManagement
+
+### Set OS Info in BMC/Service Processor ###
+# Name: SET_OS_INFO
+# Description: Set OS Name, Version and Hostname in the Service Processor (BMC)
+# Default: yes
+SET_OS_INFO="yes"
+
+### Reset OS Info in BMC/Service Processor ###
+# Name: RESET_OS_INFO
+# Description: Reset OS Name, Version and Hostname in the Service Processor (BMC).
+# 		Useful when the OS Name/Hostname should be empty on reboot
+# Default: no
+RESET_OS_INFO="no"
+
+### Set BMC/Service Processor Info in OS ###
+# Name; SET_BMC_INFO
+# Description: Set IP Address and URL of Service Processor/BMC in /run/bmc-info
+# Default: yes
+SET_BMC_INFO="yes"
diff --git a/contrib/ipmi.init.basic b/contrib/ipmi.init.basic
new file mode 100755
index 0000000..96ca922
--- /dev/null
+++ b/contrib/ipmi.init.basic
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+echo "Setting up OpenIPMI driver..."
+
+# load the ipmi modules
+modprobe ipmi_msghandler
+modprobe ipmi_devintf
+if ! modprobe ipmi_si_drv ; then
+	modprobe ipmi_si # try new module name
+fi
+
+maj=$(cat /proc/devices | awk '/ipmidev/{print $1}')
+if [ "$maj" ]; then
+    test -e /dev/ipmi0 && rm -f /dev/ipmi0
+    /bin/mknod /dev/ipmi0 c $maj 0
+fi
+
diff --git a/contrib/ipmi.init.redhat b/contrib/ipmi.init.redhat
new file mode 100755
index 0000000..f77168c
--- /dev/null
+++ b/contrib/ipmi.init.redhat
@@ -0,0 +1,222 @@
+#!/bin/sh
+#
+# chkconfig: 2345 11 60
+# description: start, stop, or query ipmi system monitoring tools
+# config: /etc/sysconfig/ipmi
+#
+# For Redhat, Fedora, or similar systems.  Handles both 2.4 and 2.6
+# configurations.  Requires an /etc/sysconfig/ipmi file to function,
+# see below.
+#
+# Phil Hollenback
+# philiph@pobox.com
+
+# Source function library.
+. /etc/init.d/functions
+
+# Exit silently if we don't have a sysconfig file,
+# and read IPMI setting from it to determine whether or
+# not to continue.
+# The only current setting is ipmi={YES|NO}, whether or not
+# to enable IPMI.
+[ -f /etc/sysconfig/ipmi ] || exit 0
+. /etc/sysconfig/ipmi
+[ "${IPMI}" = "yes" ] || exit 0
+
+RETVAL=0
+
+start() {
+	echo -n $"Starting ipmi: "
+
+	# If ipmidev isn't listed in /proc/devices, try
+	# loading the modules.
+	if ! grep -q ipmidev /proc/devices
+	then
+	    /sbin/modprobe ipmi_msghandler || RETVAL=1
+	    /sbin/modprobe ipmi_devintf || RETVAL=1
+	    # Try loading new driver module, fall back to old
+	    # module if that fails.
+	    if ! /sbin/modprobe ipmi_si >/dev/null 2>&1
+	    then
+		/sbin/modprobe ipmi_si_drv || RETVAL=1
+	    fi
+	fi
+
+
+	# If ipmidev still isn't listed in /proc/devices after we load
+	# modules, this just isn't going to work.  Set RETVAL to mark
+	# this failure.
+	grep -q ipmidev /proc/devices || RETVAL=1
+
+	# remove old device file always
+	# in case ipmi gets assigned new dynamic major number from kernel
+	if [ -c /dev/ipmi0 ]; then
+	    rm -f /dev/ipmi0
+	fi
+
+	# Check if the device file exists and create if not.
+	if [ ! -c /dev/ipmi0 ] && [ $RETVAL -eq 0 ]
+	then
+	    major=$(awk '/ ipmidev$/{print $1}' /proc/devices)
+	    /bin/mknod -m 0600 /dev/ipmi0 c $major 0 || RETVAL=1
+	fi
+
+	if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipmi ; then
+		echo_success
+		echo
+	else
+		echo_failure
+		echo
+	fi
+}
+
+stop() {
+	echo -n $"Shutting down ipmi: "
+
+	# Stop doesn't actually do anything because we currently don't
+	# unload ipmi modules on stop.  That might change in the future
+ 	# if we decide unloading the ipmi modules is safe.
+	RETVAL=0
+
+	if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ipmi ; then
+		echo_success
+		echo
+	else
+		echo_failure
+		echo
+	fi
+}
+
+dostatus() {
+	# Extract cpu temperatures from ipmitool output.
+
+	# Abort if we don't have the ipmitool program.
+	if ! /usr/bin/ipmitool -V >/dev/null
+	then
+	    echo "/usr/bin/ipmitool not found!" >&2
+	    exit 1
+	fi
+
+	# Abort if ipmi isn't loaded.
+	if ! grep -q ipmidev /proc/devices
+	then
+	    echo "ipmi not listed in /proc/devices!" >&2
+	    exit 1
+	fi
+
+	# Check if we are running on a v1.0 IPMI system, and
+	# change our processor search string appropriately.
+	if /usr/bin/ipmitool -I open bmc info | \
+		grep -q "IPMI Version.*1.0"
+	then
+	    IpmiVersion="1.0"
+	fi
+
+	# Determine # of running processors
+	NumProcs=$(grep -c processor /proc/cpuinfo)
+	if [ $NumProcs -eq 0 ]
+	then
+	    echo "Can't determine number of processors!" >&2
+	    exit 1
+	fi
+
+	# Now build the query string.  Concatenate it into
+	# one string because that's more efficient on 2.4 systems.
+	Count=1
+	TempString=""
+	while [ $Count -le $NumProcs ]
+	do
+	    if [ x$IpmiVersion  = x"1.0" ]
+	    then
+		TempString="$TempString CPU\ $Count"
+	    else
+		TempString="$TempString Processor$Count\ Temp"
+	    fi
+	    Count=$((Count + 1))
+	done
+	# building TempString like this and eval'ing it is ugly, but
+	# it's the only way I could make the quoting work.  Sorry.
+	TempString="/usr/bin/ipmitool -I open sensor get $TempString"
+	eval $TempString | awk -v "c=$Count" '
+BEGIN {
+   n = 1
+}
+/Sensor Reading/ {
+   printf "CPU%s Temp: %s\n",n,$4
+   n++
+}
+END {
+   if ( n != c) {
+	printf "Error: found %s CPUs, but got temps for %s\n",--c,--n >"/dev/stderr"
+	exit 1
+   }
+   exit 0
+}'
+	RETVAL=$((RETVAL + $?))
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
+	RETVAL=$?
+}
+
+condrestart() {
+	[ -e /var/lock/subsys/ipmi ] && restart || :
+}
+
+remove () {
+	# Actually remove the drivers.  Don't do during stop in case
+	# this causes system to become unstable (a la lm_sensors)
+	if /sbin/lsmod | awk '{print $1}' | grep -q ipmi_
+	then
+	    # Try removing both 2.4 and 2.6 modules.
+	    /sbin/rmmod ipmi_si 2>/dev/null
+	    /sbin/rmmod ipmi_si_drv 2>/dev/null
+	    /sbin/rmmod ipmi_devintf
+	    /sbin/rmmod ipmi_msghandler
+	else
+	    echo "No ipmi modules loaded!" >&2
+	    RETVAL=1
+	    return $RETVAL
+	fi
+
+	# Wait a sec to give modules time to unload.
+	sleep 1
+
+	# Check if we failed to remove any modules, and complain if so.
+	if /sbin/lsmod | awk '{print $1}' | grep -q ipmi_
+	then
+	    echo "ipmi modules still loaded!" >&2
+	    RETVAL=1
+	    return $RETVAL
+	fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  status)
+	dostatus
+	;;
+  restart|reload)
+	restart
+	;;
+  condrestart)
+	condrestart
+	;;
+  remove)
+	remove
+	;;
+  *)
+	echo "Usage: ipmi {start|stop|status|restart|condrestart|remove}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/contrib/ipmievd.init.debian b/contrib/ipmievd.init.debian
new file mode 100755
index 0000000..1783d1a
--- /dev/null
+++ b/contrib/ipmievd.init.debian
@@ -0,0 +1,92 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          ipmievd
+# Required-Start:    $local_fs $remote_fs $syslog
+# Required-Stop:     $local_fs $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      S 0 1 6
+# Short-Description: IPMI event daemon
+# Description:       ipmievd  is a daemon which will listen for events
+#                    from the BMC that are being sent to the SEL and
+#                    also log those messages to syslog.
+### END INIT INFO
+#
+# Author:	Elmar Hoffmann <elho@elho.net>
+# Licence:      This script is public domain using the same
+#               licence as ipmitool itself.
+# Modified by:  Petter Reinholdtsen
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="IPMI event daemon"
+NAME=ipmievd
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+. /etc/default/rcS
+
+# Options used by ipmievd.
+#
+# "open" uses the asynchronous event notification from the OpenIPMI
+# kernel driver, "sel" uses active polling of the contents of the SEL
+# for new events.
+#
+# Need to force 'daemon' mode, to make sure messages are sent to
+# syslog and the program forks into the background.
+#
+# Se ipmievd(8) for more info.
+IPMIEVD_OPTIONS="open daemon"
+
+# Read config file if it is present.
+[ -f /etc/default/$NAME ] && . /etc/default/$NAME
+
+#
+#	Function that starts the daemon/service.
+#
+d_start() {
+	start-stop-daemon --start --quiet --exec $DAEMON -- $IPMIEVD_OPTIONS
+}
+
+#
+#	Function that stops the daemon/service.
+#
+d_stop() {
+	start-stop-daemon --stop --quiet --name $NAME --exec $DAEMON
+}
+
+CODE=0
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME"
+	d_start || CODE=$?
+	[ "$VERBOSE" != no ] && log_end_msg $CODE
+	exit $CODE
+	;;
+  stop)
+	log_begin_msg "Stopping $DESC" "$NAME"
+	d_stop || CODE=$?
+	log_end_msg $CODE
+	exit $CODE
+	;;
+  restart|force-reload)
+	log_begin_msg "Restarting $DESC" "$NAME"
+	d_stop || true
+	sleep 1
+	d_start || CODE=$?
+	log_end_msg $CODE
+	exit $CODE
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/contrib/ipmievd.init.redhat b/contrib/ipmievd.init.redhat
new file mode 100755
index 0000000..1c0253d
--- /dev/null
+++ b/contrib/ipmievd.init.redhat
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/ipmievd
+#
+#       Based on example sysvinitfiles script
+#       Copyright (c) 2000 Red Hat Software, Inc.
+#
+# chkconfig: 345 99 00
+# description: ipmievd daemon to send events to syslog
+# processname: ipmievd
+# config:      /etc/sysconfig/ipmievd
+#
+### BEGIN INIT INFO
+# Provides:          ipmievd
+# Required-Start:    $syslog ipmi
+# Should-Start: $time
+# Required-Stop:     $syslog ipmi
+# Should-Stop: $time
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: ipmievd daemon to send events to syslog
+# Description:       Start ipmievd to read events from BMC and
+#	             log them to syslog.  Events correspond to hardware faults,
+#	             state transitions such as power on and off, and sensor
+#	             readings such as temperature, voltage and fan speed that
+#	             are abnormal.
+### END INIT INFO
+
+IPMIEVD_BIN=/usr/sbin/ipmievd
+test -x $IPMIEVD_BIN || { echo "$IPMIEVD_BIN not installed";
+        if [ "$1" = "stop" ]; then exit 0;
+        else exit 5; fi; }
+
+# Check for existence of needed config file
+IPMIEVD_CONFIG=/etc/sysconfig/ipmievd
+test -r $IPMIEVD_CONFIG || { echo "$IPMIEVD_CONFIG does not exist";
+        if [ "$1" = "stop" ]; then exit 0;
+        else exit 6; fi; }
+
+# Read config file
+. $IPMIEVD_CONFIG
+
+# Source function library.
+. /etc/init.d/functions
+
+start() {
+	echo "Starting ipmievd:"
+	if [ -f /var/lock/subsys/ipmievd ]; then
+		return 0
+	fi
+	daemon $IPMIEVD_BIN $IPMIEVD_OPTIONS
+	ret=$?
+	[ $ret -eq 0 ] && touch /var/lock/subsys/ipmievd
+	return $ret
+}	
+
+stop() {
+	echo "Shutting down ipmievd:"
+	killproc $IPMIEVD_BIN
+	ret=$?
+	[ $ret -eq 0 ] && rm -f /var/lock/subsys/ipmievd
+	return $ret
+}
+
+case "$1" in
+    start)
+	start
+	;;
+    stop)
+	stop
+	;;
+    status)
+	status $IPMIEVD_BIN
+	;;
+    restart|reload)
+    	stop
+	start
+	;;
+    condrestart)
+	[ -f /var/lock/subsys/ipmievd ] && restart || :
+	;;
+    *)
+	echo "Usage: ipmievd {start|stop|status|reload|restart|condrestart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/contrib/ipmievd.init.suse b/contrib/ipmievd.init.suse
new file mode 100755
index 0000000..a1e216c
--- /dev/null
+++ b/contrib/ipmievd.init.suse
@@ -0,0 +1,212 @@
+#!/bin/bash
+#
+#     System startup script for ipmievd
+#     Based on skeleton.compat example script
+#     Copyright (C) 1995--2005  Kurt Garloff, SUSE / Novell Inc.
+#          
+#     This library is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU Lesser General Public License as published by
+#     the Free Software Foundation; either version 2.1 of the License, or (at
+#     your option) any later version.
+#			      
+#     This library is distributed in the hope that it will be useful, but
+#     WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#      
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+#     USA.
+#
+# Note: This template uses functions rc_XXX defined in /etc/rc.status on
+# UnitedLinux/SUSE/Novell based Linux distributions. However, it will work
+# on other distributions as well, by using the LSB (Linux Standard Base) 
+# or RH functions or by open coding the needed functions.
+# Read http://www.tldp.org/HOWTO/HighQuality-Apps-HOWTO/ if you prefer not 
+# to use this template.
+#
+# chkconfig: 345 99 00
+# description: ipmievd daemon
+# 
+### BEGIN INIT INFO
+# Provides:          ipmievd
+# Required-Start:    $syslog ipmi
+# Should-Start: $time
+# Required-Stop:     $syslog ipmi
+# Should-Stop: $time
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: ipmievd daemon to send events to syslog
+# Description:       Start ipmievd to read events from BMC and
+#	log them to syslog.  Events correspond to hardware faults,
+#	state transitions such as power on and off, and sensor
+#	readings such as temperature, voltage and fan speed that
+#	are abnormal.
+### END INIT INFO
+# 
+
+# Check for missing binaries (stale symlinks should not happen)
+# Note: Special treatment of stop for LSB conformance
+IPMIEVD_BIN=/usr/sbin/ipmievd
+test -x $IPMIEVD_BIN || { echo "$IPMIEVD_BIN not installed"; 
+	if [ "$1" = "stop" ]; then exit 0;
+	else exit 5; fi; }
+
+# Check for existence of needed config file and read it
+IPMIEVD_CONFIG=/etc/sysconfig/ipmievd
+test -r $IPMIEVD_CONFIG || { echo "$IPMIEVD_CONFIG does not exist";
+	if [ "$1" = "stop" ]; then exit 0;
+	else exit 6; fi; }
+
+# Read config	
+. $IPMIEVD_CONFIG
+
+if test -e /etc/rc.status; then
+    # SUSE rc script library
+    . /etc/rc.status
+else
+    export LC_ALL=POSIX
+    _cmd=$1
+    declare -a _SMSG
+    if test "${_cmd}" = "status"; then
+	_SMSG=(running dead dead unused unknown reserved)
+	_RC_UNUSED=3
+    else
+	_SMSG=(done failed failed missed failed skipped unused failed failed reserved)
+	_RC_UNUSED=6
+    fi
+    if test -e /lib/lsb/init-functions; then
+	# LSB    
+    	. /lib/lsb/init-functions
+	echo_rc()
+	{
+	    if test ${_RC_RV} = 0; then
+		log_success_msg "  [${_SMSG[${_RC_RV}]}] "
+	    else
+		log_failure_msg "  [${_SMSG[${_RC_RV}]}] "
+	    fi
+	}
+	# TODO: Add checking for lockfiles
+	checkproc() { return pidofproc ${1+"$@"} >/dev/null 2>&1; }
+    elif test -e /etc/init.d/functions; then
+	# RHAT
+	. /etc/init.d/functions
+	echo_rc()
+	{
+	    #echo -n "  [${_SMSG[${_RC_RV}]}] "
+	    if test ${_RC_RV} = 0; then
+		success "  [${_SMSG[${_RC_RV}]}] "
+	    else
+		failure "  [${_SMSG[${_RC_RV}]}] "
+	    fi
+	}
+	checkproc() { return status ${1+"$@"}; }
+	start_daemon() { return daemon ${1+"$@"}; }
+    else
+	# emulate it
+	echo_rc() { echo "  [${_SMSG[${_RC_RV}]}] "; }
+    fi
+    rc_reset() { _RC_RV=0; }
+    rc_failed()
+    {
+	if test -z "$1"; then 
+	    _RC_RV=1;
+	elif test "$1" != "0"; then 
+	    _RC_RV=$1; 
+    	fi
+	return ${_RC_RV}
+    }
+    rc_check()
+    {
+	return rc_failed $?
+    }	
+    rc_status()
+    {
+	rc_failed $?
+	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+	if test "$1" = "-s"; then rc_failed 5; echo_rc; rc_failed 3; shift; fi
+	if test "$1" = "-u"; then rc_failed ${_RC_UNUSED}; echo_rc; rc_failed 3; shift; fi
+	if test "$1" = "-v"; then echo_rc; shift; fi
+	if test "$1" = "-r"; then _RC_RV=0; shift; fi
+	return ${_RC_RV}
+    }
+    rc_exit() { exit ${_RC_RV}; }
+    rc_active() 
+    {
+	if test -z "$RUNLEVEL"; then read RUNLEVEL REST < <(/sbin/runlevel); fi
+	if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi
+	return 1
+    }
+fi
+
+# Reset status of this service
+rc_reset
+
+# Return values acc. to LSB for all commands but status:
+# 0	  - success
+# 1       - generic or unspecified error
+# 2       - invalid or excess argument(s)
+# 3       - unimplemented feature (e.g. "reload")
+# 4       - user had insufficient privileges
+# 5       - program is not installed
+# 6       - program is not configured
+# 7       - program is not running
+# 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
+# 
+# Note that starting an already running service, stopping
+# or restarting a not-running service as well as the restart
+# with force-reload (in case signaling is not supported) are
+# considered a success.
+
+case "$1" in
+    start)
+	echo -n "Starting ipmievd "
+	start_daemon $IPMIEVD_BIN $IPMIEVD_OPTIONS
+	rc_status -v
+	;;
+    stop)
+	echo -n "Shutting down ipmievd "
+	killproc -TERM $IPMIEVD_BIN
+	rc_status -v
+	;;
+    try-restart|condrestart)
+	## Do a restart only if the service was active before.
+	## Note: try-restart is now part of LSB (as of 1.9).
+	## RH has a similar command named condrestart.
+	if test "$1" = "condrestart"; then
+		echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
+	fi
+	$0 status
+	if test $? = 0; then
+		$0 restart
+	else
+		rc_reset	# Not running is not a failure.
+	fi
+	rc_status
+	;;
+    restart)
+	$0 stop
+	$0 start
+	rc_status
+	;;
+    force-reload)
+	echo -n "Reload service ipmievd "
+	$0 try-restart
+	rc_status
+	;;
+    reload)
+	rc_failed 3
+	rc_status -v
+	;;
+    status)
+	echo -n "Checking for service ipmievd "
+	checkproc $IPMIEVD_BIN
+	rc_status -v
+	;;
+    *)
+	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload| reload}"
+	exit 1
+	;;
+esac
+rc_exit
diff --git a/contrib/log_bmc.sh b/contrib/log_bmc.sh
new file mode 100644
index 0000000..c7bbb76
--- /dev/null
+++ b/contrib/log_bmc.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+#############################################################################
+#
+# log_bmc.sh: Add SEL entries to indicate OS Boot/Install status.
+#
+# version:      0.1
+#
+# Authors:      Charles Rose <charles_rose@dell.com>
+#               Jordan Hargrave <jordan_hargrave@dell.com>
+#
+# Description:  Script to log OS boot/install status to the BMC. Primarily
+#		meant for use in automated installs and start up scripts.
+#		Will provide administrators with OS boot/install status in
+#		BMC and aid with debugging.
+#
+#               Example usage:
+#               # ./log_bmc.sh inst_start
+#               # ipmitool sel list
+#		b | 05/07/2014 | 12:07:32 | OS Boot | Installation started
+#
+#               See here for details:
+#               https://fedoraproject.org/wiki/Features/AgentFreeManagement
+#
+#############################################################################
+IPMI_CMD="/usr/bin/ipmitool"
+
+#############################################################################
+# SEL Event types from ipmi_sel.h
+OS_STOP="0x20"
+OS_BOOT="0x1f"
+# SEL Event data from ipmi_sel.h
+GRACEFUL_SHUTDOWN="0x03" # OS Stop/Shutdown: Installation started
+BOOT_COMPLETED="0x01" # OS Boot: Installation started
+INSTALL_STARTED="0x07" # OS Boot: Installation started
+INSTALL_COMPLETED="0x08" # OS Boot: Installation completed
+INSTALL_ABORTED="0x09" # OS Boot: Installation aborted
+INSTALL_FAILED="0x0a" # OS Boot: Installation failed
+
+##########################################################################
+
+# check for ipmi functionality.
+check_ipmi()
+{
+	# ensures presence of ipmitool and /dev/ipmi*
+	${IPMI_CMD} mc info > /dev/null 2>&1
+	[ $? -ne 0 ] && RETVAL=2
+}
+
+# Write out the events to SEL
+ipmi_sel_add()
+{
+	# Refer ipmitool(1) event for details on format.
+	printf "0x04 %s 0x00 0x6f %s 0x00 0x00" ${type} ${status} > \
+		${tmpfile} && \
+		${IPMI_CMD} sel add ${tmpfile} > /dev/null 2>&1
+	[ $? -ne 0 ] && RETVAL=3
+}
+
+### Main
+# Most of the status is for this event type
+tmpfile=$(/usr/bin/mktemp)
+RETVAL=0
+type=${OS_BOOT}
+
+case ${1} in
+	os_shutdown)   type=${OS_STOP}; status=${GRACEFUL_SHUTDOWN} ;;
+	os_boot)       status=${BOOT_COMPLETED} ;;
+	inst_start)    status=${INSTALL_STARTED} ;;
+	inst_complete) status=${INSTALL_COMPLETED} ;;
+	inst_abort)    status=${INSTALL_ABORTED} ;;
+	inst_fail)     status=${INSTALL_FAILED} ;;
+	*)             RETVAL=1 ;;
+esac
+
+[ ${RETVAL} -eq 0 ] && check_ipmi
+[ ${RETVAL} -eq 0 ] && ipmi_sel_add ${status}
+
+case ${RETVAL} in
+	0) ;;
+	1) printf -- %s\\n "Usage: $0 <os_boot|os_shutdown|inst_start|inst_complete|inst_abort|inst_fail>" ;;
+	2) printf -- %s\\n "failed to communicate with BMC." ;;
+	3) printf -- %s\\n "error adding ipmi sel entry." ;;
+esac
+
+[ -f ${tmpfile} ] && rm -f ${tmpfile} > /dev/null 2>&1
+
+exit ${RETVAL}
+### End
diff --git a/contrib/oem_ibm_sel_map b/contrib/oem_ibm_sel_map
new file mode 100644
index 0000000..330d362
--- /dev/null
+++ b/contrib/oem_ibm_sel_map
@@ -0,0 +1,229 @@
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x01","0x00","Chassis Number","R","R","0x00","CPU shutdown - Potential cause "triple fault" a software address problem"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x02","0x01","Chassis Number","Failed Memory Card","Spare Memory Card","0x00","Memory Mirrored Failover Occurred - System running from mirrored memory image"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x02","0x04","Chassis Number","Memory Card","Completion Code (0x00=Success)","0x00","Memory hot replace event"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x02","0x05","Chassis Number","Memory Card","Memory Size (in 512MB units)","0x00","Memory hot add event"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x00","Chassis Number","Scalability Port Number","R","0x00","Scalability link down"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","Chassis Number","Scalability Port Number","R","0x00","Scalability link up"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x02","Chassis Number","Scalability Port Number","R","0x00","Scalability link double wide down"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x03","Chassis Number","Scalability Port Number","R","0x00","Scalability link double wide up"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x80","Chassis Number","Scalability Port Number","R","0x00","Scalability link PFA"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x81","Chassis Number","Scalability Port Number","R","0x00","Scalability link invalid port"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x82","Chassis Number","Scalability Port Number","R","0x00","Scalability link invalid node"
+"0xC1","XX","XX","XX","XX","XX","XX","XX","0x03","0x83","Chassis Number","Scalability Port Number","R","0x00","Scalability link kill"
+"0xE0","0x00","0x00","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Device OK"
+"0xE0","0x00","0x01","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Required ROM space not available"
+"0xE0","0x00","0x02","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Required I/O Space not available"
+"0xE0","0x00","0x03","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Required memory not available"
+"0xE0","0x00","0x04","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Required memory below 1MB not available"
+"0xE0","0x00","0x05","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","ROM checksum failed"
+"0xE0","0x00","0x06","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","BIST failed"
+"0xE0","0x00","0x07","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Planar device missing or disabled by user"
+"0xE0","0x00","0x08","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","PCI device has an invalid PCI configuration space header"
+"0xE0","0x00","0x09","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","FRU information for added PCI device"
+"0xE0","0x00","0x0A","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","FRU information for removed PCI device"
+"0xE0","0x00","0x0B","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","A PCI device was removed, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x0C","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","A PCI device was added, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x0D","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Requested resources not available"
+"0xE0","0x00","0x13","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Planar video disabled due to add in video card"
+"0xE0","0x00","0x14","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","FRU information for PCI device partially disabled "
+"0xE0","0x00","0x15","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","A PCI device was partially disabled, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x16","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","A 33Mhz device is installed on a 66Mhz bus, PCI device information is stored in next log entry"
+"0xE0","0x00","0x17","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","FRU information, 33Mhz device installed on 66Mhz bus"
+"0xE0","0x00","0x18","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Merge cable missing"
+"0xE0","0x00","0x19","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Node 1 to Node 2 cable missing"
+"0xE0","0x00","0x1A","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Node 1 to Node 3 cable missing"
+"0xE0","0x00","0x1B","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Node 2 to Node 3 cable missing"
+"0xE0","0x00","0x1C","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Nodes could not merge"
+"0xE0","0x00","0x1D","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","No 8 way SMP cable"
+"0xE0","0x00","0x1E","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Primary North Bridge to PCI Host Bridge IB Link has failed"
+"0xE0","0x00","0x1F","Chassis Number","Slot Number","Bus Number","Device ID (MSB)","Device ID (LSB)","Vendor ID (MSB)","Vendor ID (LSB)","R","R","R","0x00","Redundant PCI Host Bridge IB Link has failed"
+"0xE0","0x00","0x00","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Device OK"
+"0xE0","0x00","0x01","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Required ROM space not available"
+"0xE0","0x00","0x02","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Required I/O Space not available"
+"0xE0","0x00","0x03","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Required memory not available"
+"0xE0","0x00","0x04","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Required memory below 1MB not available"
+"0xE0","0x00","0x05","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","ROM checksum failed"
+"0xE0","0x00","0x06","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","BIST failed"
+"0xE0","0x00","0x07","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Planar device missing or disabled by user"
+"0xE0","0x00","0x08","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","PCI device has an invalid PCI configuration space header"
+"0xE0","0x00","0x09","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","FRU information for added PCI device"
+"0xE0","0x00","0x0A","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","FRU information for removed PCI device"
+"0xE0","0x00","0x0B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","A PCI device was added, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x0C","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","A PCI device was removed, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x0D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Requested resources not available"
+"0xE0","0x00","0x13","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Planar video disabled due to add in video card"
+"0xE0","0x00","0x14","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","FRU information for PCI device partially disabled "
+"0xE0","0x00","0x15","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","A PCI device was partially disabled, PCI FRU information is stored in next log entry"
+"0xE0","0x00","0x16","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","A 33Mhz device is installed on a 66Mhz bus, PCI device information is stored in next log entry"
+"0xE0","0x00","0x17","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","FRU information, 33Mhz device installed on 66Mhz bus"
+"0xE0","0x00","0x18","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Merge cable missing"
+"0xE0","0x00","0x19","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Node 1 to Node 2 cable missing"
+"0xE0","0x00","0x1A","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Node 1 to Node 3 cable missing"
+"0xE0","0x00","0x1B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Node 2 to Node 3 cable missing"
+"0xE0","0x00","0x1C","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Nodes could not merge"
+"0xE0","0x00","0x1D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","No 8 way SMP cable"
+"0xE0","0x00","0x1E","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Primary North Bridge to PCI Host Bridge IB Link has failed"
+"0xE0","0x00","0x1F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","R","R","R","0x01","Redundant PCI Host Bridge IB Link has failed"
+"0xE0","0x01","0x00","Chassis Number","Processor Number","R","R","R","R","R","R","R","R","0x00","Processor has failed BIST"
+"0xE0","0x01","0x01","Chassis Number","Processor Number","R","R","R","R","R","R","R","R","0x00","Unable to apply processor microcode update"
+"0xE0","0x01","0x02","Chassis Number","Processor Number","R","R","R","R","R","R","R","R","0x00","POST does not support current stepping level of processor"
+"0xE0","0x01","0x03","Chassis Number","Processor Number","R","R","R","R","R","R","R","R","0x00","CPU mismatch detected"
+"0xE0","0x01","0x04","Chassis Number","R","R","R","R","R","R","R","R","R","0x00","Invalid configuration of processor card."
+"0xE0","0x02","0x00","Chassis Number","Memory Card","Memory DIMM","R","R","R","R","R","R","R","0x00","Uncorrectable memory error occurred"
+"0xE0","0x02","0x01","Chassis Number","Memory Card","Memory DIMM","Failing Symbol","R","R","R","R","R","R","0x00","Correctable memory threshold occurred"
+"0xE0","0x02","0x02","0x00","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x00","DIMM enabled"
+"0xE0","0x02","0x02","0x01","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x00","DIMM disabled, failed ECC test"
+"0xE0","0x02","0x02","0x02","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x00","DIMM disabled, failed POST/BIOS memory test"
+"0xE0","0x02","0x02","0x03","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x00","DIMM disabled, non-supported memory device"
+"0xE0","0x02","0x02","0x04","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x00","DIMM disabled, non-matching or missing DIMM(s)"
+"0xE0","0x02","0x03","0x00","Chassis Number","Memory Card","R","R","R","R","R","R","R","0x00","Memory card enabled"
+"0xE0","0x02","0x03","0x01","Chassis Number","Memory Card","R","R","R","R","R","R","R","0x00","Memory card disabled"
+"0xE0","0x02","0x00","0x00","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM enabled"
+"0xE0","0x02","0x00","0x01","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM disabled, failed ECC test"
+"0xE0","0x02","0x00","0x02","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM disabled, failed POST/BIOS memory test"
+"0xE0","0x02","0x00","0x03","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM disabled, non-supported memory device"
+"0xE0","0x02","0x00","0x04","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM disabled, non-matching or missing DIMM(s)"
+"0xE0","0x02","0x00","0x05","Chassis","Memory Card","Memory DIMM","R","R","R","R","R","R","0x01","DIMM disabled, multi-bit or multi-symbol error"
+"0xE0","0x02","0x01","0x00","Chassis","Failed Channel","R","R","R","R","R","R","R","0x01","AMB Failure Detected on Channel X During Last Boot"
+"0xE1","0x00","0x00","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","Unknown SERR/PERR detected on PCI bus"
+"0xE1","0x00","0x01","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Address of special cycle DPE"
+"0xE1","0x00","0x02","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: Master read parity error"
+"0xE1","0x00","0x03","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Received target parity error"
+"0xE1","0x00","0x04","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: Master write parity error"
+"0xE1","0x00","0x05","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Device signaled SERR"
+"0xE1","0x00","0x06","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: Slave signaled parity error"
+"0xE1","0x00","0x07","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Signaled Target Abort"
+"0xE1","0x00","0x08","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","BUS_CORRECTABLE: Additional Correctable ECC Error"
+"0xE1","0x00","0x09","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Received Master Abort"
+"0xE1","0x00","0x0A","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: Additional Uncorrectable ECC Error"
+"0xE1","0x00","0x0B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Split Completion Discarded"
+"0xE1","0x00","0x0C","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","BUS_CORRECTABLE: Correctable ECC Error"
+"0xE1","0x00","0x0D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Unexpected Split Completion"
+"0xE1","0x00","0x0E","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: Uncorrectable ECC Error"
+"0xE1","0x00","0x0F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Received split completion error"
+"0xE1","0x00","0x11","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Address of special cycle DPE"
+"0xE1","0x00","0x12","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI-PCI bridge secondary error: Master read parity error"
+"0xE1","0x00","0x13","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Received target parity error"
+"0xE1","0x00","0x14","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI-PCI bridge secondary error: Master write parity error"
+"0xE1","0x00","0x15","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Device Signaled SERR"
+"0xE1","0x00","0x16","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI-PCI bridge secondary error: Slave Signaled Parity Error"
+"0xE1","0x00","0x17","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Signaled Target Abort"
+"0xE1","0x00","0x18","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","BUS_CORRECTABLE: PCI-PCI bridge secondary error: Additional Correctable ECC Error"
+"0xE1","0x00","0x19","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Received Master Abort"
+"0xE1","0x00","0x1A","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI-PCI bridge secondary error: Additional Uncorrectable ECC Error"
+"0xE1","0x00","0x1B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Split Completion Discarded"
+"0xE1","0x00","0x1C","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","BUS_CORRECTABLE: PCI-PCI bridge secondary error: Correctable ECC Error"
+"0xE1","0x00","0x1D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Unexpected Split Completion"
+"0xE1","0x00","0x1E","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI-PCI bridge secondary error: Uncorrectable ECC Error"
+"0xE1","0x00","0x1F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI-PCI bridge secondary error: Received split completion error"
+"0xE1","0x00","0x20","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","BUS_CORRECTABLE: PCI ECC Error (Corrected)"
+"0xE1","0x00","0x21","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI Bus Address Parity Error"
+"0xE1","0x00","0x22","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI Bus Data Parity Error"
+"0xE1","0x00","0x23","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: SERR# Asserted"
+"0xE1","0x00","0x24","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PERR Received by Calgary on a PCIX Split Completion"
+"0xE1","0x00","0x25","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Invalid Address"
+"0xE1","0x00","0x27","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: TCE Extent Error"
+"0xE1","0x00","0x29","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Page Fault"
+"0xE1","0x00","0x2B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Unauthorized Access"
+"0xE1","0x00","0x2D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Parity Error in DMA Read Data Buffer"
+"0xE1","0x00","0x2F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI Bus Time Out"
+"0xE1","0x00","0x31","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: DMA Delayed Read Timeout"
+"0xE1","0x00","0x33","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Internal Error on PCIX Split Completion"
+"0xE1","0x00","0x35","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: DMA Read Reply (RIO) Timeout"
+"0xE1","0x00","0x37","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Internal RAM Error on DMA Write"
+"0xE1","0x00","0x39","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: MVE Valid Bit Off"
+"0xE1","0x00","0x3B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: MVE Index Invalid"
+"0xE1","0x00","0x40","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: ECC Error (Corrected)"
+"0xE1","0x00","0x41","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: SERR# Detected"
+"0xE1","0x00","0x42","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI Bus Data Parity Error"
+"0xE1","0x00","0x43","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: No DEVSEL#"
+"0xE1","0x00","0x45","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Bus Time Out"
+"0xE1","0x00","0x47","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Retry Count Expired"
+"0xE1","0x00","0x49","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Target-Abort"
+"0xE1","0x00","0x4B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Invalid Size"
+"0xE1","0x00","0x4D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Access Not Enabled"
+"0xE1","0x00","0x4F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Internal RAM Error on MMIO Store"
+"0xE1","0x00","0x51","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Split Response Received"
+"0xE1","0x00","0x53","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCIX Split Completion Error Status Received"
+"0xE1","0x00","0x55","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Unexpected PCIX Split Completion Received"
+"0xE1","0x00","0x57","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCIX Split Completion Timeout"
+"0xE1","0x00","0x59","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Recoverable Error Summary Bit"
+"0xE1","0x00","0x5B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: CSR Error Summary Bit"
+"0xE1","0x00","0x5D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Internal RAM Error on MMIO Load"
+"0xE1","0x00","0x61","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Bad Command"
+"0xE1","0x00","0x63","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Length Field Invalid"
+"0xE1","0x00","0x65","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Load Greater Than 8 & No Write Buffer Enabled"
+"0xE1","0x00","0x67","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCIX Discontiguous Byte Enable Error"
+"0xE1","0x00","0x69","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: 4K Address Boundary Crossing Error"
+"0xE1","0x00","0x6B","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Store Wrap State Machine Check"
+"0xE1","0x00","0x6D","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Target State Machine Check"
+"0xE1","0x00","0x6F","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Invalid Transaction PM/DW"
+"0xE1","0x00","0x71","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Invalid Transaction PM/DR"
+"0xE1","0x00","0x73","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: Invalid Transaction PS/DW"
+"0xE1","0x00","0x75","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: DMA Write Command FIFO Parity Error"
+"0xE1","0x00","0x76","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PERR: PCI Secondary Status Register Dump"
+"0xE1","0x00","0x77","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","SERR: PCI Secondary Status Register Dump"
+"0xE1","0x00","0x81","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x00","PCI-to-PCI Bridge Discard Timer Error"
+"0xE1","0x00","0x01","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x01","SERR detected on PCI bus"
+"0xE1","0x00","0x02","Chassis Number","Slot Number","Bus Number","Device ID (LSB)","Device ID (MSB)","Vendor ID (LSB)","Vendor ID (MSB)","Status Register (LSB)","Status Register (MSB)","DevFun Number","0x01","PERR detected on PCI bus"
+"0xE1","0x01","0x00","R","R","Bank (LSB)","Bank (MSB)","Apic ID (LSB)","Apic ID (MSB)","CK4(LSB)","CK4","CK4","CK4(MSB)","0x00","Processor Error Information Data A"
+"0xE1","0x01","0x01","R","R","Address high (LSB)","Address high","Address high","Address high (MSB)","Address low (LSB)","Address low ","Address low ","Address low (MSB)","0x00","Processor Error Information Data B1"
+"0xE1","0x01","0x02","R","R","Timestamp high (LSB)","Timestamp high","Timestamp high","Timestamp high (MSB)","Timestamp Low (LSB)","Timestamp low","Timestamp low","Timestamp low (MSB)","0x00","Processor Error Information Data B2"
+"0xE1","0x01","0x03","R","R","MCA status register high (LSB)","MCA status register high","MCA status register high","MCA status register high (MSB)","MCA status register low (LSB)","MCA status register low","MCA status register low","MCA status register low (MSB)","0x00","Processor Error Information Data C"
+"0xE1","0x01","0x04","Chassis","0x00","Processor ID","R","R","R","R","R","R","R","0x00","Processor recoverable error"
+"0xE1","0x01","0x04","Chassis","0x01","Processor ID","R","R","R","R","R","R","R","0x00","Processor unrecoverable error"
+"0xE1","0x02","0x00","0x00","Failed Row","Spare Row","R","R","R","R","R","R","R","0x00","Memory sparing event, start 1"
+"0xE1","0x02","0x00","0x02","Failed Row","Spare Row","R","R","R","R","R","R","R","0x00","Memory sparing event, done  1"
+"0xE1","0x02","0x00","0x01","Failed Row 1","Failed Row 2","Spare Row 1","Spare Row 2","R","R","R","R","R","0x00","Memory sparing event, start 2"
+"0xE1","0x02","0x00","0x03","Failed Row 1","Failed Row 2","Spare Row 1","Spare Row 2","R","R","R","R","R","0x00","Memory sparing event, done  2"
+"0xE1","0x02","0x01","Failed Port","Spare Port","R","R","R","R","R","R","R","R","0x00","Memory mirroring failover occurred"
+"0xE1","0x02","0x00","0x00","R","R","R","R","R","R","R","R","R","0x01","Memory sparing event, start 1"
+"0xE1","0x02","0x00","0x02","R","R","R","R","R","R","R","R","R","0x01","Memory sparing event, done 1"
+"0xE1","0x04","0x00","0x00","FSB FERR/NERR Register","FSB FERR/NERR Register","Chassis Number","R","R","R","R","R","R","0x00","FSB A Fatal"
+"0xE1","0x04","0x00","0x01","FSB FERR/NERR Register","FSB FERR/NERR Register","Chassis Number","R","R","R","R","R","R","0x00","FSB A Nonfatal"
+"0xE1","0x04","0x00","0x02","FSB FERR/NERR Register","FSB FERR/NERR Register","Chassis Number","R","R","R","R","R","R","0x00","FSB B Fatal"
+"0xE1","0x04","0x00","0x03","FSB FERR/NERR Register","FSB FERR/NERR Register","Chassis Number","R","R","R","R","R","R","0x00","FSB B Nonfatal"
+"0xE1","0x05","0x00","0x02","Hi FERR or NERR Register","R","R","R","R","R","R","R","R","0x00","Lindenhurst Chipset Event: Hi Fatal"
+"0xE1","0x05","0x00","0x03","Hi FERR or NERR Register","R","R","R","R","R","R","R","R","0x00","Lindenhurst Chipset Event: Hi Nonfatal"
+"0xE1","0x05","0x01","0x02","Status Register Contents","R","R","R","R","R","R","R","R","0x00","Fatal internal north bridge error"
+"0xE1","0x05","0x01","0x03","Status Register Contents","R","R","R","R","R","R","R","R","0x00","Nonfatal internal north bridge error"
+"0xE1","0x05","0x01","0x04","Bus","Device","Function Number","R","R","R","R","R","R","0x00","Link Degrade Event"
+"0xE1","0x05","0x01","0x05","R","R","R","R","R","R","R","R","R","0x00","Spurious Memory Event"
+"0xE2","0x00","Register ID","R","First Fire Bit (0xFF=N/A)","Register Data (LSB)","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data (MSB)","0x00","PCI Industry Standard Register Dump"
+"0xE2","0x01","Register ID","R","First Fire Bit (0xFF if N/A)","Register Data (LSB)","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data (MSB)","0x00","PCI-X Industry Standard Register Dump"
+"0xE2","0x02","Register ID","R","First Fire Bit (0xFF if N/A)","Register Data (LSB)","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data","Register Data (MSB)","0x00","PCI Express Industry Standard Register Dump"
+"0xE3","Platform ID","Register ID","R","R","R","R","R","R","Register Data (LSB)","Register Data","Register Data","Register Data (MSB)","0x00","RAW Hex Dump"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x00","0x00","R","R","R","0x00","PCI Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x01","0x00","R","R","R","0x00","Processor Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x02","0x00","R","R","R","0x00","Memory Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x00","R","R","R","0x00"," Scalability Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x07","R","R","0x00","Merge Failure - BIOS version is newer than secondary server BIOS"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x08","R","R","0x00","Merge Failure - BIOS version is older than secondary server BIOS"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x09","R","R","0x00","Merge Failure - Primary server booted standalone"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x0A","R","R","0x00","Merge Failure - Communication error occurred with secondary server"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x0B","R","R","0x00","Merge Failure - Timed out waiting for secondary server"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x10","R","R","0x00","Merge Failure - No path through partition"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x11","Expected Chassis Count","R","0x00","Merge Information - Expected chassis count"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x12","Actual Chassis Count","R","0x00","Merge Information - Actual chassis count"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x19","R","R","0x00","Merge Failure - No secondary servers found to merge"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x34","R","R","0x00","Merge Failure - Primary server booted standalone"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x35","R","R","0x00","Merge Failure - Communication error occurred with primary server"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x36","R","R","0x00","Merge Failure - Secondary server booted standalone"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x41","R","R","0x00","Merge Failure - Timeout occurred waiting for primary server"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x46","R","R","0x00","Merge Failure - BIOS version is newer than primary server BIOS"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x47","R","R","0x00","Merge Failure - BIOS version is older than primary server BIOS"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x52","R","R","0x00","Merge Failure - Scalability hardware not detected"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x53","R","R","0x00","Merge Failure - No partition descriptor found"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x54","R","R","0x00","Merge Failure - Error Reading partition descriptor"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x55","R","R","0x00","Merge Failure - Error Reading system UUID"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x56","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x57","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x58","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x59","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x5A","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x5B","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x03","0x01","0x5C","R","R","0x00","Merge Failure [Byte 13 value]"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x04","0x00","R","R","R","0x00","Bus PCI Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x05","0x00","R","R","R","0x00","Chipset Event/Error Occurred. Next non-timestamped OEM SEL entry will contain details of the specific PCI event/error"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x06","0x01","PostVersion","BMCVersion","R","0x00","Incompatible BIOS-BMC Power Executive support"
+"0xC0","XX","XX","XX","XX","XX","XX","XX","0x06","0x02","R","R","R","0x00","Boot denied due to power limitations"
diff --git a/control/Makefile.am b/control/Makefile.am
new file mode 100644
index 0000000..91950d6
--- /dev/null
+++ b/control/Makefile.am
@@ -0,0 +1,37 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+EXTRA_DIST		= pkginfo.in prototype.in \
+			  ipmitool.spec.in rpmmacros.in rpmrc
+
+dist-hook: pkginfo prototype rpmmacros
+
diff --git a/control/Makefile.in b/control/Makefile.in
new file mode 100644
index 0000000..3c1ae92
--- /dev/null
+++ b/control/Makefile.in
@@ -0,0 +1,503 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = control
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/pkginfo.in $(srcdir)/prototype.in \
+	$(srcdir)/rpmmacros.in $(srcdir)/ipmitool.spec.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = pkginfo prototype rpmmacros ipmitool.spec
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = pkginfo.in prototype.in \
+			  ipmitool.spec.in rpmmacros.in rpmrc
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign control/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign control/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+pkginfo: $(top_builddir)/config.status $(srcdir)/pkginfo.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+prototype: $(top_builddir)/config.status $(srcdir)/prototype.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+rpmmacros: $(top_builddir)/config.status $(srcdir)/rpmmacros.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ipmitool.spec: $(top_builddir)/config.status $(srcdir)/ipmitool.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+
+dist-hook: pkginfo prototype rpmmacros
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/control/ipmitool.spec.in b/control/ipmitool.spec.in
new file mode 100644
index 0000000..85e61f9
--- /dev/null
+++ b/control/ipmitool.spec.in
@@ -0,0 +1,404 @@
+Name:         ipmitool
+Summary:      ipmitool - Utility for IPMI control
+Version:      @VERSION@
+Release:      @RPM_RELEASE@%{?_distro:.%{_distro}}
+License:      BSD
+Group:        Utilities
+Packager:     Jim Mankovich <jmank@hp.com>
+Source:       %{name}-%{version}.tar.gz
+Buildroot:    /var/tmp/ipmitool-root
+
+%description
+This package contains a utility for interfacing with devices that support
+the Intelligent Platform Management Interface specification.  IPMI is
+an open standard for machine health, inventory, and remote power control.
+
+This utility can communicate with IPMI-enabled devices through either a
+kernel driver such as OpenIPMI or over the RMCP LAN protocol defined in
+the IPMI specification.  IPMIv2 adds support for encrypted LAN
+communications and remote Serial-over-LAN functionality.
+
+It provides commands for reading the Sensor Data Repository (SDR) and
+displaying sensor values, displaying the contents of the System Event
+Log (SEL), printing Field Replaceable Unit (FRU) information, reading and
+setting LAN configuration, and chassis power control.
+
+%prep
+if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then
+    rm -rf $RPM_BUILD_ROOT
+fi
+
+%setup
+
+%build
+./configure --with-kerneldir \
+	--with-rpm-distro=@DISTRO@ \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--sbindir=%{_sbindir} \
+	--datadir=%{_datadir} \
+	--includedir=%{_includedir} \
+	--libdir=%{_libdir} \
+	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}
+make
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install-strip
+
+%clean
+if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then
+    rm -rf $RPM_BUILD_ROOT
+fi
+
+%files
+%defattr(755,root,root)
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%{_datadir}/ipmitool/*
+%{_mandir}/man*/*
+%doc %{_datadir}/doc/ipmitool
+
+
+%changelog
+* Wed Feb 25 2009 <pere@hungry.com>  1.8.11-1
+- Fix new GCC compilation issues in regards to Packing
+- Fix Tracker bug #1642710 - ipmi_kcs_drv being loaded/unloaded
+  for 2.4 kernel instead of ipmi_si_drv driver module
+- New -y option added to allow specification of kg keys with
+  non-printable characters
+- New -K option added to allow kgkey settings via environmental
+  variable IPMI_KGKEY
+- Generic device support added for EEPROM with SDR Type 10h (gendev)
+- Fix to lan-bridging for a double-bridging crash and to fix
+  an issue with bridging multiple concurrent requests and
+  erroneous handling of raw Send Message
+- Lanplus fix for commands like 'sensor list' without the -t option
+  causing wrong double bridged requests of a sensor is located
+  on another satellite controller
+- Fix lan and lanplus request list entry removal bugs
+- Fix non-working issue when trying to send a bridge message with
+  Cipher 3
+- Change bridge message handling to reuse command ipmi_lan_poll_recv
+- Added PICMG 2.0 and 2.3 support
+- Fix PICMG (ATCA) extension verification and reversal of BCD encoded
+  values for "major" and "minor" fields
+- Add IANA support for Pigeon Point
+- Add OEM SW/FW Record identification
+- Fix to include I2C and LUN addresses so sensors are correctly managed
+- Patch ID 1990560 to get readings from non-linear analog sensors
+- Add support for SOL payload status command
+- SOL set parameter range checking added
+- Fixed SOL activate options usage 
+- Fixed crashes when parsing 'sol payload' and 'tsol' cmds (#216967)
+- Added retries to SOL keepalive
+- Fixed wrong mask values for Front Panel disable/enable status
+- Add support to access fru internal use area
+- Add support for new PICMG 3.0 R3.0 (March 24, 2008) to allow
+  blocks of data within the FRU storage area to be write protected.
+- Fix node reporting in GUID; Tracker bug #2339675
+- Fix watchdog use/action print strings
+- Fix endian bug in SDR add from file; Tracker bug #2075258
+- Fix crash when dumping SDRs in a file and there's an error
+  getting an SDR; improve algorithm for optimal packet size
+- Fix occasional SDR dump segfault; #1793076
+- Allow ipmitool sel delete to accept hex list entry numbers
+- Fix SEL total space reporting.
+- Fix for garbage sensor threshold values reported when none 
+  returned.  Tracker Bug #863748
+- ipmievd change to Monitor %used in SEL buffer and log warnings when
+  the buffer is 80% and 100% full
+
+* Fri Aug 08 2008 <pere@hungry.com>  1.8.10-1
+ - Added support for BULL IANA number.
+ - Fixed contrib build so the oem_ibm_sel_map file gets included in rpm 
+   builds again.
+ - Added support for Debian packages to be built from CVS
+ - Fix for sdr and sel timestamp reporting issues
+ - Fix for discrete sensor state print routines to address state bits 8-14
+ - Change ipmi_chassis_status() to non-static so it can be used externally
+ - Added retries to SOL keepalive
+ - Fix to stop sensor list command from reporting a failure due to missing 
+   sensor
+ - Fix bug in sdr free space reporting
+ - Add support for IANA number to vendor name conversion for many vendors
+ - Fix segfault bug in lan set command
+ - Fix bug in population of raw i2c wdata buffer
+ - Fix bug in ipmb sensor reading
+ - Fix misspellings, typos, incorrect strncmp lengths, white space
+ - Update/fix printed help and usages for many commands
+ - Add and update support for all commands in ipmitool man page
+ - Fix for lanplus session re-open when the target becomes unavailable following
+   a fw upgrade activation
+ - Add support for watchdog timer shutoff, reset, and get info
+ - Add support for more ibm systems in oem_ibm_sel_map
+ - Add more JEDEC support info for DIMMs; decrease request size for DIMM FRU
+   info to 16 bytes at a time to allow more DIMM FRUs to respond.
+ - Fix to change hpmfwupg to version 1.02; fix to reduce hpmfwupg buffer 
+   length more aggressively when no response from iol
+ - Fix HPM firmware activation via IOL; fake a timeout after IOL session 
+   re-open to force get upgrade status retry; Added retries on 0xD3 
+   completion code
+ - Add support for freeipmi 0.6.0; adjust autoconf for changes
+ - Fix for oemval2str size
+ - Add support for product name resolution in mc info
+ - Fix FRU display format
+ - Added PICMG ekeying analyzer module support (ekanalyzer); display point
+   to point physical connectivity and power supply information between 
+   carriers and AMC modules; display matched results of ekeying match 
+   between an on-carrier device and AMC module or between 2 AMC modules
+ - Fix AMC GUID display support
+ - Improved amcportstate operations
+ - Added resolution for new sensor types
+ - Fix segfault in SOL
+ - Fix bug that caused infinite loop on BMCs with empty SDRs
+ - Fix to move out Kontron OEM sensor resolution for other OEMs which could 
+   lead to bad event descriptions
+ - Add new FRU edit mode thereby allowing serial numbers, etc. to be changed;
+    improvements to OEM edit mode
+ - Added SPD support for parms: channel number, max read size
+ - Add SDR support for adding SDR records from a dumped file, clearing SDR, 
+   adding partial SDR records
+ - Add updates and fixes to hpmfwupg: upload block size to 32 bytes for KCS,
+   handle long response option, implement rollback override, garbage output fix
+ - Add double bridge lan support , fix bridging issue
+ - Add HPM support to pre-check which components need to be skipped
+ - Fix autodetection of maximum packet size when using IPMB
+ - Add new Kontron OEM command to set the BIOS boot option sequence
+ - Add support for dual-bridge/ dual send message
+ - Add auto-detect for local IPMB address using PICMG 2.X extension
+ - Add support for HPM.1 1.0 specification compliance
+ - Fix for improper lan/lanplus addressing
+ - Added transit_channel and transit_addr to ipmi_intf struct
+ - Fix bad password assertion bug due to rakp2 HMAC not being checked properly
+ - Added ability to interpret PPS shelf manager clia sel dump
+ - Corrected PICMG M7 state event definition macros
+ - Added FRU parsing enhancements
+ - Added "isol info", "isol set" and "isol activate" commands to support 
+   Intel IPMI v1.5 SOL functionality. Removed "isol setup" command.
+ - Fix bug in ipmi_lan_recv_packet() in lan and lanplus interfaces.
+ - Fix bug in "chassis poh" command.
+ - Fix HPM.1 upgrade to apply to only given component when instructed to do so
+ - Added configure auto-detection if dual bridge extension is supported 
+   by OpenIPMI
+
+* Tue Mar  6 2007 <pere@hungry.com>  1.8.9-1
+ - Added initial AMC ekey query operation support
+ - Improvements to ekeying support (PICMG 3.x only)
+ - Added initial interactive edition support for multirec; added IANA
+   verification before interpreting PICMG records.
+ - Added edit support for AMC activation "Maximum Internal Current"
+ - Fix bug generating garbage on the screen when handling GetDeviceId
+   and sol traffic occurs
+ - Added ability to map OEM sensor types to OEM description string using 
+   IANA number; moved IANA number table
+ - Fix lan set access command to use value already saved within parameters 
+   for PEF and authentication
+ - Fix bug in cmd ipmitool lan stats get 1
+ - Add support to allow ipmitool/ipmievd to target specific device nodes 
+   on multi-BMC systems
+ - Add support for name+privilege lookup for lanplus sessions
+ - Fix time_t conversion bug for 64-bit OS
+ - Added prefix of hostname on sel ipmievd sessions
+ - Fixed FWUM Get Info
+ - Fix ipmievd fd closing bug
+ - Add set-in-progress flag support to chassis bootdev
+ - Added new chassis bootdev options
+ - Add sol payload enable/disable comman
+ - Fix SOL set errors when commit-write not supported
+ - Fix reset of session timeout for lanplus interface
+ - Fixed lan interface accessibility timeout handling
+ - Fix bug with Function Get Channel Cipher Suites command when more 
+   than 1 page used.
+ - Fix missing firmware firewall top-level command
+ - Fix bug in SOL keepalive functionality
+ - Fix SOLv2 NACK and retry handling for Intel ESB2 BMC
+ - Added ipmi_sel_get_oem_sensor* APIs
+ - Added HPM.1 support 
+ - Fix segfault when incorrect oem option supplied
+ - Fix bus problem with spd command
+ - Fix segfault in SOL when remote BMC does not return packet
+ - Adjust packet length for AMC.0 retricting IPMB packets to 32 bytes
+ - Added lan packet size reduction mechanism
+ - Fix bug with sendMessage of bad length with different target
+ - Fix for big endian (PPC) architecture
+ - NetBSD fixes
+ - Fix segfault and channel problem with user priv command
+ - Add support for bus/chan on i2c raw command
+ - Add freeipmi interface support
+ - Add remote spd printing
+ - Add better detection of linux/compiler.h to config
+ - Makefile changes to fix makedistcheck, etc. 
+
+* Tue May 02 2006 <duncan@iceblink.org>  1.8.8-1
+ - Fix segfaults in sensor data repository list
+ - Fix ipmievd to open interface before daemonizing
+ - Fix IPMIv1.5 authtype NONE to ignore supplied password
+ - Fix cipher suite display bug in lan print
+ - Fix typo in IPMIv2 SOL output when sending break
+ - Fix improper LUN handling with Tyan SOL
+ - Add LUN support to OpenIPMI interface
+ - Add support for Kontron OEM commands
+ - Update to Kontron Firmware Update command
+
+* Sun Mar 19 2006 <duncan@iceblink.org>  1.8.7-1
+ - Add Sun OEM command for blades
+ - Increase argument size for raw commands in shell/exec
+ - Fix handling of LUNs for LAN interfaces
+ - Add IPMIv2 SOL loopback test
+ - Add support for IBM OEM SEL messages
+ - Disable file paranoia checks on read files by default
+ - 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
+ - Add support for IPMIv2 Firmware Firewall
+ - Fix gcc4 compile warnings
+ - Make ipmievd generate pidfile
+ - Add initscripts for ipmievd
+
+* Mon Jan 17 2006 <duncan@iceblink.org>  1.8.6-1
+ - Fix memory corruption when sending encrypted SOL traffic
+ - Add keepalive timer to IPMIv2 SOL sessions
+
+* Sat Jan 14 2006 <duncan@iceblink.org>  1.8.5-1
+ - Raise privilege level after creating IPMIv2 session
+ - Add support for settable SOL escape character with -e option
+ - Add support for Kg BMC key for IPMIv2 authentication with -k option
+ - Add support for Tyan IPMIv1.5 SOL with tsol command
+ - Add support for PICMG devices
+ - Add support for OEM SEL event parsing
+ - Add support for command bridging over lan and lanplus interfaces
+ - New 'chassis selftest' command
+ - Many bufxies and patches from contributors
+
+* Wed May 18 2005 <duncan@iceblink.org>  1.8.2-1
+ - Fix FRU reading for large (>255 bytes) areas.
+ - Overhaul to ipmievd to support SEL polling in addition to OpenIPMI.
+ - Fix LAN parameter segfault when no Ciphers supported by BMC.
+ - Fix IPMIv2 support on Intel v2 BMCs (use -o intelplus).
+ - Separate option parsing code from main ipmitool source file.
+ - Add raw I2C support with IPMI Master Read-Write command.
+ - Add support for new 'sdr elist' extended output format.
+ - Add support for listing sensors by type with 'sdr type' command.
+ - Add support for new 'sel elist' extended output format that
+   cross-references events with sensors.
+ - Add support for sending dynamically generated platform events
+   based on existing sensor information.
+ - New '-S' argument to read local SDR cache created with 'sdr dump'.
+ - Updated manpage for ipmitool and ipmievd.
+
+* Wed Apr 06 2005 <duncan@iceblink.org>  1.8.1-1
+ - Install ipmievd into /usr/sbin
+
+* Wed Mar 16 2005 <duncan@iceblink.org>  1.8.0-1
+ - Fix IPMIv2.0 issues
+ - Fix chassis boot parameter support
+ - Add support for linear sensors
+ - Update bmc plugin to work with new Solaris bmc driver (new ioctl
+   for interface detection and new STREAMS message-based interface)
+
+* Tue Jan 18 2005 <duncan@iceblink.org>  1.7.0-1
+ - Propogate errors correctly so exit status will be useful
+ - More consistent display of errors including completion code text
+ - Errors and debug is send to stderr now
+ - New "sel get" command that will print details about SEL entry
+   and corresponding SDR records as well as FRUs via entity association
+ - Improved event generator, now supports reading events from text file
+ - New "-o oemtype" option for specifying OEM boards
+   exsting types are "supermicro" and "intelwv2"
+ - New PEF subsystem from Tim Murphy at Dell
+ - New "bmc" plugin for Solaris 10 x86
+ - Many bugfixes and contributed patches
+ - Support for Supermicro BMC OEM authentication method
+ - Fix minor problem with LAN parameter setting
+
+* Wed Aug 18 2004 <duncan@iceblink.org>  1.6.0-1
+ - Add a README
+ - Add support for IPMIv2 and Serial-over-LAN from Newisys
+ - Add Solaris x86 lipmi interface
+ - Add support for building Solaris packages
+ - Add support for building RPMs as non-root user
+ - Fix segfault when doing "sel list" (from Matthew Braithwaite)
+ - Fix "chassis identify" on some BMCs (from ebrower@sourceforge)
+ - Add "bmc info" and related output (from ebrower@sourceforge)
+ - new "shell" and "exec" commands
+ - lots of other contributed patches
+
+* Sat May 27 2004 <duncan@iceblink.org>  1.5.9-1
+ - Add ability to get a particular sensor by name
+ - Add ability to set a particular sensor threshold
+ - Add support for displaying V2 channel authentication levels
+ - Add README for rrdtool scripts in contrib directory
+ - Improve lan interface retry handling
+ - Support prompting for password or reading from environment
+ - Move chaninfo command into channel subcommand
+ - Fix reservation ID handling when two sessions open to BMC
+ - Fix reading of large FRU data
+ - Add configure option for changing binary to ipmiadm for Solaris
+ - Fix compile problem on Solaris 8
+
+* Tue Jan 27 2004 <duncan@iceblink.org>  1.5.8-1
+ - Enable static compilation of interfaces
+ - Fix types to be 64-bit safe
+ - Fix compilation problems on Solaris
+ - Fix multiple big-endian problems for Solaris/SPARC
+ - Fix channel access to save settings to NVRAM
+ - Set channel privilege limit to ADMIN during "access on"
+ - Enable gratuitous ARP in bmcautoconf.sh
+ - Add support for Linux kernel panic messages in SEL output
+ - Add support for type 3 SDR records
+
+* Mon Jan  5 2004 <duncan@iceblink.org>  1.5.7-1
+ - add IPMIv1.5 eratta fixes
+ - additions to FRU printing and FRU multirecords
+ - better handling of SDR printing
+ - contrib scripts for creating rrdtool graphs
+
+* Thu Dec  4 2003 <duncan@iceblink.org>  1.5.6-1
+ - Fix SEL event decoding for generic events
+ - Handle empty SEL gracefully when doing "sel list"
+ - Fix sdr handling of sensors that do not return a reading
+ - Fix for CSV display of sensor readings/units from Fredrik �hrn
+
+* Tue Nov 25 2003 <duncan@iceblink.org>  1.5.5-1
+ - Add -U option for setting LAN username
+ - Fix -v usage for plugin interfaces
+
+* Fri Nov 14 2003 <duncan@iceblink.org>  1.5.4-1
+ - pull interface plugin api into library
+ - fix ipmievd
+
+* Fri Oct 31 2003 <duncan@iceblink.org>  1.5.3-1
+ - add -g optin for pedantic ipmi-over-lan communication
+
+* Fri Oct 24 2003 <duncan@iceblink.org>  1.5.2-1
+ - add gratuitous arp interval setting
+
+* Wed Oct  8 2003 <duncan@iceblink.org>  1.5.1-1
+ - better SEL support
+ - fix display bug in SDR list
+
+* Fri Sep  5 2003 <duncan@iceblink.org>  1.5.0-1
+ - use automake/autoconf/libtool
+ - dynamic loading interface plugins
+
+* Wed May 28 2003 <duncan@iceblink.org>  1.4.0-1
+ - make UDP packet handling more robust
+ - fix imb driver support
+
+* Thu May 22 2003 <duncan@iceblink.org>  1.3-1
+ - update manpage
+ - rework of low-level network handling
+ - add basic imb driver support
+
+* Wed Apr  2 2003 <duncan@iceblink.org>  1.2-1
+ - change command line option parsing
+ - support for more chassis commands
+
+* Tue Apr  1 2003 <duncan@iceblink.org>  1.1-1
+ - minor fixes.
+
+* Sun Mar 30 2003 <duncan@iceblink.org>  1.0-1
+ - Initial release.
+
diff --git a/control/pkginfo.in b/control/pkginfo.in
new file mode 100644
index 0000000..3a86616
--- /dev/null
+++ b/control/pkginfo.in
@@ -0,0 +1,10 @@
+PKG="@PACKAGE@"
+NAME="@PACKAGE@ - Utility for Intelligent Platform Management Interface (IPMI) control"
+ARCH="@ARCH@"
+VERSION="@VERSION@"
+CATEGORY="system"
+VENDOR="Duncan Laurie"
+EMAIL="duncan@iceblink.org"
+PSTAMP="@PSTAMP@"
+BASEDIR="@BASEDIR@"
+CLASSES="none"
diff --git a/control/prototype.in b/control/prototype.in
new file mode 100644
index 0000000..cfaf436
--- /dev/null
+++ b/control/prototype.in
@@ -0,0 +1,12 @@
+i pkginfo
+d none bin ? ? ?
+f none bin/@PACKAGE@=../src/@PACKAGE@ 0755 root bin
+d none sbin ? ? ?
+f none sbin/ipmievd=../src/ipmievd 0755 root bin
+d none share ? ? ?
+d none share/man ? ? ?
+d none share/man/man1 ? ? ?
+f none share/man/man1/@PACKAGE@.1=../doc/@PACKAGE@.1 0644 root bin
+d none share/man/man8 ? ? ?
+f none share/man/man8/ipmievd.8=../doc/ipmievd.8 0644 root bin
+
diff --git a/control/rpmmacros.in b/control/rpmmacros.in
new file mode 100644
index 0000000..429e098
--- /dev/null
+++ b/control/rpmmacros.in
@@ -0,0 +1,12 @@
+%_topdir	%(echo $BUILDDIR)
+%_sourcedir     %{_topdir}/..
+%_specdir       %{_sourcedir}
+%_tmppath	%{_topdir}/tmp
+%_builddir	%{_topdir}/BUILD
+%_buildroot	%{_topdir}/%{_tmppath}/%{name}-%{version}-root
+%_rpmdir	%{_topdir}/RPMS
+%_srcrpmdir	%{_topdir}/SRPMS
+%_distro	@DISTRO@
+%_rpmfilename	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+%packager	jmank@hp.com
+%distribution	Sourceforge Build
diff --git a/control/rpmrc b/control/rpmrc
new file mode 100644
index 0000000..0a99ecb
--- /dev/null
+++ b/control/rpmrc
@@ -0,0 +1,8 @@
+macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros:/etc/rpm/%{_target}/macros:%(echo $CONFIGDIR)/rpmmacros
+
+buildarchtranslate: athlon: i386
+buildarchtranslate: i686: i386
+buildarchtranslate: i586: i386
+buildarchtranslate: i486: i386
+buildarchtranslate: i386: i386
+
diff --git a/depcomp b/depcomp
new file mode 100755
index 0000000..4ebd5b3
--- /dev/null
+++ b/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..cc7b4f1
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,36 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+man_MANS		= ipmitool.1 ipmievd.8
+
+EXTRA_DIST		= $(man_MANS)
+
diff --git a/doc/Makefile.in b/doc/Makefile.in
new file mode 100644
index 0000000..fb184ec
--- /dev/null
+++ b/doc/Makefile.in
@@ -0,0 +1,611 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+man_MANS = ipmitool.1 ipmievd.8
+EXTRA_DIST = $(man_MANS)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man8: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man8dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.8[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list=''; test -n "$(man8dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.8[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man1 install-man8
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
+
+uninstall-man: uninstall-man1 uninstall-man8
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man8 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1 uninstall-man8
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/ipmievd.8 b/doc/ipmievd.8
new file mode 100644
index 0000000..a39dce0
--- /dev/null
+++ b/doc/ipmievd.8
@@ -0,0 +1,231 @@
+.TH "ipmievd" "8" "" "Duncan Laurie" ""
+.SH "NAME"
+ipmievd \- IPMI event daemon for sending events to syslog
+.SH "SYNOPSIS"
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-d \fIN\fP\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIopen\fP <\fIopen\fR | \fIsel\fR> [<\fIoption\fP>]
+
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
+        [\fB\-p\fR <\fIport\fP>]
+        [\fB\-U\fR <\fIusername\fP>]
+        [\fB\-A\fR <\fIauthtype\fP>]
+        [\fB\-L\fR <\fIprivlvl\fP>]
+        [\fB\-a\fR|\fB\-E\fR|\fB\-P\fR|\fB\-f\fR <\fIpassword\fP>]
+        [\fB\-o\fR <\fIoemtype\fP>]
+        [\fB\-O\fR <\fIsel oem\fP>]
+        \fIsel\fP [<\fIoption\fP>]
+
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIlanplus\fP \fB\-H\fR <\fIhostname\fP>
+        [\fB\-p\fR <\fIport\fP>]
+        [\fB\-U\fR <\fIusername\fP>]
+        [\fB\-L\fR <\fIprivlvl\fP>]
+        [\fB\-a\fR|\fB\-E\fR|\fB\-P\fR|\fB\-f\fR <\fIpassword\fP>]
+        [\fB\-o\fR <\fIoemtype\fP>]
+        [\fB\-O\fR <\fIsel oem\fP>]
+        [\fB\-C\fR <\fIciphersuite\fP>]
+        \fIsel\fR [<\fIoption\fP>]
+.SH "DESCRIPTION"
+\fBipmievd\fP is a daemon which will listen for events from the
+BMC that are being sent to the SEL and also log those messages to
+syslog.  It is able to run in one of two modes: either using the
+Event Message Buffer and asynchronous event notification from the
+OpenIPMI kernel driver or actively polling the contents of the
+SEL for new events.  Upon receipt of an event via either mechanism
+it will be logged to syslog with the \fILOG_LOCAL4\fP facility.
+
+It is based on the \fBipmitool\fR utility and shares the same IPMI
+interface support and session setup options.  Please see the
+\fBipmitool\fR manpage for more information on supported IPMI
+interfaces.
+.SH "OPTIONS"
+.TP 
+\fB\-a\fR
+Prompt for the remote server password.
+.TP 
+\fB\-A\fR <\fIauthtype\fP>
+Specify an authentication type to use during IPMIv1.5 \fIlan\fP
+session activation.  Supported types are NONE, PASSWORD, MD2, MD5, or OEM.
+.TP 
+\fB\-c\fR
+Present output in CSV (comma separated variable) format.  
+This is not available with all commands.
+.TP 
+\fB\-C\fR <\fIciphersuite\fP>
+The remote server authentication, integrity, and encryption algorithms
+to use for IPMIv2 \fIlanplus\fP connections.  See table 22\-19 in the
+IPMIv2 specification.  The default is 3 which specifies RAKP\-HMAC\-SHA1 
+authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorightms.
+.TP 
+\fB\-E\fR
+The remote server password is specified by the environment
+variable \fIIPMI_PASSWORD\fP.
+.TP 
+\fB\-f\fR <\fIpassword_file\fP>
+Specifies a file containing the remote server password. If this
+option is absent, or if password_file is empty, the password
+will default to NULL.
+.TP 
+\fB\-h\fR
+Get basic usage help from the command line.
+.TP 
+\fB\-H\fR <\fIaddress\fP>
+Remote server address, can be IP address or hostname.  This 
+option is required for \fIlan\fP and \fIlanplus\fP interfaces.
+.TP 
+\fB\-I\fR <\fIinterface\fP>
+Selects IPMI interface to use.  Supported interfaces that are
+compiled in are visible in the usage help output.
+.TP 
+\fB\-L\fR <\fIprivlvl\fP>
+Force session privilege level.  Can be CALLBACK, USER,
+OPERATOR, ADMIN. Default is ADMIN.
+.TP 
+\fB\-m\fR <\fIlocal_address\fP>
+Set the local IPMB address.  The default is 0x20 and there
+should be no need to change it for normal operation.
+.TP 
+\fB\-o\fR <\fIoemtype\fP>
+Select OEM type to support.  This usually involves minor hacks
+in place in the code to work around quirks in various BMCs from
+various manufacturers.  Use \fI\-o list\fP to see a list of
+current supported OEM types.
+.TP 
+\fB\-O\fR <\fIsel oem\fP>
+Open selected file and read OEM SEL event descriptions to be used
+during SEL listings.  See examples in contrib dir for file format.
+.TP
+\fB\-p\fR <\fIport\fP>
+Remote server UDP port to connect to.  Default is 623.
+.TP 
+\fB\-P\fR <\fIpassword\fP>
+Remote server password is specified on the command line.
+If supported it will be obscured in the process list. 
+\fBNote!\fR Specifying the password as a command line
+option is not recommended.
+.TP 
+\fB\-S\fR <\fIsdr_cache_file\fP>
+Use local file for remote SDR cache.  Using a local SDR cache
+can drastically increase performance for commands that require
+knowledge of the entire SDR to perform their function.
+.TP 
+\fB\-t\fR <\fItarget_address\fP>
+Bridge IPMI requests to the remote target address.
+.TP 
+\fB\-U\fR <\fIusername\fP>
+Remote server username, default is NULL user.
+.TP 
+\fB\-d \fIN\fP\fR
+Use device number N to specify the /dev/ipmiN (or 
+/dev/ipmi/N or /dev/ipmidev/N) device to use for in-band 
+BMC communication.  Used to target a specific BMC on a 
+multi-node, multi-BMC system through the ipmi device 
+driver interface.  Default is 0.
+.TP 
+\fB\-v\fR
+Increase verbose output level.  This option may be specified
+multiple times to increase the level of debug output.  If given
+three times you will get hexdumps of all incoming and
+outgoing packets.
+.TP 
+\fB\-V\fR
+Display version information.
+
+.LP 
+If no password method is specified then ipmievd will prompt the
+user for a password. If no password is entered at the prompt,
+the remote server password will default to NULL.
+.SH "COMMANDS"
+.TP 
+\fIhelp\fP
+This can be used to get command\-line help.  It may also be
+placed at the end of commands to get option usage help.
+
+> ipmievd help
+.br 
+Commands:
+    open    Use OpenIPMI for asyncronous notification of events
+    sel     Poll SEL for notification of events
+
+.TP 
+\fIopen\fP
+This command starts ipmievd with the OpenIPMI event watching
+mechanism which relies on the Event Message Buffer feature of
+IPMI.  This requires a properly installed and configured
+OpenIPMI driver on Linux and is only valid to be run through
+the \fIopen\fP interface.  See the \fBipmitool\fR manpage
+and associated documentation for more information on setting
+up the OpenIPMI driver.
+
+\fBNote\fR: Some BMC do not support the Event Message Buffer
+required for this command.  Other BMCs claim to support it but
+do not actually deliver events to it.  If this is the case please
+use the \fIsel\fP method.
+
+.RS
+.TP 
+\fIdaemon\fP
+Launch process as a daemon and reparent to init process.
+All messages will be sent to syslog.  This is the default action.
+.TP 
+\fInodaemon\fP
+Do NOT become a daemon, instead log all messages to stderr.
+.TP
+\fIpidfile\fP=<\fBfilename\fR>
+Save process ID to this file when in daemon mode.  Defaults to
+/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+number -- defaults to 0).
+.RE
+
+.TP 
+\fIsel\fP
+This command starts ipmievd with the SEL Polling event watching
+mechanism.  This will poll the SEL periodically to determine if
+new events have been logged.  This command should work with all
+BMCs and is capable of using the LAN interface as well to monitor
+a remote system and log its events to a local syslog.
+
+.RS
+.TP 
+\fIdaemon\fP
+Launch process as a daemon and reparent to init process.
+All messages will be sent to syslog.  This is the default action.
+.TP 
+\fInodaemon\fP
+Do NOT become a daemon, instead log all messages to stderr.
+.TP
+\fIpidfile\fP=<\fBfilename\fR>
+Save process ID to this file when in daemon mode.  Defaults to
+/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+number -- defaults to 0).
+.TP 
+\fItimeout\fP=<\fBseconds\fR>
+Time between checks for SEL polling method.  Default is 10 seconds.
+.RE
+.SH "EXAMPLES"
+.TP 
+\fIExample 1\fP: Daemon process watching OpenIPMI for events
+
+> ipmievd \-I open open daemon
+.TP 
+\fIExample 2\fP: Local non\-daemon process checking remote SEL every 30 seconds
+
+> ipmievd \-I lan \-H 1.2.3.4 \-f passfile sel nodaemon timeout=30
+.br 
+Reading Sensors...
+.br 
+Waiting for Events...
+.br 
+.SH "AUTHOR"
+Duncan Laurie <duncan@iceblink.org>
+.SH "SEE ALSO"
+.TP 
+IPMItool Homepage
+http://ipmitool.sourceforge.net
+.TP 
+Intelligent Platform Management Interface Specification
+http://www.intel.com/design/servers/ipmi
+.TP 
+OpenIPMI Homepage
+http://openipmi.sourceforge.net
diff --git a/doc/ipmitool.1 b/doc/ipmitool.1
new file mode 100644
index 0000000..2e39fad
--- /dev/null
+++ b/doc/ipmitool.1
@@ -0,0 +1,3745 @@
+.TH "ipmitool" "1" "" "Duncan Laurie" ""
+.SH "NAME"
+ipmitool \- utility for controlling IPMI\-enabled devices
+.SH "SYNOPSIS"
+
+ipmitool [ <options> ] <command> [ <sub-commands and sub-options> ]
+
+<options>           := [ <general-options> | <conditional-opts> ]
+.br
+Any recognized option is accepted. Conditional options may be ignored or it's usage postponed until shell or exec processes relevant command.
+.br
+
+<general\-options>   := [ \-h | \-V | \-v | \-I <interface> | \-H <address> |
+                         \-d <N> | \-p <port> | \-c | \-U <username> |
+                         \-L <privlvl> | \-l <lun> | \-m <local_address> |
+                         \-N <sec> | \-R <count> | <password\-option> |
+                         <oem-option> | <bridge-options> ]
+
+<conditional\-opts>  := [ <lan\-options> | <lanplus\-options> |
+                         <command\-options> ]
+.br
+Bridging:
+.br
+<bridge\-options>    := \-t <target_address> [ \-b <channel> |
+                       [ \-T <address> | \-B <channel> ] ]
+.br
+
+Options used with \-I lan:
+.br
+<lan\-options>       := [ \-A <authtype> ]
+.br
+
+Options used with \-I lanplus:
+.br
+<lanplus\-options>   := [ \-C <ciphersuite> | <key\-option> ]
+.br
+
+Option groups setting same value:
+.br
+<key\-option>        := [ \-k <key> | \-K | \-y <hex_key> | \-Y ]
+.br
+<password\-option>   := [ \-f <password_file> | \-a | \-P <password> | \-E ]
+.br
+<oem\-option>        := [ \-o <oemtype> | \-g | \-s ]
+.br
+
+Options used with specific command <command-options>:
+.br
+<options\-sdr>       := [ \-S <sdr_cache_file> ]
+.br
+<options\-sel>       := [ \-O <sel_oem> ]
+.br
+<options\-sol>       := [ \-e <sol_escape_char> ]
+
+
+.SH "DESCRIPTION"
+This program lets you manage Intelligent Platform Management Interface 
+(IPMI) functions of either the local system, via a kernel device driver,
+or a remote system, using IPMI v1.5 and IPMI v2.0. These functions include
+printing FRU information, LAN configuration, sensor readings, and remote
+chassis power control.
+
+IPMI management of a local system interface requires a compatible IPMI
+kernel driver to be installed and configured.  On Linux this driver is
+called \fIOpenIPMI\fP and it is included in standard distributions.
+On Solaris this driver is called \fIBMC\fP and is included in Solaris 10.
+Management of a remote station requires the IPMI\-over\-LAN interface to be
+enabled and configured.  Depending on the particular requirements of each
+system it may be possible to enable the LAN interface using ipmitool over
+the system interface.
+.SH "OPTIONS"
+.TP 
+\fB\-a\fR
+Prompt for the remote server password.
+.TP 
+\fB\-A\fR <\fIauthtype\fP>
+Specify an authentication type to use during IPMIv1.5 \fIlan\fP
+session activation.  Supported types are NONE, PASSWORD, MD2, MD5, or OEM.
+.TP
+\fB\-b\fR <\fIchannel\fP>
+Set destination channel for bridged request.
+.TP
+\fB\-B\fR <\fIchannel\fP>
+Set transit channel for bridged request (dual bridge).
+.TP 
+\fB\-b\fR <\fIchannel\fP>
+Set destination channel for bridged request.
+.TP 
+\fB\-B\fR <\fIchannel\fP>
+Set transit channel for bridged request. (dual bridge)
+.TP 
+\fB\-c\fR
+Present output in CSV (comma separated variable) format.  
+This is not available with all commands.
+.TP 
+\fB\-C\fR <\fIciphersuite\fP>
+The remote server authentication, integrity, and encryption algorithms
+to use for IPMIv2.0 \fIlanplus\fP connections.  See table 22\-19 in the
+IPMIv2.0 specification.  The default is 3 which specifies RAKP\-HMAC\-SHA1 
+authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorithms.
+.TP 
+\fB\-d \fIN\fP\fR
+Use device number N to specify the /dev/ipmiN (or 
+/dev/ipmi/N or /dev/ipmidev/N) device to use for in-band 
+BMC communication.  Used to target a specific BMC on a 
+multi-node, multi-BMC system through the ipmi device 
+driver interface.  Default is 0.
+.TP 
+\fB\-e\fR <\fIsol_escape_char\fP>
+Use supplied character for SOL session escape character.  The default
+is to use \fI~\fP but this can conflict with ssh sessions.
+.TP 
+\fB\-E\fR
+The remote server password is specified by the environment
+variable \fIIPMI_PASSWORD\fP or \fIIPMITOOL_PASSWORD\fP. The \fIIPMITOOL_PASSWORD\fP takes precedence.
+.TP 
+\fB\-f\fR <\fIpassword_file\fP>
+Specifies a file containing the remote server password. If this
+option is absent, or if password_file is empty, the password
+will default to NULL.
+.TP 
+\fB\-g\fR
+Deprecated. Use: \-o intelplus
+.TP 
+\fB\-h\fR
+Get basic usage help from the command line.
+.TP 
+\fB\-H\fR <\fIaddress\fP>
+Remote server address, can be IP address or hostname.  This 
+option is required for \fIlan\fP and \fIlanplus\fP interfaces.
+.TP 
+\fB\-I\fR <\fIinterface\fP>
+Selects IPMI interface to use.  Supported interfaces that are
+compiled in are visible in the usage help output.
+.TP 
+\fB\-k\fR <\fIkey\fP>
+Use supplied Kg key for IPMIv2.0 authentication.  The default is not to
+use any Kg key.
+.TP 
+\fB\-K\fR
+Read Kg key from IPMI_KGKEY environment variable.
+.TP 
+\fB\-l\fR <\fIlun\fP>
+Set destination lun for raw commands.
+.TP 
+\fB\-L\fR <\fIprivlvl\fP>
+Force session privilege level.  Can be CALLBACK, USER,
+OPERATOR, ADMINISTRATOR. Default is ADMINISTRATOR.
+This value is ignored and always set to ADMINISTRATOR when
+combined with \fI-t target address\fP.
+.TP 
+\fB\-m\fR <\fIlocal_address\fP>
+Set the local IPMB address.  The local address defaults to 0x20
+or is auto discovered on PICMG platforms when \-m is not specified.
+There should be no need to change the local address for normal operation.
+.TP 
+\fB\-N\fR <\fIsec\fP>
+Specify nr. of seconds between retransmissions of lan/lanplus messages.
+Defaults are 2 seconds for lan and 1 second for lanplus interfaces.
+Command \fIraw\fP uses fixed value of 15 seconds.
+Command \fIsol\fP uses fixed value of 1 second.
+.TP 
+\fB\-o\fR <\fIoemtype\fP>
+Select OEM type to support.  This usually involves minor hacks
+in place in the code to work around quirks in various BMCs from
+various manufacturers.  Use \fI\-o list\fP to see a list of
+current supported OEM types.
+.TP 
+\fB\-O\fR <\fIsel oem\fP>
+Open selected file and read OEM SEL event descriptions to be used
+during SEL listings.  See examples in contrib dir for file format.
+.TP 
+\fB\-p\fR <\fIport\fP>
+Remote server UDP port to connect to.  Default is 623.
+.TP 
+\fB\-P\fR <\fIpassword\fP>
+Remote server password is specified on the command line.
+If supported it will be obscured in the process list. 
+\fBNote!\fR Specifying the password as a command line
+option is not recommended.
+.TP 
+\fB\-R\fR <\fIcount\fP>
+Set the number of retries for lan/lanplus interface (default=4).
+Command \fIraw\fP uses fixed value of one try (no retries).
+Command \fIhpm\fP uses fixed value of 10 retries.
+.TP 
+\fB\-s\fR
+Deprecated. Use: \-o supermicro
+.TP 
+\fB\-S\fR <\fIsdr_cache_file\fP>
+Use local file for remote SDR cache.  Using a local SDR cache
+can drastically increase performance for commands that require
+knowledge of the entire SDR to perform their function.  Local
+SDR cache from a remote system can be created with the
+\fIsdr dump\fP command.
+.TP 
+\fB\-t\fR <\fItarget_address\fP>
+Bridge IPMI requests to the remote target address. Default is 32.
+The \fI-L privlvl\fP option is always ignored and value set to ADMINISTRATOR.
+.TP
+\fB\-T\fR <\fIaddress\fP>
+Set transit address for bridge request (dual bridge).
+.TP 
+\fB\-T\fR <\fItransmit_address\fP>
+Set transit address for bridge request. (dual bridge)
+.TP 
+\fB\-U\fR <\fIusername\fP>
+Remote server username, default is NULL user.
+.TP 
+\fB\-v\fR
+Increase verbose output level.  This option may be specified
+multiple times to increase the level of debug output.  If given
+three times you will get hexdumps of all incoming and
+outgoing packets. Using it five times provides details
+on request and expected reply procesing. The \fIhpm\fP commands
+\fItargetcap\fP \fIcompprop\fP \fIabort\fP \fIupgstatus\fP
+\fIrollback\fP \fIrollbackstatus\fP \fIselftestresult\fP increases
+the verbosity level
+.TP 
+\fB\-V\fR
+Display version information.
+.TP 
+\fB\-y\fR <\fIhex key\fP>
+Use supplied Kg key for IPMIv2.0 authentication. The key is expected in
+hexadecimal format and can be used to specify keys with non-printable
+characters. E.g. '\-k PASSWORD' and '\-y 50415353574F5244' are
+equivalent.
+The default is not to use any Kg key.
+.TP 
+\fB\-Y\fR
+Prompt for the Kg key for IPMIv2.0 authentication.
+.TP
+\fB\-z\fR <\fIsize\fP>
+Change Size of Communication Channel. (OEM)
+
+.LP 
+If no password method is specified then ipmitool will prompt the
+user for a password. If no password is entered at the prompt,
+the remote server password will default to NULL.
+.SH "SECURITY"
+There are several security issues be be considered before enabling the
+IPMI LAN interface. A remote station has the ability to control a system's power 
+state as well as being able to gather certain platform information. To reduce 
+vulnerability it is strongly advised that the IPMI LAN interface only be 
+enabled in 'trusted' environments where system security is not an issue or 
+where there is a dedicated secure 'management network'.
+
+Further it is strongly advised that you should not enable IPMI for
+remote access without setting a password, and that that password should
+not be the same as any other password on that system.
+
+When an IPMI password is changed on a remote machine with the IPMIv1.5
+\fIlan\fP interface the new password is sent across the network
+as clear text.  This could be observed and then used to attack the remote
+system.  It is thus recommended that IPMI password management only be done
+over IPMIv2.0 \fIlanplus\fP interface or the system interface on the
+local station.
+
+For IPMI v1.5, the maximum password length is 16 characters.
+Passwords longer than 16 characters will be truncated.
+
+For IPMI v2.0, the maximum password length is 20 characters;
+longer passwords are truncated.
+.SH "COMMANDS"
+.TP 
+\fIhelp\fP
+This can be used to get command\-line help  on  ipmitool
+commands.  It may also be placed at the end of commands
+to get option usage help.
+
+ipmitool help
+.br 
+Commands:
+        bmc          Deprecated. Use mc
+        channel      Configure Management Controller channels
+        chassis      Get chassis status and set power state
+        dcmi         Data Center Management Interface
+        delloem      Manage Dell OEM Extensions.
+        echo         Used to echo lines to stdout in scripts
+        ekanalyzer   run FRU-Ekeying analyzer using FRU files
+        event        Send events to MC
+        exec         Run list of commands from file
+        firewall     Configure Firmware Firewall
+        fru          Print built\-in FRU and scan for FRU locators
+        fwum         Update IPMC using Kontron OEM Firmware Update Manager
+        gendev       Read/Write Device associated with Generic Device locators sdr
+        hpm          Update HPM components using PICMG HPM.1 file
+        i2c          Send an I2C Master Write-Read command and print response
+        ime          Upgrade/Query Intel ME firmware
+        isol         Configure and connect Intel IPMIv1.5 Serial\-over\-LAN
+        kontronoem   Manage Kontron OEM Extensions
+        lan          Configure LAN Channels
+        mc           Management Controller status and global enables
+        nm           Node Manager
+        pef          Configure Platform Event Filtering (PEF)
+        picmg        Run a PICMG/ATA extended command
+        power        Shortcut to chassis power commands
+        raw          Send a RAW IPMI request and print response
+        sdr          Print Sensor Data Repository entries and readings
+        sel          Print System Event Log (SEL)
+        sensor       Print detailed sensor information
+        session      Print session information
+        set          Set runtime variable for shell and exec
+        shell        Launch interactive IPMI shell
+        sol          Configure and connect IPMIv2.0 Serial\-over\-LAN
+        spd          Print SPD info from remote I2C device
+        sunoem       Manage Sun OEM Extensions
+        tsol         Configure and connect Tyan IPMIv1.5 Serial\-over\-LAN
+        user         Configure Management Controller users
+
+.TP 
+\fIchannel\fP
+.RS
+.TP 
+\fIauthcap\fP <\fBchannel number\fR> <\fBmax priv\fR>
+
+Displays information about the authentication capabilities of
+the selected channel at the specified privilege level.
+.RS
+.TP 
+Possible privilege levels are:
+.br 
+\fI1\fP   Callback level
+.br 
+\fI2\fP   User level
+.br 
+\fI3\fP   Operator level
+.br 
+\fI4\fP   Administrator level
+.br 
+\fI5\fP   OEM Proprietary level
+.br 
+\fI15\fP   No access
+.RE
+.TP 
+\fIinfo\fP [\fBchannel number\fR]
+
+Displays  information  about  the selected  channel.  If no channel 
+is given it will display information about the currently used channel.
+.RS
+.PP 
+> ipmitool channel info
+.br 
+Channel 0xf info:
+.br 
+  Channel Medium Type   : System Interface
+.br 
+  Channel Protocol Type : KCS
+.br 
+  Session Support       : session\-less
+.br 
+  Active Session Count  : 0
+.br 
+  Protocol Vendor ID    : 7154
+.RE
+.TP 
+\fIgetaccess\fP <\fBchannel number\fR> [<\fBuserid\fR>]
+.RS
+
+Configure the given userid as the default on the given channel number.  
+When the given channel is subsequently used, the user is identified 
+implicitly by the given userid.
+.TP 
+\fIsetaccess\fP <\fBchannel number\fR> <\fBuserid\fR> [<\fIcallin\fP=\fBon\fR|\fBoff\fR>]
+[<\fIipmi\fP=\fBon\fR|\fBoff\fR>] [<\fIlink\fP=\fBon\fR|\fBoff\fR>] [<\fIprivilege\fP=\fBlevel\fR>]
+.br 
+
+Configure user access information on the given channel for the given userid.
+.TP 
+\fIgetciphers\fP <\fIipmi\fP|\fIsol\fP> [<\fBchannel\fR>]
+.br 
+
+Displays the list of cipher suites supported for the given
+application (ipmi or sol) on the given channel.
+.RE
+.RE
+.TP 
+\fIchassis\fP
+.RS
+.TP 
+\fIstatus\fP
+
+Status information related to power, buttons, cooling, drives and faults.
+.RS
+.RE
+.TP 
+\fIpower\fP
+.RS
+.TP 
+\fIstatus\fP
+.RS
+.RE
+.TP
+\fIon\fP
+.RS
+.RE
+.TP
+\fIoff\fP
+.RS
+.RE
+.TP
+\fIcycle\fP
+.RS
+.RE
+.TP
+\fIreset\fP
+.RS
+.RE
+.TP
+\fIdiag\fP
+.RS
+.RE
+.TP
+\fIsoft\fP
+.RS
+.RE
+.RE
+.TP 
+\fIidentify\fP [<seconds>|force]
+
+Identify interval.
+.br
+Default is 15 seconds.
+.br
+0 - Off
+.br
+force - To turn on indefinitely
+.RS
+.RE
+.TP 
+\fIpolicy\fP
+
+What to do when power is restored.
+.RS
+.TP 
+\fIlist\fP
+
+Show available options.
+.RS
+.RE
+.TP 
+\fIalways-on\fP
+.RS
+.RE
+.TP 
+\fIprevious\fP
+.RS
+.RE
+.TP 
+\fIalways-off\fP
+.RS
+.RE
+.RE
+
+.TP 
+\fIrestart_cause\fP
+
+Last restart cause.
+.RS
+.RE
+.TP 
+\fIpoh\fP
+
+Get power on hours.
+.RS
+.RE
+.TP 
+\fIbootdev\fP
+.RS
+.TP 
+\fInone\fP
+
+Do not change boot device order.
+.RS
+.RE
+.TP 
+\fIpxe\fP
+
+Force PXE boot.
+.RS
+.RE
+.TP 
+\fIdisk\fP
+
+Force boot from default Hard-drive.
+.RS
+.RE
+.TP 
+\fIsafe\fP
+
+Force boot from default Hard-drive, request Safe Mode.
+.RS
+.RE
+.TP 
+\fIdiag\fP
+
+Force boot from Diagnostic Partition.
+.RS
+.RE
+.TP 
+\fIcdrom\fP
+
+Force boot from CD/DVD.
+.RS
+.RE
+.TP 
+\fIbios\fP
+
+Force boot into BIOS Setup.
+.RS
+.RE
+.TP 
+\fIfloppy\fP
+
+Force boot from Floppy/primary removable media.
+.RS
+.RE
+.RE
+.TP 
+\fIbootparam\fP
+.RS
+.TP 
+\fIforce_pxe\fP
+
+Force PXE boot
+.RS
+.RE
+.TP 
+\fIforce_disk\fP
+
+Force boot from default Hard-drive
+.RS
+.RE
+.TP 
+\fIforce_safe\fP
+
+Force boot from default Hard-drive, request Safe Mode
+.RS
+.RE
+.TP 
+\fIforce_diag\fP
+
+Force boot from Diagnostic Partition
+.RS
+.RE
+.TP 
+\fIforce_cdrom\fP
+
+Force boot from CD/DVD
+.RS
+.RE
+.TP 
+\fIforce_bios\fP
+
+Force boot into BIOS Setup
+.RS
+.RE
+.RE
+.TP 
+\fIselftest\fP
+.RS
+.RE
+.RE
+.TP 
+\fIdcmi\fP
+.RS
+.TP 
+\fIdiscover\fP
+.br 
+
+This command is used to discover supported capabilities in DCMI.
+
+.TP 
+\fIpower\fP <\fBcommand\fR>
+.br 
+
+Platform power limit command options are:
+
+.RS
+.TP 
+\fIreading\fP
+.br 
+
+Get power related readings from the system.
+.TP 
+\fIget_limit\fP
+.br 
+
+Get the configured power limits.
+.TP 
+\fIset_limit\fP  <\fBparameter\fR> <\fBvalue\fR>
+.br 
+
+Set a power limit option.
+.br
+
+.RS
+.TP
+Possible parameters/values are:
+
+.TP
+\fIaction\fP <\fBNo Action | Hard Power Off & Log Event to SEL | Log Event to SEL\fR>
+.br
+
+Exception Actions are taken as "No Action", "Hard Power Off system and log events to SEL", or "Log event to SEL only".
+.TP
+\fIlimit\fP <\fBnumber in Watts\fR>
+.br
+
+Power Limit Requested in Watts.
+.TP
+\fIcorrection\fP <\fBnumber in milliseconds\fR>
+.br
+
+Correction Time Limit in milliseconds.
+.TP
+\fIsample\fP <\fBnumber in seconds\fR>
+.br
+
+Statistics Sampling period in seconds.
+
+.RE
+.TP 
+\fIactivate\fP
+.br 
+
+Activate the set power limit.
+.TP 
+\fIdeactivate\fP
+.br 
+
+Deactivate the set power limit.
+.RE
+.TP 
+\fIsensors\fP
+.br 
+
+Prints the available DCMI sensors.
+.TP 
+\fIasset_tag\fP
+.br 
+
+Prints the platforms asset tag.
+.TP 
+\fIset_asset_tag\fP  <\fBstring\fR>
+.br 
+
+Sets the platforms asset tag
+.TP 
+\fIget_mc_id_string\fP
+.br 
+
+Get management controller identifier string.
+.TP 
+\fIset_mc_id_string\fP  <\fBstring\fR>
+.br 
+
+Set management controller identifier string.  The maximum length is 64 bytes including a null terminator.
+.TP 
+\fIthermalpolicy\fP  [<\fBget\fR | \fBset\fR>]
+.br
+
+Thermal Limit policy get/set.  
+.br
+
+.RS
+.TP
+The commands are:
+
+.TP
+\fIGet\fP  <\fBentityID\fR> <\fBinstanceID\fR>
+.br 
+
+Get Thermal Limit values.
+
+\fBentityID\fR is the physical entity that a sensor or device is associated with.   
+\fBinstanceID\fR is a particular instance of an entity.  Entity Instance can be in one of two ranges, system-relative or device-relative.  For example, a system with four processors could use an Entity Instance value of "0" to identify the first processor.  
+.TP
+\fISet\fP  <\fBentityID\fR> <\fBinstanceID\fR>
+.br 
+
+Set Thermal Limit values.  
+
+\fBentityID\fR is the physical entity that a sensor or device is associated with.   
+\fBinstanceID\fR is a particular instance of an entity.  Entity Instance can be in one of two ranges, system-relative or device-relative.  For example, a system with four processors could use an Entity Instance value of "0" to identify the first processor.  
+.RE
+.TP 
+\fIget_temp_reading\fP
+.br 
+
+Get Temperature Sensor Readings.
+.TP 
+\fIget_conf_param\fP
+.br 
+
+Get DCMI Configuration Parameters.
+.TP 
+\fIset_conf_param\fP <\fBparameters\fR>
+.br 
+
+Set DCMI Configuration Parameters.  
+.RS
+.TP
+The Configuration Parameters are:
+.TP 
+\fIactivate_dhcp\fP
+.br 
+
+Activate/restart DHCP
+.TP 
+\fIdhcp_config\fP
+.br 
+
+Discover DHCP Configuration.
+.TP 
+\fIinit\fP 
+.br 
+
+Set DHCP Initial timeout interval, in seconds.  The recommended default is four seconds.
+.TP 
+\fItimeout\fP
+.br 
+
+Set DHCP Server contact timeout interval, in seconds.  The recommended default timeout is two minutes.
+.TP 
+\fIretry\fP
+.br 
+
+Set DHCP Server contact retry interval, in seconds.  The recommended default timeout is sixty-four seconds.
+.RE
+.TP
+\fIoob_discover\fP
+.br 
+
+Ping/Pong Message for DCMI Discovery.
+
+.RE
+.RE
+.RE
+.TP
+\fIdelloem\fP
+.RS
+.br
+
+The delloem commands provide information on Dell-specific features.
+.TP
+\fIsetled {b:d.f} {state..}\fP
+.RS
+.br
+
+Sets the drive backplane LEDs for a device.
+.br
+{b:d.f} = PCI Address of device (eg. 06:00.0)
+.br
+{state} = one or more of the following:
+.RS
+\fIonline | present | hotspare | identify | rebuilding | fault | predict | critical | failed\fP
+.br
+.RE
+.RE
+
+.TP
+\fIlcd\fP 
+.RS
+.br
+\fIset {mode}\fP|\fI{lcdqualifier}\fP|\fI{errordisplay}\fP
+.RS
+.br
+
+Allows you to set the LCD mode and user-defined string.
+.RE
+.TP
+\fIlcd set mode\fP
+.RS
+.br
+\fI{none}\fP|\fI{modelname}\fP|\fI{ipv4address}\fP|\fI{macaddress}\fP|
+.br
+\fI{systemname}\fP|\fI{servicetag}\fP|\fI{ipv6address}\fP|
+.br
+\fI{ambienttemp}\fP|\fI{systemwatt}\fP|\fI{assettag}\fP|
+.br
+\fI{userdefined}<text>\fP
+.br
+
+Allows you to set the LCD display mode to any of the preceding parameters.
+
+.RE
+.TP
+\fIlcd set lcdqualifier\fP
+.RS
+.br
+\fI{watt}\fP|\fI{btuphr}\fP|
+.br
+\fI{celsius}\fP|\fI{fahrenheit}\fP
+.br
+
+Allows you to set the unit for the system ambient temperature mode.
+
+.RE
+.TP
+\fIlcd set errordisplay\fP
+.RS
+.br
+\fI{sel}\fP|\fI{simple}\fP
+.br
+
+Allows you to set the error display.
+.RE
+.TP
+\fIlcd info\fP
+.RS
+.br
+
+Displays the LCD screen information.
+.RE
+.TP
+\fIlcd set vkvm\fP
+.RS
+\fI{active}\fP|\fI{inactive}\fP
+.br
+
+Allows you to set the vKVM status to active or inactive. When it is active and session is in progress, a message appears on LCD.
+.RE
+.TP
+\fIlcd status\fP
+.RS
+.br
+
+Displays the LCD status for vKVM display active or inactive and Front Panel access mode (viewandmodify, view-only or disabled).
+.RE
+.RE
+.TP
+\fImac\fP
+.RS
+.br
+
+Displays the information about the system NICs.
+.TP
+\fImac list\fP
+.br
+
+Displays the NIC MAC address and status of all NICs. It also displays the DRAC/iDRAC MAC address.
+
+.TP
+\fImac get\fP
+.RS
+\fI<NIC number>\fP
+.br
+
+Displays the selected NICs MAC address and status.
+.RE
+.RE
+.TP
+\fIlan\fP
+.RS
+.br 
+Displays the information of Lan.
+
+.TP
+\fIlan set\fP
+.RS
+\fI<Mode>\fP
+.br
+
+Sets the NIC selection mode (dedicated, shared with lom1, shared with lom2,shared with lom3,shared with lom4,shared with failover lom1,shared with failover lom2,shared with failover lom3,shared with failover lom4,shared with Failover all loms, shared with Failover None).
+.RE
+.TP
+\fIlan get\fP
+.br
+
+Returns the current NIC selection mode (dedicated, shared with lom1, shared with lom2, shared with lom3, shared with lom4,shared with failover lom1, shared with failover lom2,shared with failover lom3,shared with failover lom4,shared with Failover all loms,shared with Failover None).
+
+.TP
+\fIlan get active\fP
+.br
+
+Returns the current active NIC (dedicated, LOM1, LOM2, LOM3 or LOM4).
+.RE
+.TP
+\fIpowermonitor\fP
+.RS
+.br
+
+Displays power tracking statistics.
+
+.TP
+\fIpowermonitor clear cumulativepower\fP
+.RS
+.br
+
+Reset cumulative power reading.
+.RE
+.TP
+\fIpowermonitor clear peakpower\fP
+.RS
+.br
+
+Reset peak power reading.
+.RE
+.TP
+\fIpowermonitor powerconsumption\fP
+.RS
+\fI<watt>\fP|\fI<btuphr>\fP
+.br
+Displays the power consumption in watt or btuphr.
+.RE
+.TP
+\fIpowermonitor powerconsumptionhistory\fP
+.RS
+\fI<watt>\fP|\fI<btuphr>\fP
+.br
+Displays the power consumption history in watt or btuphr.
+.RE
+.TP
+\fIpowermonitor getpowerbudget\fP
+.RS
+\fI<watt>\fP|\fI<btuphr>\fP
+.br
+Displays the power cap in watt or btuphr.
+.RE
+.TP
+\fIpowermonitor setpowerbudget\fP
+.RS
+\fI<val>\fP\fI<watt\fP|\fIbtuphr\fP|\fIpercent>\fP
+.br
+Allows you to set the  power cap in watt, BTU/hr or percentage.
+.RE
+.TP
+\fIpowermonitor enablepowercap\fP
+.RS
+.br
+Enables set power cap.
+.RE
+.TP
+\fIpowermonitor disablepowercap\fP
+.RS
+.br
+
+Disables set power cap.
+.RE
+.RE
+.RE
+
+.RS
+.TP
+\fIvFlash info Card\fP
+.RS
+.br
+
+Shows Extended SD Card information.
+.RE
+.RE
+.TP 
+\fIecho\fP
+
+For echoing lines to stdout in scripts.
+.RS
+.RE
+.TP
+\fIekanalyzer\fP <\fBcommand\fR> <\fBxx=filename1\fR> <\fBxx=filename2\fR> [<\fBrc=filename3\fR>] \fB...\fR
+.RS
+.TP
+.br
+\fINOTE\fP : This command can support a maximum of 8 files per command line
+.TP
+.br
+\fIfilename1\fP : binary file that stores FRU data of a Carrier or an AMC module
+.TP
+.br
+\fIfilename2\fP : binary file that stores FRU data of an AMC module.
+      These binary files can be generated from command:
+      \fIipmitool fru read <id> <filename>\fP
+.TP
+.br
+\fIfilename3\fP : configuration file used for configuring On-Carrier Device ID
+or OEM GUID. This file is optional.
+.TP
+.br
+\fIxx\fP : indicates the type of the file. It can take the following value:
+.RS
+.TP
+.br
+\fIoc\fP : On-Carrier device
+.TP
+.br
+\fIa1\fP : AMC slot A1
+.TP
+.br
+\fIa2\fP : AMC slot A2
+.TP
+.br
+\fIa3\fP : AMC slot A3
+.TP
+.br
+\fIa4\fP : AMC slot A4
+.TP
+.br
+\fIb1\fP : AMC slot B1
+.TP
+.br
+\fIb2\fP : AMC slot B2
+.TP
+.br
+\fIb3\fP : AMC slot B3
+.TP
+.br
+\fIb4\fP : AMC slot B4
+.TP
+.br
+\fIsm\fP : Shelf Manager
+
+.RE
+.TP
+.br
+The available commands for ekanalyzer are:
+
+.RE
+.RS
+.TP
+\fIprint\fP [<\fBcarrier\fR | \fBpower\fR | \fBall\fR>]
+.RS
+.TP
+\fIcarrier\fP (default) <\fBoc=filename1\fR> <\fBoc=filename2\fR> \fB...\fR
+.br
+
+Display point to point physical connectivity between carriers and AMC modules.
+ Example:
+   > ipmitool ekanalyzer print carrier oc=fru oc=carrierfru
+   From Carrier file: fru
+      Number of AMC bays supported by Carrier: 2 
+      AMC slot B1 topology:
+         Port 0 =====> On Carrier Device ID 0, Port 16
+         Port 1 =====> On Carrier Device ID 0, Port 12
+         Port 2 =====> AMC slot B2, Port 2
+      AMC slot B2 topology:
+         Port 0 =====> On Carrier Device ID 0, Port 3
+         Port 2 =====> AMC slot B1, Port 2
+   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+   From Carrier file: carrierfru
+      On Carrier Device ID 0 topology:
+         Port 0 =====> AMC slot B1, Port 4
+         Port 1 =====> AMC slot B1, Port 5
+         Port 2 =====> AMC slot B2, Port 6
+         Port 3 =====> AMC slot B2, Port 7
+      AMC slot B1 topology:
+         Port 0 =====> AMC slot B2, Port 0
+      AMC slot B1 topology:
+         Port 1 =====> AMC slot B2, Port 1
+      Number of AMC bays supported by Carrier: 2
+
+.TP
+\fIpower\fP <\fBxx=filename1\fR> <\fBxx=filename2\fR> \fB...\fr
+.br
+
+Display power supply information between carrier and AMC modules.
+.TP
+\fIall\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
+.br
+
+Display both physical connectivity and power supply of each carrier and AMC
+modules.
+
+.RE
+.TP
+\fIfrushow\fP <\fBxx=filename\fR>
+.br
+Convert a binary FRU file into human readable text format. Use \-v option to get
+more display information.
+
+.RE
+.RS
+.TP
+\fIsummary\fP [<\fBmatch\fR | \fBunmatch\fR | \fBall\fR>]
+.RS
+.TP
+\fImatch\fP (default) <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fR
+.br
+Display only matched results of Ekeying match between an On-Carrier device
+and an AMC module or between 2 AMC modules. Example:
+ > ipmitool ekanalyzer summary match oc=fru b1=amcB1 a2=amcA2
+ On-Carrier Device vs AMC slot B1
+  AMC slot B1 port 0 ==> On-Carrier Device 0 port 16
+   Matching Result
+   - From On-Carrier Device ID 0
+    \-Channel ID 11 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   - To AMC slot B1
+    \-Channel ID 0 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+  AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
+   Matching Result
+   - From On-Carrier Device ID 0
+    \-Channel ID 6 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   - To AMC slot B1
+    \-Channel ID 1 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ On-Carrier Device vs AMC slot A2
+  AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
+   Matching Result
+   - From On-Carrier Device ID 0
+    \-Channel ID 9 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   - To AMC slot A2
+    \-Channel ID 0 || Lane 0: enable
+    \-Link Type: AMC.2 Ethernet
+    \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
+    \-Link Group ID: 0 || Link Asym. Match: exact match
+   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+ AMC slot B1 vs AMC slot A2
+  AMC slot A2 port 2 ==> AMC slot B1 port 2
+   Matching Result
+   - From AMC slot B1
+    \-Channel ID 2 || Lane 0: enable
+    \-Link Type: AMC.3 Storage
+    \-Link Type extension: Serial Attached SCSI (SAS/SATA)
+    \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
+   - To AMC slot A2
+    \-Channel ID 2 || Lane 0: enable
+    \-Link Type: AMC.3 Storage
+    \-Link Type extension: Serial Attached SCSI (SAS/SATA)
+    \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+.TP
+\fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
+.br
+
+Display the unmatched results of Ekeying match between an On-Carrier device
+and an AMC module or between 2 AMC modules
+.TP
+\fIall\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
+.br
+
+Display both matched result and unmatched results of Ekeying match between two
+cards or two modules.
+.RE
+.RE
+.TP 
+\fIevent\fP
+.RS
+.TP 
+<\fBpredefined event number\fR \fIN\fR>
+.br 
+
+Send a pre\-defined test event to the System Event Log.  The following
+events are included as a means to test the functionality of the 
+System Event Log component of the BMC (an entry will be added each 
+time the event \fIN\fP command is executed).
+
+Currently supported values for \fIN\fR are:
+.br 
+\fI1\fP	Temperature: Upper Critical: Going High
+.br 
+\fI2\fP	Voltage Threshold: Lower Critical: Going Low
+.br 
+\fI3\fP	Memory: Correctable ECC 
+.br 
+
+\fBNOTE\fR: These pre\-defined events will likely not produce
+"accurate" SEL records for a particular system because they will
+not be correctly tied to a valid sensor number, but they are
+sufficient to verify correct operation of the SEL.
+
+.TP 
+\fIfile\fP <\fBfilename\fR>
+.br 
+
+Event log records specified in <\fBfilename\fP> will be added to
+the System Event Log.
+
+The format of each line in the file is as follows:
+
+<{\fIEvM Revision\fP} {\fISensor Type\fP} {\fISensor Num\fP} {\fIEvent Dir/Type\fP} {\fIEvent Data 0\fP} {\fIEvent Data 1\fP} {\fIEvent Data 2\fP}>[\fI# COMMENT\fP]
+
+e.g.:
+0x4 0x2 0x60 0x1 0x52 0x0 0x0 # Voltage threshold: Lower Critical: Going Low
+.br 
+
+\fIEvM Revision\fP - 
+The "Event Message Revision" is 0x04 for messages that comply with the IPMI 2.0 
+Specification and 0x03 for messages that comply with the IPMI 1.0 Specification.
+
+\fISensor Type\fP - 
+Indicates the Event Type or Class.
+
+\fISensor Num\fP - 
+Represents the 'sensor' within the management controller that generated 
+the Event Message.
+
+\fIEvent Dir/Type\fP - 
+This field is encoded with the event direction as the high bit 
+(bit 7) and the event type as the low 7 bits.  Event direction is 
+0 for an assertion event and 1 for a deassertion event. 
+
+See the IPMI 2.0 specification for further details on the definitions for
+each field.
+
+.TP 
+<\fBsensorid\fR> <\fBlist\fR>
+.br 
+
+Get a list of all the possible Sensor States and pre-defined Sensor State
+Shortcuts available for a particular sensor.   \fBsensorid\fR is the character 
+string representation of the sensor and must be enclosed in double quotes
+if it includes white space.  Several different commands including 
+\fIipmitool sensor list\fP may be used to obtain a list that includes 
+the \fBsensorid\fR strings representing the sensors on a given system. 
+.RS
+.PP 
+> ipmitool \-I open event "PS 2T Fan Fault" list
+.br 
+Finding sensor PS 2T Fan Fault... ok
+.br 
+Sensor States:
+.br 
+  State Deasserted
+.br 
+  State Asserted
+.br 
+Sensor State Shortcuts:
+.br 
+  present    absent
+.br 
+  assert     deassert
+.br 
+  limit      nolimit
+.br 
+  fail       nofail
+.br 
+  yes        no
+.br 
+  on         off
+.br 
+  up         down
+
+.RE
+.TP 
+<\fBsensorid\fR> <\fBsensor state\fR> [<\fBdirection\fR>]
+
+Generate a custom event based on existing sensor information.
+The optional event \fBdirection can be either \fIassert\fP 
+(the default) or \fIdeassert\fP.  
+
+.RS
+.PP 
+> ipmitool event "PS 2T Fan Fault" "State Asserted"
+.br 
+Finding sensor PS 2T Fan Fault... ok
+.br 
+   0 | Pre-Init Time-stamp   | Fan PS 2T Fan Fault | State Asserted
+.RE
+.RS
+.PP 
+> ipmitool event "PS 2T Fan Fault" "State Deasserted"
+.br 
+Finding sensor PS 2T Fan Fault... ok
+.br 
+   0 | Pre-Init Time-stamp   | Fan PS 2T Fan Fault | State Desserted
+.RE
+.RS
+.PP 
+.RE
+.RE
+.TP 
+\fIexec\fP <\fBfilename\fR>
+
+.RS
+Execute ipmitool commands from \fIfilename\fR.  Each line is a
+complete command.  The syntax of the commands are defined by the
+COMMANDS section in this manpage.  Each line may have an optional
+comment at the end of the line, delimited with a `#' symbol.
+
+e.g., a command file with two lines:
+
+sdr list # get a list of sdr records
+.br 
+sel list # get a list of sel records
+.RE
+.TP 
+\fIfirewall\fP
+.br 
+
+This command supports the Firmware Firewall capability.  It may be used to 
+add or remove security-based restrictions on certain commands/command 
+sub-functions  or to list the current firmware firewall restrictions set on 
+any commands.  For each firmware firewall command listed below, parameters 
+may be included to cause the command to be executed with increasing 
+granularity on a specific LUN, for a specific NetFn, for a specific IPMI 
+Command, and finally for a specific command's sub-function (see Appendix H in the 
+IPMI 2.0 Specification for a listing of any sub-function numbers that may 
+be associated with a particular command).
+
+Parameter syntax and dependencies are as follows:
+
+[<\fIchannel\fP \fBH\fR>] [<\fIlun\fP \fBL\fR> [ <\fInetfn\fP \fBN\fR> [<\fIcommand\fP \fBC\fR [<\fIsubfn\fP \fBS\fR>]]]] 
+
+Note that if "netfn <\fBN\fR>" is specified, then "lun <\fBL\fR>" must also be 
+specified;  if "command <\fBC\fR>" is specified, then "netfn <\fBN\fR>" (and
+therefore "lun <\fBL\fR>") must also be specified, and so forth.
+
+"channel <\fBH\fR>" is an optional and standalone parameter.  If not specified,
+the requested operation will be performed on the current channel.  Note that
+command support may vary from channel to channel. 
+
+Firmware firewall commands:
+.RS
+.TP 
+\fIinfo\fP [<\fBParms as described above\fR>]
+.br 
+
+List firmware firewall information for the specified LUN, NetFn, and 
+Command (if supplied) on the current or specified channel.  Listed
+information includes the support, configurable, and enabled bits for
+the specified command or commands.
+
+Some usage examples:
+.RS
+.TP 
+\fIinfo\fP [<\fBchannel H\fR>] [<\fBlun L\fR>] 
+.br 
+
+This command will list firmware firewall information for all NetFns for the 
+specified LUN on either the current or the specified channel.
+.TP 
+\fIinfo\fP [<\fBchannel H\fR>] [<\fBlun L\fR> [ <\fBnetfn N\fR> ] 
+.br 
+
+This command will print out all command information for a single LUN/NetFn pair.
+.TP 
+\fIinfo\fP [<\fBchannel H\fR>] [<\fBlun L\fR> [ <\fBnetfn N\fR> [<\fBcommand C\fR] ]] 
+.br 
+
+This prints out detailed, human-readable information showing the support, configurable,
+and enabled bits for the specified command on the specified LUN/NetFn pair.  Information
+will be printed about each of the command subfunctions.
+.TP 
+\fIinfo\fP [<\fBchannel H\fR>] [<\fBlun L\fR> [ <\fBnetfn N\fR> [<\fBcommand C\fR [<\fBsubfn S\fR>]]]] 
+.br 
+
+Print out information for a specific sub-function.
+.RE
+.TP 
+\fIenable\fP [<\fBParms as described above\fR>]
+.br 
+
+This command is used to enable commands for a given NetFn/LUN combination on
+the specified channel. 
+.TP 
+\fIdisable\fP [<\fBParms as described above\fR>] [\fBforce\fR]
+.br 
+
+This command is used to disable commands for a given NetFn/LUN combination on
+the specified channel.   Great care should be taken if using the "force"
+option so as not to disable the "Set Command Enables" command.
+.TP 
+\fIreset\fP [<\fBParms as described above\fR>]
+.br 
+
+This command may be used to reset the firmware firewall back to a state
+where all commands and command sub-functions are enabled.
+.RE
+.TP 
+\fIfru\fP
+.RS
+.TP 
+\fIprint\fP
+.br 
+
+Read all Field  Replaceable  Unit (FRU) inventory data and extract 
+such information as serial number, part number, asset tags, and 
+short strings describing the chassis, board, or product.
+.TP 
+\fIread\fP <\fBfru id\fR> <\fBfru file\fR>
+.br 
+
+\fBfru id\fR is the digit ID of the FRU (see output of 'fru print').
+\fBfru file\fR is the absolute pathname of a file in which to dump the
+binary FRU data pertaining to the specified FRU entity.
+.TP 
+\fIwrite\fP <\fBfru id\fR> <\fBfru file\fR>
+.br 
+
+\fBfru id\fR is the digit ID of the FRU (see output of 'fru print').
+\fBfru file\fR is the absolute pathname of a file from which to pull
+the binary FRU data before uploading it to the specified FRU.
+.TP 
+\fIupgEkey\fP <\fBfru id\fR> <\fBfru file\fR>
+.br 
+
+Update a multirecord FRU location.
+\fBfru id\fR is the digit ID of the FRU (see output of 'fru print').
+\fBfru file\fR is the absolute pathname of a file from which to pull the
+binary FRU data to upload into the specified multirecord FRU entity.
+
+.TP 
+\fIedit\fP <\fBfru id\fR> 
+.br 
+
+This command provides interactive editing of some supported records, namely
+PICMG Carrier Activation Record.  \fBfru id\fR is the digit ID of the FRU 
+(see output of 'fru print'); default is 0.
+
+.TP 
+\fIedit\fP <\fBfru id\fR> \fBfield\fR <\fBsection\fR> <\fBindex\fR> <\fBstring\fR>
+.br 
+
+This command may be used to set a field string to a new value.  It replaces 
+the FRU data found at \fBindex\fR in the specified \fBsection\fR with the 
+supplied \fBstring\fR.  
+
+.RS
+.TP
+\fBfru id\fR is the digit ID of the FRU (see output of 'fru print').
+.br
+
+.TP
+<\fBsection\fR> is a string which refers to FRU Inventory Information
+Storage Areas and may be refer to:
+.RS
+.TP 
+\fIc\fP FRU Inventory Chassis Info Area
+.br
+.TP
+\fIb\fP FRU Inventory Board Info Area
+.br
+.TP
+\fIp\fP FRU Inventory Product Info Area
+.br
+.RE
+
+.TP
+<\fBindex\fR> specifies the field number. Field numbering starts on the first 'english text' field type. For instance in the <\fBboard\fR> info area field '0' is <\fBBoard Manufacturer\fR> and field '2' is <\fBBoard Serial Number\fR>; see IPMI Platform Management FRU Information Storage Definition v1.0 R1.1 for field locations.
+.br
+
+.TP
+<\fBstring\fR> must be the same length as the string being replaced and must be 8-bit ASCII (0xCx).
+.br
+
+.RE
+
+.TP 
+\fIedit\fP <\fBfru id\fR> \fBoem\fR \fBiana\fR <\fBrecord\fR> <\fBformat\fR> [<\fBargs\fR>]
+.br 
+
+This command edits the data found in the multirecord area. Support for
+OEM specific records is limited. 
+.RE
+.TP
+\fIfwum\fP
+.RS
+Update IPMC using Kontron OEM Firmware Update Manager.
+.TP
+\fIinfo\fR
+.br
+Show information about current firmware.
+
+.TP
+\fIstatus\fR
+.br
+Show status of each firmware bank present in the hardware.
+
+.TP
+\fIdownload\fP <\fBfilename\fR>
+.br
+
+Download specified firmware.
+
+.TP
+\fIupgrade\fP [\fBfilename\fR]
+.br
+
+Install firmware upgrade. If the filename is specified, the file is downloaded
+first, otherwise the last firmware downloaded is used.
+
+.TP
+\fIrollback\fP
+.br
+
+Ask IPMC to rollback to previous version.
+
+.TP
+\fItracelog\fP
+.br
+
+Show firmware upgrade log.
+
+.RE
+.TP 
+\fIgendev\fP
+.RS
+.TP 
+\fIlist\fP
+
+List All Generic Device Locators.
+.RS
+.RE
+.TP 
+\fIread\fP <\fBsdr name\fR> <\fBfile\fR>
+
+Read to file eeprom specify by Generic Device Locators.
+.RS
+.RE
+.TP
+\fIwrite\fP <\fBsdr name\fR> <\fBfile\fR>
+
+Write from file eeprom specify by Generic Device Locators
+.RS
+.RE
+.RE
+.TP
+\fIhpm\fP
+.RS
+PICMG HPM.1 Upgrade Agent
+.TP
+\fIcheck\fR
+.br
+Check the target information.
+
+.TP
+\fIcheck\fP <\fBfilename\fR>
+.br
+Display both the existing target version and image version on the screen.
+
+.TP
+\fIdownload\fP <\fBfilename\fR>
+.br
+
+Download specified firmware.
+
+.TP
+\fIupgrade\fP <\fBfilename\fR> [\fBall\fR] [\fBcomponent <x>\fR] [\fBactivate\fR]
+.br
+Upgrade the firmware using a valid HPM.1 image file. If no option is specified,
+the firmware versions are checked first and the firmware is upgraded only if they
+are different.
+
+.RS
+.TP
+\fIall\fR
+.br
+Upgrade all components even if the firmware versions are the same
+(use this only after using "check" command).
+
+.TP
+\fIcomponent\fP <\fBx\fR>
+.br
+Upgrade only given component from the given file.
+.br
+component 0 - BOOT
+.br
+component 1 - RTK
+
+.TP
+\fIactivate\fR
+.br
+Activate new firmware right away.
+
+.RE
+
+.TP
+\fIactivate\fR
+.br
+
+Activate the newly uploaded firmware.
+
+.TP
+\fItargetcap\fR
+.br
+
+Get the target upgrade capabilities.
+
+.TP
+\fIcompprop\fP <\fBid\fR> <\fBselect\fR>
+.br
+Get the specified component properties. Valid component \fBid\fR: 0-7.
+\fBSelect\fR can be one of following:
+.br
+0 - General properties
+.br
+1 - Current firmware version
+.br
+2 - Description string
+.br
+3 - Rollback firmware version
+.br
+4 - Deferred firmware version
+
+.TP
+\fIabort\fR
+.br
+
+Abort the on-going firmware upgrade.
+
+.TP
+\fIupgstatus\fR
+.br
+Show status of the last long duration command.
+
+.TP
+\fIrollback\fR
+.br
+Perform manual rollback on the IPM Controller firmware.
+
+.TP
+\fIrollbackstatus\fR
+.br
+
+Show the rollback status.
+
+.TP
+\fIselftestresult\fR
+.br
+
+Query the self test results.
+
+.RE
+.TP
+\fIi2c\fP <\fBi2caddr\fR> <\fBread bytes\fR> [<\fBwrite data\fR>]
+.br 
+
+This command may be used to execute raw I2C commands with the Master
+Write\-Read IPMI command.
+.RE
+.TP 
+\fIime\fP
+.RS
+.TP 
+\fIhelp\fP
+.br 
+
+Print usage information
+.TP 
+\fIinfo\fP
+
+Displays information about the Manageability Engine (ME)
+.TP 
+\fIupdate\fP <\fBfile\fR>
+.br
+
+Upgrade the ME firmware with the specified image file
+.br
+\fBWARNING\fR You MUST use a supported image provided by your board vendor
+.br
+.TP
+\fIrollback\fP
+
+Perform manual rollback of the ME firmware
+
+.RE
+.RE
+.TP 
+\fIisol\fP
+.RS
+.TP 
+\fIinfo\fP
+.br 
+
+Retrieve information about the Intel IPMI v1.5 Serial\-Over\-LAN
+configuration.
+.TP 
+\fIset\fP <\fBparameter\fR> <\fBvalue\fR>
+.br 
+
+Configure parameters for Intel IPMI v1.5 Serial\-over\-LAN.
+.RS
+.TP
+Valid parameters and values are:
+.br
+.TP
+\fIenabled\fP
+true, false.
+.TP
+\fIprivilege\-level\fP
+user, operator, admin, oem.
+.TP
+\fIbit\-rate\fP
+9.6, 19.2, 38.4, 57.6, 115.2.
+.RE
+.TP
+\fIactivate\fP
+.br
+
+Causes ipmitool to enter Intel IPMI v1.5 Serial Over LAN mode. An RMCP+
+connection is made to the BMC, the terminal is set to raw mode, and user
+input is sent to the serial console on the remote server. On exit, 
+the SOL payload mode is deactivated and the terminal is reset to its
+original settings.
+.RS
+
+Special escape sequences are provided to control the SOL session:
+.RS
+.TP
+\fI~.\fP        Terminate connection
+.TP
+\fI~^Z\fP       Suspend ipmitool
+.TP
+\fI~^X\fP       Suspend ipmitool, but don't restore tty on restart
+.TP
+\fI~B\fP        Send break
+.TP
+\fI~~\fP        Send the escape character by typing it twice
+.TP
+\fI~?\fP        Print the supported escape sequences
+.RE
+
+Note that escapes are only recognized immediately after newline.
+.RE
+.RE
+.TP 
+\fIkontronoem\fP
+.RS
+
+OEM commands specific to Kontron devices.
+.TP
+\fIsetsn\fP
+.br
+
+Set FRU serial number.
+.TP
+\fIsetmfgdate\fP
+.br
+
+Set FRU manufacturing date.
+.TP
+\fInextboot\fP <\fBboot device\fR>
+.br
+
+Select the next boot order on the Kontron CP6012.
+.RE
+.TP 
+\fIlan\fP
+.RS
+
+These commands will allow you to configure IPMI LAN channels
+with network information so they can be used with the ipmitool
+\fIlan\fP and \fIlanplus\fP interfaces.  \fINOTE\fR: To
+determine on which channel the LAN interface is located, issue
+the `channel info \fInumber\fR' command until you come across
+a valid 802.3 LAN channel.  For example:
+
+.br 
+> ipmitool \-I open channel info 1
+.br 
+Channel 0x1 info:
+.br 
+  Channel Medium Type   : 802.3 LAN
+  Channel Protocol Type : IPMB\-1.0
+  Session Support       : session\-based
+  Active Session Count  : 8
+  Protocol Vendor ID    : 7154
+
+.TP 
+\fIprint\fP [<\fBchannel\fR>]
+.br 
+
+Print the  current  configuration  for  the  given channel.
+The default will print information on the first found LAN channel.
+.TP 
+\fIset\fP <\fBchannel number\fR> <\fBcommand\fR> <\fBparameter\fR>
+.br 
+
+Set the given command and parameter on the specified channel.  Valid 
+command/parameter options are:
+.RS
+.TP 
+\fIipaddr\fP <\fBx.x.x.x\fR>
+.br 
+
+Set the IP address for this channel.
+.TP 
+\fInetmask\fP <\fBx.x.x.x\fR>
+.br 
+
+Set the netmask for this channel.
+.TP 
+\fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
+.br 
+
+Set the MAC address for this channel.
+.TP 
+\fIdefgw ipaddr\fP <\fBx.x.x.x\fR>
+.br 
+
+Set the default gateway IP address.
+.TP 
+\fIdefgw macaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
+.br 
+
+Set the default gateway MAC address.
+.TP 
+\fIbakgw ipaddr\fP <\fBx.x.x.x\fR>
+.br 
+
+Set the backup gateway IP address.
+.TP 
+\fIbakgw macaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
+.br 
+
+Set the backup gateway MAC address.
+.TP 
+\fIpassword\fP <\fBpass\fR>
+.br 
+
+Set the null user password.
+.TP 
+\fIsnmp\fP <\fBcommunity string\fR>
+.br 
+
+Set the SNMP community string.
+.TP 
+\fIuser\fP
+.br 
+
+Enable user access mode for userid 1 (issue the `user'
+command to display information about userids for a given channel).
+.TP 
+\fIaccess\fP <\fBon|off\fR>
+.br 
+
+Set LAN channel access mode.
+.TP 
+\fIalert\fP <\fBon|off\fR>
+.br 
+
+Enable or disable PEF alerting for this channel.
+.TP 
+\fIipsrc\fP <\fBsource\fR>
+.br 
+
+Set the IP address source:
+.br 
+\fInone\fP	unspecified
+.br 
+\fIstatic\fP	manually configured static IP address
+.br 
+\fIdhcp\fP	address obtained by BMC running DHCP
+.br 
+\fIbios\fP	address loaded by BIOS or system software
+.TP 
+\fIarp respond\fP <\fBon\fR|\fBoff\fR>
+.br 
+
+Set BMC generated ARP responses.
+.TP 
+\fIarp generate\fP <\fBon\fR|\fBoff\fR>
+.br 
+
+Set BMC generated gratuitous ARPs.
+.TP 
+\fIarp interval\fP <\fBseconds\fR>
+.br 
+
+Set BMC generated gratuitous ARP interval.
+.TP 
+\fIvlan id\fP <\fBoff\fR|\fBid\fR>
+.br 
+
+Disable VLAN operation or enable VLAN and set the ID.
+.br 
+ID: value of the virtual lan identifier between 1 and 4094 inclusive.
+.TP 
+\fIvlan priority\fP <\fBpriority\fR>
+.br 
+
+Set the priority associated with VLAN frames.
+.br 
+ID: priority of the virtual lan frames between 0 and 7 inclusive.
+.TP 
+\fIauth\fP <\fBlevel\fR,\fB...\fR> <\fBtype\fR,\fB...\fR>
+.br 
+
+Set the valid  authtypes  for  a  given  auth level.
+.br 
+Levels: callback, user, operator, admin
+.br 
+Types: none, md2, md5, password, oem
+.TP 
+\fIcipher_privs\fP <\fBprivlist\fR>
+.br 
+
+Correlates cipher suite numbers with the maximum privilege
+level that is allowed to use it.  In this way, cipher suites can restricted
+to users with a given privilege level, so that, for example,
+administrators are required to use a stronger cipher suite than
+normal users.
+
+The format of \fIprivlist\fR is as follows.  Each character represents
+a privilege level and the character position identifies the cipher
+suite number.  For example, the first character represents cipher
+suite 0, the second represents cipher suite 1, and so on.
+\fIprivlist\fR must be 15 characters in length.
+
+Characters used in \fIprivlist\fR and their associated privilege levels are:
+
+\fIX\fP	Cipher Suite Unused
+.br 
+\fIc\fP	CALLBACK
+.br 
+\fIu\fP	USER
+.br 
+\fIo\fP	OPERATOR
+.br 
+\fIa\fP	ADMIN
+.br 
+\fIO\fP	OEM
+.br 
+
+So, to set the maximum privilege for cipher suite 0 to USER and suite 1 to
+ADMIN, issue the following command:
+
+> ipmitool \-I \fIinterface\fR lan set \fIchannel\fR cipher_privs uaXXXXXXXXXXXXX
+
+.TP
+
+\fIbad_pass_thresh\fP <\fBthresh_num\fR> <\fB1|0\fR> <\fBreset_interval\fR> <\fBlockout_interval\fR>
+.br
+
+Sets the Bad Password Threshold.
+
+<\fBthresh_num\fR> If non-zero, this value determines the number of sequential bad passwords
+that will be allowed to be entered for the identified user before the user is automatically
+disabled from access on the channel.
+
+<\fB1|0\fR> 1 = generate a Session Audit sensor "Invalid password disable" event message.
+0 = do not generate an event message when the user is disabled.
+
+<\fBreset_interval\fR> Attempt Count Reset Interval. The interval, in tens of seconds, for
+which the accumulated count of bad password attempts is retained before being automatically
+reset to zero.
+
+<\fBlockout_interval\fR> User Lockout Interval. The interval, in tens of seconds, that the user
+will remain disabled after being disabled because the Bad Password Threshold number was reached.
+
+.RE
+.TP
+\fIalert\fP \fIprint\fP [<\fBchannel\fR>] [<\fBalert destination\fR>]
+.br 
+
+Print alert information for the specified channel and destination.  
+The default will print all alerts for all alert destinations on the 
+first found LAN channel.
+
+.TP
+\fIalert\fP \fIset\fP <\fBchannel number\fR> <\fBalert destination\fR> <\fBcommand\fR> <\fBparameter\fR>
+.br 
+
+Set an alert on the given LAN channel and destination.   Alert Destinations are
+listed via the '\fIlan alert print\fP' command.  Valid command/parameter options are:
+.RS
+.TP 
+\fIipaddr\fP <\fBx.x.x.x\fR>
+.br 
+
+Set alert IP address.
+.TP 
+\fImacaddr\fP <\fBxx:xx:xx:xx:xx:xx\fR>
+.br 
+
+Set alert MAC address.
+.TP 
+\fIgateway\fP <\fBdefault | backup\fR>
+.br 
+
+Set the channel gateway to use for alerts.
+.TP 
+\fIack\fP <\fBon | off\fR>
+.br 
+
+Set Alert Acknowledge on or off.
+.TP 
+\fItype\fP <\fBpet | oem1 | oem2\fR>
+.br 
+
+Set the destination type as PET or OEM.
+.TP 
+\fItime\fP <\fBseconds\fR>
+.br 
+
+Set ack timeout or unack retry interval.
+.TP 
+\fIretry\fP <\fBnumber\fR>
+.br 
+
+Set the number of alert retries.
+.RE
+.TP
+\fIstats\fP \fIget\fP [<\fBchannel number\fR>]
+.br 
+
+Retrieve information about the IP connections on the specified channel.
+The default will retrieve statistics on the first found LAN channel.
+.TP
+\fIstats\fP \fIclear\fP [<\fBchannel number\fR>]
+.br 
+
+Clear all IP/UDP/RMCP Statistics to 0 on the specified channel.
+The default will clear statistics on the first found LAN channel.
+.RE
+.TP 
+\fImc | bmc\fP
+.RS
+.TP 
+\fIreset\fP <\fBwarm\fR|\fBcold\fR>
+.br 
+
+Instructs the BMC to perform a warm or cold reset.
+.TP 
+\fIguid\fP
+
+Display the Management Controller Globally Unique IDentifier.
+.TP 
+\fIinfo\fP
+.br
+
+Displays information about the BMC hardware, including device
+revision, firmware revision, IPMI version supported, manufacturer ID,
+and information on additional device support.
+.TP 
+\fIwatchdog\fP
+.br 
+
+These commands allow a user to view and change the current 
+state of the watchdog timer.
+.RS
+.TP 
+\fIget\fP
+.br
+
+Show current Watchdog Timer settings and countdown state.
+.TP 
+\fIreset\fP
+.br
+
+Reset the Watchdog Timer to its most recent state and restart the 
+countdown timer.
+.TP 
+\fIoff\fP
+.br
+
+Turn off a currently running Watchdog countdown timer.
+.RE
+.TP 
+\fIselftest\fP
+.br 
+
+Check on the basic health of the BMC by executing the Get Self Test
+results command and report the results.
+.TP 
+\fIgetenables\fP
+.br 
+
+Displays a list of the currently enabled options for the BMC.
+.br 
+.TP 
+\fIsetenables\fP <\fBoption\fR>=[\fIon\fP|\fIoff\fP]
+.br 
+
+Enables or disables the given \fIoption\fR.  This command is
+only supported over the system interface according to the IPMI
+specification.  Currently supported values for \fIoption\fR include:
+.RS
+.TP 
+\fIrecv_msg_intr\fP
+.br 
+
+Receive Message Queue Interrupt
+.TP 
+\fIevent_msg_intr\fP
+.br 
+
+Event Message Buffer Full Interrupt
+.TP 
+\fIevent_msg\fP
+.br 
+
+Event Message Buffer
+.TP 
+\fIsystem_event_log\fP
+.br 
+
+System Event Logging
+.TP 
+\fIoem0\fP
+.br 
+
+OEM\-Defined option #0
+.TP 
+\fIoem1\fP
+.br 
+
+OEM\-Defined option #1
+.TP 
+\fIoem2\fP
+.br 
+
+OEM\-Defined option #2
+
+.RE
+.TP
+\fIgetsysinfo\fP <\fBargument\fP>
+Retrieves system info from bmc for given argument.
+.br
+See \fIsetsysinfo\fP for argument definitions
+.TP
+\fIsetsysinfo\fP  <\fBargument\fP> <\fBstring\fP>
+Stores system info string to bmc for given argument
+.RS
+.TP
+Possible arguments are:
+.RS
+.TP
+\fIprimary_os_name\fP     Primary Operating System Name
+.TP
+\fIos_name\fP             Operating System Name
+.TP
+\fIsystem_name\fP         System Name of Server
+.TP
+\fIdelloem_os_version\fP Running version of operating system
+.TP
+\fIdelloem_URL\fP        URL of BMC Webserver
+.RE
+.RE
+.TP 
+\fIchassis\fP
+.RS
+.TP 
+\fIstatus\fP
+.br 
+
+Displays information regarding the high\-level
+status of the system chassis and main power
+subsystem.
+.TP 
+\fIpoh\fP
+.br 
+
+This command will return the Power\-On Hours counter.
+.TP 
+\fIidentify\fP <\fBinterval\fR>
+
+Control the front panel identify  light.   Default interval
+is 15 seconds.  Use 0 to turn off.  Use "force" to turn on 
+indefinitely.
+.TP 
+\fIrestart_cause\fP
+.br 
+
+Query the chassis for the cause of the last system restart.
+.TP 
+\fIselftest\fP
+.br 
+
+Check on the basic health of the BMC by executing the Get Self Test
+results command and report the results.
+.TP 
+\fIpolicy\fP
+.br 
+
+Set the chassis power policy in  the  event  power failure.
+.RS
+.TP 
+\fIlist\fP
+.br 
+
+Return supported policies.
+.TP 
+\fIalways\-on\fP
+.br 
+
+Turn on when power is restored.
+.TP 
+\fIprevious\fP
+.br 
+
+Returned to  previous  state  when  power  is restored.
+.TP 
+\fIalways\-off\fP
+.br 
+
+Stay off after power is restored.
+.RE
+.TP 
+\fIpower\fP
+.br 
+
+Performs a chassis control  command  to  view  and
+change the power state.
+.RS
+.TP 
+\fIstatus\fP
+.br 
+
+Show current chassis power status.
+.TP 
+\fIon\fP
+.br 
+
+Power up chassis.
+.TP 
+\fIoff\fP
+.br 
+
+Power down chassis into soft off (S4/S5 state).
+\fBWARNING\fR: This command does not initiate a clean 
+shutdown of the operating system prior to powering down the system.
+.TP 
+\fIcycle\fP
+.br 
+
+Provides a power off interval of at least 1 second.  No action
+should occur if chassis power is in S4/S5 state, but it is
+recommended to check power state first and only issue a power
+cycle command if the  system  power is on or in lower sleep
+state than S4/S5.
+.TP 
+\fIreset\fP
+.br 
+
+This command will perform a hard reset.
+.TP 
+\fIdiag\fP
+.br 
+
+Pulse a diagnostic interrupt (NMI) directly to the processor(s).
+.TP 
+\fIsoft\fP
+.br 
+
+Initiate a soft\-shutdown of OS via ACPI.  This can be done in a
+number of ways, commonly by simulating an overtemperture or by
+simulating a power button press.  It is necessary for there to
+be Operating System support for ACPI and some sort of daemon
+watching for events for this soft power to work.
+.RE
+.TP 
+\fIbootdev\fP <\fBdevice\fR> [<\fIclear\-cmos\fP=\fByes\fR|\fBno\fR>] [<\fIoptions\fP=\fBhelp,...\fR>]
+.br 
+
+Request the system to boot from an alternate boot device on next reboot.
+The \fIclear\-cmos\fP option, if supplied, will instruct the BIOS to
+clear its CMOS on the next reboot.  Various options may be used to modify 
+the boot device settings.  Run \fI"bootdev none options=help"\fP for a list of 
+available boot device modifiers/options.  
+
+.RS
+.TP 
+Currently supported values for <device> are:
+.TP 
+\fInone\fP
+.br 
+
+Do not change boot device
+.TP 
+\fIpxe\fP
+.br 
+
+Force PXE boot
+.TP 
+\fIdisk\fP
+.br 
+
+Force boot from BIOS default boot device
+.TP 
+\fIsafe\fP
+.br 
+
+Force boot from BIOS default boot device, request Safe Mode
+.TP 
+\fIdiag\fP
+.br 
+
+Force boot from diagnostic partition
+.TP 
+\fIcdrom\fP
+.br 
+
+Force boot from CD/DVD
+.TP 
+\fIbios\fP
+.br 
+
+Force boot into BIOS setup
+.TP 
+\fIfloppy\fP
+.br 
+
+Force boot from Floppy/primary removable media
+.RE
+.TP 
+\fIbootparam\fP
+.br 
+
+Get or set various system boot option parameters.
+.RS
+.TP 
+\fIget\fP <\fBparam #\fR>
+.br 
+
+Get boot parameter. Currently supported values for <\fBparam #\fR> are:
+
+\fI0\fP - Set In Progress
+
+\fI1\fP - Service Partition Selector
+
+\fI2\fP - Service Partition Scan
+
+\fI3\fP - BMC Boot Flag Valid Bit Clearing
+
+\fI4\fP - Boot Info Acknowledge 
+
+\fI5\fP - Boot Flags
+
+\fI6\fP - Boot Initiator Info
+
+\fI7\fP - Boot Initiator Mailbox
+.br 
+
+.TP 
+\fIset\fP <\fBdevice\fR> [<\fIoptions\fP=\fBhelp,...\fR>]
+.br 
+
+Set boot device parameter used for next boot.  Various options may be used
+to change when the the next boot device is cleared.
+Run \fI"options=help"\fP for a list of available bootparam set device options.
+
+.RS
+.TP 
+Currently supported bootparam \fBdevice\fR settings are:
+.TP 
+\fIforce_pxe\fP
+.br 
+
+Force PXE boot
+.TP 
+\fIforce_disk\fP
+.br 
+
+Force boot from default hard-drive
+.TP 
+\fIforce_safe\fP
+.br 
+
+Force boot from default hard-drive, request Safe Mode
+.TP 
+\fIforce_diag\fP
+.br 
+
+Force boot from diagnostic partition
+.TP 
+\fIforce_cdrom\fP
+.br 
+
+Force boot from CD/DVD 
+.TP 
+\fIforce_bios\fP
+.br 
+
+Force boot into BIOS setup
+
+.RE
+.RS
+.TP 
+Currently supported bootparam \fBoptions\fR settings are associated with BMC Boot Valid Bit Clearing and are as follows:   Any option can be prefixed with "no-" to invert the sense of the operation.
+.TP 
+\fIPEF\fP
+.br 
+
+Clear valid bit on reset/power cycle caused by PEF
+.TP 
+\fItimeout\fP
+.br 
+
+Automatically clear boot flag valid bit if Chassis Control command is
+not received within 60 seconds.
+.TP 
+\fIwatchdog\fP
+.br 
+
+Clear valid bit on reset/power cycle caused by watchdog timeout
+.TP 
+\fIreset\fP
+.br 
+
+Clear valid bit on push button reset / soft-reset
+.TP 
+\fIpower\fP
+.br 
+
+Clear valid bit on power up via power push button or wake event
+
+.RE
+.RE
+.RE
+.RE
+.TP
+\fInm\fP
+.RS
+.TP
+\fIalert\fP
+.RS
+.TP
+\fIclear dest\fP <\fBdest\fR>
+.br
+
+Clear the Node Manager Alert lan destination.
+
+.RE
+.RS
+.TP
+\fIget\fP
+.br
+Get the Node Manager Alert settings.
+
+.RE
+.RS
+.TP
+\fIset chan\fP <\fBchan\fR> \fIdest\fP <\fBdest\fR> \fIstring\fP <\fBstring\fR>
+.br
+
+Set the Node Manager alert channel, lan destination, and alert string number.
+
+.RE
+.TP
+\fIcapability\fP
+.br
+
+Obtain the Node Manager power control capabilities and ranges.
+
+.TP
+\fIcontrol\fP
+.RS
+.TP
+\fIenable\fP|\fIdisable \fP
+.RS
+.TP
+\fIglobal\fP
+.br
+
+Enable/disable all policies for all domains.
+.TP
+\fIper_domain\fP <platform|CPU|Memory>
+.br
+
+Enable/disable all policies of the specified domain.
+.TP
+\fIper_policy\fP <0-7>
+.br
+
+Enable/disable the policy for the specified domain/policy combination.
+.RE
+.RE
+.TP
+\fIdiscover\fP
+.br
+
+Discover Node Manager presence as well as the Node Manager version, revision, and patch number.
+
+.TP
+\fIpolicy\fP
+.RS
+.TP
+\fIadd\fP
+.RS
+.TP
+\fIpower\fP <watts> \fIpolicy_id\fP <0-7> [\fIcorrection\fP auto|soft|hard] \fItrig_lim\fP <seconds> \fIstats\fP <seconds> [\fIdomain\fP <platform|CPU|Memory>] \fIenable\fP|\fIdisable\fP
+.br
+
+Add a new power policy, or overwrite an existing policy.
+The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto.
+The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535.
+The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535.
+If domain is not supplied a default of platform is used.
+
+
+.TP
+\fIinlet\fP <temp> \fIpolicy_id\fP <0-7> [\fIcorrection\fP auto|soft|hard] \fItrig_lim\fP <seconds> \fIstats\fP <seconds> [\fIdomain\fP <platform|CPU|Memory>] \fIenable\fP|\fIdisable\fP
+.br
+
+Add a new inlet temp policy, or overwrite an existing policy.
+The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto.
+The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535.
+The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535.
+If domain is not supplied a default of platform is used.
+
+
+.RE
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7>
+.br
+
+Get a previously stored policy.
+.TP
+\fIlimiting\fP
+.br
+
+Report policy number if any policy is limiting power.
+.TP
+\fIremove\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Remove a policy. If domain is not supplied a default of platform is used.
+.RE
+.TP
+\fIpower\fP \fImin\fP <minimum> \fImax\fP <maximum> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Configure Node Manager power minimum and maximum power draw limits.
+The \fImin\fP and \fImax\fP values must be in the range of 0-65535.
+If domain is not supplied a default of platform is used.
+
+.RE
+.RS
+.TP
+\fIreset\fP
+.RS
+.TP
+\fIcomm\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager communication statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIglobal\fI 
+.br
+
+Reset Node Manager global statistics.
+
+.TP
+\fImemory\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager memory throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIper_policy\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager per policy statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIrequests\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager unhandled requests statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIresponse\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager response time statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIthrottling\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Reset Node Manager throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.RE
+.TP
+\fIstatistics\fP
+.RS
+.TP
+\fIcomm_fail\fP
+.br
+
+Report Node Manager communication failure statistics.
+
+.TP
+\fIcpu_throttling\fP
+.br
+
+Report Node Manager cpu throttling statistics.
+
+.TP
+\fImem_throttling\fP
+.br
+
+Report Node Manager memory throttling statistics.
+
+.TP
+\fIpolicy_power\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy power statistics (policy must be a power limit type policy).
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIpolicy_temps\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy temp statistics (policy must be an inlet temp limit policy).
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIpolicy_throt\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Report Node Manager per policy throttling statistics.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIrequests\fP
+.br
+
+Report Node Manager unhandled requests statistics.
+
+.TP
+\fIresponse\fP
+.br
+
+Report Node Manager response time statistics.
+
+.RE
+.TP
+\fIsuspend\fP
+.RS
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Get Node Manager policy suspend periods.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIset\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>] <start> <stop> <repeat>
+.br
+
+Set Node Manager policy suspend periods.
+If domain is not supplied a default of platform is used.
+The <start> and <stop> values must be in the range of 0-239, which is the number of minutes past midnight divided by 6.
+The <repeat> value is the daily recurrence pattern. Bit 0 is repeat every Monday, bit 1 is repeat every Tuesday, on through bit 6 for Sunday.
+
+.RE
+.TP
+\fIthreshold\fP
+.RS
+.TP
+\fIget\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>]
+.br
+
+Get Node Manager policy Alert Threshold settings.
+If domain is not supplied a default of platform is used.
+
+.TP
+\fIset\fP \fIpolicy_id\fP <0-7> [\fIdomain\fP <platform|CPU|Memory>] \fIthresh_array\fP
+.br
+
+Set Node Manager policy Alert Threshold values.
+If domain is not supplied a default of platform is used.
+The \fIthresh_array\fP is 1, 2, or 3 integers that set three alert threshold settings. The setting type is a power or temperature value which must match the type of policy.
+
+.RE
+.RE
+
+.TP 
+\fIpef\fP
+.RS
+.TP 
+\fIinfo\fP
+.br 
+
+This command will query the BMC and print information about the PEF 
+supported features.
+.TP 
+\fIstatus\fP
+.br 
+
+This command prints the current PEF status (the last SEL entry 
+processed by the BMC, etc).
+.TP 
+\fIpolicy\fP
+.br 
+
+This command lists the PEF policy table entries.  Each policy 
+entry describes an alert destination.  A policy set is a 
+collection of table entries.  PEF alert actions reference policy sets.
+.TP 
+\fIlist\fP
+.br 
+
+This command lists the PEF table entries.  Each PEF entry 
+relates a sensor event to an action.  When PEF is active, 
+each platform event causes the BMC to scan this table for 
+entries matching the event, and possible actions to be taken.
+Actions are performed in priority order (higher criticality first).
+.RE
+.TP 
+\fIpicmg\fP <\fBproperties\fR> 
+.RS
+
+Run a PICMG/ATA extended command. Get PICMG properties may be used to
+obtain and print Extension major version information, PICMG identifier,
+FRU Device ID and Max FRU Device ID.
+.TP 
+\fIaddrinfo\fP
+.br 
+
+Get address information.  This command may return information on the Hardware
+address, IPMB-0 Address, FRU ID, Site/Entity ID, and Site/Entity Type.
+.TP 
+\fIfrucontrol\fP <\fBfru id\fR> <\fBoptions\fR>
+.br 
+
+Set various control options:
+.RS
+.TP 
+\fI0x00\fP      - Cold Reset
+.br 
+.TP 
+\fI0x01\fP      - Warm Reset
+.br 
+.TP 
+\fI0x02\fP      - Graceful Reboot
+.br 
+.TP 
+\fI0x03\fP      - Issue Diagnostic Interrupt
+.br 
+.TP 
+\fI0x04\fP      - Quiesce [AMC only]
+.br 
+.TP 
+\fI0x05-0xFF\fP - Cold Reset
+.br 
+.RE
+.TP 
+\fIactivate\fP <\fBfru id\fR>
+.br 
+
+Activate the specified FRU.
+.TP 
+\fIdeactivate\fP <\fBfru id\fR>
+.br 
+
+Deactivate the specified FRU.
+.TP 
+\fIpolicy\fP \fIget\fP <\fBfru id\fR>
+.br 
+
+Get FRU activation policy.
+.TP 
+\fIpolicy\fP \fIset\fP <\fBfru id\fR> <\fBlockmask\fR> <\fBlock\fR>
+.br 
+
+Set FRU activation policy.  \fBlockmask\fR is 1 or 0 to indicate action
+on the deactivation or activation locked bit respectively.  \fBlock\fR is
+1 or 0 to set/clear locked bit.
+.TP 
+\fIportstate\fP \fBset\fR|\fBgetall\fR|\fBgetgranted\fR|\fBgetdenied\fR <\fBparameters\fR> 
+.br 
+Get or set various port states.  See usage for parameter details.
+.RE
+.TP 
+\fIpower\fP <\fBchassis power command\fR>
+.br 
+
+Shortcut to the \fIchassis power\fP commands.
+See the \fIchassis power\fP commands for usage information.
+.RE
+.TP 
+\fIraw\fP <\fBnetfn\fR> <\fBcmd\fR> [<\fBdata\fR>]
+.br 
+
+This will allow you to execute raw IPMI commands.   For
+example to query the POH counter with a raw command:
+
+> ipmitool \-v raw 0x0 0xf
+.br 
+RAW REQ (netfn=0x0 cmd=0xf data_len=0)
+.br 
+RAW RSP (5 bytes)
+.br 
+3c 72 0c 00 00
+
+\fBNote\fR that the OpenIPMI driver provided by the Linux kernel will reject the Get Message, Send Message and Read Event Message Buffer commands because it handles the message sequencing internally.
+.RE
+.TP 
+\fIsdr\fP
+.RS
+.TP 
+\fIget\fP <\fBid\fR> ... [<\fBid\fR>]
+.br 
+
+Prints information for sensor data records specified by sensor id.
+.TP 
+\fIinfo\fP
+.br 
+
+This command will query the BMC for Sensor Data Record (SDR) Repository information.
+.TP 
+\fItype\fP [<\fBsensor type\fP>]
+
+This command will display all records from the SDR Repository of a specific type.
+Run with type \fIlist\fP (or simply with no type) to see the list of available types.
+For example to query for all Temperature sensors:
+
+> ipmitool sdr type Temperature
+.br 
+Baseboard Temp   | 30h | ok  |  7.1 | 28 degrees C
+.br 
+FntPnl Amb Temp  | 32h | ok  | 12.1 | 24 degrees C
+.br 
+Processor1 Temp  | 98h | ok  |  3.1 | 57 degrees C
+.br 
+Processor2 Temp  | 99h | ok  |  3.2 | 53 degrees C
+
+.TP 
+\fIlist\fP | \fIelist\fP [<\fBall\fR|\fBfull\fR|\fBcompact\fR|\fBevent\fR|\fBmcloc\fR|\fBfru\fR|\fBgeneric\fR>]
+.br 
+
+This command will read the Sensor Data Records (SDR) and extract sensor
+information of a given type,  then query each sensor and print its name,
+reading, and status.  If invoked as \fIelist\fP then it will also print
+sensor number, entity id and instance, and asserted discrete states.
+
+The default output will only display \fIfull\fP and \fIcompact\fP sensor
+types, to see all sensors use the \fIall\fP type with this command.
+.RS
+.TP 
+Valid types are:
+.RS
+.TP 
+\fIall\fP
+.br 
+
+All SDR records (Sensor and Locator) 
+.TP 
+\fIfull\fP
+.br 
+
+Full Sensor Record
+.TP 
+\fIcompact\fP
+.br 
+
+Compact Sensor Record
+.TP 
+\fIevent\fP
+.br 
+
+Event\-Only Sensor Record
+.TP 
+\fImcloc\fP
+.br 
+
+Management Controller Locator Record
+.TP 
+\fIfru\fP
+.br 
+
+FRU Locator Record
+.TP 
+\fIgeneric\fP
+.br 
+
+Generic SDR records
+.RE
+.RE
+.TP 
+\fIentity\fP <\fBid\fR>[.<\fBinstance\fR>]
+.br 
+
+Displays all sensors associated with an entity.  Get a list of
+valid entity ids on the target system by issuing the \fIsdr elist\fP command.
+A list of all entity ids can be found in the IPMI specifications.
+.TP 
+\fIdump\fP <\fBfile\fR>
+.br 
+
+Dumps raw SDR data to a file.  This data file can then be used as
+a local SDR cache of the remote managed system with the \fI\-S <file>\fP
+option on the ipmitool command line.  This can greatly improve performance
+over system interface or remote LAN.
+.TP 
+\fIfill\fP \fIsensors\fP
+.br 
+
+Create the SDR Repository for the current configuration.  Will perform
+a 'Clear SDR Repository' command so be careful.
+.TP 
+\fIfill\fP \fIfile\fP <\fBfilename\fR>
+.br 
+
+Fill the SDR Repository using records stored in a binary data file. Will perform
+a 'Clear SDR Repository' command so be careful.
+.RE
+.TP 
+\fIsel\fP
+.br 
+
+NOTE: System Event Log (SEL) entry\-times are displayed as 
+`Pre\-Init Time\-stamp' if the SEL clock needs to be set.
+Ensure that the SEL clock is accurate by invoking the
+\fIsel time get\fP and
+\fIsel time set <time string>\fP commands.
+.RS
+.TP 
+\fIinfo\fP
+.br 
+
+This command will query the BMC for information
+about the System Event Log (SEL) and its contents.
+.TP 
+\fIclear\fP
+.br 
+
+This command will clear the contents of the SEL.
+It cannot be undone so be careful.
+.TP 
+\fIlist\fP | \fIelist\fP
+.br 
+
+When this command is invoked without arguments, the entire
+contents of the System Event Log are displayed.  If invoked as
+\fIelist\fP (extended list) it will also use the Sensor Data 
+Record entries to display the sensor ID for the sensor that caused 
+each event.  \fBNote\fR this can take a long time over the 
+system interface.
+
+.RS
+.TP 
+<\fBcount\fR> | \fIfirst\fP <\fBcount\fR>
+.br 
+
+Displays the first \fIcount\fR (least\-recent) entries in the SEL.
+If \fIcount\fR is zero, all entries are displayed.
+.TP 
+\fIlast\fP <\fBcount\fR>
+.br 
+
+Displays the last \fIcount\fR (most\-recent) entries in the SEL.
+If \fIcount\fR is zero, all entries are displayed.
+.RE
+.TP          
+\fIdelete\fP <\fBSEL Record ID\fR> ... <\fBSEL Record ID\fR>
+.br 
+
+Delete one or more SEL event records.
+.TP 
+\fIadd\fP <\fBfilename ID\fR>
+.br 
+
+Read event entries from a file and add them to the SEL.  New SEL
+entries area added onto the SEL after the last record in the SEL.
+Record added is of type 2 and is automatically timestamped.
+.TP 
+\fIget\fP <\fBSEL Record ID\fR>
+.br 
+
+Print information on the specified SEL Record entry.
+.TP 
+\fIsave\fP <\fBfile\fR>
+
+Save SEL records to a text file that can be fed back into the
+\fIevent file\fP ipmitool command.  This can be useful for
+testing Event generation by building an appropriate Platform
+Event Message file based on existing events.  Please see the
+available help for the 'event file ...' command for a description of
+the format of this file.
+.TP 
+\fIwriteraw\fP <\fBfile\fR>
+
+Save SEL records to a file in raw, binary format.  This file can
+be fed back to the \fIsel readraw\fP ipmitool command for viewing.
+.TP 
+\fIreadraw\fP <\fBfile\fR>
+
+Read and display SEL records from a binary file.  Such a file can
+be created using the \fIsel writeraw\fP ipmitool command.
+.TP          
+\fItime\fP
+.RS
+.TP 
+\fIget\fP
+.br 
+Displays the SEL clock's current time.
+.TP 
+\fIset\fP <\fBtime string\fR>
+.br 
+
+Sets the SEL clock.  Future SEL entries will use the time
+set by this command.  <\fBtime string\fR> is of the
+form "MM/DD/YYYY HH:MM:SS".  Note that hours are in 24\-hour
+form.  It is recommended that the SEL be cleared before
+setting the time.
+.RE
+.RE
+.TP 
+\fIsensor\fP
+.RS
+.TP 
+\fIlist\fP
+.br 
+
+Lists sensors and thresholds in a wide table format.
+.TP 
+\fIget\fP <\fBid\fR> ... [<\fBid\fR>]
+.br 
+
+Prints information for sensors specified by name.
+.TP 
+\fIthresh\fP <\fBid\fR> <\fBthreshold\fR> <\fBsetting\fR>
+.br 
+
+This allows you to set a particular sensor threshold 
+value.  The sensor is specified by name.
+.RS
+.TP 
+Valid \fIthresholds\fP are:
+.br 
+\fIunr\fP	Upper Non\-Recoverable
+.br 
+\fIucr\fP	Upper Critical
+.br 
+\fIunc\fP	Upper Non\-Critical
+.br 
+\fIlnc\fP	Lower Non\-Critical
+.br 
+\fIlcr\fP	Lower Critical
+.br 
+\fIlnr\fP	Lower Non\-Recoverable
+.RE
+.TP 
+\fIthresh\fP <\fBid\fR> \fIlower\fP <\fBlnr\fR> <\fBlcr\fR> <\fBlnc\fR>
+
+This allows you to set all lower thresholds for a sensor at the same time.
+The sensor is specified by name and the thresholds are listed in order of
+Lower Non\-Recoverable, Lower Critical, and Lower Non\-Critical.
+.TP 
+\fIthresh\fP <\fBid\fR> \fIupper\fP <\fBunc\fR> <\fBucr\fR> <\fBunr\fR>
+
+This allows you to set all upper thresholds for a sensor at the same time.
+The sensor is specified by name and the thresholds are listed in order of
+Upper Non\-Critical, Upper Critical, and Upper Non\-Recoverable.
+.RE
+.TP 
+\fIsession\fP
+.RS
+.TP 
+\fIinfo\fP <\fBactive\fR|\fBall\fR|\fBid 0xnnnnnnnn\fR|\fBhandle 0xnn\fR>
+.br 
+
+Get information about the specified session(s).  You may identify
+sessions by their id, by their handle number, by their active status,
+or by using the keyword `all' to specify all sessions.
+.RE
+.TP
+\fIset\fP
+.RS
+.TP
+\fIhostname\fP <\fBhost\fR>
+
+Session hostname.
+.RS
+.RE
+.TP
+\fIusername\fP <\fBuser\fR>
+
+Session username.
+.RS
+.RE
+.TP
+\fIpassword\fP <\fBpass\fR>
+
+Session password.
+.RS
+.RE
+.TP
+\fIprivlvl\fP <\fBlevel\fR>
+
+Session privilege level force.
+.RS
+.RE
+.TP
+\fIauthtype\fP <\fBtype\fR>
+
+Authentication type force.
+.RS
+.RE
+.TP
+\fIlocaladdr\fP <\fBaddr\fR>
+
+Local IPMB address.
+.RS
+.RE
+.TP
+\fItargetaddr\fP <\fBaddr\fR>
+
+Remote target IPMB address.
+.RS
+.RE
+.TP
+\fIport\fP <\fBport\fR>
+
+Remote RMCP port.
+.RS
+.RE
+.TP
+\fIcsv\fP [\fBlevel\fR]
+
+Enable output in comma separated format.
+Affects following commands:
+\fIuser\fP, \fIchannel\fP, \fIisol\fP, \fIsunoem\fP,
+\fIsol\fP, \fIsensor\fP, \fIsdr\fP, \fIsel\fP, \fIsession\fP.
+.RS
+.RE
+.TP
+\fIverbose\fP [\fBverbose\fR]
+
+Verbosity level.
+.RS
+.RE
+.RE
+.TP 
+\fIshell\fP
+.RS
+This command will launch an interactive shell which you can use
+to send multiple ipmitool commands to a BMC and see the responses.
+This can be useful instead of running the full ipmitool command each
+time.  Some commands will make use of a Sensor Data Record cache
+and you will see marked improvement in speed if these commands
+are able to reuse the same cache in a shell session.  LAN sessions
+will send a periodic keepalive command to keep the IPMI session
+from timing out.
+.RE
+.TP 
+\fIsol\fP
+.RS
+.TP 
+\fIinfo\fP [<\fBchannel number\fR>]
+.br 
+
+Retrieve information about the Serial\-Over\-LAN configuration on 
+the specified channel.  If no channel is given, it will display 
+SOL configuration data for the currently used channel.
+.TP 
+\fIpayload\fP <\fIenable\fP | \fIdisable\fP | \fIstatus\fP> <\fBchannel number\fR> <\fBuserid\fR>
+.br 
+
+Enable, disable or show status of SOL payload for the user on the specified channel. 
+.TP 
+\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>]
+.br 
+
+Configure parameters for Serial Over Lan.  If no channel is given,
+it will display SOL configuration data for the currently used
+channel.  Configuration parameter updates are automatically guarded
+with the updates to the set\-in\-progress parameter.
+.RS
+.TP 
+Valid parameters and values are:
+.br 
+.TP 
+\fIset\-in\-progress\fP
+set\-complete set\-in\-progress commit\-write
+.TP 
+\fIenabled\fP
+true false
+.TP 
+\fIforce\-encryption\fP
+true false
+.TP 
+\fIforce\-authentication\fP
+true false
+.TP 
+\fIprivilege\-level\fP
+user operator admin oem
+.TP 
+\fIcharacter\-accumulate\-level\fP
+Decimal number given in 5 milliseconds increments
+.TP 
+\fIcharacter\-send\-threshold\fP
+Decimal number
+.TP 
+\fIretry\-count\fP
+Decimal number.  0 indicates no retries after packet is transmitted.
+.TP 
+\fIretry\-interval\fP
+Decimal number in 10 millisecond increments.  0 indicates 
+that retries should be sent back to back.
+.TP 
+\fInon\-volatile\-bit\-rate\fP
+serial, 19.2, 38.4, 57.6, 115.2.  Setting this value to 
+serial indicates that the BMC should use the setting used 
+by the IPMI over serial channel.
+.TP 
+\fIvolatile\-bit\-rate\fP
+serial, 19.2, 38.4, 57.6, 115.2.  Setting this value to 
+serial indicates that the BMC should use the setting used 
+by the IPMI over serial channel.
+.RE
+.TP 
+\fIactivate\fP [\fIusesolkeepalive\fP | \fInokeepalive\fP] [\fIinstance=<number>\fP]
+.br 
+
+Causes ipmitool to enter Serial Over LAN
+mode, and is only available when using the lanplus
+interface.  An RMCP+ connection is made to the BMC,
+the terminal is set to raw mode, and user input is
+sent to the serial console on the remote server.
+On exit, the the SOL payload mode is deactivated and
+the terminal is reset to its original settings.
+
+If the instance is given, it will activate using the given instance
+number.  The default is 1.
+.RS
+
+Special escape sequences are provided to control the SOL session:
+.RS
+.TP 
+\fI~.\fP	Terminate connection
+.TP 
+\fI~^Z\fP	Suspend ipmitool
+.TP 
+\fI~^X\fP	Suspend ipmitool, but don't restore tty on restart
+.TP 
+\fI~B\fP	Send break
+.TP 
+\fI~~\fP	Send the escape character by typing it twice
+.TP 
+\fI~?\fP	Print the supported escape sequences
+.RE
+
+Note that escapes are only recognized immediately after newline.
+.RE
+.TP 
+\fIdeactivate\fP [\fIinstance=<number>\fP]
+.br 
+
+Deactivates Serial Over LAN mode on the BMC.
+Exiting Serial Over LAN mode should automatically cause
+this command to be sent to the BMC, but in the case of an
+unintentional exit from SOL mode, this command may be
+necessary to reset the state of the BMC.
+
+If the instance is given, it will deactivate the given instance
+number.  The default is 1.
+.RE
+.TP 
+\fIspd\fP <\fBi2cbus\fR> <\fBi2caddr\fR> [<\fBchannel\fR>] [<\fmaxread\fR>]
+.br 
+
+This command may be used to read SPD (Serial Presence Detect) data using the 
+I2C Master Write\-Read IPMI command.
+
+.TP
+\fIsunoem\fP
+.RS
+.TP
+\fIcli\fP [<\fBcommand string\fR> ...]
+.br
+
+Execute the service processor command line interface commands.
+Without any command string, an interactive session is started
+in the service processor command line environment.  If a
+command string is specified, the command string is executed
+on the service processor and the connection is closed.
+.TP
+\fIled\fP
+.RS
+
+These commands provide a way to get and set the status of LEDs
+on a Sun Microsystems server.  Use 'sdr list generic' to get a
+list of devices that are controllable LEDs.  The \fIledtype\fP
+parameter is optional and not necessary to provide on the command
+line unless it is required by hardware.
+.TP
+\fIget\fP <\fBsensorid\fR> [<\fBledtype\fR>]
+
+Get status of a particular LED described by a Generic Device Locator
+record in the SDR.  A sensorid of \fIall\fP will get the status
+of all available LEDS.
+.TP
+\fIset\fP <\fBsensorid\fR> <\fBledmode\fR> [<\fBledtype\fR>]
+
+Set status of a particular LED described by a Generic Device Locator
+record in the SDR.  A sensorid of \fIall\fP will set the status
+of all available LEDS to the specified \fIledmode\fP and \fIledtype\fP.
+.TP
+LED Mode is required for set operations:
+.br
+\fIOFF\fP         Off
+.br
+\fION\fP          Steady On
+.br
+\fISTANDBY\fP     100ms on 2900ms off blink rate
+.br
+\fISLOW\fP        1HZ blink rate
+.br
+\fIFAST\fP        4HZ blink rate
+.TP
+LED Type is optional:
+.br
+\fIOK2RM\fP       Ok to Remove
+.br
+\fISERVICE\fP     Service Required
+.br
+\fIACT\fP         Activity
+.br
+\fILOCATE\fP      Locate
+
+.RE
+.TP
+\fInacname\fP <\fBipmi name\fR>
+.br
+
+Return the full NAC name of a target identified by ipmi name.
+.TP
+\fIping\fP <\fBcount\fR> [<\fBq\fR>]
+.br
+
+Send and receive count packets. Each packet is 64 bytes.
+
+q - Quiet. Displays output only at the start and end of the process.
+.TP
+\fIgetval\fP <\fBproperty name\fR>
+.br
+
+Returns value of specified ILOM property.
+.TP
+\fIsetval\fP <\fBproperty name\fR> <\fBproperty value\fR> [<\fBtimeout\fR>]
+.br
+
+Sets value of ILOM  property. If timeout is not specified, the
+default value is 5 seconds. NOTE: setval must be executed locally on host!
+.TP
+\fIsshkey\fP
+.RS
+.TP
+\fIset\fP <\fBuserid\fR> <\fBkeyfile\fR>
+
+This command will allow you to specify an SSH key to use for a particular
+user on the Service Processor. This key will be used for CLI logins to
+the SP and not for IPMI sessions. View available users and their userids
+with the 'user list' command.
+.TP
+\fIdel\fP <\fBuserid\fR>
+
+This command will delete the SSH key for a specified userid.
+.RE
+.TP
+\fIversion\fP
+.br
+
+Display the version of ILOM firmware.
+.TP
+\fIgetfile\fP <\fBfile identifier\fR> <\fBdestination file name\fR>
+.br
+
+This command will return various files from service processor and store them
+in specified destination file. Note that some files may not be present or
+be supported by your SP.
+.br
+
+.RS
+File identifiers:
+.RS
+.br
+\fISSH_PUBKEYS\fP
+.br
+\fIDIAG_PASSED\fP
+.br
+\fIDIAG_FAILED\fP
+.br
+\fIDIAG_END_TIME\fP
+.br
+\fIDIAG_INVENTORY\fP
+.br
+\fIDIAG_TEST_LOG\fP
+.br
+\fIDIAG_START_TIME\fP
+.br
+\fIDIAG_UEFI_LOG\fP
+.br
+\fIDIAG_TEST_LOG\fP
+.br
+\fIDIAG_LAST_LOG\fP
+.br
+\fIDIAG_LAST_CMD\fP
+.RE
+.RE
+
+.TP
+\fIgetbehavior\fP <\fBfeature identifier\fR>
+.br
+
+This command will test if various ILOM features are enabled.
+.br
+
+.RS
+Feature identifiers:
+.RS
+.br
+\fISUPPORTS_SIGNED_PACKAGES\fP
+.br
+\fIREQUIRES_SIGNED_PACKAGES\fP
+.RE
+.RE
+.RE
+.TP
+\fItsol\fP
+.RS
+
+This command allows Serial-over-LAN sessions to be established with Tyan
+IPMIv1.5 SMDC such as the M3289 or M3290.  The default command run with
+no arguments will establish default SOL session back to local IP address.
+Optional arguments may be supplied in any order.
+
+.TP
+\fI<ipaddr>\fP
+.br
+
+Send receiver IP address to SMDC which it will use to send serial
+traffic to.  By default this detects the local IP address and establishes
+two-way session.  Format of ipaddr is XX.XX.XX.XX
+
+.TP
+\fIport=NUM\fP
+.br
+
+Configure UDP port to receive serial traffic on.  By default this is 6230.
+
+.TP
+\fIro|rw\fP
+.br
+
+Confiure SOL session as read-only or read-write.  Sessions are read-write
+by default.
+
+.RE
+
+.TP 
+\fIuser\fP
+.RS
+.TP 
+\fIsummary\fP
+.br 
+
+Displays a summary of userid information, including maximum number of userids,
+the number of enabled users, and the number of fixed names defined.
+.TP 
+\fIlist\fP
+.br 
+
+Displays a list of user information for all defined userids.
+.TP 
+\fIset\fP
+.RS
+.TP 
+\fIname\fP <\fBuserid\fR> <\fBusername\fR>
+.br 
+
+Sets the username associated with the given userid.
+.TP 
+\fIpassword\fP <\fBuserid\fR> [<\fBpassword\fR>]
+.br 
+
+Sets the password for the given userid.  If no password is given,
+the password is cleared (set to the NULL password).  Be careful when
+removing passwords from administrator\-level accounts.
+.RE
+.TP 
+\fIdisable\fP <\fBuserid\fR>
+.br 
+
+Disables access to the BMC by the given userid.
+.TP 
+\fIenable\fP <\fBuserid\fR>
+.br 
+
+Enables access to the BMC by the given userid.
+.TP 
+\fIpriv\fP <\fBuserid\fR> <\fBprivilege level\fR> [<\fBchannel number\fR>]
+.br 
+
+Set user privilege level on the specified channel.  If the channel is not 
+specified, the current channel will be used.
+.TP 
+\fItest\fP <\fBuserid\fR> <\fB16\fR|\fB20\fR> [<\fBpassword\fR>]
+.br 
+
+Determine whether a password has been stored as 16 or 20 bytes.
+.RE
+
+.SH "OPEN INTERFACE"
+The ipmitool \fIopen\fP interface utilizes the OpenIPMI
+kernel device driver.  This driver is present in all modern
+2.4 and all 2.6 kernels and it should be present in recent
+Linux distribution kernels.  There are also IPMI driver
+kernel patches for different kernel versions available from
+the OpenIPMI homepage.
+
+The required kernel modules is different for 2.4 and 2.6
+kernels.  The following kernel modules must be loaded on
+a 2.4\-based kernel in order for ipmitool to work:
+.TP 
+.B ipmi_msghandler
+Incoming and outgoing message handler for IPMI interfaces.
+.TP 
+.B ipmi_kcs_drv
+An IPMI Keyboard Controller Style (KCS) interface driver for the message handler.
+.TP 
+.B ipmi_devintf
+Linux character device interface for the message handler.
+.LP 
+The following kernel modules must be loaded on
+a 2.6\-based kernel in order for ipmitool to work:
+.TP 
+.B ipmi_msghandler
+Incoming and outgoing message handler for IPMI interfaces.
+.TP 
+.B ipmi_si
+An IPMI system interface driver for the message handler.
+This module supports various IPMI system interfaces such
+as KCS, BT, SMIC, and even SMBus in 2.6 kernels.
+.TP 
+.B ipmi_devintf
+Linux character device interface for the message handler.
+.LP 
+Once the required modules are loaded there will be a dynamic
+character device entry that must exist at \fB/dev/ipmi0\fR.
+For systems that use devfs or udev this will appear at
+\fB/dev/ipmi/0\fR.
+
+To create the device node first determine what dynamic major
+number it was assigned by the kernel by looking in
+\fB/proc/devices\fR and checking for the \fIipmidev\fP
+entry.  Usually if this is the first dynamic device it will
+be major number \fB254\fR and the minor number for the first
+system interface is \fB0\fR so you would create the device
+entry with:
+
+.I mknod /dev/ipmi0 c 254 0
+
+ipmitool includes some sample initialization scripts that
+can perform this task automatically at start\-up.
+
+In order to have ipmitool use the OpenIPMI device interface
+you can specify it on the command line:
+.PP 
+ipmitool \fB\-I\fR \fIopen\fP <\fIcommand\fP>
+.SH "BMC INTERFACE"
+The ipmitool bmc interface utilizes the \fIbmc\fP device driver as
+provided by Solaris 10 and higher.  In order to force ipmitool to make
+use of this interface you can specify it on the command line:
+.PP 
+ipmitool \fB\-I\fR \fIbmc\fP <\fIcommand\fP>
+
+The following files are associated with the bmc driver:
+
+.TP 
+.B /platform/i86pc/kernel/drv/bmc
+32\-bit \fBELF\fR kernel module for the bmc driver.
+.TP 
+.B /platform/i86pc/kernel/drv/amd64/bmc
+64\-bit \fBELF\fR kernel module for the bmc driver.
+.TP 
+.B /dev/bmc
+Character device node used to communicate with the bmc driver.
+.SH "LIPMI INTERFACE"
+The ipmitool \fIlipmi\fP interface uses the Solaris 9 IPMI kernel device driver.
+It has been superceeded by the \fIbmc\fP interface on Solaris 10.  You can tell
+ipmitool to use this interface by specifying it on the command line.
+
+ipmitool \fB\-I\fR \fIlipmi\fP <\fIexpression\fP>
+.SH "LAN INTERFACE"
+The ipmitool \fIlan\fP interface communicates with the BMC
+over an Ethernet LAN connection using UDP under IPv4.  UDP
+datagrams are formatted to contain IPMI request/response 
+messages with a IPMI session headers and RMCP headers.
+
+IPMI\-over\-LAN uses version 1 of the Remote Management Control
+Protocol (RMCP) to support pre\-OS and OS\-absent management.  
+RMCP is a request\-response protocol delivered using UDP 
+datagrams to port 623.
+
+The LAN interface is an authentication multi\-session connection;
+messages delivered to the BMC can (and should) be authenticated
+with a challenge/response protocol with either straight
+password/key or MD5 message\-digest algorithm.  ipmitool will
+attempt to connect with administrator privilege level as this
+is required to perform chassis power functions.
+
+You can tell ipmitool to use the lan interface with the
+\fB\-I\fR \fIlan\fP option:
+
+.PP 
+ipmitool \fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
+[\fB\-U\fR <\fIusername\fP>] [\fB\-P\fR <\fIpassword\fP>] <\fIcommand\fP>
+
+A hostname must be given on the command line in order to use the 
+lan interface with ipmitool.  The password field is optional;
+if you do not provide a password on the command line, ipmitool
+will attempt to connect without authentication.  If you specify a 
+password it will use MD5 authentication if supported by the BMC
+and straight password/key otherwise, unless overridden with a
+command line option.
+.SH "LANPLUS INTERFACE"
+Like the \fIlan\fP interface, the \fIlanplus\fP interface
+communicates with the BMC over an Ethernet LAN connection using 
+UDP under IPv4.  The difference is that the \fIlanplus\fP
+interface uses the RMCP+ protocol as described in the IPMI v2.0
+specification.  RMCP+ allows for improved authentication and data 
+integrity checks, as well as encryption and the ability to carry
+multiple types of payloads.  Generic Serial Over LAN support 
+requires RMCP+, so the ipmitool \fIsol activate\fP command
+requires the use of the \fIlanplus\fP interface.
+
+RMCP+ session establishment uses a symmetric challenge\-response
+protocol called RAKP (\fBRemote Authenticated Key\-Exchange Protocol\fR)
+which allows the negotiation of many options.  ipmitool does not
+yet allow the user to specify the value of every option, defaulting
+to the most obvious settings marked as required in the v2.0 
+specification.  Authentication and integrity HMACS are produced with
+SHA1, and encryption is performed with AES\-CBC\-128.  Role\-level logins
+are not yet supported.
+
+ipmitool must be linked with the \fIOpenSSL\fP library in order to
+perform the encryption functions and support the \fIlanplus\fP
+interface.  If the required packages are not found it will not be
+compiled in and supported.
+
+You can tell ipmitool to use the lanplus interface with the
+\fB\-I\fR \fIlanplus\fP option:
+
+.PP 
+ipmitool \fB\-I\fR \fIlanplus\fP 
+\fB\-H\fR <\fIhostname\fP>
+[\fB\-U\fR <\fIusername\fP>]
+[\fB\-P\fR <\fIpassword\fP>]
+<\fIcommand\fP>
+
+A hostname must be given on the command line in order to use the 
+lan interface with ipmitool.  With the exception of the \fB\-A\fR and
+\fB\-C\fR options the rest of the command line options are identical to
+those available for the \fIlan\fP interface.
+
+The \fB\-C\fR option allows you specify the authentication, integrity,
+and encryption algorithms to use for for \fIlanplus\fP session based
+on the cipher suite ID found in the IPMIv2.0 specification in table
+22\-19.  The default cipher suite is \fI3\fP which specifies
+RAKP\-HMAC\-SHA1 authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128
+encryption algorightms.
+
+.SH "FREE INTERFACE"
+.LP
+The ipmitool \fIfree\fP interface utilizes the FreeIPMI libfreeipmi
+drivers.  
+.LP
+You can tell ipmitool to use the FreeIPMI interface with the \-I option:
+.PP
+ipmitool \fB\-I\fR \fIfree\fP <\fIcommand\fP>
+
+
+.SH "IMB INTERFACE"
+.LP
+The ipmitool \fIimb\fP interface supports the Intel IMB (Intel
+Inter-module Bus) Interface through the /dev/imb device.  
+.LP
+You can tell ipmitool to use the IMB interface with the \-I option:
+.PP
+ipmitool \fB\-I\fR \fIimb\fP <\fIcommand\fP>
+
+.SH "EXAMPLES"
+.TP 
+\fIExample 1\fP: Listing remote sensors
+
+> ipmitool \-I lan \-H 1.2.3.4 \-f passfile sdr list
+.br 
+Baseboard 1.25V  | 1.24 Volts        | ok
+.br 
+Baseboard 2.5V   | 2.49 Volts        | ok
+.br 
+Baseboard 3.3V   | 3.32 Volts        | ok
+.TP 
+\fIExample 2\fP: Displaying status of a remote sensor
+
+> ipmitool \-I lan \-H 1.2.3.4 \-f passfile sensor get "Baseboard 1.25V"
+.br 
+Locating sensor record...
+.br 
+Sensor ID              : Baseboard 1.25V (0x10)
+.br 
+Sensor Type (Analog)   : Voltage
+.br 
+Sensor Reading         : 1.245 (+/\- 0.039) Volts
+.br 
+Status                 : ok
+.br 
+Lower Non\-Recoverable  : na
+.br 
+Lower Critical         : 1.078
+.br 
+Lower Non\-Critical     : 1.107
+.br 
+Upper Non\-Critical     : 1.382
+.br 
+Upper Critical         : 1.431
+.br 
+Upper Non\-Recoverable  : na 
+.TP 
+\fIExample 3\fP: Displaying the power status of a remote chassis
+
+> ipmitool \-I lan \-H 1.2.3.4 \-f passfile chassis power status
+.br 
+Chassis Power is on
+.TP 
+\fIExample 4\fP: Controlling the power on a remote chassis
+
+> ipmitool \-I lan \-H 1.2.3.4 \-f passfile chassis power on
+.br 
+Chassis Power Control: Up/On
+	
+.SH "AUTHOR"
+Duncan Laurie <duncan@iceblink.org>
+.SH "SEE ALSO"
+.TP 
+IPMItool Homepage
+http://ipmitool.sourceforge.net
+.TP 
+Intelligent Platform Management Interface Specification
+http://www.intel.com/design/servers/ipmi
+.TP 
+OpenIPMI Homepage
+http://openipmi.sourceforge.net
+.TP
+FreeIPMI Homepage
+http://www.gnu.org/software/freeipmi/
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..fbcb4f3
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,34 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = ipmitool
+
diff --git a/include/Makefile.in b/include/Makefile.in
new file mode 100644
index 0000000..023ae85
--- /dev/null
+++ b/include/Makefile.in
@@ -0,0 +1,666 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = include
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = ipmitool
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign include/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/include/ipmitool/Makefile.am b/include/ipmitool/Makefile.am
new file mode 100644
index 0000000..9093a56
--- /dev/null
+++ b/include/ipmitool/Makefile.am
@@ -0,0 +1,42 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_HEADERS = log.h bswap.h hpm2.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
+	ipmi_chassis.h ipmi_entity.h ipmi_fru.h ipmi_hpmfwupg.h ipmi_lanp.h \
+	ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_mc.h ipmi_raw.h \
+	ipmi_channel.h ipmi_sensor.h ipmi_event.h ipmi_session.h \
+	ipmi_strings.h ipmi_constants.h ipmi_user.h ipmi_pef.h \
+	ipmi_oem.h ipmi_sdradd.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \
+	ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h \
+	ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h \
+	ipmi_delloem.h ipmi_dcmi.h ipmi_vita.h ipmi_sel_supermicro.h \
+	ipmi_cfgp.h ipmi_lanp6.h
diff --git a/include/ipmitool/Makefile.in b/include/ipmitool/Makefile.in
new file mode 100644
index 0000000..96e0624
--- /dev/null
+++ b/include/ipmitool/Makefile.in
@@ -0,0 +1,564 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = include/ipmitool
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(noinst_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+noinst_HEADERS = log.h bswap.h hpm2.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \
+	ipmi_chassis.h ipmi_entity.h ipmi_fru.h ipmi_hpmfwupg.h ipmi_lanp.h \
+	ipmi_sdr.h ipmi_sel.h ipmi_sol.h ipmi_mc.h ipmi_raw.h \
+	ipmi_channel.h ipmi_sensor.h ipmi_event.h ipmi_session.h \
+	ipmi_strings.h ipmi_constants.h ipmi_user.h ipmi_pef.h \
+	ipmi_oem.h ipmi_sdradd.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \
+	ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h \
+	ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h \
+	ipmi_delloem.h ipmi_dcmi.h ipmi_vita.h ipmi_sel_supermicro.h \
+	ipmi_cfgp.h ipmi_lanp6.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/ipmitool/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign include/ipmitool/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/include/ipmitool/bswap.h b/include/ipmitool/bswap.h
new file mode 100644
index 0000000..9948208
--- /dev/null
+++ b/include/ipmitool/bswap.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_BSWAP_H
+#define IPMI_BSWAP_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#undef BSWAP_16
+#undef BSWAP_32
+
+#if HAVE_BYTESWAP_H
+# include <byteswap.h>
+# define BSWAP_16(x) bswap_16(x)
+# define BSWAP_32(x) bswap_32(x)
+#else
+# define BSWAP_16(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
+# define BSWAP_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |\
+                     (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#endif
+
+#endif /* IPMI_BSWAP_H */
diff --git a/include/ipmitool/helper.h b/include/ipmitool/helper.h
new file mode 100644
index 0000000..bfaf284
--- /dev/null
+++ b/include/ipmitool/helper.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_HELPER_H
+#define IPMI_HELPER_H
+
+#include <sys/types.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifndef TRUE
+#define TRUE    1
+#endif
+
+#ifndef FALSE
+#define FALSE   0
+#endif
+
+#ifndef tboolean
+#define tboolean   int
+#endif
+
+/* IPMI spec. - UID 0 reserved, 63 maximum UID which can be used */
+#ifndef IPMI_UID_MIN
+# define IPMI_UID_MIN 1
+#endif
+#ifndef IPMI_UID_MAX
+# define IPMI_UID_MAX 63
+#endif
+
+struct ipmi_intf;
+
+struct valstr {
+	uint16_t val;
+	const char * str;
+};
+struct oemvalstr {
+	uint32_t oem;
+   uint16_t val;
+	const char * str;
+};
+
+const char * val2str(uint16_t val, const struct valstr * vs);
+const char * oemval2str(uint32_t oem,uint16_t val, const struct oemvalstr * vs);
+
+int str2double(const char * str, double * double_ptr);
+int str2long(const char * str, int64_t * lng_ptr);
+int str2ulong(const char * str, uint64_t * ulng_ptr);
+int str2int(const char * str, int32_t * int_ptr);
+int str2uint(const char * str, uint32_t * uint_ptr);
+int str2short(const char * str, int16_t * shrt_ptr);
+int str2ushort(const char * str, uint16_t * ushrt_ptr);
+int str2char(const char * str, int8_t * chr_ptr);
+int str2uchar(const char * str, uint8_t * uchr_ptr);
+
+int eval_ccode(const int ccode);
+
+int is_fru_id(const char *argv_ptr, uint8_t *fru_id_ptr);
+int is_ipmi_channel_num(const char *argv_ptr, uint8_t *channel_ptr);
+int is_ipmi_user_id(const char *argv_ptr, uint8_t *ipmi_uid_ptr);
+int is_ipmi_user_priv_limit(const char *argv_ptr, uint8_t *ipmi_priv_limit_ptr);
+
+uint16_t str2val(const char * str, const struct valstr * vs);
+void print_valstr(const struct valstr * vs, const char * title, int loglevel);
+void print_valstr_2col(const struct valstr * vs, const char * title, int loglevel);
+
+
+uint16_t buf2short(uint8_t * buf);
+uint32_t buf2long(uint8_t * buf);
+#define BUF2STR_MAXIMUM_OUTPUT_SIZE	(3*1024 + 1)
+const char * buf2str_extended(const uint8_t *buf, int len, const char *sep);
+const char * buf2str(const uint8_t *buf, int len);
+int str2mac(const char *arg, uint8_t *buf);
+const char * mac2str(const uint8_t *buf);
+int ipmi_parse_hex(const char *str, uint8_t *out, int size);
+void printbuf(const uint8_t * buf, int len, const char * desc);
+uint8_t ipmi_csum(uint8_t * d, int s);
+FILE * ipmi_open_file(const char * file, int rw);
+void ipmi_start_daemon(struct ipmi_intf *intf);
+uint16_t ipmi_get_oem_id(struct ipmi_intf *intf);
+
+#define ipmi_open_file_read(file)	ipmi_open_file(file, 0)
+#define ipmi_open_file_write(file)	ipmi_open_file(file, 1)
+
+#ifndef __min
+# define __min(a, b)  ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef __max
+# define __max(a, b)  ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef __minlen
+# define __minlen(a, b) ({ int x=strlen(a); int y=strlen(b); (x < y) ? x : y;})
+#endif
+
+#ifndef __maxlen
+# define __maxlen(a, b) ({ int x=strlen(a); int y=strlen(b); (x > y) ? x : y;})
+#endif
+
+#endif /* IPMI_HELPER_H */
diff --git a/include/ipmitool/hpm2.h b/include/ipmitool/hpm2.h
new file mode 100644
index 0000000..09b6237
--- /dev/null
+++ b/include/ipmitool/hpm2.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2012 Pigeon Point Systems.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pigeon Point Systems nor the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdint.h>
+#include <ipmitool/ipmi_intf.h>
+
+/* Global HPM.2 defines */
+#define HPM2_REVISION		0x01
+#define HPM3_REVISION		0x01
+#define HPM2_LAN_PARAMS_REV	0x01
+#define HPM2_SOL_PARAMS_REV	0x01
+#define HPM3_LAN_PARAMS_REV	0x01
+/* IPMI defines parameter revision as
+ * MSN = present revision,
+ * LSN = oldest revision parameter is
+ * backward compatible with. */
+#define LAN_PARAM_REV(x, y)	(((x) << 4) | ((y) & 0xF))
+
+/* HPM.2 capabilities */
+#define HPM2_CAPS_SOL_EXTENSION		0x01
+#define HPM2_CAPS_PACKET_TRACE		0x02
+#define HPM2_CAPS_EXT_MANAGEMENT	0x04
+#define HPM2_CAPS_VERSION_SENSOR	0x08
+#define HPM2_CAPS_DYNAMIC_SESSIONS	0x10
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(push, 1)
+#endif
+
+/* HPM.2 LAN attach capabilities */
+struct hpm2_lan_attach_capabilities {
+	uint8_t hpm2_revision_id;
+	uint16_t lan_channel_mask;
+	uint8_t hpm2_caps;
+	uint8_t hpm2_lan_params_start;
+	uint8_t hpm2_lan_params_rev;
+	uint8_t hpm2_sol_params_start;
+	uint8_t hpm2_sol_params_rev;
+} ATTRIBUTE_PACKING;
+
+/* HPM.2 LAN channel capabilities */
+struct hpm2_lan_channel_capabilities {
+	uint8_t capabilities;
+	uint8_t attach_type;
+	uint8_t bandwidth_class;
+	uint16_t max_inbound_pld_size;
+	uint16_t max_outbound_pld_size;
+} ATTRIBUTE_PACKING;
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(pop)
+#endif
+
+/* HPM.2 command assignments */
+#define HPM2_GET_LAN_ATTACH_CAPABILITIES	0x3E
+
+extern int hpm2_get_capabilities(struct ipmi_intf * intf,
+		struct hpm2_lan_attach_capabilities * caps);
+extern int hpm2_get_lan_channel_capabilities(struct ipmi_intf * intf,
+		uint8_t hpm2_lan_params_start,
+		struct hpm2_lan_channel_capabilities * caps);
+extern int hpm2_detect_max_payload_size(struct ipmi_intf * intf);
diff --git a/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
new file mode 100644
index 0000000..6e42d06
--- /dev/null
+++ b/include/ipmitool/ipmi.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_H
+#define IPMI_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_cc.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define IPMI_BUF_SIZE 1024
+#define IPMI_MAX_MD_SIZE 0x20
+
+#if HAVE_PRAGMA_PACK
+#define ATTRIBUTE_PACKING
+#else
+#define ATTRIBUTE_PACKING __attribute__ ((packed))
+#endif
+
+
+/* From table 13.16 of the IPMI v2 specification */
+#define IPMI_PAYLOAD_TYPE_IPMI               0x00
+#define IPMI_PAYLOAD_TYPE_SOL                0x01
+#define IPMI_PAYLOAD_TYPE_OEM                0x02
+#define IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST  0x10
+#define IPMI_PAYLOAD_TYPE_RMCP_OPEN_RESPONSE 0x11
+#define IPMI_PAYLOAD_TYPE_RAKP_1             0x12
+#define IPMI_PAYLOAD_TYPE_RAKP_2             0x13
+#define IPMI_PAYLOAD_TYPE_RAKP_3             0x14
+#define IPMI_PAYLOAD_TYPE_RAKP_4             0x15
+
+extern int verbose;
+extern int csv_output;
+
+struct ipmi_rq {
+	struct {
+		uint8_t netfn:6;
+		uint8_t lun:2;
+		uint8_t cmd;
+		uint8_t target_cmd;
+		uint16_t data_len;
+		uint8_t *data;
+	} msg;
+};
+
+/*
+ * This is what the sendrcv_v2() function would take as an argument. The common case
+ * is for payload_type to be IPMI_PAYLOAD_TYPE_IPMI.
+ */
+struct ipmi_v2_payload {
+	uint16_t payload_length;
+	uint8_t payload_type;
+
+	union {
+
+		struct {
+			uint8_t rq_seq;
+			struct ipmi_rq *request;
+		} ipmi_request;
+
+		struct {
+			uint8_t rs_seq;
+			struct ipmi_rs *response;
+		} ipmi_response;
+
+		/* Only used internally by the lanplus interface */
+		struct {
+			uint8_t *request;
+		} open_session_request;
+
+		/* Only used internally by the lanplus interface */
+		struct {
+			uint8_t *message;
+		} rakp_1_message;
+
+		/* Only used internally by the lanplus interface */
+		struct {
+			uint8_t *message;
+		} rakp_2_message;
+
+		/* Only used internally by the lanplus interface */
+		struct {
+			uint8_t *message;
+		} rakp_3_message;
+
+		/* Only used internally by the lanplus interface */
+		struct {
+			uint8_t *message;
+		} rakp_4_message;
+
+		struct {
+			uint8_t data[IPMI_BUF_SIZE];
+			uint16_t character_count;
+			uint8_t packet_sequence_number;
+			uint8_t acked_packet_number;
+			uint8_t accepted_character_count;
+			uint8_t is_nack;	/* bool */
+			uint8_t assert_ring_wor;	/* bool */
+			uint8_t generate_break;	/* bool */
+			uint8_t deassert_cts;	/* bool */
+			uint8_t deassert_dcd_dsr;	/* bool */
+			uint8_t flush_inbound;	/* bool */
+			uint8_t flush_outbound;	/* bool */
+		} sol_packet;
+
+	} payload;
+};
+
+struct ipmi_rq_entry {
+	struct ipmi_rq req;
+	struct ipmi_intf *intf;
+	uint8_t rq_seq;
+	uint8_t *msg_data;
+	int msg_len;
+	int bridging_level;
+	struct ipmi_rq_entry *next;
+};
+
+struct ipmi_rs {
+	uint8_t ccode;
+	uint8_t data[IPMI_BUF_SIZE];
+
+	/*
+	 * Looks like this is the length of the entire packet, including the RMCP
+	 * stuff, then modified to be the length of the extra IPMI message data
+	 */
+	int data_len;
+
+	struct {
+		uint8_t netfn;
+		uint8_t cmd;
+		uint8_t seq;
+		uint8_t lun;
+	} msg;
+
+	struct {
+		uint8_t authtype;
+		uint32_t seq;
+		uint32_t id;
+		uint8_t bEncrypted;	/* IPMI v2 only */
+		uint8_t bAuthenticated;	/* IPMI v2 only */
+		uint8_t payloadtype;	/* IPMI v2 only */
+		/* This is the total length of the payload or
+		   IPMI message.  IPMI v2.0 requires this to
+		   be 2 bytes.  Not really used for much. */
+		uint16_t msglen;
+	} session;
+
+	/*
+	 * A union of the different possible payload meta-data
+	 */
+	union {
+		struct {
+			uint8_t rq_addr;
+			uint8_t netfn;
+			uint8_t rq_lun;
+			uint8_t rs_addr;
+			uint8_t rq_seq;
+			uint8_t rs_lun;
+			uint8_t cmd;
+		} ipmi_response;
+		struct {
+			uint8_t message_tag;
+			uint8_t rakp_return_code;
+			uint8_t max_priv_level;
+			uint32_t console_id;
+			uint32_t bmc_id;
+			uint8_t auth_alg;
+			uint8_t integrity_alg;
+			uint8_t crypt_alg;
+		} open_session_response;
+		struct {
+			uint8_t message_tag;
+			uint8_t rakp_return_code;
+			uint32_t console_id;
+			uint8_t bmc_rand[16];	/* Random number generated by the BMC */
+			uint8_t bmc_guid[16];
+			uint8_t key_exchange_auth_code[IPMI_MAX_MD_SIZE];
+		} rakp2_message;
+		struct {
+			uint8_t message_tag;
+			uint8_t rakp_return_code;
+			uint32_t console_id;
+			uint8_t integrity_check_value[IPMI_MAX_MD_SIZE];
+		} rakp4_message;
+		struct {
+			uint8_t packet_sequence_number;
+			uint8_t acked_packet_number;
+			uint8_t accepted_character_count;
+			uint8_t is_nack;	/* bool */
+			uint8_t transfer_unavailable;	/* bool */
+			uint8_t sol_inactive;	/* bool */
+			uint8_t transmit_overrun;	/* bool */
+			uint8_t break_detected;	/* bool */
+		} sol_packet;
+
+	} payload;
+};
+
+#define IPMI_NETFN_CHASSIS		0x0
+#define IPMI_NETFN_BRIDGE		0x2
+#define IPMI_NETFN_SE			0x4
+#define IPMI_NETFN_APP			0x6
+#define IPMI_NETFN_FIRMWARE		0x8
+#define IPMI_NETFN_STORAGE		0xa
+#define IPMI_NETFN_TRANSPORT	0xc
+#define IPMI_NETFN_PICMG		0x2C
+#define IPMI_NETFN_DCGRP		0x2C
+#define IPMI_NETFN_OEM		0x2E
+#define IPMI_NETFN_ISOL			0x34
+#define IPMI_NETFN_TSOL			0x30
+
+#define IPMI_BMC_SLAVE_ADDR		0x20
+#define IPMI_REMOTE_SWID		0x81
+
+
+/* These values are IANA numbers */
+/************************************************************************
+* Add ID String for IANA Enterprise Number of IBM & ADLINK
+* https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
+************************************************************************/
+
+typedef enum IPMI_OEM {
+     IPMI_OEM_UNKNOWN    = 0,
+     /* 2 for [IBM] */
+     IPMI_OEM_IBM_2      = 2,
+     IPMI_OEM_HP         = 11,
+     IPMI_OEM_SUN        = 42,
+     IPMI_OEM_NOKIA      = 94,
+     IPMI_OEM_BULL       = 107,
+     IPMI_OEM_HITACHI_116 = 116,
+     IPMI_OEM_NEC        = 119,
+     IPMI_OEM_TOSHIBA    = 186,
+     IPMI_OEM_ERICSSON   = 193,
+     IPMI_OEM_INTEL      = 343,
+     IPMI_OEM_TATUNG     = 373,
+     IPMI_OEM_HITACHI_399 = 399,
+     IPMI_OEM_DELL       = 674,
+     IPMI_OEM_LMC        = 2168,
+     IPMI_OEM_RADISYS    = 4337,
+     IPMI_OEM_BROADCOM   = 4413,
+     /* 4769 for [IBM Corporation] */
+     IPMI_OEM_IBM_4769   = 4769,
+     IPMI_OEM_MAGNUM     = 5593,
+     IPMI_OEM_TYAN       = 6653,
+     IPMI_OEM_QUANTA     = 7244,
+     IPMI_OEM_NEWISYS    = 9237,
+     IPMI_OEM_ADVANTECH  = 10297,
+     IPMI_OEM_FUJITSU_SIEMENS = 10368,
+     IPMI_OEM_AVOCENT    = 10418,
+     IPMI_OEM_PEPPERCON  = 10437,
+     IPMI_OEM_SUPERMICRO = 10876,
+     IPMI_OEM_OSA        = 11102,
+     IPMI_OEM_GOOGLE     = 11129,
+     IPMI_OEM_PICMG      = 12634,
+     IPMI_OEM_RARITAN    = 13742,
+     IPMI_OEM_KONTRON    = 15000,
+     IPMI_OEM_PPS        = 16394,
+     /* 20301 for [IBM eServer X] */
+     IPMI_OEM_IBM_20301  = 20301,
+     IPMI_OEM_AMI        = 20974,
+     /* 24339 for [ADLINK TECHNOLOGY INC.] */
+     IPMI_OEM_ADLINK_24339 = 24339,
+     IPMI_OEM_NOKIA_SOLUTIONS_AND_NETWORKS = 28458,
+     IPMI_OEM_VITA       = 33196,
+     IPMI_OEM_SUPERMICRO_47488 = 47488
+} IPMI_OEM;
+
+extern const struct valstr completion_code_vals[];
+
+#endif				/* IPMI_H */
diff --git a/include/ipmitool/ipmi_cc.h b/include/ipmitool/ipmi_cc.h
new file mode 100644
index 0000000..237b1ee
--- /dev/null
+++ b/include/ipmitool/ipmi_cc.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_CC_H
+#define IPMI_CC_H
+
+/*
+   Thu Jan 11 09:32:41 2007
+   francois.isabelle@ca.kontron.com
+
+   I just noticed that most modules refer to IPMI completion codes using
+   hard coded values ... 
+*/
+
+/*
+ * CC
+ * See IPMI specification table 5-2 Generic Completion Codes
+ */
+
+#define IPMI_CC_OK                                 0x00 
+#define IPMI_CC_NODE_BUSY                          0xc0 
+#define IPMI_CC_INV_CMD                            0xc1 
+#define IPMI_CC_INV_CMD_FOR_LUN                    0xc2 
+#define IPMI_CC_TIMEOUT                            0xc3 
+#define IPMI_CC_OUT_OF_SPACE                       0xc4 
+#define IPMI_CC_RES_CANCELED                       0xc5 
+#define IPMI_CC_REQ_DATA_TRUNC                     0xc6 
+#define IPMI_CC_REQ_DATA_INV_LENGTH                0xc7 
+#define IPMI_CC_REQ_DATA_FIELD_EXCEED              0xc8 
+#define IPMI_CC_PARAM_OUT_OF_RANGE                 0xc9 
+#define IPMI_CC_CANT_RET_NUM_REQ_BYTES             0xca 
+#define IPMI_CC_REQ_DATA_NOT_PRESENT               0xcb 
+#define IPMI_CC_INV_DATA_FIELD_IN_REQ              0xcc 
+#define IPMI_CC_ILL_SENSOR_OR_RECORD               0xcd 
+#define IPMI_CC_RESP_COULD_NOT_BE_PRV              0xce 
+#define IPMI_CC_CANT_RESP_DUPLI_REQ                0xcf 
+#define IPMI_CC_CANT_RESP_SDRR_UPDATE              0xd0 
+#define IPMI_CC_CANT_RESP_FIRM_UPDATE              0xd1 
+#define IPMI_CC_CANT_RESP_BMC_INIT                 0xd2 
+#define IPMI_CC_DESTINATION_UNAVAILABLE            0xd3 
+#define IPMI_CC_INSUFFICIENT_PRIVILEGES            0xd4 
+#define IPMI_CC_NOT_SUPPORTED_PRESENT_STATE        0xd5 
+#define IPMI_CC_ILLEGAL_COMMAND_DISABLED           0xd6 
+#define IPMI_CC_UNSPECIFIED_ERROR                  0xff 
+
+
+#endif /*IPMI_CC_H*/
diff --git a/include/ipmitool/ipmi_cfgp.h b/include/ipmitool/ipmi_cfgp.h
new file mode 100644
index 0000000..ab8acb3
--- /dev/null
+++ b/include/ipmitool/ipmi_cfgp.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2016 Pentair Technical Products. All right reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pentair Technical Products or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * PENTAIR TECHNICAL SOLUTIONS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef IPMI_CFGP_H
+#define IPMI_CFGP_H
+
+#include <stdio.h>
+
+/* Forward declarations. */
+struct ipmi_cfgp;
+struct ipmi_cfgp_ctx;
+
+/*
+ * Action types.
+ */
+enum {
+	/* parse dumped parameter data */
+	CFGP_PARSE,
+	/* get parameter from BMC */
+	CFGP_GET,
+	/* set parameter to BMC */
+	CFGP_SET,
+	/* output parameter data in form that can be parsed back */
+	CFGP_SAVE,
+	/* print parameter in user-friendly format */
+	CFGP_PRINT
+};
+
+/*
+ * Action-specific information.
+ */
+struct ipmi_cfgp_action {
+	/* Action type. */
+	int type;
+
+	/* Set selector. */
+	int set;
+
+	/* Block selector. */
+	int block;
+
+	/* No error output needed. */
+	int quiet;
+
+	/* Number of command line arguments (only for parse action). */
+	int argc;
+
+	/* Command line arguments (only for parse action). */
+	const char **argv;
+
+	/* Output file (only for dump/print actions). */
+	FILE *file;
+};
+
+/*
+ * Access types.
+ */
+enum {
+	CFGP_RDWR,
+	CFGP_RDONLY,
+	CFGP_WRONLY,
+	CFGP_RESERVED
+};
+
+/*
+ * Configuration parameter descriptor.
+ */
+struct ipmi_cfgp {
+	/* Parameter name. */
+	const char *name;
+
+	/* Parameter format description. */
+	const char *format;
+
+	/* Various parameter traits. */
+	unsigned int size;		/* block size */
+	unsigned int access:2;		/* read-write/read-only/write-only */
+	unsigned int is_set:1;		/* takes non-zero set selectors */
+	unsigned int first_set:1;	/* 1 = 1-based set selector */
+	unsigned int has_blocks:1;	/* takes non-zero block selectors */
+	unsigned int first_block:1;	/* 1 = 1-based block selector */
+
+	/* Parameter-specific data. */
+	int specific;
+};
+
+/* Parameter callback. */
+typedef int (*ipmi_cfgp_handler_t)(void *priv,
+	const struct ipmi_cfgp *p, const struct ipmi_cfgp_action *action,
+	unsigned char *data);
+
+/*
+ * Parameter selector.
+ */
+struct ipmi_cfgp_sel {
+	int param;
+	int set;
+	int block;
+};
+
+/*
+ * Configuration parameter data.
+ */
+struct ipmi_cfgp_data {
+	struct ipmi_cfgp_data *next;
+	struct ipmi_cfgp_sel sel;
+	unsigned char data[];
+};
+
+/*
+ * Configuration parameter operation context.
+ */
+struct ipmi_cfgp_ctx {
+	/* Set of parameters. */
+	const struct ipmi_cfgp *set;
+
+	/* Descriptor count. */
+	int count;
+
+	/* Parameter action handler. */
+	ipmi_cfgp_handler_t handler;
+
+	/* ipmitool cmd name */
+	const char *cmdname;
+
+	/* List of parameter values. */
+	struct ipmi_cfgp_data *v;
+
+	/* Private data. */
+	void *priv;
+};
+
+/* Initialize configuration context. */
+extern int ipmi_cfgp_init(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp *set, unsigned int count,
+		const char *cmdname,
+		ipmi_cfgp_handler_t handler, void *priv);
+
+/* Uninitialize context, free allocated memory. */
+extern int ipmi_cfgp_uninit(struct ipmi_cfgp_ctx *ctx);
+
+/* Print parameter usage. */
+void ipmi_cfgp_usage(const struct ipmi_cfgp *set, int count, int write);
+
+/* Parse parameter selector from command line. */
+extern int ipmi_cfgp_parse_sel(struct ipmi_cfgp_ctx *ctx,
+		int argc, const char **argv, struct ipmi_cfgp_sel *sel);
+
+/* Parse parameter data from command line. */
+extern int ipmi_cfgp_parse_data(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, int argc, const char **argv);
+
+/* Get parameter data from BMC. */
+extern int ipmi_cfgp_get(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel);
+
+/* Set parameter data to BMC. */
+extern int ipmi_cfgp_set(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel);
+
+/* Write parameter data to file. */
+extern int ipmi_cfgp_save(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, FILE *file);
+
+/* Print parameter data in user-friendly format. */
+extern int ipmi_cfgp_print(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, FILE *file);
+
+#endif /* IPMI_CFGP_H */
diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
new file mode 100644
index 0000000..b138c26
--- /dev/null
+++ b/include/ipmitool/ipmi_channel.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_CHANNEL_H
+#define IPMI_CHANNEL_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/ipmi.h>
+
+
+#define IPMI_GET_CHANNEL_AUTH_CAP      0x38
+#define IPMI_SET_CHANNEL_ACCESS        0x40
+#define IPMI_GET_CHANNEL_ACCESS        0x41
+#define IPMI_GET_CHANNEL_INFO          0x42
+#define IPMI_SET_USER_ACCESS           0x43
+#define IPMI_GET_USER_ACCESS           0x44
+#define IPMI_SET_USER_NAME             0x45
+#define IPMI_GET_USER_NAME             0x46
+#define IPMI_SET_USER_PASSWORD         0x47
+#define IPMI_GET_CHANNEL_CIPHER_SUITES 0x54
+
+/* These are for channel_info_t.session_support */
+#define IPMI_CHANNEL_SESSION_LESS 0x00
+#define IPMI_CHANNEL_SESSION_SINGLE 0x40
+#define IPMI_CHANNEL_SESSION_MULTI 0x80
+#define IPMI_CHANNEL_SESSION_BASED 0xC0
+
+/* (22.24) Get Channel Info */
+struct channel_info_t {
+	uint8_t channel;
+	uint8_t medium;
+	uint8_t protocol;
+	uint8_t session_support;
+	uint8_t active_sessions;
+	uint8_t vendor_id[3];
+	uint8_t aux_info[2];
+};
+
+/* (22.23) Get Channel Access */
+struct channel_access_t {
+	uint8_t access_mode;
+	uint8_t alerting;
+	uint8_t channel;
+	uint8_t per_message_auth;
+	uint8_t privilege_limit;
+	uint8_t user_level_auth;
+};
+
+/*
+ * The Get Authentication Capabilities response structure
+ * From table 22-15 of the IPMI v2.0 spec
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct get_channel_auth_cap_rsp {
+	uint8_t channel_number;
+#if WORDS_BIGENDIAN
+	uint8_t v20_data_available : 1; /* IPMI v2.0 data is available */
+	uint8_t __reserved1        : 1; 
+	uint8_t enabled_auth_types : 6; /* IPMI v1.5 enabled auth types */
+#else
+	uint8_t enabled_auth_types : 6; /* IPMI v1.5 enabled auth types */
+	uint8_t __reserved1        : 1;
+	uint8_t v20_data_available : 1; /* IPMI v2.0 data is available */
+#endif
+#if WORDS_BIGENDIAN
+	uint8_t __reserved2        : 2;
+	uint8_t kg_status          : 1; /* two-key login status */
+	uint8_t per_message_auth   : 1; /* per-message authentication status */
+	uint8_t user_level_auth    : 1; /* user-level authentication status */
+	uint8_t non_null_usernames : 1; /* one or more non-null users exist */
+	uint8_t null_usernames     : 1; /* one or more null usernames non-null pwds */
+	uint8_t anon_login_enabled : 1; /* a null-named, null-pwd user exists */
+#else
+	uint8_t anon_login_enabled : 1; /* a null-named, null-pwd user exists */
+	uint8_t null_usernames     : 1; /* one or more null usernames non-null pwds */
+	uint8_t non_null_usernames : 1; /* one or more non-null users exist */
+	uint8_t user_level_auth    : 1; /* user-level authentication status */
+	uint8_t per_message_auth   : 1; /* per-message authentication status */
+	uint8_t kg_status          : 1; /* two-key login status */
+	uint8_t __reserved2        : 2;
+#endif
+#if WORDS_BIGENDIAN
+	uint8_t __reserved3        : 6;
+	uint8_t ipmiv20_support    : 1; /* channel supports IPMI v2.0 connections */
+	uint8_t ipmiv15_support    : 1; /* channel supports IPMI v1.5 connections */
+#else
+	uint8_t ipmiv15_support    : 1; /* channel supports IPMI v1.5 connections */
+	uint8_t ipmiv20_support    : 1; /* channel supports IPMI v2.0 connections */
+	uint8_t __reserved3        : 6;
+#endif
+	uint8_t oem_id[3];    /* IANA enterprise number for auth type */
+	uint8_t oem_aux_data; /* Additional OEM specific data for oem auths */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int _ipmi_get_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t *channel_access,
+		uint8_t get_volatile_settings);
+int _ipmi_get_channel_info(struct ipmi_intf *intf,
+        struct channel_info_t *channel_info);
+int _ipmi_set_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t channel_access, uint8_t access_option,
+		uint8_t privilege_option);
+
+uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel);
+uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf);
+int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);
+int ipmi_get_channel_auth_cap(struct ipmi_intf * intf, uint8_t channel, uint8_t priv);
+int ipmi_get_channel_info(struct ipmi_intf * intf, uint8_t channel);
+
+#endif /*IPMI_CHANNEL_H*/
diff --git a/include/ipmitool/ipmi_chassis.h b/include/ipmitool/ipmi_chassis.h
new file mode 100644
index 0000000..3f56924
--- /dev/null
+++ b/include/ipmitool/ipmi_chassis.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_CHASSIS_H
+#define IPMI_CHASSIS_H
+
+#include <ipmitool/ipmi.h>
+
+#define IPMI_CHASSIS_CTL_POWER_DOWN	0x0
+#define IPMI_CHASSIS_CTL_POWER_UP	0x1
+#define IPMI_CHASSIS_CTL_POWER_CYCLE	0x2
+#define IPMI_CHASSIS_CTL_HARD_RESET	0x3
+#define IPMI_CHASSIS_CTL_PULSE_DIAG	0x4
+#define IPMI_CHASSIS_CTL_ACPI_SOFT	0x5
+
+#define IPMI_CHASSIS_POLICY_NO_CHANGE	0x3
+#define IPMI_CHASSIS_POLICY_ALWAYS_ON	0x2
+#define IPMI_CHASSIS_POLICY_PREVIOUS	0x1
+#define IPMI_CHASSIS_POLICY_ALWAYS_OFF	0x0
+
+int ipmi_chassis_power_status(struct ipmi_intf * intf);
+int ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl);
+int ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv);
+int ipmi_power_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /*IPMI_CHASSIS_H*/
diff --git a/include/ipmitool/ipmi_constants.h b/include/ipmitool/ipmi_constants.h
new file mode 100644
index 0000000..8f2bc87
--- /dev/null
+++ b/include/ipmitool/ipmi_constants.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_CONSTANTS_H
+#define IPMI_CONSTANTS_H
+
+
+/*
+ * COMMANDS
+ */
+#define IPMI_GET_SDR_REPOSITORY_INFO            0x20
+#define IPMI_SOL_ACTIVATING                     0x20
+#define IPMI_SET_SOL_CONFIG_PARAMETERS          0x21
+#define IPMI_GET_SOL_CONFIG_PARAMETERS          0x22
+#define IPMI_SET_USER_ACCESS                    0x43
+#define IPMI_GET_USER_ACCESS                    0x44
+#define IPMI_SET_USER_NAME                      0x45
+#define IPMI_GET_USER_NAME                      0x46
+#define IPMI_SET_USER_PASSWORD                  0x47
+#define IPMI_ACTIVATE_PAYLOAD                   0x48
+#define IPMI_DEACTIVATE_PAYLOAD                 0x49
+#define IPMI_SUSPEND_RESUME_PAYLOAD_ENCRYPTYION 0x55
+#define IPMI_GET_SEL_TIME                       0x48
+#define IPMI_SET_SEL_TIME                       0x49
+#define IPMI_SET_USER_PAYLOAD_ACCESS		0x4c
+#define IPMI_GET_USER_PAYLOAD_ACCESS		0x4d
+
+#define IPMI_1_5_AUTH_TYPE_BIT_NONE     0x01
+#define IPMI_1_5_AUTH_TYPE_BIT_MD2      0x02
+#define IPMI_1_5_AUTH_TYPE_BIT_MD5      0x04
+#define IPMI_1_5_AUTH_TYPE_BIT_PASSWORD 0x10
+#define IPMI_1_5_AUTH_TYPE_BIT_OEM      0x20
+
+#define IPMI_SESSION_AUTHTYPE_NONE      0x0
+#define IPMI_SESSION_AUTHTYPE_MD2       0x1
+#define IPMI_SESSION_AUTHTYPE_MD5   	0x2
+#define IPMI_SESSION_AUTHTYPE_KEY	0x4
+#define IPMI_SESSION_AUTHTYPE_PASSWORD	IPMI_SESSION_AUTHTYPE_KEY
+#define IPMI_SESSION_AUTHTYPE_OEM       0x5
+#define IPMI_SESSION_AUTHTYPE_RMCP_PLUS 0x6
+
+#define IPMI_SESSION_PRIV_UNSPECIFIED   0x0
+#define IPMI_SESSION_PRIV_CALLBACK	0x1
+#define IPMI_SESSION_PRIV_USER		0x2
+#define IPMI_SESSION_PRIV_OPERATOR	0x3
+#define IPMI_SESSION_PRIV_ADMIN		0x4
+#define IPMI_SESSION_PRIV_OEM		0x5
+
+#define IPMI_SET_IN_PROGRESS_SET_COMPLETE 0x00
+#define IPMI_SET_IN_PROGRESS_IN_PROGRESS  0x01
+#define IPMI_SET_IN_PROGRESS_COMMIT_WRITE 0x02
+
+#define IPMI_CHANNEL_MEDIUM_RESERVED	0x0
+#define IPMI_CHANNEL_MEDIUM_IPMB_I2C	0x1
+#define IPMI_CHANNEL_MEDIUM_ICMB_1	0x2
+#define IPMI_CHANNEL_MEDIUM_ICMB_09	0x3
+#define IPMI_CHANNEL_MEDIUM_LAN		0x4
+#define IPMI_CHANNEL_MEDIUM_SERIAL	0x5
+#define IPMI_CHANNEL_MEDIUM_LAN_OTHER	0x6
+#define IPMI_CHANNEL_MEDIUM_SMBUS_PCI	0x7
+#define IPMI_CHANNEL_MEDIUM_SMBUS_1	0x8
+#define IPMI_CHANNEL_MEDIUM_SMBUS_2	0x9
+#define IPMI_CHANNEL_MEDIUM_USB_1	0xa
+#define IPMI_CHANNEL_MEDIUM_USB_2	0xb
+#define IPMI_CHANNEL_MEDIUM_SYSTEM	0xc
+
+#define IPMI_CHASSIS_CTL_POWER_DOWN	0x0
+#define IPMI_CHASSIS_CTL_POWER_UP	0x1
+#define IPMI_CHASSIS_CTL_POWER_CYCLE	0x2
+#define IPMI_CHASSIS_CTL_HARD_RESET	0x3
+#define IPMI_CHASSIS_CTL_PULSE_DIAG	0x4
+#define IPMI_CHASSIS_CTL_ACPI_SOFT	0x5
+
+#define IPMI_CHASSIS_POLICY_NO_CHANGE	0x3
+#define IPMI_CHASSIS_POLICY_ALWAYS_ON	0x2
+#define IPMI_CHASSIS_POLICY_PREVIOUS	0x1
+#define IPMI_CHASSIS_POLICY_ALWAYS_OFF	0x0
+
+#define IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS	0
+#define IPMI_CHASSIS_BOOTPARAM_SVCPART_SELECT	1
+#define IPMI_CHASSIS_BOOTPARAM_SVCPART_SCAN	2
+#define IPMI_CHASSIS_BOOTPARAM_FLAG_VALID	3
+#define IPMI_CHASSIS_BOOTPARAM_INFO_ACK		4
+#define IPMI_CHASSIS_BOOTPARAM_BOOT_FLAGS	5
+#define IPMI_CHASSIS_BOOTPARAM_INIT_INFO	6
+#define IPMI_CHASSIS_BOOTPARAM_INIT_MBOX	7
+
+/* From table 13-17 of the IPMI v2 specification */
+#define IPMI_AUTH_RAKP_NONE         0x00
+#define IPMI_AUTH_RAKP_HMAC_SHA1    0x01
+#define IPMI_AUTH_RAKP_HMAC_MD5     0x02
+#define IPMI_AUTH_RAKP_HMAC_SHA256  0x03
+
+/* From table 13-18 of the IPMI v2 specification */
+#define IPMI_INTEGRITY_NONE         0x00
+#define IPMI_INTEGRITY_HMAC_SHA1_96 0x01
+#define IPMI_INTEGRITY_HMAC_MD5_128 0x02
+#define IPMI_INTEGRITY_MD5_128      0x03
+#define IPMI_INTEGRITY_HMAC_SHA256_128 0x04
+
+/* From table 13-19 of the IPMI v2 specfication */
+#define IPMI_CRYPT_NONE             0x00
+#define IPMI_CRYPT_AES_CBC_128      0x01
+#define IPMI_CRYPT_XRC4_128         0x02
+#define IPMI_CRYPT_XRC4_40          0x03
+
+#endif /*IPMI_CONSTANTS_H*/
diff --git a/include/ipmitool/ipmi_dcmi.h b/include/ipmitool/ipmi_dcmi.h
new file mode 100644
index 0000000..15a959f
--- /dev/null
+++ b/include/ipmitool/ipmi_dcmi.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2008 Intel Corporation.
+ * All rights reserved
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+ *
+ */
+
+
+#ifndef IPMI_DCMI_H
+#define IPMI_DCMI_H
+
+#include <ipmitool/ipmi.h>
+
+/* DCMI commands per DCMI 1.5 SPEC */
+
+#define IPMI_DCMI                   0xDC  /* Group Extension Identification */
+#define IPMI_DCMI_COMPAT            0x01
+#define IPMI_DCMI_GETRED            0x02
+#define IPMI_DCMI_GETLMT            0x03
+#define IPMI_DCMI_SETLMT            0x04
+#define IPMI_DCMI_PWRACT            0x05
+#define IPMI_DCMI_GETASSET          0x06
+#define IPMI_DCMI_SETASSET          0x08
+#define IPMI_DCMI_GETMNGCTRLIDS     0x09
+#define IPMI_DCMI_SETMNGCTRLIDS     0x0A
+#define IPMI_DCMI_SETTERMALLIMIT    0x0B
+#define IPMI_DCMI_GETTERMALLIMIT    0x0C
+#define IPMI_DCMI_GETSNSR           0x07
+#define IPMI_DCMI_PWRMGT            0x08
+#define IPMI_DCMI_GETTEMPRED        0x10
+#define IPMI_DCMI_SETCONFPARAM      0x12
+#define IPMI_DCMI_GETCONFPARAM      0x13
+
+#define IPMI_DCMI_CONFORM           0x0001
+#define IPMI_DCMI_1_1_CONFORM       0x0101
+#define IPMI_DCMI_1_5_CONFORM       0x0501
+
+#define DCMI_MAX_BYTE_SIZE              0x10
+#define DCMI_MAX_BYTE_TEMP_READ_SIZE    0x08
+
+#define GOOD_PWR_GLIMIT_CCODE(ccode) ((ccode = ((ccode == 0x80) ? 0 : ccode)))
+#define GOOD_ASSET_TAG_CCODE(ccode) ((ccode = (((ccode == 0x80) || (ccode == 0x81) || (ccode == 0x82) || (ccode == 0x83)) ? 0 : ccode)))
+
+/* External Node Manager Configuration and Control Commands per spec 2.0 */
+
+#define IPMI_NM_POLICY_CTL     0xC0
+#define IPMI_NM_SET_POLICY     0xC1
+#define IPMI_NM_GET_POLICY     0xC2
+#define IPMI_NM_SET_ALERT_TH   0xC3
+#define IPMI_NM_GET_ALERT_TH   0xC4
+#define IPMI_NM_SET_SUSPEND    0xC5
+#define IPMI_NM_GET_SUSPEND    0xC6
+#define IPMI_NM_RESET_STATS    0xC7
+#define IPMI_NM_GET_STATS      0xC8
+#define IPMI_NM_GET_CAP        0xC9
+#define IPMI_NM_GET_VERSION    0xCA
+#define IPMI_NM_SET_POWER      0xCB
+#define IPMI_NM_SET_ALERT_DS   0xCE
+#define IPMI_NM_GET_ALERT_DS   0xCF
+#define IPMI_NM_LIMITING       0xF2
+
+/* Node Manager Policy Control Flags */
+#define IPMI_NM_GLOBAL_ENABLE  0x01
+#define IPMI_NM_DOMAIN_ENABLE  0x02
+#define IPMI_NM_PER_POLICY_ENABLE  0x04
+
+/* Node Manager Set Policy Enable */
+#define IPMI_NM_POLICY_ENABLE  0x10
+
+/* Node Manager Policy Trigger Codes */
+#define IPMI_NM_NO_POLICY_TRIG 0x00
+#define IPMI_NM_TEMP_TRIGGER   0x01
+#define IPMI_NM_NO_READ_TRIG   0x02
+#define IPMI_NM_RESET_TRIGGER  0x03
+#define IPMI_NM_BOOT_TRIGGER   0x04
+
+/* Policy Exception Actions flags */
+#define IPMI_NM_POLICY_ALERT  0x01
+#define IPMI_NM_POLICY_SHUT   0x02
+
+/* Power Correction codes for Policy action */
+#define IPMI_NM_PWR_AUTO_CORR 0x00
+#define IPMI_NM_PWR_SOFT_CORR 0x01
+#define IPMI_NM_PWR_AGGR_CORR 0x02
+
+/* Set Threshold message size */
+#define IPMI_NM_SET_THRESH_LEN 12
+
+/* Number of Suspend Periods */
+#define IPMI_NM_SUSPEND_PERIOD_MAX 5
+
+struct dcmi_cmd {
+    uint16_t val;
+    const char * str;
+    const char * desc;
+};
+
+/* make a struct for the return from the get limit command */
+struct power_limit {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint16_t reserved_1; /* second and third bytes are reserved */
+    uint8_t action; /* fourth byte is the exception action */
+    uint16_t limit; /* fifth through sixth byte are the power limit in watts */
+    uint32_t correction; /* seventh - 10th bytes are the correction period */
+    uint16_t reserved_2; /* 11th - 12th are reserved bytes */
+    uint16_t sample; /* 13th - 14th are sample period time */
+} __attribute__ ((packed));
+
+/* make a struct for the return from the reading command */
+struct power_reading {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint16_t curr_pwr;
+    uint16_t min_sample;
+    uint16_t max_sample;
+    uint16_t avg_pwr;
+    uint32_t time_stamp; /* time since epoch */
+    uint32_t sample;
+    uint8_t state;
+} __attribute__ ((packed));
+
+/* make a struct for the return from the capabilites command */
+struct capabilities {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint16_t conformance;
+    uint8_t revision;
+    uint8_t data_byte1;
+    uint8_t data_byte2;
+    uint8_t data_byte3;
+    uint8_t data_byte4;
+} __attribute__ ((packed));
+
+/* make a struct for the return from the sensor info command */
+struct sensor_info {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint8_t i_instances;
+    uint8_t i_records;
+    
+} __attribute__ ((packed));
+
+/* make a struct for the return from the get asset tag command */
+struct asset_tag {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint8_t length;
+    const char tag[16];
+} __attribute__ ((packed));
+
+/* make a struct for the return from the set asset tag command */
+struct set_asset_tag {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint8_t length;
+    const char tag[16];
+	uint8_t *data;
+} __attribute__ ((packed));
+
+/* make a struct for the return from the get thermal limit command */
+struct thermal_limit {
+    uint8_t grp_id; /* first byte: Group Extension ID */
+    uint8_t exceptionActions;
+    uint8_t tempLimit;
+    uint16_t exceptionTime;
+} __attribute__ ((packed));
+
+int ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+/* Node Manager discover command */
+struct nm_discover {
+    uint8_t intel_id[3]; /* Always returns 000157 */
+    uint8_t nm_version;
+    uint8_t ipmi_version;
+    uint8_t patch_version;
+    uint8_t major_rev;
+    uint8_t minor_rev;
+} __attribute__ ((packed));
+
+/* Node Manager get capabilites command */
+struct nm_capability {
+    uint8_t  intel_id[3];
+    uint8_t  max_settings;
+    uint16_t max_value; /* max power/thermal/time after reset */
+    uint16_t min_value; /* min ""                             */
+    uint32_t min_corr;  /* min correction time inmillesecs */
+    uint32_t max_corr;
+    uint16_t min_stats;
+    uint16_t max_stats;
+    uint8_t  scope;
+} __attribute__ ((packed));
+
+/* Node Manager get statistics command */
+struct nm_statistics {
+    uint8_t  intel_id[3];
+    uint16_t curr_value;
+    uint16_t min_value;
+    uint16_t max_value;
+    uint16_t ave_value;
+    uint32_t time_stamp;
+    uint32_t stat_period;
+    uint8_t  id_state;
+} __attribute__ ((packed));
+
+/* Node Manager set policy */
+struct nm_policy {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  policy_type;  /* 0:3 trigger type 4 = action 5:6 correction */
+    uint8_t  policy_exception;   /* exception actions */
+    uint16_t policy_limits;
+    uint32_t corr_time;
+    uint16_t trigger_limit;
+    uint16_t stats_period;
+} __attribute__ ((packed));
+
+/* Node Maager get policy */
+struct nm_get_policy {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_type;  /* 0:3 trigger type 4 = action 5:6 correction */
+    uint8_t  policy_exception;   /* exception actions */
+    uint16_t policy_limits;
+    uint32_t corr_time;
+    uint16_t trigger_limit;
+    uint16_t stats_period;
+} __attribute__ ((packed));
+
+/* Node Manager set alert destination */
+struct nm_set_alert {
+    uint8_t  intel_id[3];
+    uint8_t  chan;           /* 0:3 BMC chan, 4:6 reserved, bit 7=0 register alert reciever =1 invalidate */
+    uint8_t  dest;           /* lan destination */
+    uint8_t  string;         /* alert string selector  */
+} __attribute__ ((packed));
+
+/* Node Manager set alert threshold */
+struct nm_thresh {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  count;
+    uint16_t thresholds[3];
+} __attribute__ ((packed));
+
+/* Node Manager suspend period struct */
+struct nm_period {
+    uint8_t  start;
+    uint8_t  stop;
+    uint8_t  repeat;
+} __attribute__ ((packed));
+
+/* Node Manager set suspend period */
+struct nm_suspend {
+    uint8_t  intel_id[3];
+    uint8_t  domain;       /* 0:3 are domain, 4 = Policy enabled */
+    uint8_t  policy_id;
+    uint8_t  count;
+    struct nm_period period[IPMI_NM_SUSPEND_PERIOD_MAX];
+} __attribute__ ((packed));
+
+int ipmi_nm_main(struct ipmi_intf * intf, int argc, char ** argv);
+#endif /*IPMI_DCMI_H*/
diff --git a/include/ipmitool/ipmi_delloem.h b/include/ipmitool/ipmi_delloem.h
new file mode 100644
index 0000000..7543e4f
--- /dev/null
+++ b/include/ipmitool/ipmi_delloem.h
@@ -0,0 +1,370 @@
+/****************************************************************************
+Copyright (c) 2008, Dell Inc
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution. 
+- Neither the name of Dell Inc nor the names of its contributors
+may be used to endorse or promote products derived from this software 
+without specific prior written permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE. 
+
+
+*****************************************************************************/
+#ifndef IPMI_DELLOEM_H
+#define IPMI_DELLOEM_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#pragma pack(1)
+
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+
+
+/* Dell selector for LCD control - get and set unless specified */
+#define IPMI_DELL_LCD_STRING_SELECTOR       0xC1        /* RW get/set the user string */
+#define IPMI_DELL_LCD_CONFIG_SELECTOR       0xC2        /* RW set to user/default/none */
+#define IPMI_DELL_LCD_GET_CAPS_SELECTOR     0xCF        /* RO use when available*/
+#define IPMI_DELL_LCD_STRINGEX_SELECTOR     0xD0        /* RW get/set the user string use first when available*/
+#define IPMI_DELL_LCD_STATUS_SELECTOR       0xE7        /* LCD string when config set to default.*/
+#define IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR 0xD1    /* LCD string when config set to default.*/
+
+/* Dell defines for picking which string to use */
+#define IPMI_DELL_LCD_CONFIG_USER_DEFINED   0x00 /* use string set by user*/
+#define IPMI_DELL_LCD_CONFIG_DEFAULT        0x01 /* use platform model name*/
+#define IPMI_DELL_LCD_CONFIG_NONE           0x02 /* blank*/
+#define IPMI_DELL_LCD_iDRAC_IPV4ADRESS      0x04 /* use string set by user*/
+#define IPMI_DELL_LCD_IDRAC_MAC_ADDRESS     0x08 /* use platform model name*/
+#define IPMI_DELL_LCD_OS_SYSTEM_NAME        0x10 /* blank*/
+
+#define IPMI_DELL_LCD_SERVICE_TAG           0x20  /* use string set by user*/
+#define IPMI_DELL_LCD_iDRAC_IPV6ADRESS      0x40  /* use string set by user*/
+#define IPMI_DELL_LCD_AMBEINT_TEMP          0x80  /* use platform model name*/
+#define IPMI_DELL_LCD_SYSTEM_WATTS          0x100 /* blank*/
+#define IPMI_DELL_LCD_ASSET_TAG             0x200
+
+#define IPMI_DELL_LCD_ERROR_DISP_SEL        0x01  /* use platform model name*/
+#define IPMI_DELL_LCD_ERROR_DISP_VERBOSE    0x02  /* blank*/
+
+#define IPMI_DELL_IDRAC_VALIDATOR           0xDD    
+#define IPMI_DELL_POWER_CAP_STATUS          0xBA   
+#define IPMI_DELL_AVG_POWER_CONSMP_HST 	0xEB
+#define IPMI_DELL_PEAK_POWER_CONSMP_HST 0xEC
+#define SYSTEM_BOARD_SYSTEM_LEVEL_SENSOR_NUM 0x98
+
+#define	IDRAC_11G					1
+#define	IDRAC_12G					2
+#define	IDRAC_13G					3
+// Return Error code for license
+#define	LICENSE_NOT_SUPPORTED		0x6F
+#define	VFL_NOT_LICENSED			0x33
+#define btuphr              0x01
+#define watt                0x00
+#define IPMI_DELL_POWER_CAP 0xEA
+#define percent             0x03 
+
+/* Not on all Dell servers. If there, use it.*/
+typedef struct _tag_ipmi_dell_lcd_caps
+{
+       uint8_t parm_rev;                                       /* 0x11 for IPMI 2.0 */
+        uint8_t char_set;                                       /* always 1 for printable ASCII 0x20-0x7E */
+   uint8_t number_lines;                           /* 0-4, 1 for 9G. 10G tbd */
+   uint8_t max_chars[4];                           /* 62 for triathlon, 0 if not present (glacier) */
+                                                                             /* [0] is max chars for line 1 */
+}IPMI_DELL_LCD_CAPS;
+
+#define IPMI_DELL_LCD_STRING_LENGTH_MAX 62      /* Valid for 9G. Glacier ??. */
+#define IPMI_DELL_LCD_STRING1_SIZE      14
+#define IPMI_DELL_LCD_STRINGN_SIZE      16
+
+/* vFlash subcommands */
+#define IPMI_GET_EXT_SD_CARD_INFO 0xA4
+
+
+typedef struct _tag_ipmi_dell_lcd_string
+{
+     uint8_t parm_rev;                       /* 0x11 for IPMI 2.0 */
+     uint8_t data_block_selector;            /* 16-byte data block number to access, 0 based.*/
+     union 
+     {
+          struct 
+          {
+                uint8_t encoding : 4;                     /* 0 is printable ASCII 7-bit */
+                uint8_t length;                           /* 0 to max chars from lcd caps */
+                uint8_t data[IPMI_DELL_LCD_STRING1_SIZE]; /* not zero terminated.  */
+          }selector_0_string;
+          uint8_t selector_n_data[IPMI_DELL_LCD_STRINGN_SIZE];
+     }lcd_string;
+} __attribute__ ((packed)) IPMI_DELL_LCD_STRING;
+
+/* Only found on servers with more than 1 line. Use if available. */
+typedef struct _tag_ipmi_dell_lcd_stringex
+{
+      uint8_t parm_rev;                       /* 0x11 for IPMI 2.0 */
+      uint8_t line_number;                    /* LCD line number 1 to 4 */
+      uint8_t data_block_selector;            /* 16-byte data block number to access, 0 based.*/
+      union 
+      {
+           struct  
+           {
+                uint8_t encoding : 4;                     /* 0 is printable ASCII 7-bit */
+                uint8_t length;                           /* 0 to max chars from lcd caps */
+                uint8_t data[IPMI_DELL_LCD_STRING1_SIZE]; /* not zero terminated.  */
+           } selector_0_string;
+           uint8_t selector_n_data[IPMI_DELL_LCD_STRINGN_SIZE];
+   } lcd_string;
+} __attribute__ ((packed)) IPMI_DELL_LCD_STRINGEX;
+
+
+typedef struct _lcd_status
+{
+      char parametersel;
+      char vKVM_status;
+      char lock_status;
+      char Resv1;
+      char Resv;
+} __attribute__ ((packed)) LCD_STATUS;
+
+typedef struct _lcd_mode
+{
+    uint8_t parametersel;
+    uint32_t lcdmode;
+    uint16_t lcdquallifier;
+    uint32_t capabilites;
+    uint8_t error_display;
+    uint8_t Resv;
+} __attribute__ ((packed)) LCD_MODE;
+
+#define PARAM_REV_OFFSET                    (uint8_t)(0x1)
+#define VIRTUAL_MAC_OFFSET                  (uint8_t)(0x1)
+
+#define LOM_MACTYPE_ETHERNET 0
+#define LOM_MACTYPE_ISCSI 1
+#define LOM_MACTYPE_RESERVED 3
+
+#define LOM_ETHERNET_ENABLED 0
+#define LOM_ETHERNET_DISABLED 1
+#define LOM_ETHERNET_PLAYINGDEAD 2
+#define LOM_ETHERNET_RESERVED 3
+
+#define LOM_ACTIVE 1
+#define LOM_INACTIVE 0
+
+#define MACADDRESSLENGH 6
+#define MAX_LOM 8
+
+
+#define EMB_NIC_MAC_ADDRESS_11G     (uint8_t)(0xDA)
+#define EMB_NIC_MAC_ADDRESS_9G_10G  (uint8_t)(0xCB)
+
+#define IMC_IDRAC_10G               (uint8_t) (0x08) 
+#define IMC_CMC                     (uint8_t) (0x09)
+#define IMC_IDRAC_11G_MONOLITHIC    (uint8_t) (0x0A)
+#define IMC_IDRAC_11G_MODULAR       (uint8_t) (0x0B)
+#define IMC_UNUSED                  (uint8_t) (0x0C)
+#define IMC_MASER_LITE_BMC          (uint8_t) (0x0D)
+#define IMC_MASER_LITE_NU 			(uint8_t) (0x0E)
+#define IMC_IDRAC_12G_MONOLITHIC 	(uint8_t) (0x10)
+#define IMC_IDRAC_12G_MODULAR 		(uint8_t) (0x11)
+
+#define IMC_IDRAC_13G_MONOLITHIC 	(uint8_t) (0x20)
+#define IMC_IDRAC_13G_MODULAR 		(uint8_t) (0x21)
+#define IMC_IDRAC_13G_DCS			(uint8_t) (0x22)
+
+
+typedef struct
+{
+     unsigned int BladSlotNumber : 4;
+     unsigned int MacType : 2;
+     unsigned int EthernetStatus : 2;
+     unsigned int NICNumber : 5;
+     unsigned int Reserved : 3;
+     uint8_t MacAddressByte[MACADDRESSLENGH];
+} LOMMacAddressType;
+
+
+typedef struct
+{
+     LOMMacAddressType LOMMacAddress [MAX_LOM];
+} EmbeddedNICMacAddressType;
+
+typedef struct
+{
+     uint8_t MacAddressByte[MACADDRESSLENGH];
+} MacAddressType;
+
+typedef struct
+{
+   MacAddressType MacAddress [MAX_LOM];
+} EmbeddedNICMacAddressType_10G;
+
+
+
+#define TRANSPORT_NETFN             (uint8_t)(0xc)
+#define GET_LAN_PARAM_CMD           (uint8_t)(0x02)
+#define MAC_ADDR_PARAM              (uint8_t)(0x05)
+#define LAN_CHANNEL_NUMBER          (uint8_t)(0x01)
+
+#define IDRAC_NIC_NUMBER            (uint8_t)(0x8)
+
+#define TOTAL_N0_NICS_INDEX         (uint8_t)(0x1)
+
+
+// 12g supported 
+#define SET_NIC_SELECTION_12G_CMD       (uint8_t)(0x28)
+#define GET_NIC_SELECTION_12G_CMD       (uint8_t)(0x29)
+
+// 11g supported 
+#define SET_NIC_SELECTION_CMD       (uint8_t)(0x24)
+#define GET_NIC_SELECTION_CMD       (uint8_t)(0x25)
+#define GET_ACTIVE_NIC_CMD          (uint8_t)(0xc1)
+#define POWER_EFFICENCY_CMD     		(uint8_t)(0xc0)
+#define SERVER_POWER_CONSUMPTION_CMD   	(uint8_t)(0x8F)
+
+#define POWER_SUPPLY_INFO           (uint8_t)(0xb0)
+#define IPMI_ENTITY_ID_POWER_SUPPLY (uint8_t)(0x0a)
+#define SENSOR_STATE_STR_SIZE       (uint8_t)(64)
+#define SENSOR_NAME_STR_SIZE        (uint8_t)(64)
+
+#define GET_PWRMGMT_INFO_CMD	    (uint8_t)(0x9C)
+#define CLEAR_PWRMGMT_INFO_CMD	    (uint8_t)(0x9D)
+#define GET_PWR_HEADROOM_CMD	    (uint8_t)(0xBB)
+#define GET_PWR_CONSUMPTION_CMD	    (uint8_t)(0xB3)
+#define	GET_FRONT_PANEL_INFO_CMD		(uint8_t)0xb5
+
+
+typedef struct _ipmi_power_monitor
+{
+    uint32_t        cumStartTime;
+    uint32_t        cumReading;
+    uint32_t        maxPeakStartTime;
+    uint32_t        ampPeakTime;
+    uint16_t        ampReading;
+    uint32_t        wattPeakTime;
+    uint16_t        wattReading;
+} __attribute__ ((packed)) IPMI_POWER_MONITOR;
+
+
+#define MAX_POWER_FW_VERSION 8
+
+typedef struct _ipmi_power_supply_infoo
+{
+	/*No param_rev it is not a System Information Command */
+	uint16_t ratedWatts;
+	uint16_t ratedAmps;
+	uint16_t ratedVolts;
+	uint32_t vendorid;
+    uint8_t FrimwareVersion[MAX_POWER_FW_VERSION];
+	uint8_t  Powersupplytype;
+	uint16_t ratedDCWatts;
+	uint16_t Resv;	
+                          
+} __attribute__ ((packed)) IPMI_POWER_SUPPLY_INFO;
+
+
+typedef struct ipmi_power_consumption_data
+{
+    uint16_t actualpowerconsumption;
+    uint16_t powerthreshold;
+    uint16_t warningthreshold;
+    uint8_t throttlestate;
+    uint16_t maxpowerconsumption;
+    uint16_t throttlepowerconsumption;
+    uint16_t Resv;
+} __attribute__ ((packed)) IPMI_POWER_CONSUMPTION_DATA;
+
+
+typedef struct ipmi_inst_power_consumption_data
+{
+    uint16_t instanpowerconsumption;
+    uint16_t instanApms;
+    uint16_t resv1;
+    uint8_t resv;
+} __attribute__ ((packed)) IPMI_INST_POWER_CONSUMPTION_DATA;
+
+typedef struct _ipmi_avgpower_consump_histroy
+{
+    uint8_t parameterselector;  
+    uint16_t lastminutepower;
+    uint16_t lasthourpower;
+    uint16_t lastdaypower;
+    uint16_t lastweakpower;  
+                          
+} __attribute__ ((packed)) IPMI_AVGPOWER_CONSUMP_HISTORY;
+
+typedef struct _ipmi_power_consump_histroy
+{
+    uint8_t parameterselector;   
+    uint16_t lastminutepower;
+    uint16_t lasthourpower;
+    uint16_t lastdaypower;
+    uint16_t lastweakpower; 
+    uint32_t lastminutepowertime;
+    uint32_t lasthourpowertime;
+    uint32_t lastdaypowertime;
+    uint32_t lastweekpowertime;
+} __attribute__ ((packed)) IPMI_POWER_CONSUMP_HISTORY;
+
+
+typedef struct _ipmi_delloem_power_cap
+{     
+    uint8_t parameterselector;      
+    uint16_t PowerCap;
+    uint8_t unit;
+    uint16_t MaximumPowerConsmp;
+    uint16_t MinimumPowerConsmp;
+    uint16_t totalnumpowersupp;
+    uint16_t AvailablePower ;
+    uint16_t SystemThrottling;
+    uint16_t Resv;
+} __attribute__ ((packed)) IPMI_POWER_CAP;       
+
+typedef struct _power_headroom
+{ 
+    uint16_t instheadroom;
+    uint16_t peakheadroom;
+} __attribute__ ((packed)) POWER_HEADROOM;
+
+struct vFlashstr {
+	uint8_t val;
+	const char * str;
+};
+typedef struct ipmi_vFlash_extended_info
+{
+	uint8_t  vflashcompcode;
+	uint8_t  sdcardstatus;
+	uint32_t sdcardsize;
+	uint32_t sdcardavailsize;
+	uint8_t  bootpartion;
+	uint8_t  Resv;
+} __attribute__ ((packed)) IPMI_DELL_SDCARD_INFO;
+
+
+typedef struct _SensorReadingType
+{
+    uint8_t sensorReading;
+    uint8_t sensorFlags;
+    uint16_t sensorState;
+}SensorReadingType;
+uint16_t compareinputwattage(IPMI_POWER_SUPPLY_INFO* powersupplyinfo, uint16_t inputwattage);
+int ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /*IPMI_DELLOEM_H*/
diff --git a/include/ipmitool/ipmi_ekanalyzer.h b/include/ipmitool/ipmi_ekanalyzer.h
new file mode 100644
index 0000000..7c43220
--- /dev/null
+++ b/include/ipmitool/ipmi_ekanalyzer.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2007 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_EKANALYZER_H
+#define IPMI_EKANALYZER_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_fru.h>
+
+#define RTM_FRU_FILE             0x00
+#define A1_AMC_FRU_FILE          0x01
+#define A2_AMC_FRU_FILE          0x02
+#define A3_AMC_FRU_FILE          0x03
+#define A4_AMC_FRU_FILE          0x04
+#define B1_AMC_FRU_FILE          0x05
+#define B2_AMC_FRU_FILE          0x06
+#define B3_AMC_FRU_FILE          0x07
+#define B4_AMC_FRU_FILE          0x08
+#define ON_CARRIER_FRU_FILE      0x09
+#define CONFIG_FILE              0x0A
+#define SHELF_MANAGER_FRU_FILE   0x0B
+
+#define MIN_ARGUMENT             0x02
+#define RTM_IPMB_L               0x90
+
+#define MAX_FILE_NUMBER          8
+/* this voltag is specified in AMC.0 specification Table 3-10 */
+#define AMC_VOLTAGE                  12 /*volts*/
+
+#define SIZE_OF_GUID             16
+#define FRU_RADIAL_IPMB0_LINK_MAPPING 0x15
+
+int ipmi_ekanalyzer_main(struct ipmi_intf *, int, char **);
+
+#endif /* IPMI_EKANALYZER_H */
diff --git a/include/ipmitool/ipmi_entity.h b/include/ipmitool/ipmi_entity.h
new file mode 100644
index 0000000..6e5198c
--- /dev/null
+++ b/include/ipmitool/ipmi_entity.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_ENTITY_H
+#define IPMI_ENTITY_H
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct entity_id {
+	uint8_t	id;			/* physical entity id */
+#if WORDS_BIGENDIAN
+	uint8_t	logical     : 1;	/* physical/logical */
+	uint8_t	instance    : 7;	/* instance number */
+#else
+	uint8_t	instance    : 7;	/* instance number */
+	uint8_t	logical     : 1;	/* physical/logical */
+#endif
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#endif /* IPMI_ENTITY_H */
diff --git a/include/ipmitool/ipmi_event.h b/include/ipmitool/ipmi_event.h
new file mode 100644
index 0000000..2ba2fa5
--- /dev/null
+++ b/include/ipmitool/ipmi_event.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_EVENT_H
+#define IPMI_EVENT_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/ipmi.h>
+
+#define EVENT_DIR_ASSERT	0
+#define EVENT_DIR_DEASSERT	1
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct platform_event_msg {
+	uint8_t evm_rev;
+	uint8_t sensor_type;
+	uint8_t sensor_num;
+#if WORDS_BIGENDIAN
+	uint8_t event_dir  : 1;
+	uint8_t event_type : 7;
+#else
+	uint8_t event_type : 7;
+	uint8_t event_dir  : 1;
+#endif
+	uint8_t event_data[3];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int  ipmi_event_main(struct ipmi_intf *, int, char **);
+
+#endif /*IPMI_EVENT_H*/
diff --git a/include/ipmitool/ipmi_firewall.h b/include/ipmitool/ipmi_firewall.h
new file mode 100644
index 0000000..f18770e
--- /dev/null
+++ b/include/ipmitool/ipmi_firewall.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_FIREWALL_H
+#define IPMI_FIREWALL_H
+
+#include <ipmitool/ipmi.h>
+
+int ipmi_firewall_main(struct ipmi_intf *, int, char **);
+
+#define BMC_GET_NETFN_SUPPORT				0x09
+#define BMC_GET_COMMAND_SUPPORT				0x0A
+#define BMC_GET_COMMAND_SUBFUNCTION_SUPPORT		0x0B
+#define BMC_GET_CONFIGURABLE_COMMANDS			0x0C
+#define BMC_GET_CONFIGURABLE_COMMAND_SUBFUNCTIONS 	0x0D
+#define BMC_SET_COMMAND_ENABLES				0x60
+#define BMC_GET_COMMAND_ENABLES				0x61
+#define BMC_SET_COMMAND_SUBFUNCTION_ENABLES		0x62
+#define BMC_GET_COMMAND_SUBFUNCTION_ENABLES		0x63
+#define BMC_OEM_NETFN_IANA_SUPPORT			0x64
+
+#define SET_COMMAND_ENABLE_BYTE (BMC_SET_COMMAND_ENABLES / 8)
+#define SET_COMMAND_ENABLE_BIT (BMC_SET_COMMAND_ENABLES % 8)
+
+#define MAX_LUN 4
+#define MAX_NETFN 64
+#define MAX_NETFN_PAIR (MAX_NETFN/2)
+#define MAX_COMMAND 256
+#define MAX_SUBFN 32
+#define MAX_COMMAND_BYTES (MAX_COMMAND>>3)
+#define MAX_SUBFN_BYTES (MAX_SUBFN>>3)
+
+// support is a bitfield with the following bits set...
+#define BIT_AVAILABLE 0x01
+#define BIT_CONFIGURABLE 0x02
+#define BIT_ENABLED 0x04
+
+extern int verbose;
+
+struct command_support {
+	unsigned char support;
+	unsigned char version[3];
+	unsigned char subfn_support[MAX_SUBFN_BYTES];
+	unsigned char subfn_config[MAX_SUBFN_BYTES];
+	unsigned char subfn_enable[MAX_SUBFN_BYTES];
+};
+struct lun_netfn_support {
+	unsigned char support;
+	struct command_support command[MAX_COMMAND];
+	unsigned char command_mask[MAX_COMMAND_BYTES];
+	unsigned char config_mask[MAX_COMMAND_BYTES];
+	unsigned char enable_mask[MAX_COMMAND_BYTES];
+};
+struct lun_support {
+	unsigned char support;
+	struct lun_netfn_support netfn[MAX_NETFN_PAIR];
+};
+struct bmc_fn_support {
+	struct lun_support lun[MAX_LUN];
+};
+struct ipmi_function_params {
+	int channel;
+	int lun;
+	int netfn;
+	int command;
+	int subfn;
+	unsigned char force;
+};
+
+static inline int bit_test(const unsigned char * bf, int n) {
+	return !!(bf[n>>3]&(1<<(n%8)));
+}
+static inline void bit_set(unsigned char * bf, int n, int v) {
+	bf[n>>3] = (bf[n>>3] & ~(1<<(n%8))) | ((v?1:0)<<(n%8));
+}
+
+#endif				/*IPMI_FIREWALL_H */
diff --git a/include/ipmitool/ipmi_fru.h b/include/ipmitool/ipmi_fru.h
new file mode 100644
index 0000000..65696ba
--- /dev/null
+++ b/include/ipmitool/ipmi_fru.h
@@ -0,0 +1,618 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_FRU_H
+#define IPMI_FRU_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define GET_FRU_INFO		0x10
+#define GET_FRU_DATA		0x11
+#define SET_FRU_DATA		0x12
+
+enum {
+	FRU_CHASSIS_PARTNO,
+	FRU_CHASSIS_SERIAL,
+	FRU_BOARD_MANUF,
+	FRU_BOARD_PRODUCT,
+	FRU_BOARD_SERIAL,
+	FRU_BOARD_PARTNO,
+	FRU_PRODUCT_MANUF,
+	FRU_PRODUCT_NAME,
+	FRU_PRODUCT_PARTNO,
+	FRU_PRODUCT_VERSION,
+	FRU_PRODUCT_SERIAL,
+	FRU_PRODUCT_ASSET,
+};
+
+struct fru_info {
+	uint16_t size;
+	uint8_t access:1;
+	uint8_t max_read_size;
+	uint8_t max_write_size;
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_header {
+	uint8_t version;
+	union {
+		struct {
+			uint8_t internal;
+			uint8_t chassis;
+			uint8_t board;
+			uint8_t product;
+			uint8_t multi;
+		} offset;
+		uint8_t offsets[5];
+	};
+	uint8_t pad;
+	uint8_t checksum;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct fru_area_chassis {
+	uint8_t area_ver;
+	uint8_t type;
+	uint16_t area_len;
+	char * part;
+	char * serial;
+};
+
+struct fru_area_board {
+	uint8_t area_ver;
+	uint8_t lang;
+	uint16_t area_len;
+	uint32_t mfg_date_time;
+	char * mfg;
+	char * prod;
+	char * serial;
+	char * part;
+	char * fru;
+};
+
+struct fru_area_product {
+	uint8_t area_ver;
+	uint8_t lang;
+	uint16_t area_len;
+	char * mfg;
+	char * name;
+	char * part;
+	char * version;
+	char * serial;
+	char * asset;
+	char * fru;
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_multirec_header {
+#define FRU_RECORD_TYPE_POWER_SUPPLY_INFORMATION 0x00
+#define FRU_RECORD_TYPE_DC_OUTPUT 0x01
+#define FRU_RECORD_TYPE_DC_LOAD 0x02
+#define FRU_RECORD_TYPE_MANAGEMENT_ACCESS 0x03
+#define FRU_RECORD_TYPE_BASE_COMPATIBILITY 0x04
+#define FRU_RECORD_TYPE_EXTENDED_COMPATIBILITY 0x05
+#define FRU_RECORD_TYPE_OEM_EXTENSION	0xc0
+	uint8_t type;
+	uint8_t format;
+	uint8_t len;
+	uint8_t record_checksum;
+	uint8_t header_checksum;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_multirec_powersupply {
+#if WORDS_BIGENDIAN
+	uint16_t capacity;
+#else
+	uint16_t capacity:12;
+	uint16_t __reserved1:4;
+#endif
+	uint16_t peak_va;
+	uint8_t inrush_current;
+	uint8_t inrush_interval;
+	uint16_t lowend_input1;
+	uint16_t highend_input1;
+	uint16_t lowend_input2;
+	uint16_t highend_input2;
+	uint8_t lowend_freq;
+	uint8_t highend_freq;
+	uint8_t dropout_tolerance;
+#if WORDS_BIGENDIAN
+	uint8_t __reserved2:3;
+	uint8_t tach:1;
+	uint8_t hotswap:1;
+	uint8_t autoswitch:1;
+	uint8_t pfc:1;
+	uint8_t predictive_fail:1;
+#else
+	uint8_t predictive_fail:1;
+	uint8_t pfc:1;
+	uint8_t autoswitch:1;
+	uint8_t hotswap:1;
+	uint8_t tach:1;
+	uint8_t __reserved2:3;
+#endif
+	uint16_t peak_cap_ht;
+#if WORDS_BIGENDIAN
+	uint8_t combined_voltage1:4;
+	uint8_t combined_voltage2:4;
+#else
+	uint8_t combined_voltage2:4;
+	uint8_t combined_voltage1:4;
+#endif
+	uint16_t combined_capacity;
+	uint8_t rps_threshold;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static const char * combined_voltage_desc[] __attribute__((unused)) = {
+"12 V", "-12 V", "5 V", "3.3 V"};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_multirec_dcoutput {
+#if WORDS_BIGENDIAN
+	uint8_t standby:1;
+	uint8_t __reserved:3;
+	uint8_t output_number:4;
+#else
+	uint8_t output_number:4;
+	uint8_t __reserved:3;
+	uint8_t standby:1;
+#endif
+	short nominal_voltage;
+	short max_neg_dev;
+	short max_pos_dev;
+	uint16_t ripple_and_noise;
+	uint16_t min_current;
+	uint16_t max_current;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_multirec_dcload {
+#if WORDS_BIGENDIAN
+	uint8_t __reserved:4;
+	uint8_t output_number:4;
+#else
+	uint8_t output_number:4;
+	uint8_t __reserved:4;
+#endif
+	short nominal_voltage;
+	short min_voltage;
+	short max_voltage;
+	uint16_t ripple_and_noise;
+	uint16_t min_current;
+	uint16_t max_current;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_multirec_oem_header {
+	unsigned char mfg_id[3];
+#define FRU_PICMG_BACKPLANE_P2P			0x04
+#define FRU_PICMG_ADDRESS_TABLE			0x10
+#define FRU_PICMG_SHELF_POWER_DIST		0x11
+#define FRU_PICMG_SHELF_ACTIVATION		0x12
+#define FRU_PICMG_SHMC_IP_CONN			0x13
+#define FRU_PICMG_BOARD_P2P				0x14
+#define FRU_AMC_CURRENT					0x16
+#define FRU_AMC_ACTIVATION				0x17
+#define FRU_AMC_CARRIER_P2P				0x18
+#define FRU_AMC_P2P						0x19
+#define FRU_AMC_CARRIER_INFO			0x1a
+#define FRU_UTCA_FRU_INFO_TABLE			0x20
+#define FRU_UTCA_CARRIER_MNG_IP			0x21
+#define FRU_UTCA_CARRIER_INFO			0x22
+#define FRU_UTCA_CARRIER_LOCATION		0x23
+#define FRU_UTCA_SHMC_IP_LINK			0x24
+#define FRU_UTCA_POWER_POLICY			0x25
+#define FRU_UTCA_ACTIVATION				0x26
+#define FRU_UTCA_PM_CAPABILTY			0x27
+#define FRU_UTCA_FAN_GEOGRAPHY			0x28
+#define FRU_UTCA_CLOCK_MAPPING			0x29
+#define FRU_UTCA_MSG_BRIDGE_POLICY		0x2A
+#define FRU_UTCA_OEM_MODULE_DESC		0x2B
+#define FRU_PICMG_CLK_CARRIER_P2P		0x2C
+#define FRU_PICMG_CLK_CONFIG			0x2D
+	unsigned char record_id;
+	unsigned char record_version;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_guid {
+	unsigned char guid[16];
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_link_desc {
+#ifndef WORDS_BIGENDIAN
+	unsigned int desig_channel:6;
+	unsigned int desig_if:2;
+	unsigned int desig_port:4;
+#define FRU_PICMGEXT_LINK_TYPE_BASE			0x01
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET		0x02
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND	0x03
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR		0x04
+#define FRU_PICMGEXT_LINK_TYPE_PCIE			0x05
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET_10GBD	0x32
+	unsigned int type:8;
+	unsigned int ext:4;
+	unsigned int grouping:8;
+#else
+	unsigned int grouping:8;
+	unsigned int ext:4;
+#define FRU_PICMGEXT_LINK_TYPE_BASE			0x01
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET		0x02
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND	0x03
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR		0x04
+#define FRU_PICMGEXT_LINK_TYPE_PCIE			0x05
+#define FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET_10GBD	0x32
+	unsigned int type:8;
+	unsigned int desig_port:4;
+	unsigned int desig_if:2;
+	unsigned int desig_channel:6;
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+#define FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED			 	  0x00
+#define FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED1            0x01
+#define FRU_PICMGEXT_AMC_LINK_TYPE_PCI_EXPRESS          0x02
+#define FRU_PICMGEXT_AMC_LINK_TYPE_ADVANCED_SWITCHING1  0x03
+#define FRU_PICMGEXT_AMC_LINK_TYPE_ADVANCED_SWITCHING2  0x04
+#define FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET             0x05
+#define FRU_PICMGEXT_AMC_LINK_TYPE_RAPIDIO              0x06
+#define FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE              0x07
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+/* This is used in command, not in FRU */
+struct fru_picmgext_amc_link_info {
+   unsigned char linkInfo[3];
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_link_desc_core {
+#ifndef WORDS_BIGENDIAN
+	unsigned int designator:12;
+	unsigned int type:8;
+	unsigned int ext:4;
+	unsigned int grouping:8;
+#else
+	unsigned int grouping:8;
+	unsigned int ext:4;
+	unsigned int type:8;
+	unsigned int designator:12;
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_link_desc_extra {
+#ifndef WORDS_BIGENDIAN
+	unsigned char asymetricMatch:2;
+	unsigned char reserved:6;
+#else
+	unsigned char reserved:6;
+	unsigned char asymetricMatch:2;
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_link_desc {
+#ifndef WORDS_BIGENDIAN
+   struct fru_picmgext_amc_link_desc_core  core;/* lsb */
+   struct fru_picmgext_amc_link_desc_extra extra;
+#else
+   struct fru_picmgext_amc_link_desc_extra extra;
+   struct fru_picmgext_amc_link_desc_core  core;/* lsb */
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+#define FRU_PICMGEXT_OEM_SWFW 0x03
+#define OEM_SWFW_NBLOCK_OFFSET 0x05
+#define OEM_SWFW_FIELD_START_OFFSET 0x06
+
+#define FRU_PICMGEXT_CHN_DESC_RECORD_SIZE 3
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_chn_desc {
+#ifndef WORDS_BIGENDIAN
+	unsigned int remote_slot:8;
+	unsigned int remote_chn:5;
+	unsigned int local_chn:5;
+	unsigned int res:14;
+#else
+	unsigned int res:14;
+	unsigned int local_chn:5;
+	unsigned int remote_chn:5;
+	unsigned int remote_slot:8;
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_slot_desc {
+	unsigned char chan_type;
+	unsigned char slot_addr;
+	unsigned char chn_count;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define FRU_PICMGEXT_DESIGN_IF_BASE				0x00
+#define FRU_PICMGEXT_DESIGN_IF_FABRIC			0x01
+#define FRU_PICMGEXT_DESIGN_IF_UPDATE_CHANNEL	0x02
+#define FRU_PICMGEXT_DESIGN_IF_RESERVED			0x03
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_carrier_activation_record {
+	unsigned short max_internal_curr;
+	unsigned char  allowance_for_readiness;
+   unsigned char  module_activation_record_count;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_activation_record {
+	unsigned char ibmb_addr;
+	unsigned char max_module_curr;
+	unsigned char reserved;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_carrier_p2p_record {
+	unsigned char resource_id;
+	unsigned char p2p_count;
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_carrier_p2p_descriptor {
+#ifndef WORDS_BIGENDIAN
+	unsigned char  remote_resource_id;
+	unsigned short remote_port:5;
+	unsigned short local_port:5;
+	unsigned short reserved:6;
+#else
+	unsigned short reserved:6;
+	unsigned short local_port:5;
+	unsigned short remote_port:5;
+	unsigned char  remote_resource_id;
+#endif
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_p2p_record {
+#ifndef WORDS_BIGENDIAN
+	unsigned char resource_id         :4;
+	unsigned char /* reserved */      :3;
+	unsigned char record_type         :1;
+#else	
+	unsigned char record_type         :1;
+	unsigned char /* reserved */      :3;
+	unsigned char resource_id         :4;
+#endif 
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE 3
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_channel_desc_record {
+#ifndef WORDS_BIGENDIAN
+	unsigned int lane0port           :5;
+	unsigned int lane1port           :5;
+	unsigned int lane2port           :5;
+	unsigned int lane3port           :5;
+	unsigned int /* reserved */      :12;
+#else
+	unsigned int /* reserved */      :12;
+	unsigned int lane3port           :5;
+	unsigned int lane2port           :5;
+	unsigned int lane1port           :5;
+	unsigned int lane0port           :5;
+#endif 
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define FRU_PICMGEXT_AMC_LINK_DESC_RECORD_SIZE 5
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct fru_picmgext_amc_link_desc_record {
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_PCIE		0x02
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS1	0x03
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS2	0x04
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET	0x05		
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_RAPIDIO	0x06
+	#define FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE	0x07
+	
+	#define AMC_LINK_TYPE_EXT_PCIE_G1_NSSC	0x00
+	#define AMC_LINK_TYPE_EXT_PCIE_G1_SSC	0x01
+	#define AMC_LINK_TYPE_EXT_PCIE_G2_NSSC	0x02
+	#define AMC_LINK_TYPE_EXT_PCIE_G2_SSC	0x03
+
+	#define AMC_LINK_TYPE_EXT_ETH_1000_BX	0x00
+	#define AMC_LINK_TYPE_EXT_ETH_10G_XAUI	0x01
+	
+	#define AMC_LINK_TYPE_EXT_STORAGE_FC	0x00
+	#define AMC_LINK_TYPE_EXT_STORAGE_SATA	0x01
+	#define AMC_LINK_TYPE_EXT_STORAGE_SAS	0x02
+#ifndef WORDS_BIGENDIAN
+	unsigned int channel_id          :8;
+	unsigned int port_flag_0         :1;
+	unsigned int port_flag_1         :1;
+	unsigned int port_flag_2         :1;
+	unsigned int port_flag_3         :1;
+	unsigned int type                :8;
+	unsigned int type_ext            :4;
+	unsigned int group_id            :8;
+	unsigned int asym_match          :2;
+	unsigned int  /* reserved */     :30;
+#else	
+	unsigned int group_id            :8;
+	unsigned int type_ext            :4;
+	unsigned int type                :8;
+	unsigned int port_flag_3         :1;
+	unsigned int port_flag_2         :1;
+	unsigned int port_flag_1         :1;
+	unsigned int port_flag_0         :1;
+	unsigned int channel_id          :8;
+
+	unsigned int  /* reserved */     :30;
+	unsigned int asym_match          :2;
+#endif 
+}ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+/* FRU Board manufacturing date */
+static const uint64_t secs_from_1970_1996 = 820454400;
+static const char * chassis_type_desc[] __attribute__((unused)) = {
+	"Unspecified", "Other", "Unknown",
+	"Desktop", "Low Profile Desktop", "Pizza Box",
+	"Mini Tower", "Tower",
+	    "Portable", "LapTop", "Notebook", "Hand Held",
+	    "Docking Station", "All in One", "Sub Notebook",
+	    "Space-saving", "Lunch Box", "Main Server Chassis",
+	    "Expansion Chassis", "SubChassis", "Bus Expansion Chassis",
+	    "Peripheral Chassis", "RAID Chassis", "Rack Mount Chassis",
+	    "Sealed-case PC", "Multi-system Chassis", "CompactPCI",
+	    "AdvancedTCA", "Blade", "Blade Enclosure"
+};
+
+typedef struct ipmi_fru_bloc {
+	struct ipmi_fru_bloc * next;
+	uint16_t start;
+	uint16_t size;
+	uint8_t  blocId[32];
+} t_ipmi_fru_bloc;
+
+int ipmi_fru_main(struct ipmi_intf *intf, int argc, char **argv);
+int ipmi_fru_print(struct ipmi_intf *intf, struct sdr_record_fru_locator *fru);
+
+#endif /* IPMI_FRU_H */
diff --git a/include/ipmitool/ipmi_fwum.h b/include/ipmitool/ipmi_fwum.h
new file mode 100644
index 0000000..c19a582
--- /dev/null
+++ b/include/ipmitool/ipmi_fwum.h
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_KFWUM_H
+# define IPMI_KFWUM_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+/* KFWUM Version */
+# define VER_MAJOR        1
+# define VER_MINOR        3
+/* Minimum size (IPMB/IOL/old protocol) */
+# define KFWUM_SMALL_BUFFER     32
+/* Maximum size on KCS interface */
+# define KFWUM_BIG_BUFFER       32
+# define MAX_BUFFER_SIZE          1024*16
+
+/* 3 address + 1 size + 1 checksum + 1 command */
+# define KFWUM_OLD_CMD_OVERHEAD 6
+/* 1 sequence + 1 size + 1 checksum + 1 command */
+# define KFWUM_NEW_CMD_OVERHEAD 4
+# define KFWUM_PAGE_SIZE        256
+
+# define FWUM_SAVE_FIRMWARE_NO_RESPONSE_LIMIT 6
+# define FWUM_MAX_UPLOAD_RETRY 6
+
+# define TRACE_LOG_CHUNK_COUNT 7
+# define TRACE_LOG_CHUNK_SIZE  7
+# define TRACE_LOG_ATT_COUNT   3
+
+# define IN_FIRMWARE_INFO_OFFSET_LOCATION           0x5a0
+# define IN_FIRMWARE_INFO_SIZE                      20
+# define IN_FIRMWARE_INFO_OFFSET_FILE_SIZE          0
+# define IN_FIRMWARE_INFO_OFFSET_CHECKSUM           4
+# define IN_FIRMWARE_INFO_OFFSET_BOARD_ID           6
+# define IN_FIRMWARE_INFO_OFFSET_DEVICE_ID          8
+# define IN_FIRMWARE_INFO_OFFSET_TABLE_VERSION      9
+# define IN_FIRMWARE_INFO_OFFSET_IMPLEMENT_REV      10
+# define IN_FIRMWARE_INFO_OFFSET_VER_MAJOROR      11
+# define IN_FIRMWARE_INFO_OFFSET_VER_MINORSUB     12
+# define IN_FIRMWARE_INFO_OFFSET_SDR_REV            13
+# define IN_FIRMWARE_INFO_OFFSET_IANA0              14
+# define IN_FIRMWARE_INFO_OFFSET_IANA1              15
+# define IN_FIRMWARE_INFO_OFFSET_IANA2              16
+
+# define KWUM_GET_BYTE_AT_OFFSET(pBuffer,os)            pBuffer[os]
+
+int ipmi_fwum_main(struct ipmi_intf *, int, char **);
+
+typedef enum eKFWUM_BoardList
+{
+	KFWUM_BOARD_KONTRON_UNKNOWN = 0,
+	KFWUM_BOARD_KONTRON_5002 = 5002,
+} tKFWUM_BoardList;
+
+typedef struct sKFWUM_BoardInfo
+{
+	tKFWUM_BoardList boardId;
+	IPMI_OEM  iana;
+} tKFWUM_BoardInfo;
+
+typedef enum eKFWUM_DownloadType
+{
+	KFWUM_DOWNLOAD_TYPE_ADDRESS = 0,
+	KFWUM_DOWNLOAD_TYPE_SEQUENCE,
+} tKFWUM_DownloadType;
+
+typedef enum eKFWUM_DownloadBuffferType
+{
+	KFWUM_SMALL_BUFFER_TYPE = 0,
+	KFUMW_BIG_BUFFER_TYPE
+} tKFWUM_DownloadBuffferType;
+
+typedef struct sKFWUM_InFirmwareInfo
+{
+	unsigned long   fileSize;
+	unsigned short  checksum;
+	unsigned short  sumToRemoveFromChecksum;
+	/* Since the checksum is added in the bin
+	 * after the checksum is calculated, we
+	 * need to remove the each byte value.  This
+	 * byte will contain the addition of both bytes
+	 */
+	tKFWUM_BoardList boardId;
+	unsigned char   deviceId;
+	unsigned char   tableVers;
+	unsigned char   implRev;
+	unsigned char   versMajor;
+	unsigned char   versMinor;
+	unsigned char   versSubMinor;
+	unsigned char   sdrRev;
+	IPMI_OEM iana;
+} tKFWUM_InFirmwareInfo;
+
+typedef struct sKFWUM_SaveFirmwareInfo
+{
+	tKFWUM_DownloadType downloadType;
+	unsigned char       bufferSize;
+	unsigned char       overheadSize;
+} tKFWUM_SaveFirmwareInfo;
+
+/* COMMANDS */
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumGetInfoResp {
+	unsigned char protocolRevision;
+	unsigned char controllerDeviceId;
+	struct {
+		unsigned char mode:1;
+		unsigned char seqAdd:1;
+		unsigned char res : 6;
+	} byte;
+	unsigned char firmRev1;
+	unsigned char firmRev2;
+	unsigned char numBank;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumGetStatusResp {
+	unsigned char bankState;
+	unsigned char firmLengthLSB;
+	unsigned char firmLengthMid;
+	unsigned char firmLengthMSB;
+	unsigned char firmRev1;
+	unsigned char firmRev2;
+	unsigned char firmRev3;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumManualRollbackReq {
+	unsigned char type;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumStartFirmwareDownloadReq {
+	unsigned char lengthLSB;
+	unsigned char lengthMid;
+	unsigned char lengthMSB;
+	unsigned char paddingLSB;
+	unsigned char paddingMSB;
+	unsigned char useSequence;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumStartFirmwareDownloadResp {
+	unsigned char bank;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumSaveFirmwareAddressReq
+{
+	unsigned char addressLSB;
+	unsigned char addressMid;
+	unsigned char addressMSB;
+	unsigned char numBytes;
+	unsigned char txBuf[KFWUM_SMALL_BUFFER-KFWUM_OLD_CMD_OVERHEAD];
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumSaveFirmwareSequenceReq
+{
+	unsigned char sequenceNumber;
+	unsigned char txBuf[KFWUM_BIG_BUFFER];
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(1)
+# endif
+struct KfwumFinishFirmwareDownloadReq {
+	unsigned char versionMaj;
+	unsigned char versionMinSub;
+	unsigned char versionSdr;
+	unsigned char reserved;
+} ATTRIBUTE_PACKING;
+# ifdef HAVE_PRAGMA_PACK
+#  pragma pack(0)
+# endif
+
+#endif /* IPMI_KFWUM_H */
diff --git a/include/ipmitool/ipmi_gendev.h b/include/ipmitool/ipmi_gendev.h
new file mode 100644
index 0000000..cb18699
--- /dev/null
+++ b/include/ipmitool/ipmi_gendev.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2003 Kontron Canada, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_GENDEV_H
+#define IPMI_GENDEV_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <inttypes.h>
+#include <math.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_entity.h>
+
+int ipmi_gendev_main(struct ipmi_intf *, int, char **);
+
+#endif				/* IPMI_GENDEV_H */
diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
new file mode 100644
index 0000000..de65292
--- /dev/null
+++ b/include/ipmitool/ipmi_hpmfwupg.h
@@ -0,0 +1,809 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_HPMFWUPG_H
+#define IPMI_HPMFWUPG_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+int ipmi_hpmfwupg_main(struct ipmi_intf *, int, char **);
+
+/* Agent version */
+#define HPMFWUPG_VERSION_MAJOR    1
+#define HPMFWUPG_VERSION_MINOR    0
+#define HPMFWUPG_VERSION_SUBMINOR 9
+
+/* HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG) */
+#define HPMFWUPG_GET_TARGET_UPG_CAPABILITIES 0x2E
+#define HPMFWUPG_GET_COMPONENT_PROPERTIES    0x2F
+#define HPMFWUPG_ABORT_UPGRADE               0x30
+#define HPMFWUPG_INITIATE_UPGRADE_ACTION     0x31
+#define HPMFWUPG_UPLOAD_FIRMWARE_BLOCK       0x32
+#define HPMFWUPG_FINISH_FIRMWARE_UPLOAD      0x33
+#define HPMFWUPG_GET_UPGRADE_STATUS          0x34
+#define HPMFWUPG_ACTIVATE_FIRMWARE           0x35
+#define HPMFWUPG_QUERY_SELFTEST_RESULT       0x36
+#define HPMFWUPG_QUERY_ROLLBACK_STATUS       0x37
+#define HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK    0x38
+
+/*  HPM.1 SPECIFIC COMPLETION CODES */
+#define HPMFWUPG_ROLLBACK_COMPLETED   0x00
+#define HPMFWUPG_COMMAND_IN_PROGRESS  0x80
+#define HPMFWUPG_NOT_SUPPORTED        0x81
+#define HPMFWUPG_SIZE_MISMATCH        0x81
+#define HPMFWUPG_ROLLBACK_FAILURE     0x81
+#define HPMFWUPG_INV_COMP_MASK        0x81
+#define HPMFWUPG__ABORT_FAILURE       0x81
+#define HPMFWUPG_INV_COMP_ID          0x82
+#define HPMFWUPG_INT_CHECKSUM_ERROR   0x82
+#define HPMFWUPG_INV_UPLOAD_MODE      0x82
+#define HPMFWUPG_ROLLBACK_OVERRIDE    0x82
+#define HPMFWUPG_INV_COMP_PROP        0x83
+#define HPMFWUPG_FW_MISMATCH          0x83
+#define HPMFWUPG_ROLLBACK_DENIED      0x83
+
+/*
+ * This error code is used as a temporary PATCH to
+ * the latest Open ipmi driver.  This PATCH
+ * will be removed once a new Open IPMI driver is released.
+ * (Buggy version = 39)
+ */
+#define ENABLE_OPENIPMI_V39_PATCH
+
+#ifdef ENABLE_OPENIPMI_V39_PATCH
+# define RETRY_COUNT_MAX 3
+static int errorCount;
+# define HPMFWUPG_IS_RETRYABLE(error)                                          \
+ ((((error==0x83)||(error==0x82)||(error==0x80)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE)
+#else
+# define HPMFWUPG_IS_RETRYABLE(error) FALSE
+#endif
+
+/* HPM FIRMWARE UPGRADE GENERAL DEFINITIONS */
+#define HPMFWUPG_PICMG_IDENTIFIER         0
+#define HPMFWUPG_VERSION_SIZE             6
+#define HPMFWUPG_DESC_STRING_LENGTH       12
+#define HPMFWUPG_DEFAULT_INACCESS_TIMEOUT 60 /* sec */
+#define HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT  60 /* sec */
+#define HPMFWUPG_MD5_SIGNATURE_LENGTH     16
+
+/* Component IDs */
+typedef enum eHpmfwupgComponentId {
+	HPMFWUPG_COMPONENT_ID_0 = 0,
+	HPMFWUPG_COMPONENT_ID_1,
+	HPMFWUPG_COMPONENT_ID_2,
+	HPMFWUPG_COMPONENT_ID_3,
+	HPMFWUPG_COMPONENT_ID_4,
+	HPMFWUPG_COMPONENT_ID_5,
+	HPMFWUPG_COMPONENT_ID_6,
+	HPMFWUPG_COMPONENT_ID_7,
+	HPMFWUPG_COMPONENT_ID_MAX
+} tHpmfwupgComponentId;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgComponentBitMask {
+	union {
+		unsigned char byte;
+		struct {
+#ifdef WORDS_BIGENDIAN
+			unsigned char component7 : 1;
+			unsigned char component6 : 1;
+			unsigned char component5 : 1;
+			unsigned char component4 : 1;
+			unsigned char component3 : 1;
+			unsigned char component2 : 1;
+			unsigned char component1 : 1;
+			unsigned char component0 : 1;
+#else
+			unsigned char component0 : 1;
+			unsigned char component1 : 1;
+			unsigned char component2 : 1;
+			unsigned char component3 : 1;
+			unsigned char component4 : 1;
+			unsigned char component5 : 1;
+			unsigned char component6 : 1;
+			unsigned char component7 : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+	} ATTRIBUTE_PACKING ComponentBits;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+
+static const int HPMFWUPG_SUCCESS = 0;
+static const int HPMFWUPG_ERROR = -1;
+/* Upload firmware specific error codes */
+static const int HPMFWUPG_UPLOAD_BLOCK_LENGTH = 1;
+static const int HPMFWUPG_UPLOAD_RETRY = 2;
+
+
+/* TARGET UPGRADE CAPABILITIES DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesResp {
+	unsigned char picmgId;
+	unsigned char hpmVersion;
+	union {
+		unsigned char byte;
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char fwUpgUndesirable    : 1;
+			unsigned char autRollbackOverride : 1;
+			unsigned char ipmcDegradedDurinUpg: 1;
+			unsigned char deferActivation     : 1;
+			unsigned char servAffectDuringUpg : 1;
+			unsigned char manualRollback      : 1;
+			unsigned char autRollback         : 1;
+			unsigned char ipmcSelftestCap     : 1;
+#else
+			unsigned char ipmcSelftestCap     : 1;
+			unsigned char autRollback         : 1;
+			unsigned char manualRollback      : 1;
+			unsigned char servAffectDuringUpg : 1;
+			unsigned char deferActivation     : 1;
+			unsigned char ipmcDegradedDurinUpg: 1;
+			unsigned char autRollbackOverride : 1;
+			unsigned char fwUpgUndesirable    : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+	} ATTRIBUTE_PACKING GlobalCapabilities;
+	unsigned char upgradeTimeout;
+	unsigned char selftestTimeout;
+	unsigned char rollbackTimeout;
+	unsigned char inaccessTimeout;
+	struct HpmfwupgComponentBitMask componentsPresent;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetTargetUpgCapabilitiesCtx {
+	struct HpmfwupgGetTargetUpgCapabilitiesReq req;
+	struct HpmfwupgGetTargetUpgCapabilitiesResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* COMPONENT PROPERTIES DEFINITIONS */
+typedef enum eHpmfwupgCompPropertiesSelect {
+	HPMFWUPG_COMP_GEN_PROPERTIES = 0,
+	HPMFWUPG_COMP_CURRENT_VERSION,
+	HPMFWUPG_COMP_DESCRIPTION_STRING,
+	HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION,
+	HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION,
+	HPMFWUPG_COMP_RESERVED,
+	HPMFWUPG_COMP_OEM_PROPERTIES = 192
+} tHpmfwupgCompPropertiesSelect;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesReq {
+	unsigned char picmgId;
+	unsigned char componentId;
+	unsigned char selector;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetGeneralPropResp {
+	unsigned char picmgId;
+	union {
+		unsigned char byte;
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char reserved           : 2;
+			unsigned char payloadColdReset   : 1;
+			unsigned char deferredActivation : 1;
+			unsigned char comparisonSupport  : 1;
+			unsigned char preparationSupport : 1;
+			unsigned char rollbackBackup     : 2;
+#else
+			unsigned char rollbackBackup     : 2;
+			unsigned char preparationSupport : 1;
+			unsigned char comparisonSupport  : 1;
+			unsigned char deferredActivation : 1;
+			unsigned char payloadColdReset   : 1;
+			unsigned char reserved           : 2;
+#endif
+		} ATTRIBUTE_PACKING bitfield;
+	} ATTRIBUTE_PACKING GeneralCompProperties;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetCurrentVersionResp {
+	unsigned char picmgId;
+	unsigned char currentVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetDescStringResp {
+	unsigned char picmgId;
+	char descString[HPMFWUPG_DESC_STRING_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetRollbackFwVersionResp {
+	unsigned char picmgId;
+	unsigned char rollbackFwVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetDeferredFwVersionResp {
+	unsigned char picmgId;
+	unsigned char deferredFwVersion[HPMFWUPG_VERSION_SIZE];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* GetComponentProperties - OEM properties (192) */
+#define HPMFWUPG_OEM_LENGTH 4
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetOemProperties {
+	unsigned char picmgId;
+	unsigned char oemRspData[HPMFWUPG_OEM_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesResp {
+	union {
+		struct HpmfwupgGetGeneralPropResp       generalPropResp;
+		struct HpmfwupgGetCurrentVersionResp    currentVersionResp;
+		struct HpmfwupgGetDescStringResp        descStringResp;
+		struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp;
+		struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp;
+		struct HpmfwupgGetOemProperties         oemProperties;
+	} ATTRIBUTE_PACKING Response;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetComponentPropertiesCtx {
+	struct HpmfwupgGetComponentPropertiesReq  req;
+	struct HpmfwupgGetComponentPropertiesResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/*  ABORT UPGRADE DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgAbortUpgradeCtx {
+	struct HpmfwupgAbortUpgradeReq  req;
+	struct HpmfwupgAbortUpgradeResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* UPGRADE ACTIONS DEFINITIONS */
+typedef enum eHpmfwupgUpgradeAction {
+	HPMFWUPG_UPGRADE_ACTION_BACKUP = 0,
+	HPMFWUPG_UPGRADE_ACTION_PREPARE,
+	HPMFWUPG_UPGRADE_ACTION_UPGRADE,
+	HPMFWUPG_UPGRADE_ACTION_COMPARE,
+	HPMFWUPG_UPGRADE_ACTION_INVALID = 0xff
+}  tHpmfwupgUpgradeAction;
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionReq {
+	unsigned char picmgId;
+	struct HpmfwupgComponentBitMask componentsMask;
+	unsigned char upgradeAction;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgInitiateUpgradeActionCtx {
+	struct HpmfwupgInitiateUpgradeActionReq  req;
+	struct HpmfwupgInitiateUpgradeActionResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* UPLOAD FIRMWARE BLOCK DEFINITIONS */
+#define HPMFWUPG_SEND_DATA_COUNT_KCS   30
+#define HPMFWUPG_SEND_DATA_COUNT_LAN   25
+#define HPMFWUPG_SEND_DATA_COUNT_IPMB  26
+#define HPMFWUPG_SEND_DATA_COUNT_IPMBL 26
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockReq {
+	unsigned char picmgId;
+	unsigned char blockNumber;
+	unsigned char data[];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUploadFirmwareBlockCtx {
+	struct HpmfwupgUploadFirmwareBlockReq * req;
+	struct HpmfwupgUploadFirmwareBlockResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* FINISH FIRMWARE UPLOAD DEFINITIONS */
+#define HPMFWUPG_IMAGE_SIZE_BYTE_COUNT 4
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadReq {
+	unsigned char picmgId;
+	unsigned char componentId;
+	unsigned char imageLength[HPMFWUPG_IMAGE_SIZE_BYTE_COUNT];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFinishFirmwareUploadCtx {
+	struct HpmfwupgFinishFirmwareUploadReq  req;
+	struct HpmfwupgFinishFirmwareUploadResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* ACTIVATE FW DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareReq {
+	unsigned char picmgId;
+	unsigned char rollback_override;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActivateFirmwareCtx {
+	struct HpmfwupgActivateFirmwareReq  req;
+	struct HpmfwupgActivateFirmwareResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* GET UPGRADE STATUS DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusResp {
+	unsigned char picmgId;
+	unsigned char cmdInProcess;
+	unsigned char lastCmdCompCode;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgGetUpgradeStatusCtx {
+	struct HpmfwupgGetUpgradeStatusReq  req;
+	struct HpmfwupgGetUpgradeStatusResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* MANUAL FW ROLLBACK DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgManualFirmwareRollbackReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgManualFirmwareRollbackResp {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+struct HpmfwupgManualFirmwareRollbackCtx {
+	struct HpmfwupgManualFirmwareRollbackReq  req;
+	struct HpmfwupgManualFirmwareRollbackResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* QUERY ROLLBACK STATUS DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusResp {
+	unsigned char picmgId;
+	struct HpmfwupgComponentBitMask rollbackComp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQueryRollbackStatusCtx {
+	struct HpmfwupgQueryRollbackStatusReq  req;
+	struct HpmfwupgQueryRollbackStatusResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* QUERY SELF TEST RESULT DEFINITIONS */
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct  HpmfwupgQuerySelftestResultReq {
+	unsigned char picmgId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct  HpmfwupgQuerySelftestResultResp {
+	unsigned char picmgId;
+	unsigned char result1;
+	unsigned char result2;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgQuerySelftestResultCtx {
+	struct HpmfwupgQuerySelftestResultReq  req;
+	struct HpmfwupgQuerySelftestResultResp resp;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+/* HPM.1 IMAGE DEFINITIONS */
+#define HPMFWUPG_HEADER_SIGNATURE_LENGTH 8
+#define HPMFWUPG_MANUFATURER_ID_LENGTH   3
+#define HPMFWUPG_PRODUCT_ID_LENGTH       2
+#define HPMFWUPG_TIME_LENGTH             4
+#define HPMFWUPG_TIMEOUT_LENGTH          1
+#define HPMFWUPG_COMP_REVISION_LENGTH    2
+#define HPMFWUPG_FIRM_REVISION_LENGTH    6
+#define HPMFWUPG_IMAGE_HEADER_VERSION    0
+#define HPMFWUPG_IMAGE_SIGNATURE "PICMGFWU"
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct HpmfwupgImageHeader {
+	char           signature[HPMFWUPG_HEADER_SIGNATURE_LENGTH];
+	unsigned char  formatVersion;
+	unsigned char  deviceId;
+	unsigned char  manId[HPMFWUPG_MANUFATURER_ID_LENGTH];
+	unsigned char  prodId[HPMFWUPG_PRODUCT_ID_LENGTH];
+	unsigned char  time[HPMFWUPG_TIME_LENGTH];
+	union {
+		struct {
+#if WORDS_BIGENDIAN
+			unsigned char imageSelfTest   : 1;
+			unsigned char autRollback     : 1;
+			unsigned char manRollback     : 1;
+			unsigned char servAffected    : 1;
+			unsigned char reserved        : 4;
+#else
+			unsigned char reserved        : 4;
+			unsigned char servAffected    : 1;
+			unsigned char manRollback     : 1;
+			unsigned char autRollback     : 1;
+			unsigned char imageSelfTest   : 1;
+#endif
+		} ATTRIBUTE_PACKING bitField;
+		unsigned char byte;
+	}ATTRIBUTE_PACKING imageCapabilities;
+	struct HpmfwupgComponentBitMask components;
+	unsigned char  selfTestTimeout;
+	unsigned char  rollbackTimeout;
+	unsigned char  inaccessTimeout;
+	unsigned char  compRevision[HPMFWUPG_COMP_REVISION_LENGTH];
+	unsigned char  firmRevision[HPMFWUPG_FIRM_REVISION_LENGTH];
+	unsigned short oemDataLength;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#define HPMFWUPG_DESCRIPTION_LENGTH   21
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgActionRecord {
+	unsigned char  actionType;
+	struct HpmfwupgComponentBitMask components;
+	unsigned char  checksum;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#define HPMFWUPG_FIRMWARE_SIZE_LENGTH 4
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgFirmwareImage {
+	unsigned char version[HPMFWUPG_FIRM_REVISION_LENGTH];
+	char          desc[HPMFWUPG_DESCRIPTION_LENGTH];
+	unsigned char length[HPMFWUPG_FIRMWARE_SIZE_LENGTH];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+#endif
+struct HpmfwupgUpgradeCtx {
+	struct HpmfwupgComponentBitMask compUpdateMask;
+	unsigned int   imageSize;
+	unsigned char* pImageData;
+	unsigned char  componentId;
+	struct HpmfwupgGetTargetUpgCapabilitiesResp targetCap;
+	struct HpmfwupgGetGeneralPropResp genCompProp[HPMFWUPG_COMPONENT_ID_MAX];
+	struct ipm_devid_rsp devId;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+# pragma pack(0)
+#endif
+
+typedef enum eHpmfwupgActionType {
+	HPMFWUPG_ACTION_BACKUP_COMPONENTS = 0,
+	HPMFWUPG_ACTION_PREPARE_COMPONENTS,
+	HPMFWUPG_ACTION_UPLOAD_FIRMWARE,
+	HPMFWUPG_ACTION_RESERVED = 0xFF
+} tHpmfwupgActionType;
+
+/* FUNCTIONS PROTOTYPES */
+#define HPMFWUPG_MAJORMINOR_VERSION_SIZE        2
+
+/* Options added for user to check the version and to view both the FILE and
+ * TARGET Version
+ */
+#define VIEW_MODE                     0x01
+#define DEBUG_MODE                    0x02
+#define FORCE_MODE                    0x04
+#define COMPARE_MODE                  0x08
+
+typedef struct _VERSIONINFO {
+	unsigned char componentId;
+	unsigned char targetMajor;
+	unsigned char targetMinor;
+	unsigned char targetAux[4];
+	unsigned char rollbackMajor;
+	unsigned char rollbackMinor;
+	unsigned char rollbackAux[4];
+	unsigned char deferredMajor;
+	unsigned char deferredMinor;
+	unsigned char deferredAux[4];
+	unsigned char imageMajor;
+	unsigned char imageMinor;
+	unsigned char imageAux[4];
+	unsigned char coldResetRequired;
+	unsigned char rollbackSupported;
+	unsigned char deferredActivationSupported;
+	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+}VERSIONINFO, *PVERSIONINFO;
+
+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+
+#define TARGET_VER (0x01)
+#define ROLLBACK_VER (0x02)
+#define IMAGE_VER (0x04)
+
+#endif /* IPMI_KFWUM_H */
diff --git a/include/ipmitool/ipmi_ime.h b/include/ipmitool/ipmi_ime.h
new file mode 100755
index 0000000..734ddb3
--- /dev/null
+++ b/include/ipmitool/ipmi_ime.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2007 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_IME_H
+#define IPMI_IME_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+
+int ipmi_ime_main(struct ipmi_intf *, int, char **);
+
+#endif /* IPMI_IME_H */
diff --git a/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h
new file mode 100644
index 0000000..982f645
--- /dev/null
+++ b/include/ipmitool/ipmi_intf.h
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_INTF_H
+#define IPMI_INTF_H
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_oem.h>
+#include <ipmitool/ipmi_constants.h>
+
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+/*
+ * An enumeration that describes every possible session state for
+ * an IPMIv2 / RMCP+ session.
+ */
+enum LANPLUS_SESSION_STATE {
+	LANPLUS_STATE_PRESESSION = 0,
+	LANPLUS_STATE_OPEN_SESSION_SENT,
+	LANPLUS_STATE_OPEN_SESSION_RECEIEVED,
+	LANPLUS_STATE_RAKP_1_SENT,
+	LANPLUS_STATE_RAKP_2_RECEIVED,
+	LANPLUS_STATE_RAKP_3_SENT,
+	LANPLUS_STATE_ACTIVE,
+	LANPLUS_STATE_CLOSE_SENT,
+};
+
+
+#define IPMI_AUTHCODE_BUFFER_SIZE 20
+#define IPMI_SIK_BUFFER_SIZE      IPMI_MAX_MD_SIZE
+#define IPMI_KG_BUFFER_SIZE       21 /* key plus null byte */
+
+struct ipmi_session_params {
+	char * hostname;
+	uint8_t username[17];
+	uint8_t authcode_set[IPMI_AUTHCODE_BUFFER_SIZE + 1];
+	uint8_t authtype_set;
+	uint8_t privlvl;
+	uint8_t cipher_suite_id;
+	char sol_escape_char;
+	int password;
+	int port;
+	int retry;
+	uint32_t timeout;
+	uint8_t kg[IPMI_KG_BUFFER_SIZE];   /* BMC key */
+	uint8_t lookupbit;
+};
+
+#define IPMI_AUTHSTATUS_PER_MSG_DISABLED	0x10
+#define IPMI_AUTHSTATUS_PER_USER_DISABLED	0x08
+#define IPMI_AUTHSTATUS_NONNULL_USERS_ENABLED	0x04
+#define IPMI_AUTHSTATUS_NULL_USERS_ENABLED	0x02
+#define IPMI_AUTHSTATUS_ANONYMOUS_USERS_ENABLED	0x01
+
+struct ipmi_session {
+	int active;
+	uint32_t session_id;
+	uint32_t in_seq;
+	uint32_t out_seq;
+
+	uint8_t authcode[IPMI_AUTHCODE_BUFFER_SIZE + 1];
+	uint8_t challenge[16];
+	uint8_t authtype;
+	uint8_t authstatus;
+	uint8_t authextra;
+	uint32_t timeout;
+
+	struct sockaddr_storage addr;
+	socklen_t addrlen;
+
+	/*
+	 * This struct holds state data specific to IPMI v2 / RMCP+ sessions
+	 */
+	struct {
+		enum LANPLUS_SESSION_STATE session_state;
+
+		/* These are the algorithms agreed upon for the session */
+		uint8_t requested_auth_alg;
+		uint8_t requested_integrity_alg;
+		uint8_t requested_crypt_alg;
+		uint8_t auth_alg;
+		uint8_t integrity_alg;
+		uint8_t crypt_alg;
+		uint8_t max_priv_level;
+
+		uint32_t console_id;
+		uint32_t bmc_id;
+
+		/*
+		 * Values required for RAKP mesages
+		 */
+
+		/* Random number generated byt the console */
+		uint8_t console_rand[16]; 
+		/* Random number generated by the BMC */
+		uint8_t bmc_rand[16];
+
+		uint8_t bmc_guid[16];
+		uint8_t requested_role;   /* As sent in the RAKP 1 message */
+		uint8_t rakp2_return_code;
+
+		uint8_t  sik[IPMI_SIK_BUFFER_SIZE]; /* Session integrity key */
+		uint8_t sik_len;                   /* Session Integrity key length */
+		uint8_t  kg[IPMI_KG_BUFFER_SIZE];   /* BMC key */
+		uint8_t  k1[IPMI_MAX_MD_SIZE];      /* Used for Integrity checking? */
+		uint8_t k1_len;                    /* K1 key length */
+		uint8_t  k2[IPMI_MAX_MD_SIZE];      /* First 16 bytes used for AES  */
+		uint8_t k2_len;                    /* K2 key length */
+	} v2_data;
+
+
+	/*
+	 * This data is specific to the Serial Over Lan session
+	 */
+	struct {
+		uint16_t max_inbound_payload_size;
+		uint16_t max_outbound_payload_size;
+		uint16_t port;
+		uint8_t sequence_number;
+
+		/*  This data describes the last SOL packet */
+		uint8_t last_received_sequence_number;
+		uint8_t last_received_byte_count;
+		void (*sol_input_handler)(struct ipmi_rs * rsp);
+	} sol_data;
+};
+
+struct ipmi_cmd {
+	int (*func)(struct ipmi_intf * intf, int argc, char ** argv);
+	const char * name;
+	const char * desc;
+};
+
+struct ipmi_intf_support {
+	const char * name;
+	int supported;
+};
+
+struct ipmi_intf {
+	char name[16];
+	char desc[128];
+	char *devfile;
+	int fd;
+	int opened;
+	int abort;
+	int noanswer;
+	int picmg_avail;
+	int vita_avail;
+	IPMI_OEM manufacturer_id;
+	int ai_family;
+
+	struct ipmi_session_params ssn_params;
+	struct ipmi_session * session;
+	struct ipmi_oem_handle * oem;
+	struct ipmi_cmd * cmdlist;
+	uint8_t	target_ipmb_addr;
+	uint32_t my_addr;
+	uint32_t target_addr;
+	uint8_t target_lun;
+	uint8_t target_channel;
+	uint32_t transit_addr;
+	uint8_t transit_channel;
+	uint16_t max_request_data_size;
+	uint16_t max_response_data_size;
+
+	uint8_t devnum;
+
+	int (*setup)(struct ipmi_intf * intf);
+	int (*open)(struct ipmi_intf * intf);
+	void (*close)(struct ipmi_intf * intf);
+	struct ipmi_rs *(*sendrecv)(struct ipmi_intf * intf, struct ipmi_rq * req);
+	int (*sendrsp)(struct ipmi_intf * intf, struct ipmi_rs * rsp);
+	struct ipmi_rs *(*recv_sol)(struct ipmi_intf * intf);
+	struct ipmi_rs *(*send_sol)(struct ipmi_intf * intf, struct ipmi_v2_payload * payload);
+	int (*keepalive)(struct ipmi_intf * intf);
+	int (*set_my_addr)(struct ipmi_intf * intf, uint8_t addr);
+	void (*set_max_request_data_size)(struct ipmi_intf * intf, uint16_t size);
+	void (*set_max_response_data_size)(struct ipmi_intf * intf, uint16_t size);
+};
+
+struct ipmi_intf * ipmi_intf_load(char * name);
+void ipmi_intf_print(struct ipmi_intf_support * intflist);
+
+void ipmi_intf_session_set_hostname(struct ipmi_intf * intf, char * hostname);
+void ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username);
+void ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password);
+void ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t privlvl);
+void ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit);
+void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id);
+void ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char);
+void ipmi_intf_session_set_kgkey(struct ipmi_intf *intf, const uint8_t *kgkey);
+void ipmi_intf_session_set_port(struct ipmi_intf * intf, int port);
+void ipmi_intf_session_set_authtype(struct ipmi_intf * intf, uint8_t authtype);
+void ipmi_intf_session_set_timeout(struct ipmi_intf * intf, uint32_t timeout);
+void ipmi_intf_session_set_retry(struct ipmi_intf * intf, int retry);
+void ipmi_intf_session_cleanup(struct ipmi_intf *intf);
+void ipmi_cleanup(struct ipmi_intf * intf);
+
+#if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
+int  ipmi_intf_socket_connect(struct ipmi_intf * intf);
+#endif
+#endif /* IPMI_INTF_H */
diff --git a/include/ipmitool/ipmi_isol.h b/include/ipmitool/ipmi_isol.h
new file mode 100644
index 0000000..e52279e
--- /dev/null
+++ b/include/ipmitool/ipmi_isol.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_ISOL_H
+#define IPMI_ISOL_H
+
+#include <ipmitool/ipmi.h>
+
+#define ACTIVATE_ISOL			0x01
+#define SET_ISOL_CONFIG			0x03
+#define GET_ISOL_CONFIG			0x04
+
+#define ISOL_ENABLE_PARAM		0x01
+#define ISOL_AUTHENTICATION_PARAM	0x02
+
+#define ISOL_BAUD_RATE_PARAM		0x05
+
+#define ISOL_PREFERRED_BAUD_RATE	0x07
+
+struct isol_config_parameters {
+	uint8_t  enabled;
+	uint8_t  privilege_level;
+	uint8_t  bit_rate;
+};
+
+int ipmi_isol_main(struct ipmi_intf *, int, char **);
+
+#endif /* IPMI_SOL_H */
diff --git a/include/ipmitool/ipmi_kontronoem.h b/include/ipmitool/ipmi_kontronoem.h
new file mode 100644
index 0000000..d3925df
--- /dev/null
+++ b/include/ipmitool/ipmi_kontronoem.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2004 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_KONTRONOEM_H
+#define IPMI_KONTRONOEM_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+
+
+int ipmi_kontronoem_main(struct ipmi_intf *, int, char **);
+int ipmi_kontronoem_set_large_buffer(struct ipmi_intf *, unsigned char size);
+
+#endif /* IPMI_KONTRONOEM_H */
diff --git a/include/ipmitool/ipmi_lanp.h b/include/ipmitool/ipmi_lanp.h
new file mode 100644
index 0000000..0ef2d96
--- /dev/null
+++ b/include/ipmitool/ipmi_lanp.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_LANP_H
+#define IPMI_LANP_H
+
+#include <ipmitool/ipmi.h>
+
+#define IPMI_LAN_SET_CONFIG	0x01
+#define IPMI_LAN_GET_CONFIG	0x02
+#define IPMI_LAN_SUSPEND_ARP	0x03
+# define IPMI_LAN_SUSPEND_ARP_RESP (2)
+# define IPMI_LAN_SUSPEND_ARP_GRAT (1)
+#define IPMI_LAN_GET_STAT	0x04
+
+#define IPMI_CHANNEL_NUMBER_MAX	0xe
+
+#define IPMI_LANP_TIMEOUT		3
+#define IPMI_LANP_RETRIES		10
+#define IPMI_LANP_WRITE_UNLOCK		0
+#define IPMI_LANP_WRITE_LOCK		1
+#define IPMI_LANP_WRITE_COMMIT		2
+
+enum {
+	IPMI_LANP_SET_IN_PROGRESS,
+	IPMI_LANP_AUTH_TYPE,
+	IPMI_LANP_AUTH_TYPE_ENABLE,
+	IPMI_LANP_IP_ADDR,
+	IPMI_LANP_IP_ADDR_SRC,
+	IPMI_LANP_MAC_ADDR,            /* 5 */
+	IPMI_LANP_SUBNET_MASK,
+	IPMI_LANP_IP_HEADER,
+	IPMI_LANP_PRI_RMCP_PORT,
+	IPMI_LANP_SEC_RMCP_PORT,
+	IPMI_LANP_BMC_ARP,             /* 10 */
+	IPMI_LANP_GRAT_ARP,
+	IPMI_LANP_DEF_GATEWAY_IP,
+	IPMI_LANP_DEF_GATEWAY_MAC,
+	IPMI_LANP_BAK_GATEWAY_IP,
+	IPMI_LANP_BAK_GATEWAY_MAC,     /* 15 */
+	IPMI_LANP_SNMP_STRING,
+	IPMI_LANP_NUM_DEST,
+	IPMI_LANP_DEST_TYPE,
+	IPMI_LANP_DEST_ADDR,
+	IPMI_LANP_VLAN_ID,             /* 20 */
+	IPMI_LANP_VLAN_PRIORITY,
+	IPMI_LANP_RMCP_CIPHER_SUPPORT,
+	IPMI_LANP_RMCP_CIPHERS,
+	IPMI_LANP_RMCP_PRIV_LEVELS,
+	IPMI_LANP_VLAN_TAGS,
+	IPMI_LANP_BAD_PASS_THRESH,
+	IPMI_LANP_IP6_SUPPORT=50,
+	IPMI_LANP_IP6_ENABLES,
+	IPMI_LANP_IP6_TRAFFIC_CLASS,
+	IPMI_LANP_IP6_STATIC_HOPS,
+	IPMI_LANP_IP6_FLOW_LABEL,
+	IPMI_LANP_IP6_STATUS,
+	IPMI_LANP_IP6_STATIC_ADDR,
+	IPMI_LANP_IP6_STATIC_DUID_STG,
+	IPMI_LANP_IP6_STATIC_DUID,
+	IPMI_LANP_IP6_DYNAMIC_ADDR,
+	IPMI_LANP_IP6_DYNAMIC_DUID_STG,
+	IPMI_LANP_IP6_DYNAMIC_DUID,
+	IPMI_LANP_IP6_DHCP6_CFG_SUP,
+	IPMI_LANP_IP6_DHCP6_CFG,
+	IPMI_LANP_IP6_ROUTER_CFG,
+	IPMI_LANP_IP6_STATIC_RTR1_ADDR,
+	IPMI_LANP_IP6_STATIC_RTR1_MAC,
+	IPMI_LANP_IP6_STATIC_RTR1_PFX_LEN,
+	IPMI_LANP_IP6_STATIC_RTR1_PFX,
+	IPMI_LANP_IP6_STATIC_RTR2_ADDR,
+	IPMI_LANP_IP6_STATIC_RTR2_MAC,
+	IPMI_LANP_IP6_STATIC_RTR2_PFX_LEN,
+	IPMI_LANP_IP6_STATIC_RTR2_PFX,
+	IPMI_LANP_IP6_NUM_DYNAMIC_RTRS,
+	IPMI_LANP_IP6_DYNAMIC_RTR_ADDR,
+	IPMI_LANP_IP6_DYNAMIC_RTR_MAC,
+	IPMI_LANP_IP6_DYNAMIC_RTR_PFX_LEN,
+	IPMI_LANP_IP6_DYNAMIC_RTR_PFX,
+	IPMI_LANP_IP6_DYNAMIC_HOPS,
+	IPMI_LANP_IP6_NDSLAAC_CFG_SUP,
+	IPMI_LANP_IP6_NDSLAAC_CFG,
+	IPMI_LANP_OEM_ALERT_STRING=96,
+	IPMI_LANP_ALERT_RETRY=97,
+	IPMI_LANP_UTC_OFFSET=98,
+	IPMI_LANP_DHCP_SERVER_IP=192,
+	IPMI_LANP_DHCP_SERVER_MAC=193,
+	IPMI_LANP_DHCP_ENABLE=194,
+	IPMI_LANP_CHAN_ACCESS_MODE=201,
+};
+
+static struct lan_param {
+	int cmd;
+	int size;
+	char desc[24];
+	uint8_t * data;
+	int data_len;
+} ipmi_lan_params[] __attribute__((unused)) = {
+	{ IPMI_LANP_SET_IN_PROGRESS,	1,	"Set in Progress", NULL, 0 },
+	{ IPMI_LANP_AUTH_TYPE,		1,	"Auth Type Support", NULL, 0 },
+	{ IPMI_LANP_AUTH_TYPE_ENABLE,	5,	"Auth Type Enable", NULL, 0	},
+	{ IPMI_LANP_IP_ADDR,		4,	"IP Address", NULL, 0 },
+	{ IPMI_LANP_IP_ADDR_SRC,	1,	"IP Address Source", NULL, 0 },
+	{ IPMI_LANP_MAC_ADDR,		6,	"MAC Address", NULL, 0 }, /* 5 */
+	{ IPMI_LANP_SUBNET_MASK,	4,	"Subnet Mask", NULL, 0 },
+	{ IPMI_LANP_IP_HEADER,		3,	"IP Header", NULL, 0 },
+	{ IPMI_LANP_PRI_RMCP_PORT,	2,	"Primary RMCP Port", NULL, 0 },
+	{ IPMI_LANP_SEC_RMCP_PORT,	2,	"Secondary RMCP Port", NULL, 0 },
+	{ IPMI_LANP_BMC_ARP,		1,	"BMC ARP Control", NULL, 0}, /* 10 */
+	{ IPMI_LANP_GRAT_ARP,		1,	"Gratituous ARP Intrvl", NULL, 0 },
+	{ IPMI_LANP_DEF_GATEWAY_IP,	4,	"Default Gateway IP", NULL, 0 },
+	{ IPMI_LANP_DEF_GATEWAY_MAC,	6,	"Default Gateway MAC", NULL, 0 },
+	{ IPMI_LANP_BAK_GATEWAY_IP,	4,	"Backup Gateway IP", NULL, 0 },
+	{ IPMI_LANP_BAK_GATEWAY_MAC,	6,	"Backup Gateway MAC", NULL, 0 }, /* 15 */
+	{ IPMI_LANP_SNMP_STRING,	18,	"SNMP Community String", NULL, 0 },
+	{ IPMI_LANP_NUM_DEST,		1,	"Number of Destinations", NULL, 0 },
+	{ IPMI_LANP_DEST_TYPE,		4,	"Destination Type", NULL, 0 },
+	{ IPMI_LANP_DEST_ADDR,		13,	"Destination Addresses", NULL, 0 },
+	{ IPMI_LANP_VLAN_ID,		2,	"802.1q VLAN ID", NULL, 0 }, /* 20 */
+	{ IPMI_LANP_VLAN_PRIORITY,	1,	"802.1q VLAN Priority", NULL, 0 },
+	{ IPMI_LANP_RMCP_CIPHER_SUPPORT,1,	"RMCP+ Cipher Suite Count", NULL, 0 },
+	{ IPMI_LANP_RMCP_CIPHERS,	16,	"RMCP+ Cipher Suites", NULL, 0 },
+	{ IPMI_LANP_RMCP_PRIV_LEVELS,	9,	"Cipher Suite Priv Max", NULL, 0 },
+	{ IPMI_LANP_BAD_PASS_THRESH,	6,	"Bad Password Threshold", NULL, 0 },
+	{ IPMI_LANP_OEM_ALERT_STRING,	28,	"OEM Alert String", NULL, 0 }, /* 25 */
+	{ IPMI_LANP_ALERT_RETRY,	1,	"Alert Retry Algorithm", NULL, 0 },
+	{ IPMI_LANP_UTC_OFFSET,		3,	"UTC Offset", NULL, 0 },
+	{ IPMI_LANP_DHCP_SERVER_IP,	4,	"DHCP Server IP", NULL, 0 },
+	{ IPMI_LANP_DHCP_SERVER_MAC,	6,	"DHDP Server MAC", NULL, 0},
+	{ IPMI_LANP_DHCP_ENABLE,	1,	"DHCP Enable", NULL, 0 }, /* 30 */
+	{ IPMI_LANP_CHAN_ACCESS_MODE,	2,	"Channel Access Mode", NULL, 0 },
+	{ -1, -1, "", NULL, -1 }
+};
+
+int  ipmi_lanp_main(struct ipmi_intf *, int, char **);
+
+uint8_t find_lan_channel(struct ipmi_intf *intf, uint8_t start);
+
+#endif /*IPMI_LANP_H*/
diff --git a/include/ipmitool/ipmi_lanp6.h b/include/ipmitool/ipmi_lanp6.h
new file mode 100644
index 0000000..91799e5
--- /dev/null
+++ b/include/ipmitool/ipmi_lanp6.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016 Pentair Technical Products. All right reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pentair Technical Products or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * PENTAIR TECHNICAL SOLUTIONS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef IPMI_LANP6_H
+#define IPMI_LANP6_H
+
+#include <ipmitool/ipmi_intf.h>
+
+/*
+ * LAN configuration parameter.
+ */
+struct ipmi_lanp {
+	int selector;
+	const char *name;
+	int size;
+};
+
+/*
+ * Private data for LAN configuration.
+ */
+struct ipmi_lanp_priv {
+	struct ipmi_intf *intf;
+	int channel;
+};
+
+#endif /* IPMI_LANP6_H */
diff --git a/include/ipmitool/ipmi_main.h b/include/ipmitool/ipmi_main.h
new file mode 100644
index 0000000..e32360a
--- /dev/null
+++ b/include/ipmitool/ipmi_main.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_MAIN_H
+#define IPMI_MAIN_H
+
+#include <ipmitool/ipmi_intf.h>
+
+int ipmi_main(int argc, char ** argv, struct ipmi_cmd * cmdlist, struct ipmi_intf_support * intflist);
+void ipmi_cmd_print(struct ipmi_cmd * cmdlist);
+int ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv);
+
+#endif /* IPMI_MAIN_H */
diff --git a/include/ipmitool/ipmi_mc.h b/include/ipmitool/ipmi_mc.h
new file mode 100644
index 0000000..0e3c59f
--- /dev/null
+++ b/include/ipmitool/ipmi_mc.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_MC_H
+#define IPMI_MC_H
+
+#include <ipmitool/ipmi.h>
+
+#define BMC_GET_DEVICE_ID	0x01
+#define BMC_COLD_RESET		0x02
+#define BMC_WARM_RESET		0x03
+#define BMC_GET_SELF_TEST	0x04
+#define BMC_RESET_WATCHDOG_TIMER	0x22
+#define BMC_SET_WATCHDOG_TIMER	0x24
+#define BMC_GET_WATCHDOG_TIMER	0x25
+#define BMC_SET_GLOBAL_ENABLES	0x2e
+#define BMC_GET_GLOBAL_ENABLES	0x2f
+#define BMC_GET_GUID		0x37
+
+int ipmi_mc_main(struct ipmi_intf *, int, char **);
+
+/*
+ * Response data from IPM Get Device ID Command (IPMI rev 1.5, section 17.1)
+ * The following really apply to any IPM device, not just BMCs...
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct ipm_devid_rsp {
+	uint8_t device_id;
+	uint8_t device_revision;
+	uint8_t fw_rev1;
+	uint8_t fw_rev2;
+	uint8_t ipmi_version;
+	uint8_t adtl_device_support;
+	uint8_t manufacturer_id[3];
+	uint8_t product_id[2];
+	uint8_t aux_fw_rev[4];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define IPM_DEV_DEVICE_ID_SDR_MASK     (0x80)	/* 1 = provides SDRs      */
+#define IPM_DEV_DEVICE_ID_REV_MASK     (0x0F)	/* BCD-enoded             */
+
+#define IPM_DEV_FWREV1_AVAIL_MASK      (0x80)	/* 0 = normal operation   */
+#define IPM_DEV_FWREV1_MAJOR_MASK      (0x3f)	/* Major rev, BCD-encoded */
+
+#define IPM_DEV_IPMI_VER_MAJOR_MASK    (0x0F)	/* Major rev, BCD-encoded */
+#define IPM_DEV_IPMI_VER_MINOR_MASK    (0xF0)	/* Minor rev, BCD-encoded */
+#define IPM_DEV_IPMI_VER_MINOR_SHIFT   (4)	/* Minor rev shift        */
+#define IPM_DEV_IPMI_VERSION_MAJOR(x) \
+	(x & IPM_DEV_IPMI_VER_MAJOR_MASK)
+#define IPM_DEV_IPMI_VERSION_MINOR(x) \
+	((x & IPM_DEV_IPMI_VER_MINOR_MASK) >> IPM_DEV_IPMI_VER_MINOR_SHIFT)
+
+#define IPM_DEV_MANUFACTURER_ID(x) \
+	((uint32_t) ((x[2] & 0x0F) << 16 | x[1] << 8 | x[0]))
+
+#define IPM_DEV_ADTL_SUPPORT_BITS      (8)
+
+/* Structure follow the IPMI V.2 Rev 1.0
+ * See Table 20-10 */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct ipmi_guid_t {
+	uint32_t  time_low;	/* timestamp low field */
+	uint16_t  time_mid;	/* timestamp middle field */
+	uint16_t  time_hi_and_version; /* timestamp high field and version number */
+	uint8_t   clock_seq_hi_variant;/* clock sequence high field and variant */
+	uint8_t   clock_seq_low; /* clock sequence low field */
+	uint8_t   node[6];	/* node */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int _ipmi_mc_get_guid(struct ipmi_intf *, struct ipmi_guid_t *);
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct ipm_selftest_rsp {
+	unsigned char code;
+	unsigned char test;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define IPM_SFT_CODE_OK			0x55
+#define IPM_SFT_CODE_NOT_IMPLEMENTED	0x56
+#define IPM_SFT_CODE_DEV_CORRUPTED	0x57
+#define IPM_SFT_CODE_FATAL_ERROR	0x58
+#define IPM_SFT_CODE_RESERVED		0xff
+
+#define IPM_SELFTEST_SEL_ERROR		0x80
+#define IPM_SELFTEST_SDR_ERROR		0x40
+#define IPM_SELFTEST_FRU_ERROR		0x20
+#define IPM_SELFTEST_IPMB_ERROR		0x10
+#define IPM_SELFTEST_SDRR_EMPTY		0x08
+#define IPM_SELFTEST_INTERNAL_USE	0x04
+#define IPM_SELFTEST_FW_BOOTBLOCK	0x02
+#define IPM_SELFTEST_FW_CORRUPTED	0x01
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct ipm_get_watchdog_rsp {
+	unsigned char timer_use;
+	unsigned char timer_actions;
+	unsigned char pre_timeout;
+	unsigned char timer_use_exp;
+	unsigned char initial_countdown_lsb;
+	unsigned char initial_countdown_msb;
+	unsigned char present_countdown_lsb;
+	unsigned char present_countdown_msb;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#define IPM_WATCHDOG_RESET_ERROR	0x80
+
+#define IPM_WATCHDOG_BIOS_FRB2		0x01
+#define IPM_WATCHDOG_BIOS_POST		0x02
+#define IPM_WATCHDOG_OS_LOAD		0x03
+#define IPM_WATCHDOG_SMS_OS		0x04
+#define IPM_WATCHDOG_OEM		0x05
+
+#define IPM_WATCHDOG_NO_ACTION		0x00
+#define IPM_WATCHDOG_HARD_RESET		0x01
+#define IPM_WATCHDOG_POWER_DOWN		0x02
+#define IPM_WATCHDOG_POWER_CYCLE	0x03
+
+#define IPM_WATCHDOG_CLEAR_OEM		0x20
+#define IPM_WATCHDOG_CLEAR_SMS_OS	0x10
+#define IPM_WATCHDOG_CLEAR_OS_LOAD	0x08
+#define IPM_WATCHDOG_CLEAR_BIOS_POST	0x04
+#define IPM_WATCHDOG_CLEAR_BIOS_FRB2	0x02
+
+/* IPMI 2.0 command for system information*/
+#define IPMI_SET_SYS_INFO                  0x58
+#define IPMI_GET_SYS_INFO                  0x59
+#define IPMI_SYSINFO_SET0_SIZE             14
+#define IPMI_SYSINFO_SETN_SIZE             16
+
+/* System Information "Parameter selector" values: */
+#define IPMI_SYSINFO_SET_STATE		0x00
+#define IPMI_SYSINFO_SYSTEM_FW_VERSION	0x01
+#define IPMI_SYSINFO_HOSTNAME		0x02
+#define IPMI_SYSINFO_PRIMARY_OS_NAME	0x03
+#define IPMI_SYSINFO_OS_NAME		0x04
+#define IPMI_SYSINFO_DELL_OS_VERSION	0xe4
+#define IPMI_SYSINFO_DELL_URL		0xde
+#define IPMI_SYSINFO_DELL_IPV6_COUNT    0xe6
+#define IPMI_SYSINFO_DELL_IPV6_DESTADDR 0xf0
+
+int ipmi_mc_getsysinfo(struct ipmi_intf * intf, int param, int block, int set, 
+		    int len, void *buffer);
+int ipmi_mc_setsysinfo(struct ipmi_intf * intf, int len, void *buffer);
+
+#endif				/*IPMI_MC_H */
diff --git a/include/ipmitool/ipmi_oem.h b/include/ipmitool/ipmi_oem.h
new file mode 100644
index 0000000..ad22fde
--- /dev/null
+++ b/include/ipmitool/ipmi_oem.h
@@ -0,0 +1,47 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_OEM_H
+#define IPMI_OEM_H
+
+#include <ipmitool/ipmi.h>
+
+/* oem handler, see lib/ipmi_oem.c */
+struct ipmi_oem_handle {
+	const char * name;
+	const char * desc;
+	int (*setup)(struct ipmi_intf * intf);
+};
+
+void ipmi_oem_print(void);
+int ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype);
+int ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype);
+
+#endif /*IPMI_OEM_H*/
diff --git a/include/ipmitool/ipmi_pef.h b/include/ipmitool/ipmi_pef.h
new file mode 100644
index 0000000..14c6e18
--- /dev/null
+++ b/include/ipmitool/ipmi_pef.h
@@ -0,0 +1,967 @@
+/*
+ * Copyright (c) 2004 Dell Computers.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Dell Computers, or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * DELL COMPUTERS ("DELL") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * DELL OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_PEF_H
+#define IPMI_PEF_H
+
+#include <ipmitool/ipmi.h>
+
+/* PEF */
+
+struct pef_capabilities {		/* "get pef capabilities" response */
+	uint8_t version;
+	uint8_t actions;						/* mapped by PEF_ACTION_xxx */
+	uint8_t event_filter_count;
+};
+
+typedef enum {
+	P_TRUE,
+	P_SUPP,
+	P_ACTV,
+	P_ABLE,
+} flg_e;
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_table_entry {
+#define PEF_CONFIG_ENABLED 0x80
+#define PEF_CONFIG_PRECONFIGURED 0x40
+	uint8_t config;
+#define PEF_ACTION_DIAGNOSTIC_INTERRUPT 0x20
+#define PEF_ACTION_OEM 0x10
+#define PEF_ACTION_POWER_CYCLE 0x08
+#define PEF_ACTION_RESET 0x04
+#define PEF_ACTION_POWER_DOWN 0x02
+#define PEF_ACTION_ALERT 0x01
+	uint8_t action;
+#define PEF_POLICY_NUMBER_MASK 0x0f
+	uint8_t policy_number;
+#define PEF_SEVERITY_NON_RECOVERABLE 0x20
+#define PEF_SEVERITY_CRITICAL 0x10
+#define PEF_SEVERITY_WARNING 0x08
+#define PEF_SEVERITY_OK 0x04
+#define PEF_SEVERITY_INFORMATION 0x02
+#define PEF_SEVERITY_MONITOR 0x01
+	uint8_t severity;
+	uint8_t generator_ID_addr;
+	uint8_t generator_ID_lun;
+	uint8_t sensor_type;
+#define PEF_SENSOR_NUMBER_MATCH_ANY 0xff
+	uint8_t sensor_number;
+#define PEF_EVENT_TRIGGER_UNSPECIFIED 0x0
+#define PEF_EVENT_TRIGGER_THRESHOLD 0x1
+#define PEF_EVENT_TRIGGER_SENSOR_SPECIFIC 0x6f
+#define PEF_EVENT_TRIGGER_MATCH_ANY 0xff
+	uint8_t event_trigger;
+	uint8_t event_data_1_offset_mask[2];
+	uint8_t event_data_1_AND_mask;
+	uint8_t event_data_1_compare_1;
+	uint8_t event_data_1_compare_2;
+	uint8_t event_data_2_AND_mask;
+	uint8_t event_data_2_compare_1;
+	uint8_t event_data_2_compare_2;
+	uint8_t event_data_3_AND_mask;
+	uint8_t event_data_3_compare_1;
+	uint8_t event_data_3_compare_2;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct desc_map {						/* maps a description to a value/mask */
+	const char *desc;
+	uint32_t mask;
+};
+
+struct bit_desc_map {				/* description text container */
+#define BIT_DESC_MAP_LIST 0x1		/* index-based text array */
+#define BIT_DESC_MAP_ANY 0x2		/* bitwise, but only print 1st one */
+#define BIT_DESC_MAP_ALL 0x3		/* bitwise, print them all */
+	uint32_t desc_map_type;
+	struct desc_map desc_maps[128];
+};
+
+static struct bit_desc_map
+pef_b2s_actions __attribute__((unused)) = {
+BIT_DESC_MAP_ALL,
+{	{"Alert",						PEF_ACTION_ALERT},
+	{"Power-off",					PEF_ACTION_POWER_DOWN},
+	{"Reset",						PEF_ACTION_RESET},
+	{"Power-cycle",				PEF_ACTION_POWER_CYCLE},
+	{"OEM-defined",				PEF_ACTION_OEM},
+	{"Diagnostic-interrupt",	PEF_ACTION_DIAGNOSTIC_INTERRUPT},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_severities __attribute__((unused)) = {
+BIT_DESC_MAP_ANY,
+{	{"Non-recoverable",			PEF_SEVERITY_NON_RECOVERABLE},
+	{"Critical",					PEF_SEVERITY_CRITICAL},
+	{"Warning",						PEF_SEVERITY_WARNING},
+	{"OK",							PEF_SEVERITY_OK},
+	{"Information",				PEF_SEVERITY_INFORMATION},
+	{"Monitor",						PEF_SEVERITY_MONITOR},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_sensortypes __attribute__((unused)) = {
+BIT_DESC_MAP_LIST,
+{	{"Any",								255},
+	{"Temperature",					1},
+	{"Voltage",							2},
+	{"Current",							3},
+	{"Fan",								4},
+	{"Chassis Intrusion",			5},
+	{"Platform security breach",	6},
+	{"Processor",						7},
+	{"Power supply",					8},
+	{"Power Unit",						9},
+	{"Cooling device",				10},
+	{"Other (units-based)",			11},
+	{"Memory",							12},
+	{"Drive Slot",						13},
+	{"POST memory resize",			14},
+	{"POST error",						15},
+	{"Logging disabled",				16},
+	{"Watchdog 1",						17},
+	{"System event",					18},
+	{"Critical Interrupt",			19},
+	{"Button",							20},
+	{"Module/board",					21},
+	{"uController/coprocessor",	22},
+	{"Add-in card",					23},
+	{"Chassis",							24},
+	{"Chipset",							25},
+	{"Other (FRU)",					26},
+	{"Cable/interconnect",			27},
+	{"Terminator",						28},
+	{"System boot",					29},
+	{"Boot error",						30},
+	{"OS boot",							31},
+	{"OS critical stop",				32},
+	{"Slot/connector",				33},
+	{"ACPI power state",				34},
+	{"Watchdog 2",						35},
+	{"Platform alert",				36},
+	{"Entity presence",				37},
+	{"Monitor ASIC/IC",				38},
+	{"LAN",								39},
+	{"Management subsytem health",40},
+	{"Battery",							41},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_1 = {
+BIT_DESC_MAP_LIST,
+{	{"<LNC",								0},		/* '<' : getting worse */
+	{">LNC",								1},		/* '>' : getting better */
+	{"<LC",								2},
+	{">LC",								3},
+	{"<LNR",								4},
+	{">LNR",								5},
+	{">UNC",								6},
+	{"<UNC",								7},
+	{">UC",								8},
+	{"<UC",								9},
+	{">UNR",								10},
+	{"<UNR",								11},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_2 = {
+BIT_DESC_MAP_LIST,
+{	{"transition to idle",			0},
+	{"transition to active",		1},
+	{"transition to busy",			2},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_3 = {
+BIT_DESC_MAP_LIST,
+{	{"state deasserted",				0},
+	{"state asserted",				1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_4 = {
+BIT_DESC_MAP_LIST,
+{	{"predictive failure deasserted",	0},
+	{"predictive failure asserted",		1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_5 = {
+BIT_DESC_MAP_LIST,
+{	{"limit not exceeded",			0},
+	{"limit exceeded",				1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_6 = {
+BIT_DESC_MAP_LIST,
+{	{"performance met",				0},
+	{"performance lags",				1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_7 = {
+BIT_DESC_MAP_LIST,
+{	{"ok",								0},
+	{"<warn",							1},		/* '<' : getting worse */
+	{"<fail",							2},
+	{"<dead",							3},
+	{">warn",							4},		/* '>' : getting better */
+	{">fail",							5},
+	{"dead",								6},
+	{"monitor",							7},
+	{"informational",					8},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_8 = {
+BIT_DESC_MAP_LIST,
+{	{"device removed/absent",		0},
+	{"device inserted/present",	1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_9 = {
+BIT_DESC_MAP_LIST,
+{	{"device disabled",				0},
+	{"device enabled",				1},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_10 = {
+BIT_DESC_MAP_LIST,
+{	{"transition to running",		0},
+	{"transition to in test",		1},
+	{"transition to power off",	2},
+	{"transition to online",		3},
+	{"transition to offline",		4},
+	{"transition to off duty",		5},
+	{"transition to degraded",		6},
+	{"transition to power save",	7},
+	{"install error",					8},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_11 = {
+BIT_DESC_MAP_LIST,
+{	{"fully redundant",					0},
+	{"redundancy lost",					1},
+	{"redundancy degraded",				2},
+	{"<non-redundant/sufficient",		3},		/* '<' : getting worse */
+	{">non-redundant/sufficient",		4},		/* '>' : getting better */
+	{"non-redundant/insufficient",	5},
+	{"<redundancy degraded",			6},
+	{">redundancy degraded",			7},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_gentype_12 = {
+BIT_DESC_MAP_LIST,
+{	{"D0 power state",				0},
+	{"D1 power state",				1},
+	{"D2 power state",				2},
+	{"D3 power state",				3},
+	{NULL}
+}	};
+
+static struct bit_desc_map *
+pef_b2s_generic_ER[] __attribute__((unused)) = {
+	&pef_b2s_gentype_1,
+	&pef_b2s_gentype_2,
+	&pef_b2s_gentype_3,
+	&pef_b2s_gentype_4,
+	&pef_b2s_gentype_5,
+	&pef_b2s_gentype_6,
+	&pef_b2s_gentype_7,
+	&pef_b2s_gentype_8,
+	&pef_b2s_gentype_9,
+	&pef_b2s_gentype_10,
+	&pef_b2s_gentype_11,
+	&pef_b2s_gentype_12,
+};
+#define PEF_B2S_GENERIC_ER_ENTRIES \
+			(sizeof(pef_b2s_generic_ER) / sizeof(pef_b2s_generic_ER[0]))
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_policy_entry {
+#define PEF_POLICY_ID_MASK 0xf0
+#define PEF_POLICY_ID_SHIFT 4
+#define PEF_POLICY_DISABLED 0xF7
+#define PEF_POLICY_ENABLED 0x08
+#define PEF_POLICY_FLAGS_MASK 0x07
+#define PEF_POLICY_FLAGS_MATCH_ALWAYS 0
+#define PEF_POLICY_FLAGS_PREV_OK_SKIP 1
+#define PEF_POLICY_FLAGS_PREV_OK_NEXT_POLICY_SET 2
+#define PEF_POLICY_FLAGS_PREV_OK_NEXT_CHANNEL_IN_SET 3
+#define PEF_POLICY_FLAGS_PREV_OK_NEXT_DESTINATION_IN_SET 4
+	uint8_t policy;
+#define PEF_POLICY_CHANNEL_MASK 0xf0
+#define PEF_POLICY_CHANNEL_SHIFT 4
+#define PEF_POLICY_DESTINATION_MASK 0x0f
+	uint8_t chan_dest;
+#define PEF_POLICY_EVENT_SPECIFIC 0x80
+	uint8_t alert_string_key;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static struct bit_desc_map
+pef_b2s_policies __attribute__((unused)) = {
+BIT_DESC_MAP_LIST,
+{	{"Match-always",				PEF_POLICY_FLAGS_MATCH_ALWAYS},
+	{"Try-next-entry",			PEF_POLICY_FLAGS_PREV_OK_SKIP},
+	{"Try-next-set",				PEF_POLICY_FLAGS_PREV_OK_NEXT_POLICY_SET},
+	{"Try-next-channel",			PEF_POLICY_FLAGS_PREV_OK_NEXT_CHANNEL_IN_SET},
+	{"Try-next-destination",	PEF_POLICY_FLAGS_PREV_OK_NEXT_DESTINATION_IN_SET},
+	{NULL}
+}	};
+
+static struct bit_desc_map
+pef_b2s_ch_medium __attribute__((unused)) = {
+#define PEF_CH_MEDIUM_TYPE_IPMB			1
+#define PEF_CH_MEDIUM_TYPE_ICMB_10		2
+#define PEF_CH_MEDIUM_TYPE_ICMB_09		3
+#define PEF_CH_MEDIUM_TYPE_LAN			4
+#define PEF_CH_MEDIUM_TYPE_SERIAL		5
+#define PEF_CH_MEDIUM_TYPE_XLAN			6
+#define PEF_CH_MEDIUM_TYPE_PCI_SMBUS	7
+#define PEF_CH_MEDIUM_TYPE_SMBUS_V1X	8
+#define PEF_CH_MEDIUM_TYPE_SMBUS_V2X	9
+#define PEF_CH_MEDIUM_TYPE_USB_V1X		10
+#define PEF_CH_MEDIUM_TYPE_USB_V2X		11
+#define PEF_CH_MEDIUM_TYPE_SYSTEM		12
+BIT_DESC_MAP_LIST,
+{	{"IPMB (I2C)",								PEF_CH_MEDIUM_TYPE_IPMB},
+	{"ICMB v1.0",								PEF_CH_MEDIUM_TYPE_ICMB_10},
+	{"ICMB v0.9",								PEF_CH_MEDIUM_TYPE_ICMB_09},
+	{"802.3 LAN",								PEF_CH_MEDIUM_TYPE_LAN},
+	{"Serial/Modem (RS-232)",				PEF_CH_MEDIUM_TYPE_SERIAL},
+	{"Other LAN",								PEF_CH_MEDIUM_TYPE_XLAN},
+	{"PCI SMBus",								PEF_CH_MEDIUM_TYPE_PCI_SMBUS},
+	{"SMBus v1.0/1.1",						PEF_CH_MEDIUM_TYPE_SMBUS_V1X},
+	{"SMBus v2.0",								PEF_CH_MEDIUM_TYPE_SMBUS_V2X},
+	{"USB 1.x",									PEF_CH_MEDIUM_TYPE_USB_V1X},
+	{"USB 2.x",									PEF_CH_MEDIUM_TYPE_USB_V2X},
+	{"System I/F (KCS,SMIC,BT)",			PEF_CH_MEDIUM_TYPE_SYSTEM},
+	{NULL}
+}	};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_selector {
+#define PEF_CFGPARM_ID_REVISION_ONLY_MASK 0x80
+#define PEF_CFGPARM_ID_SET_IN_PROGRESS 0
+#define PEF_CFGPARM_ID_PEF_CONTROL 1
+#define PEF_CFGPARM_ID_PEF_ACTION 2
+#define PEF_CFGPARM_ID_PEF_STARTUP_DELAY 3
+#define PEF_CFGPARM_ID_PEF_ALERT_STARTUP_DELAY 4
+#define PEF_CFGPARM_ID_PEF_FILTER_TABLE_SIZE 5
+#define PEF_CFGPARM_ID_PEF_FILTER_TABLE_ENTRY 6
+#define PEF_CFGPARM_ID_PEF_FILTER_TABLE_DATA_1 7
+#define PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_SIZE 8
+#define PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_ENTRY 9
+#define PEF_CFGPARM_ID_SYSTEM_GUID 10
+#define PEF_CFGPARM_ID_PEF_ALERT_STRING_TABLE_SIZE 11
+#define PEF_CFGPARM_ID_PEF_ALERT_STRING_KEY 12
+#define PEF_CFGPARM_ID_PEF_ALERT_STRING_TABLE_ENTRY 13
+	uint8_t id;
+	uint8_t set;
+	uint8_t block;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_set_in_progress {
+#define PEF_SET_IN_PROGRESS_COMMIT_WRITE 0x02 
+#define PEF_SET_IN_PROGRESS 0x01
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_control {
+#define PEF_CONTROL_ENABLE_ALERT_STARTUP_DELAY 0x08
+#define PEF_CONTROL_ENABLE_STARTUP_DELAY 0x04
+#define PEF_CONTROL_ENABLE_EVENT_MESSAGES 0x02
+#define PEF_CONTROL_ENABLE 0x01
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static struct bit_desc_map
+pef_b2s_control __attribute__((unused)) = {
+BIT_DESC_MAP_ALL,
+{	{"PEF",							PEF_CONTROL_ENABLE},
+	{"PEF event messages",		PEF_CONTROL_ENABLE_EVENT_MESSAGES},
+	{"PEF startup delay",		PEF_CONTROL_ENABLE_STARTUP_DELAY},
+	{"Alert startup delay",		PEF_CONTROL_ENABLE_ALERT_STARTUP_DELAY},
+	{NULL}
+}	};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_action {
+#define PEF_ACTION_ENABLE_DIAGNOSTIC_INTERRUPT 0x20
+#define PEF_ACTION_ENABLE_OEM 0x10
+#define PEF_ACTION_ENABLE_POWER_CYCLE 0x08
+#define PEF_ACTION_ENABLE_RESET 0x04
+#define PEF_ACTION_ENABLE_POWER_DOWN 0x02
+#define PEF_ACTION_ENABLE_ALERT 0x01
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_startup_delay {
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_alert_startup_delay {
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_filter_table_size {
+#define PEF_FILTER_TABLE_SIZE_MASK 0x7f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_filter_table_entry {
+# define PEF_FILTER_DISABLED 0x7F
+# define PEF_FILTER_ENABLED 0x80
+# define PEF_FILTER_TABLE_ID_MASK 0x7F
+	uint8_t data1;
+	struct pef_table_entry entry;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_filter_table_data_1 {
+	uint8_t id;
+	uint8_t cfg;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_policy_table_size {
+#define PEF_POLICY_TABLE_SIZE_MASK 0x7f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_policy_table_entry {
+#define PEF_POLICY_TABLE_ID_MASK 0x7f
+	uint8_t data1;
+	struct pef_policy_entry entry;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_system_guid {
+#define PEF_SYSTEM_GUID_USED_IN_PET 0x01
+	uint8_t data1;
+	uint8_t guid[16];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_alert_string_table_size {
+#define PEF_ALERT_STRING_TABLE_SIZE_MASK 0x7f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_alert_string_keys {
+#define PEF_ALERT_STRING_ID_MASK 0x7f
+	uint8_t data1;
+#define PEF_EVENT_FILTER_ID_MASK 0x7f
+	uint8_t data2;
+#define PEF_ALERT_STRING_SET_ID_MASK 0x7f
+	uint8_t data3;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_cfgparm_alert_string_table_entry {
+	uint8_t id;
+	uint8_t blockno;
+	uint8_t block[16];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+/* PEF - LAN */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_lan_cfgparm_selector {
+#define PEF_LAN_CFGPARM_CH_REVISION_ONLY_MASK 0x80
+#define PEF_LAN_CFGPARM_CH_MASK 0x0f
+#define PEF_LAN_CFGPARM_ID_PET_COMMUNITY 16
+#define PEF_LAN_CFGPARM_ID_DEST_COUNT 17
+#define PEF_LAN_CFGPARM_ID_DESTTYPE 18
+#define PEF_LAN_CFGPARM_ID_DESTADDR 19
+	uint8_t ch;
+	uint8_t id;
+	uint8_t set;
+	uint8_t block;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_lan_cfgparm_dest_size {
+#define PEF_LAN_DEST_TABLE_SIZE_MASK 0x0f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_lan_cfgparm_dest_type {
+#define PEF_LAN_DEST_TYPE_ID_MASK 0x0f
+	uint8_t dest;
+#define PEF_LAN_DEST_TYPE_ACK 0x80
+#define PEF_LAN_DEST_TYPE_MASK 0x07
+#define PEF_LAN_DEST_TYPE_PET 0
+#define PEF_LAN_DEST_TYPE_OEM_1 6
+#define PEF_LAN_DEST_TYPE_OEM_2 7
+	uint8_t dest_type;
+	uint8_t alert_timeout;
+#define PEF_LAN_RETRIES_MASK 0x07
+	uint8_t retries;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static struct bit_desc_map
+pef_b2s_lan_desttype __attribute__((unused)) = {
+BIT_DESC_MAP_LIST,
+{	{"Acknowledged",		PEF_LAN_DEST_TYPE_ACK},
+	{"PET",					PEF_LAN_DEST_TYPE_PET},
+	{"OEM 1",				PEF_LAN_DEST_TYPE_OEM_1},
+	{"OEM 2",				PEF_LAN_DEST_TYPE_OEM_2},
+	{NULL}
+}	};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_lan_cfgparm_dest_info {
+#define PEF_LAN_DEST_MASK 0x0f
+	uint8_t dest;
+#define PEF_LAN_DEST_ADDRTYPE_MASK 0xf0
+#define PEF_LAN_DEST_ADDRTYPE_SHIFT 4
+#define PEF_LAN_DEST_ADDRTYPE_IPV4_MAC 0x00
+	uint8_t addr_type;
+#define PEF_LAN_DEST_GATEWAY_USE_BACKUP 0x01
+	uint8_t gateway;
+	uint8_t ip[4];
+	uint8_t mac[6];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+/* PEF - Serial/PPP */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_selector {
+#define PEF_SERIAL_CFGPARM_CH_REVISION_ONLY_MASK 0x80
+#define PEF_SERIAL_CFGPARM_CH_MASK 0x0f
+#define PEF_SERIAL_CFGPARM_ID_DEST_COUNT 16
+#define PEF_SERIAL_CFGPARM_ID_DESTINFO 17
+#define PEF_SERIAL_CFGPARM_ID_DEST_DIAL_STRING_COUNT 20
+#define PEF_SERIAL_CFGPARM_ID_DEST_DIAL_STRING 21
+#define PEF_SERIAL_CFGPARM_ID_TAP_ACCT_COUNT 24
+#define PEF_SERIAL_CFGPARM_ID_TAP_ACCT_INFO 25
+#define PEF_SERIAL_CFGPARM_ID_TAP_ACCT_PAGER_STRING 27
+	uint8_t ch;
+	uint8_t id;
+	uint8_t set;
+	uint8_t block;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_dest_size {
+#define PEF_SERIAL_DEST_TABLE_SIZE_MASK 0x0f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_dest_info {
+#define PEF_SERIAL_DEST_MASK 0x0f
+	uint8_t dest;
+#define PEF_SERIAL_DEST_TYPE_ACK 0x80
+#define PEF_SERIAL_DEST_TYPE_MASK 0x0f
+#define PEF_SERIAL_DEST_TYPE_DIAL 0
+#define PEF_SERIAL_DEST_TYPE_TAP 1
+#define PEF_SERIAL_DEST_TYPE_PPP 2
+#define PEF_SERIAL_DEST_TYPE_BASIC_CALLBACK 3
+#define PEF_SERIAL_DEST_TYPE_PPP_CALLBACK 4
+#define PEF_SERIAL_DEST_TYPE_OEM_1 14
+#define PEF_SERIAL_DEST_TYPE_OEM_2 15
+	uint8_t dest_type;
+	uint8_t alert_timeout;
+#define PEF_SERIAL_RETRIES_MASK 0x77
+#define PEF_SERIAL_RETRIES_POST_CONNECT_MASK 0x70
+#define PEF_SERIAL_RETRIES_PRE_CONNECT_MASK 0x07
+	uint8_t retries;
+#define PEF_SERIAL_DIALPAGE_STRING_ID_MASK 0xf0
+#define PEF_SERIAL_DIALPAGE_STRING_ID_SHIFT 4
+#define PEF_SERIAL_TAP_PAGE_SERVICE_ID_MASK 0x0f 
+#define PEF_SERIAL_PPP_ACCT_IPADDR_ID_MASK 0xf0
+#define PEF_SERIAL_PPP_ACCT_IPADDR_ID_SHIFT 4
+#define PEF_SERIAL_PPP_ACCT_ID_MASK 0x0f
+#define PEF_SERIAL_CALLBACK_IPADDR_ID_MASK 0x0f
+#define PEF_SERIAL_CALLBACK_IPADDR_ID_SHIFT 4
+#define PEF_SERIAL_CALLBACK_ACCT_ID_MASK 0xf0
+	uint8_t data5;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static struct bit_desc_map
+pef_b2s_serial_desttype __attribute__((unused)) = {
+BIT_DESC_MAP_LIST,
+{	{"Acknowledged",		PEF_SERIAL_DEST_TYPE_ACK},
+	{"TAP page",			PEF_SERIAL_DEST_TYPE_TAP},
+	{"PPP PET",				PEF_SERIAL_DEST_TYPE_PPP},
+	{"Basic callback",	PEF_SERIAL_DEST_TYPE_BASIC_CALLBACK},
+	{"PPP callback",		PEF_SERIAL_DEST_TYPE_PPP_CALLBACK},
+	{"OEM 1",				PEF_SERIAL_DEST_TYPE_OEM_1},
+	{"OEM 2",				PEF_SERIAL_DEST_TYPE_OEM_2},
+	{NULL}
+}	};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_dial_string_count {
+#define PEF_SERIAL_DIAL_STRING_COUNT_MASK 0x0f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_dial_string {
+#define PEF_SERIAL_DIAL_STRING_MASK 0x0f
+	uint8_t data1;
+	uint8_t data2;
+	uint8_t data3;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_tap_acct_count {
+#define PEF_SERIAL_TAP_ACCT_COUNT_MASK 0x0f
+	uint8_t data1;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_tap_acct_info {
+	uint8_t data1;
+#define PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_MASK 0xf0
+#define PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_SHIFT 4
+#define PEF_SERIAL_TAP_ACCT_INFO_SVC_SETTINGS_ID_MASK 0x0f
+	uint8_t data2;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct pef_serial_cfgparm_tap_svc_settings {
+	uint8_t data1;
+#define PEF_SERIAL_TAP_CONFIRMATION_ACK_AFTER_ETX 0x0
+#define PEF_SERIAL_TAP_CONFIRMATION_211_ACK_AFTER_ETX 0x01
+#define PEF_SERIAL_TAP_CONFIRMATION_21X_ACK_AFTER_ETX 0x02
+	uint8_t confirmation_flags;
+	uint8_t service_type[3];
+	uint8_t escape_mask[4];
+	uint8_t timeout_parms[3];
+	uint8_t retry_parms[2];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+static struct bit_desc_map
+pef_b2s_tap_svc_confirm __attribute__((unused)) = {
+BIT_DESC_MAP_LIST,
+{	{"ACK",						PEF_SERIAL_TAP_CONFIRMATION_ACK_AFTER_ETX},
+	{"211+ACK",					PEF_SERIAL_TAP_CONFIRMATION_211_ACK_AFTER_ETX},
+	{"{211|213}+ACK",			PEF_SERIAL_TAP_CONFIRMATION_21X_ACK_AFTER_ETX},
+	{NULL}
+}	};
+
+#if 0		/* FYI : config parm groupings */
+	struct pef_config_parms {								/* PEF */
+		struct pef_cfgparm_set_in_progress;
+		struct pef_cfgparm_control;
+		struct pef_cfgparm_action;
+		struct pef_cfgparm_startup_delay;				/* in seconds, 1-based */
+		struct pef_cfgparm_alert_startup_delay;		/* in seconds, 1-based */
+		struct pef_cfgparm_filter_table_size;			/* 1-based, READ-ONLY */
+		struct pef_cfgparm_filter_table_entry;
+		struct pef_cfgparm_filter_table_data_1;
+		struct pef_cfgparm_policy_table_size;
+		struct pef_cfgparm_policy_table_entry;
+		struct pef_cfgparm_system_guid;
+		struct pef_cfgparm_alert_string_table_size;
+		struct pef_cfgparm_alert_string_keys;
+		struct pef_cfgparm_alert_string_table_entry;
+	} ATTRIBUTE_PACKING;
+
+	struct pef_lan_config_parms {							/* LAN */
+		struct pef_lan_cfgparm_set_in_progress;
+		struct pef_lan_cfgparm_auth_capabilities;
+		struct pef_lan_cfgparm_auth_type;
+		struct pef_lan_cfgparm_ip_address;
+		struct pef_lan_cfgparm_ip_address_source;
+		struct pef_lan_cfgparm_mac_address;
+		struct pef_lan_cfgparm_subnet_mask;
+		struct pef_lan_cfgparm_ipv4_header_parms;
+		struct pef_lan_cfgparm_primary_rmcp_port;
+		struct pef_lan_cfgparm_secondary_rmcp_port;
+		struct pef_lan_cfgparm_bmc_generated_arp_control;
+		struct pef_lan_cfgparm_gratuitous_arp;
+		struct pef_lan_cfgparm_default_gateway_ipaddr;
+		struct pef_lan_cfgparm_default_gateway_macaddr;
+		struct pef_lan_cfgparm_backup_gateway_ipaddr;
+		struct pef_lan_cfgparm_backup_gateway_macaddr;
+		struct pef_lan_cfgparm_pet_community;
+		struct pef_lan_cfgparm_destination_count;
+		struct pef_lan_cfgparm_destination_type;
+		struct pef_lan_cfgparm_destination_ipaddr;
+	} ATTRIBUTE_PACKING;
+
+	struct pef_serial_config_parms {						/* Serial/PPP */
+		struct pef_serial_cfgparm_set_in_progress;
+		struct pef_serial_cfgparm_auth_capabilities;
+		struct pef_serial_cfgparm_auth_type;
+		struct pef_serial_cfgparm_connection_mode;
+		struct pef_serial_cfgparm_idle_timeout;
+		struct pef_serial_cfgparm_callback_control;
+		struct pef_serial_cfgparm_session_termination;
+		struct pef_serial_cfgparm_ipmi_settings;
+		struct pef_serial_cfgparm_mux_control;
+		struct pef_serial_cfgparm_modem_ring_time;
+		struct pef_serial_cfgparm_modem_init_string;
+		struct pef_serial_cfgparm_modem_escape_sequence;
+		struct pef_serial_cfgparm_modem_hangup_sequence;
+		struct pef_serial_cfgparm_modem_dial_command;
+		struct pef_serial_cfgparm_page_blackout_interval;
+		struct pef_serial_cfgparm_pet_community;
+		struct pef_serial_cfgparm_destination_count;
+		struct pef_serial_cfgparm_destination_info;
+		struct pef_serial_cfgparm_call_retry_interval;
+		struct pef_serial_cfgparm_destination_settings;
+		struct pef_serial_cfgparm_dialstring_count;
+		struct pef_serial_cfgparm_dialstring_info;
+		struct pef_serial_cfgparm_ipaddr_count;
+		struct pef_serial_cfgparm_ipaddr_info;
+		struct pef_serial_cfgparm_tap_acct_count;
+		struct pef_serial_cfgparm_tap_acct_info;
+		struct pef_serial_cfgparm_tap_acct_passwords;			/* WRITE only */
+		struct pef_serial_cfgparm_tap_pager_id_strings;
+		struct pef_serial_cfgparm_tap_service_settings;
+		struct pef_serial_cfgparm_terminal_mode_config;
+		struct pef_serial_cfgparm_ppp_otions;
+		struct pef_serial_cfgparm_ppp_primary_rmcp_port;
+		struct pef_serial_cfgparm_ppp_secondary_rmcp_port;
+		struct pef_serial_cfgparm_ppp_link_auth;
+		struct pef_serial_cfgparm_ppp_chap_name;
+		struct pef_serial_cfgparm_ppp_accm;
+		struct pef_serial_cfgparm_ppp_snoop_accm;
+		struct pef_serial_cfgparm_ppp_acct_count;
+		struct pef_serial_cfgparm_ppp_acct_dialstring_selector;
+		struct pef_serial_cfgparm_ppp_acct_ipaddrs;
+		struct pef_serial_cfgparm_ppp_acct_user_names;
+		struct pef_serial_cfgparm_ppp_acct_user_domains;
+		struct pef_serial_cfgparm_ppp_acct_user_passwords;		/* WRITE only */
+		struct pef_serial_cfgparm_ppp_acct_auth_settings;
+		struct pef_serial_cfgparm_ppp_acct_connect_hold_times;
+		struct pef_serial_cfgparm_ppp_udp_proxy_ipheader;
+		struct pef_serial_cfgparm_ppp_udp_proxy_xmit_bufsize;
+		struct pef_serial_cfgparm_ppp_udp_proxy_recv_bufsize;
+		struct pef_serial_cfgparm_ppp_remote_console_ipaddr;
+	} ATTRIBUTE_PACKING;
+#endif
+
+#define IPMI_CMD_GET_PEF_CAPABILITIES 0x10
+#define IPMI_CMD_SET_PEF_CONFIG_PARMS 0x12
+#define IPMI_CMD_GET_PEF_CONFIG_PARMS 0x13
+#define IPMI_CMD_GET_LAST_PROCESSED_EVT_ID 0x15
+#define IPMI_CMD_GET_SYSTEM_GUID 0x37
+#define IPMI_CMD_GET_CHANNEL_INFO 0x42
+#define IPMI_CMD_LAN_GET_CONFIG 0x02
+#define IPMI_CMD_SERIAL_GET_CONFIG 0x11
+
+struct pef_cfgparm_set_policy_table_entry
+{
+	uint8_t param_selector;
+	uint8_t policy_id;
+	struct pef_policy_entry entry;
+} ATTRIBUTE_PACKING;
+
+const char * ipmi_pef_bit_desc(struct bit_desc_map * map, uint32_t val);
+void ipmi_pef_print_flags(struct bit_desc_map * map, flg_e type, uint32_t val);
+void ipmi_pef_print_dec(const char * text, uint32_t val);
+void ipmi_pef_print_hex(const char * text, uint32_t val);
+void ipmi_pef_print_1xd(const char * text, uint32_t val);
+void ipmi_pef_print_2xd(const char * text, uint8_t u1, uint8_t u2);
+void ipmi_pef_print_str(const char * text, const char * val);
+
+int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /* IPMI_PEF_H */
diff --git a/include/ipmitool/ipmi_picmg.h b/include/ipmitool/ipmi_picmg.h
new file mode 100644
index 0000000..3d70454
--- /dev/null
+++ b/include/ipmitool/ipmi_picmg.h
@@ -0,0 +1,211 @@
+
+/*
+	(C) Kontron
+ */
+
+#ifndef _IPMI_PICMG_H_
+#define _IPMI_PICMG_H_
+
+#include <ipmitool/ipmi.h>
+
+/* PICMG version */
+#define PICMG_CPCI_MAJOR_VERSION                   1
+#define PICMG_ATCA_MAJOR_VERSION                   2
+#define PICMG_AMC_MAJOR_VERSION                    4
+
+/* PICMG commands */
+#define PICMG_GET_PICMG_PROPERTIES_CMD             0x00
+#define PICMG_GET_ADDRESS_INFO_CMD                 0x01
+#define PICMG_GET_SHELF_ADDRESS_INFO_CMD           0x02
+#define PICMG_SET_SHELF_ADDRESS_INFO_CMD           0x03
+#define PICMG_FRU_CONTROL_CMD                      0x04
+#define PICMG_GET_FRU_LED_PROPERTIES_CMD           0x05
+#define PICMG_GET_LED_COLOR_CAPABILITIES_CMD       0x06
+#define PICMG_SET_FRU_LED_STATE_CMD                0x07
+#define PICMG_GET_FRU_LED_STATE_CMD                0x08
+#define PICMG_SET_IPMB_CMD                         0x09
+#define PICMG_SET_FRU_POLICY_CMD                   0x0A
+#define PICMG_GET_FRU_POLICY_CMD                   0x0B
+#define PICMG_FRU_ACTIVATION_CMD                   0x0C
+#define PICMG_GET_DEVICE_LOCATOR_RECORD_CMD        0x0D
+#define PICMG_SET_PORT_STATE_CMD                   0x0E
+#define PICMG_GET_PORT_STATE_CMD                   0x0F
+#define PICMG_COMPUTE_POWER_PROPERTIES_CMD         0x10
+#define PICMG_SET_POWER_LEVEL_CMD                  0x11
+#define PICMG_GET_POWER_LEVEL_CMD                  0x12
+#define PICMG_RENEGOTIATE_POWER_CMD                0x13
+#define PICMG_GET_FAN_SPEED_PROPERTIES_CMD         0x14
+#define PICMG_SET_FAN_LEVEL_CMD                    0x15
+#define PICMG_GET_FAN_LEVEL_CMD                    0x16
+#define PICMG_BUSED_RESOURCE_CMD                   0x17
+
+/* AMC.0 commands */
+#define PICMG_AMC_SET_PORT_STATE_CMD			0x19
+#define PICMG_AMC_GET_PORT_STATE_CMD			0x1A
+/* AMC.0 R2.0 commands */
+#define PICMG_AMC_SET_CLK_STATE_CMD				0x2C
+#define PICMG_AMC_GET_CLK_STATE_CMD				0x2D
+
+/* Site Types */
+#define PICMG_ATCA_BOARD                           0x00
+#define PICMG_POWER_ENTRY                          0x01
+#define PICMG_SHELF_FRU                            0x02
+#define PICMG_DEDICATED_SHMC                       0x03
+#define PICMG_FAN_TRAY                             0x04
+#define PICMG_FAN_FILTER_TRAY                      0x05
+#define PICMG_ALARM                                0x06
+#define PICMG_AMC                                  0x07
+#define PICMG_PMC                                  0x08
+#define PICMG_RTM                                  0x09
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct picmg_set_fru_activation_cmd {
+   unsigned char  picmg_id;      /* always 0*/
+   unsigned char  fru_id;        /* threshold setting mask */
+   unsigned char  fru_state;     /* fru activation/deactivation */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+typedef enum picmg_busres_board_cmd_types {
+	PICMG_BUSRES_BOARD_CMD_QUERY =0,
+	PICMG_BUSRES_BOARD_CMD_RELEASE,
+	PICMG_BUSRES_BOARD_CMD_FORCE,
+	PICMG_BUSRES_BOARD_CMD_BUS_FREE
+} t_picmg_busres_board_cmd_types ;
+
+typedef enum picmg_busres_shmc_cmd_types {
+	PICMG_BUSRES_SHMC_CMD_REQUEST =0,
+	PICMG_BUSRES_SHMC_CMD_RELINQUISH,
+	PICMG_BUSRES_SHMC_CMD_NOTIFY
+} t_picmg_busres_shmc_cmd_types ;
+
+typedef enum picmg_busres_resource_id {
+	PICMG_BUSRES_METAL_TEST_BUS_1=0,
+	PICMG_BUSRES_METAL_TEST_BUS_2,
+	PICMG_BUSRES_SYNC_CLOCK_GROUP_1,
+	PICMG_BUSRES_SYNC_CLOCK_GROUP_2,
+	PICMG_BUSRES_SYNC_CLOCK_GROUP_3
+} t_picmg_busres_resource_id;
+
+/* the LED color capabilities */
+static const char* led_color_str[] __attribute__((unused)) = {
+   "reserved",
+   "BLUE",
+   "RED",
+   "GREEN",
+   "AMBER",
+   "ORANGE",
+   "WHITE",
+   "reserved"
+};
+
+
+static const char* amc_link_type_str[] __attribute__((unused)) = {
+   "RESERVED",
+   "RESERVED1",
+   "PCI EXPRESS",
+   "ADVANCED SWITCHING1",
+   "ADVANCED SWITCHING2",
+   "ETHERNET",
+   "RAPIDIO",
+   "STORAGE",
+};
+
+static const char* amc_link_type_ext_str[][16] __attribute__((unused)) = {
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED */
+	{
+		"", "", "", "", "", "", "", "",   "", "", "", "", "", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED1 */
+	{
+		"", "", "", "", "", "", "", "",   "", "", "", "", "", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_PCI_EXPRESS */
+	{
+		"Gen 1 - NSSC",
+		"Gen 1 - SSC",
+		"Gen 2 - NSSC",
+		"Gen 2 - SSC",
+		"", "", "", "",
+		"", "", "", "", 
+		"", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_ADVANCED_SWITCHING1 */
+	{
+		"Gen 1 - NSSC",
+		"Gen 1 - SSC",
+		"Gen 2 - NSSC",
+		"Gen 2 - SSC",
+		"", "", "", "",
+		"", "", "", "", 
+		"", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_ADVANCED_SWITCHING2 */
+	{
+		"Gen 1 - NSSC",
+		"Gen 1 - SSC",
+		"Gen 2 - NSSC",
+		"Gen 2 - SSC",
+		"", "", "", "",
+		"", "", "", "", 
+		"", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET */
+	{
+   		"1000BASE-BX (SerDES Gigabit)",
+   		"10GBASE-BX410 Gigabit XAUI",
+   		"", "", 
+   		"", "", "", "",
+		"", "", "", "", 
+		"", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_RAPIDIO */
+	{
+   		"1.25 Gbaud transmission rate",
+   		"2.5 Gbaud transmission rate",
+   		"3.125 Gbaud transmission rate",
+   		"", "", "", "", "",
+		"", "", "", "", "", "", "", ""
+	},
+	/* FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE */
+	{
+   		"Fibre Channel", 
+   		"Serial ATA", 
+   		"Serial Attached SCSI",
+   		"", "", "", "", "",
+		"", "", "", "", "", "", "", ""
+	}
+};
+
+struct sAmcPortState {
+#ifndef WORDS_BIGENDIAN
+   unsigned short lane0       :  1;
+   unsigned short lane1       :  1;
+   unsigned short lane2       :  1;
+   unsigned short lane3       :  1;
+   unsigned short type        :  8;
+   unsigned short type_ext    :  4;
+   unsigned char  group_id    :  8;
+#else
+   unsigned char  group_id    :  8;
+   unsigned short type_ext    :  4;
+   unsigned short type        :  8;
+   unsigned short lane3       :  1;
+   unsigned short lane2       :  1;
+   unsigned short lane1       :  1;
+   unsigned short lane0       :  1;
+#endif
+
+   unsigned char state;
+};
+
+
+int ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv);
+uint8_t picmg_discover(struct ipmi_intf *intf);
+uint8_t ipmi_picmg_ipmb_address(struct ipmi_intf *intf);
+
+#endif
diff --git a/include/ipmitool/ipmi_raw.h b/include/ipmitool/ipmi_raw.h
new file mode 100644
index 0000000..f4364f3
--- /dev/null
+++ b/include/ipmitool/ipmi_raw.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_RAW_H
+#define IPMI_RAW_H
+
+#include <ipmitool/ipmi.h>
+
+int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv);
+struct ipmi_rs * ipmi_master_write_read(struct ipmi_intf * intf, uint8_t bus, uint8_t addr,
+					uint8_t * wdata, uint8_t wsize, uint8_t rsize);
+int ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv);
+int ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /* IPMI_RAW_H */
diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
new file mode 100644
index 0000000..41bb533
--- /dev/null
+++ b/include/ipmitool/ipmi_sdr.h
@@ -0,0 +1,956 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SDR_H
+#define IPMI_SDR_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <inttypes.h>
+#include <math.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_entity.h>
+
+int ipmi_sdr_main(struct ipmi_intf *, int, char **);
+
+#define tos32(val, bits)    ((val & ((1<<((bits)-1)))) ? (-((val) & (1<<((bits)-1))) | (val)) : (val))
+
+#if WORDS_BIGENDIAN
+# define __TO_TOL(mtol)     (uint16_t)(mtol & 0x3f)
+# define __TO_M(mtol)       (int16_t)(tos32((((mtol & 0xff00) >> 8) | ((mtol & 0xc0) << 2)), 10))
+# define __TO_B(bacc)       (int32_t)(tos32((((bacc & 0xff000000) >> 24) | ((bacc & 0xc00000) >> 14)), 10))
+# define __TO_ACC(bacc)     (uint32_t)(((bacc & 0x3f0000) >> 16) | ((bacc & 0xf000) >> 6))
+# define __TO_ACC_EXP(bacc) (uint32_t)((bacc & 0xc00) >> 10)
+# define __TO_R_EXP(bacc)   (int32_t)(tos32(((bacc & 0xf0) >> 4), 4))
+# define __TO_B_EXP(bacc)   (int32_t)(tos32((bacc & 0xf), 4))
+#else
+# define __TO_TOL(mtol)     (uint16_t)(BSWAP_16(mtol) & 0x3f)
+# define __TO_M(mtol)       (int16_t)(tos32((((BSWAP_16(mtol) & 0xff00) >> 8) | ((BSWAP_16(mtol) & 0xc0) << 2)), 10))
+# define __TO_B(bacc)       (int32_t)(tos32((((BSWAP_32(bacc) & 0xff000000) >> 24) | \
+                            ((BSWAP_32(bacc) & 0xc00000) >> 14)), 10))
+# define __TO_ACC(bacc)     (uint32_t)(((BSWAP_32(bacc) & 0x3f0000) >> 16) | ((BSWAP_32(bacc) & 0xf000) >> 6))
+# define __TO_ACC_EXP(bacc) (uint32_t)((BSWAP_32(bacc) & 0xc00) >> 10)
+# define __TO_R_EXP(bacc)   (int32_t)(tos32(((BSWAP_32(bacc) & 0xf0) >> 4), 4))
+# define __TO_B_EXP(bacc)   (int32_t)(tos32((BSWAP_32(bacc) & 0xf), 4))
+#endif
+
+enum {
+	ANALOG_SENSOR,
+	DISCRETE_SENSOR,
+};
+
+#define READING_UNAVAILABLE	0x20
+#define SCANNING_DISABLED	0x40
+#define EVENT_MSG_DISABLED	0x80
+
+#define IS_READING_UNAVAILABLE(val)	((val) & READING_UNAVAILABLE)
+#define IS_SCANNING_DISABLED(val)	(!((val) & SCANNING_DISABLED))
+#define IS_EVENT_MSG_DISABLED(val)	(!((val) & EVENT_MSG_DISABLED))
+
+#define GET_SDR_REPO_INFO	0x20
+#define GET_SDR_ALLOC_INFO	0x21
+
+#define SDR_SENSOR_STAT_LO_NC	(1<<0)
+#define SDR_SENSOR_STAT_LO_CR	(1<<1)
+#define SDR_SENSOR_STAT_LO_NR	(1<<2)
+#define SDR_SENSOR_STAT_HI_NC	(1<<3)
+#define SDR_SENSOR_STAT_HI_CR	(1<<4)
+#define SDR_SENSOR_STAT_HI_NR	(1<<5)
+
+#define GET_DEVICE_SDR_INFO      0x20
+#define GET_DEVICE_SDR           0x21
+#define GET_SENSOR_FACTORS      0x23
+#define GET_SENSOR_FACTORS      0x23
+#define SET_SENSOR_HYSTERESIS	0x24
+#define GET_SENSOR_HYSTERESIS	0x25
+#define SET_SENSOR_THRESHOLDS   0x26
+#define GET_SENSOR_THRESHOLDS   0x27
+#define SET_SENSOR_EVENT_ENABLE	0x28
+#define GET_SENSOR_EVENT_ENABLE 0x29
+#define GET_SENSOR_EVENT_STATUS	0x2b
+#define GET_SENSOR_READING	0x2d
+#define GET_SENSOR_TYPE		0x2f
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_repo_info_rs {
+	uint8_t version;	/* SDR version (51h) */
+	uint16_t count;		/* number of records */
+	uint16_t free;		/* free space in SDR */
+	uint32_t add_stamp;	/* last add timestamp */
+	uint32_t erase_stamp;	/* last del timestamp */
+	uint8_t op_support;	/* supported operations */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+/* builtin (device) sdrs support */
+struct sdr_device_info_rs {
+	unsigned char count;	/* number of records */
+	unsigned char flags;	/* flags */
+	unsigned char popChangeInd[3];	/* free space in SDR */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+#define GET_SDR_RESERVE_REPO	0x22
+struct sdr_reserve_repo_rs {
+	uint16_t reserve_id;	/* reservation ID */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+#define GET_SDR		0x23
+struct sdr_get_rq {
+	uint16_t reserve_id;	/* reservation ID */
+	uint16_t id;		/* record ID */
+	uint8_t offset;		/* offset into SDR */
+#define GET_SDR_ENTIRE_RECORD	0xff
+	uint8_t length;		/* length to read */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_get_rs {
+	uint16_t next;		/* next record id */
+	uint16_t id;		/* record ID */
+	uint8_t version;	/* SDR version (51h) */
+#define SDR_RECORD_TYPE_FULL_SENSOR		0x01
+#define SDR_RECORD_TYPE_COMPACT_SENSOR		0x02
+#define SDR_RECORD_TYPE_EVENTONLY_SENSOR	0x03
+#define SDR_RECORD_TYPE_ENTITY_ASSOC		0x08
+#define SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC	0x09
+#define SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR	0x10
+#define SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR	0x11
+#define SDR_RECORD_TYPE_MC_DEVICE_LOCATOR	0x12
+#define SDR_RECORD_TYPE_MC_CONFIRMATION		0x13
+#define SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO	0x14
+#define SDR_RECORD_TYPE_OEM			0xc0
+	uint8_t type;		/* record type */
+	uint8_t length;		/* remaining record bytes */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_mask {
+	union {
+		struct {
+			uint16_t assert_event;	/* assertion event mask */
+			uint16_t deassert_event;	/* de-assertion event mask */
+			uint16_t read;	/* discrete reading mask */
+		} ATTRIBUTE_PACKING discrete;
+		struct {
+#if WORDS_BIGENDIAN
+			uint16_t reserved:1;
+			uint16_t status_lnr:1;
+			uint16_t status_lcr:1;
+			uint16_t status_lnc:1;
+			uint16_t assert_unr_high:1;
+			uint16_t assert_unr_low:1;
+			uint16_t assert_ucr_high:1;
+			uint16_t assert_ucr_low:1;
+			uint16_t assert_unc_high:1;
+			uint16_t assert_unc_low:1;
+			uint16_t assert_lnr_high:1;
+			uint16_t assert_lnr_low:1;
+			uint16_t assert_lcr_high:1;
+			uint16_t assert_lcr_low:1;
+			uint16_t assert_lnc_high:1;
+			uint16_t assert_lnc_low:1;
+#else
+			uint16_t assert_lnc_low:1;
+			uint16_t assert_lnc_high:1;
+			uint16_t assert_lcr_low:1;
+			uint16_t assert_lcr_high:1;
+			uint16_t assert_lnr_low:1;
+			uint16_t assert_lnr_high:1;
+			uint16_t assert_unc_low:1;
+			uint16_t assert_unc_high:1;
+			uint16_t assert_ucr_low:1;
+			uint16_t assert_ucr_high:1;
+			uint16_t assert_unr_low:1;
+			uint16_t assert_unr_high:1;
+			uint16_t status_lnc:1;
+			uint16_t status_lcr:1;
+			uint16_t status_lnr:1;
+			uint16_t reserved:1;
+#endif
+#if WORDS_BIGENDIAN
+			uint16_t reserved_2:1;
+			uint16_t status_unr:1;
+			uint16_t status_ucr:1;
+			uint16_t status_unc:1;
+			uint16_t deassert_unr_high:1;
+			uint16_t deassert_unr_low:1;
+			uint16_t deassert_ucr_high:1;
+			uint16_t deassert_ucr_low:1;
+			uint16_t deassert_unc_high:1;
+			uint16_t deassert_unc_low:1;
+			uint16_t deassert_lnr_high:1;
+			uint16_t deassert_lnr_low:1;
+			uint16_t deassert_lcr_high:1;
+			uint16_t deassert_lcr_low:1;
+			uint16_t deassert_lnc_high:1;
+			uint16_t deassert_lnc_low:1;
+#else
+			uint16_t deassert_lnc_low:1;
+			uint16_t deassert_lnc_high:1;
+			uint16_t deassert_lcr_low:1;
+			uint16_t deassert_lcr_high:1;
+			uint16_t deassert_lnr_low:1;
+			uint16_t deassert_lnr_high:1;
+			uint16_t deassert_unc_low:1;
+			uint16_t deassert_unc_high:1;
+			uint16_t deassert_ucr_low:1;
+			uint16_t deassert_ucr_high:1;
+			uint16_t deassert_unr_low:1;
+			uint16_t deassert_unr_high:1;
+			uint16_t status_unc:1;
+			uint16_t status_ucr:1;
+			uint16_t status_unr:1;
+			uint16_t reserved_2:1;
+#endif
+			union {
+				struct {
+#if WORDS_BIGENDIAN			/* settable threshold mask */
+					uint16_t reserved:2;
+					uint16_t unr:1;
+					uint16_t ucr:1;
+					uint16_t unc:1;
+					uint16_t lnr:1;
+					uint16_t lcr:1;
+					uint16_t lnc:1;
+					/* padding lower 8 bits */
+					uint16_t readable:8;
+#else
+					uint16_t readable:8;
+					uint16_t lnc:1;
+					uint16_t lcr:1;
+					uint16_t lnr:1;
+					uint16_t unc:1;
+					uint16_t ucr:1;
+					uint16_t unr:1;
+					uint16_t reserved:2;
+#endif
+				} ATTRIBUTE_PACKING set;
+				struct {
+#if WORDS_BIGENDIAN			/* readable threshold mask */
+					/* padding upper 8 bits */
+					uint16_t settable:8;
+					uint16_t reserved:2;
+					uint16_t unr:1;
+					uint16_t ucr:1;
+					uint16_t unc:1;
+					uint16_t lnr:1;
+					uint16_t lcr:1;
+					uint16_t lnc:1;
+#else
+					uint16_t lnc:1;
+					uint16_t lcr:1;
+					uint16_t lnr:1;
+					uint16_t unc:1;
+					uint16_t ucr:1;
+					uint16_t unr:1;
+					uint16_t reserved:2;
+					uint16_t settable:8;
+#endif
+				} ATTRIBUTE_PACKING read;
+			} ATTRIBUTE_PACKING;
+		} ATTRIBUTE_PACKING threshold;
+	} ATTRIBUTE_PACKING type;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_common_sensor {
+	struct {
+		uint8_t owner_id;
+#if WORDS_BIGENDIAN
+		uint8_t channel:4;	/* channel number */
+		uint8_t __reserved:2;
+		uint8_t lun:2;	/* sensor owner lun */
+#else
+		uint8_t lun:2;	/* sensor owner lun */
+		uint8_t __reserved:2;
+		uint8_t channel:4;	/* channel number */
+#endif
+		uint8_t sensor_num;	/* unique sensor number */
+	} ATTRIBUTE_PACKING keys;
+
+	struct entity_id entity;
+
+	struct {
+		struct {
+#if WORDS_BIGENDIAN
+			uint8_t __reserved:1;
+			uint8_t scanning:1;
+			uint8_t events:1;
+			uint8_t thresholds:1;
+			uint8_t hysteresis:1;
+			uint8_t type:1;
+			uint8_t event_gen:1;
+			uint8_t sensor_scan:1;
+#else
+			uint8_t sensor_scan:1;
+			uint8_t event_gen:1;
+			uint8_t type:1;
+			uint8_t hysteresis:1;
+			uint8_t thresholds:1;
+			uint8_t events:1;
+			uint8_t scanning:1;
+			uint8_t __reserved:1;
+#endif
+		} ATTRIBUTE_PACKING init;
+		struct {
+#if WORDS_BIGENDIAN
+			uint8_t ignore:1;
+			uint8_t rearm:1;
+			uint8_t hysteresis:2;
+			uint8_t threshold:2;
+			uint8_t event_msg:2;
+#else
+			uint8_t event_msg:2;
+			uint8_t threshold:2;
+			uint8_t hysteresis:2;
+			uint8_t rearm:1;
+			uint8_t ignore:1;
+#endif
+		} ATTRIBUTE_PACKING capabilities;
+		uint8_t type;
+	} ATTRIBUTE_PACKING sensor;
+
+	uint8_t event_type;	/* event/reading type code */
+
+	struct sdr_record_mask mask;
+
+	struct {
+#if WORDS_BIGENDIAN
+		uint8_t analog:2;
+		uint8_t rate:3;
+		uint8_t modifier:2;
+		uint8_t pct:1;
+#else
+		uint8_t pct:1;
+		uint8_t modifier:2;
+		uint8_t rate:3;
+		uint8_t analog:2;
+#endif
+		struct {
+			uint8_t base;
+			uint8_t modifier;
+		} ATTRIBUTE_PACKING type;
+	} ATTRIBUTE_PACKING unit;
+} ATTRIBUTE_PACKING;
+
+/* SDR Record Common Sensor header macros */
+#define IS_THRESHOLD_SENSOR(s)	((s)->event_type == 1)
+#define UNITS_ARE_DISCRETE(s)	((s)->unit.analog == 3)
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_compact_sensor {
+	struct sdr_record_common_sensor cmn;
+	struct {
+#if WORDS_BIGENDIAN
+		uint8_t __reserved:2;
+		uint8_t mod_type:2;
+		uint8_t count:4;
+#else
+		uint8_t count:4;
+		uint8_t mod_type:2;
+		uint8_t __reserved:2;
+#endif
+#if WORDS_BIGENDIAN
+		uint8_t entity_inst:1;
+		uint8_t mod_offset:7;
+#else
+		uint8_t mod_offset:7;
+		uint8_t entity_inst:1;
+#endif
+	} ATTRIBUTE_PACKING share;
+
+	struct {
+		struct {
+			uint8_t positive;
+			uint8_t negative;
+		} ATTRIBUTE_PACKING hysteresis;
+	} ATTRIBUTE_PACKING threshold;
+
+	uint8_t __reserved[3];
+	uint8_t oem;		/* reserved for OEM use */
+	uint8_t id_code;	/* sensor ID string type/length code */
+	uint8_t id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_eventonly_sensor {
+	struct {
+		uint8_t owner_id;
+#if WORDS_BIGENDIAN
+		uint8_t channel:4;	/* channel number */
+		uint8_t fru_owner:2;	/* fru device owner lun */
+		uint8_t lun:2;	/* sensor owner lun */
+#else
+		uint8_t lun:2;	/* sensor owner lun */
+		uint8_t fru_owner:2;	/* fru device owner lun */
+		uint8_t channel:4;	/* channel number */
+#endif
+		uint8_t sensor_num;	/* unique sensor number */
+	} ATTRIBUTE_PACKING keys;
+
+	struct entity_id entity;
+
+	uint8_t sensor_type;	/* sensor type */
+	uint8_t event_type;	/* event/reading type code */
+
+	struct {
+#if WORDS_BIGENDIAN
+		uint8_t __reserved:2;
+		uint8_t mod_type:2;
+		uint8_t count:4;
+#else
+		uint8_t count:4;
+		uint8_t mod_type:2;
+		uint8_t __reserved:2;
+#endif
+#if WORDS_BIGENDIAN
+		uint8_t entity_inst:1;
+		uint8_t mod_offset:7;
+#else
+		uint8_t mod_offset:7;
+		uint8_t entity_inst:1;
+#endif
+	} ATTRIBUTE_PACKING share;
+
+	uint8_t __reserved;
+	uint8_t oem;		/* reserved for OEM use */
+	uint8_t id_code;	/* sensor ID string type/length code */
+	uint8_t id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_full_sensor {
+	struct sdr_record_common_sensor cmn;
+
+#define SDR_SENSOR_L_LINEAR     0x00
+#define SDR_SENSOR_L_LN         0x01
+#define SDR_SENSOR_L_LOG10      0x02
+#define SDR_SENSOR_L_LOG2       0x03
+#define SDR_SENSOR_L_E          0x04
+#define SDR_SENSOR_L_EXP10      0x05
+#define SDR_SENSOR_L_EXP2       0x06
+#define SDR_SENSOR_L_1_X        0x07
+#define SDR_SENSOR_L_SQR        0x08
+#define SDR_SENSOR_L_CUBE       0x09
+#define SDR_SENSOR_L_SQRT       0x0a
+#define SDR_SENSOR_L_CUBERT     0x0b
+#define SDR_SENSOR_L_NONLINEAR  0x70
+
+	uint8_t linearization;	/* 70h=non linear, 71h-7Fh=non linear, OEM */
+	uint16_t mtol;		/* M, tolerance */
+	uint32_t bacc;		/* accuracy, B, Bexp, Rexp */
+
+	struct {
+#if WORDS_BIGENDIAN
+		uint8_t __reserved:5;
+		uint8_t normal_min:1;	/* normal min field specified */
+		uint8_t normal_max:1;	/* normal max field specified */
+		uint8_t nominal_read:1;	/* nominal reading field specified */
+#else
+		uint8_t nominal_read:1;	/* nominal reading field specified */
+		uint8_t normal_max:1;	/* normal max field specified */
+		uint8_t normal_min:1;	/* normal min field specified */
+		uint8_t __reserved:5;
+#endif
+	} ATTRIBUTE_PACKING analog_flag;
+
+	uint8_t nominal_read;	/* nominal reading, raw value */
+	uint8_t normal_max;	/* normal maximum, raw value */
+	uint8_t normal_min;	/* normal minimum, raw value */
+	uint8_t sensor_max;	/* sensor maximum, raw value */
+	uint8_t sensor_min;	/* sensor minimum, raw value */
+
+	struct {
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} ATTRIBUTE_PACKING upper;
+		struct {
+			uint8_t non_recover;
+			uint8_t critical;
+			uint8_t non_critical;
+		} ATTRIBUTE_PACKING lower;
+		struct {
+			uint8_t positive;
+			uint8_t negative;
+		} ATTRIBUTE_PACKING hysteresis;
+	} ATTRIBUTE_PACKING threshold;
+	uint8_t __reserved[2];
+	uint8_t oem;		/* reserved for OEM use */
+	uint8_t id_code;	/* sensor ID string type/length code */
+	uint8_t id_string[16];	/* sensor ID string bytes, only if id_code != 0 */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_mc_locator {
+	uint8_t dev_slave_addr;
+#if WORDS_BIGENDIAN
+	uint8_t __reserved2:4;
+	uint8_t channel_num:4;
+#else
+	uint8_t channel_num:4;
+	uint8_t __reserved2:4;
+#endif
+#if WORDS_BIGENDIAN
+	uint8_t pwr_state_notif:3;
+	uint8_t __reserved3:1;
+	uint8_t global_init:4;
+#else
+	uint8_t global_init:4;
+	uint8_t __reserved3:1;
+	uint8_t pwr_state_notif:3;
+#endif
+	uint8_t dev_support;
+	uint8_t __reserved4[3];
+	struct entity_id entity;
+	uint8_t oem;
+	uint8_t id_code;
+	uint8_t id_string[16];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct sdr_record_fru_locator {
+	uint8_t dev_slave_addr;
+	uint8_t device_id;
+#if WORDS_BIGENDIAN
+	uint8_t logical:1;
+	uint8_t __reserved2:2;
+	uint8_t lun:2;
+	uint8_t bus:3;
+#else
+	uint8_t bus:3;
+	uint8_t lun:2;
+	uint8_t __reserved2:2;
+	uint8_t logical:1;
+#endif
+#if WORDS_BIGENDIAN
+	uint8_t channel_num:4;
+	uint8_t __reserved3:4;
+#else
+	uint8_t __reserved3:4;
+	uint8_t channel_num:4;
+#endif
+	uint8_t __reserved4;
+	uint8_t dev_type;
+	uint8_t dev_type_modifier;
+	struct entity_id entity;
+	uint8_t oem;
+	uint8_t id_code;
+	uint8_t id_string[16];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_generic_locator {
+	uint8_t dev_access_addr;
+	uint8_t dev_slave_addr;
+#if WORDS_BIGENDIAN
+	uint8_t channel_num:3;
+	uint8_t lun:2;
+	uint8_t bus:3;
+#else
+	uint8_t bus:3;
+	uint8_t lun:2;
+	uint8_t channel_num:3;
+#endif
+#if WORDS_BIGENDIAN
+	uint8_t addr_span:3;
+	uint8_t __reserved1:5;
+#else
+	uint8_t __reserved1:5;
+	uint8_t addr_span:3;
+#endif
+	uint8_t __reserved2;
+	uint8_t dev_type;
+	uint8_t dev_type_modifier;
+	struct entity_id entity;
+	uint8_t oem;
+	uint8_t id_code;
+	uint8_t id_string[16];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_entity_assoc {
+	struct entity_id entity;	/* container entity ID and instance */
+	struct {
+#if WORDS_BIGENDIAN
+		uint8_t isrange:1;
+		uint8_t islinked:1;
+		uint8_t isaccessable:1;
+		uint8_t __reserved:5;
+#else
+		uint8_t __reserved:5;
+		uint8_t isaccessable:1;
+		uint8_t islinked:1;
+		uint8_t isrange:1;
+#endif
+	} flags;
+	uint8_t entity_id_1;	/* entity ID 1    |  range 1 entity */
+	uint8_t entity_inst_1;	/* entity inst 1  |  range 1 first instance */
+	uint8_t entity_id_2;	/* entity ID 2    |  range 1 entity */
+	uint8_t entity_inst_2;	/* entity inst 2  |  range 1 last instance */
+	uint8_t entity_id_3;	/* entity ID 3    |  range 2 entity */
+	uint8_t entity_inst_3;	/* entity inst 3  |  range 2 first instance */
+	uint8_t entity_id_4;	/* entity ID 4    |  range 2 entity */
+	uint8_t entity_inst_4;	/* entity inst 4  |  range 2 last instance */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct sdr_record_oem {
+	uint8_t *data;
+	int data_len;
+};
+
+/*
+ * The Get SDR Repository Info response structure
+ * From table 33-3 of the IPMI v2.0 spec
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct get_sdr_repository_info_rsp {
+	uint8_t sdr_version;
+	uint8_t record_count_lsb;
+	uint8_t record_count_msb;
+	uint8_t free_space[2];
+	uint8_t most_recent_addition_timestamp[4];
+	uint8_t most_recent_erase_timestamp[4];
+#if WORDS_BIGENDIAN
+	uint8_t overflow_flag:1;
+	uint8_t modal_update_support:2;
+	uint8_t __reserved1:1;
+	uint8_t delete_sdr_supported:1;
+	uint8_t partial_add_sdr_supported:1;
+	uint8_t reserve_sdr_repository_supported:1;
+	uint8_t get_sdr_repository_allo_info_supported:1;
+#else
+	uint8_t get_sdr_repository_allo_info_supported:1;
+	uint8_t reserve_sdr_repository_supported:1;
+	uint8_t partial_add_sdr_supported:1;
+	uint8_t delete_sdr_supported:1;
+	uint8_t __reserved1:1;
+	uint8_t modal_update_support:2;
+	uint8_t overflow_flag:1;
+#endif
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct ipmi_sdr_iterator {
+	uint16_t reservation;
+	int total;
+	int next;
+	int use_built_in;
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_record_list {
+	uint16_t id;
+	uint8_t version;
+	uint8_t type;
+	uint8_t length;
+	uint8_t *raw;
+	struct sdr_record_list *next;
+	union {
+		struct sdr_record_common_sensor *common;
+		struct sdr_record_full_sensor *full;
+		struct sdr_record_compact_sensor *compact;
+		struct sdr_record_eventonly_sensor *eventonly;
+		struct sdr_record_generic_locator *genloc;
+		struct sdr_record_fru_locator *fruloc;
+		struct sdr_record_mc_locator *mcloc;
+		struct sdr_record_entity_assoc *entassoc;
+		struct sdr_record_oem *oem;
+	} ATTRIBUTE_PACKING  record;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+/* unit description codes (IPMI v1.5 section 37.16) */
+#define UNIT_MAX	0x90
+static const char *unit_desc[] __attribute__ ((unused)) = {
+"unspecified",
+	    "degrees C", "degrees F", "degrees K",
+	    "Volts", "Amps", "Watts", "Joules",
+	    "Coulombs", "VA", "Nits",
+	    "lumen", "lux", "Candela",
+	    "kPa", "PSI", "Newton",
+	    "CFM", "RPM", "Hz",
+	    "microsecond", "millisecond", "second", "minute", "hour",
+	    "day", "week", "mil", "inches", "feet", "cu in", "cu feet",
+	    "mm", "cm", "m", "cu cm", "cu m", "liters", "fluid ounce",
+	    "radians", "steradians", "revolutions", "cycles",
+	    "gravities", "ounce", "pound", "ft-lb", "oz-in", "gauss",
+	    "gilberts", "henry", "millihenry", "farad", "microfarad",
+	    "ohms", "siemens", "mole", "becquerel", "PPM", "reserved",
+	    "Decibels", "DbA", "DbC", "gray", "sievert",
+	    "color temp deg K", "bit", "kilobit", "megabit", "gigabit",
+	    "byte", "kilobyte", "megabyte", "gigabyte", "word", "dword",
+	    "qword", "line", "hit", "miss", "retry", "reset",
+	    "overflow", "underrun", "collision", "packets", "messages",
+	    "characters", "error", "correctable error", "uncorrectable error",};
+
+/* sensor type codes (IPMI v1.5 table 36.3) 
+  / Updated to v2.0 Table 42-3, Sensor Type Codes */
+#define SENSOR_TYPE_MAX 0x2C
+static const char *sensor_type_desc[] __attribute__ ((unused)) = {
+"reserved",
+	    "Temperature", "Voltage", "Current", "Fan",
+	    "Physical Security", "Platform Security", "Processor",
+	    "Power Supply", "Power Unit", "Cooling Device", "Other",
+	    "Memory", "Drive Slot / Bay", "POST Memory Resize",
+	    "System Firmwares", "Event Logging Disabled", "Watchdog1",
+	    "System Event", "Critical Interrupt", "Button",
+	    "Module / Board", "Microcontroller", "Add-in Card",
+	    "Chassis", "Chip Set", "Other FRU", "Cable / Interconnect",
+	    "Terminator", "System Boot Initiated", "Boot Error",
+	    "OS Boot", "OS Critical Stop", "Slot / Connector",
+	    "System ACPI Power State", "Watchdog2", "Platform Alert",
+	    "Entity Presence", "Monitor ASIC", "LAN",
+	    "Management Subsys Health", "Battery", "Session Audit",
+	    "Version Change", "FRU State" };
+
+struct sensor_reading {
+	char		s_id[17];		/* name of the sensor */
+	struct sdr_record_full_sensor    *full;
+	struct sdr_record_compact_sensor *compact;
+	uint8_t		s_reading_valid;	/* read value valididity */
+	uint8_t		s_scanning_disabled;	/* read of value disabled */
+	uint8_t		s_reading_unavailable;	/* read value unavailable */
+	uint8_t		s_reading;		/* value which was read */
+	uint8_t		s_data2;		/* data2 value read */
+	uint8_t		s_data3;		/* data3 value read */
+	uint8_t		s_has_analog_value;	/* sensor has analog value */
+	double		s_a_val;		/* read value converted to analog */
+	char		s_a_str[16];		/* analog value as a string */
+	const char	*s_a_units;		/* analog value units string */
+};
+
+/*
+ * Determine if bridging is necessary to address a sensor at the given
+ * address (_addr) and (_chan) via the interface (_intf).
+ *
+ * If the sensor is being addressed on channel zero, it resides on
+ * IPMB-0.  If the interface target IPMB-0 address is exactly the same as
+ * the sensor address then the sensor resides on the target IPMB-0
+ * so we don't need extra levels of bridging to address  the sensor.
+ *	Or
+ * If the sensor target address and channel match the interface target address
+ * and channel then there is no extra levels of bridging required.
+ *
+ * Note:
+ *	The target IPMB-0 address is the address of the SDR repository that was
+ *	accessed using the user specified bridging command line arguments.
+ *	Access to any sensor on the target IPMB-0 can be addressed using the
+ *	target address and transit address in the interface.
+ */
+#define BRIDGE_TO_SENSOR(_intf, _addr, _chan)			\
+ ( !((_chan == 0 && _intf->target_ipmb_addr &&			\
+			     _intf->target_ipmb_addr == _addr)  ||	\
+    (_addr == _intf->target_addr && _chan == _intf->target_channel)) )
+
+
+struct ipmi_sdr_iterator *ipmi_sdr_start(struct ipmi_intf *intf,
+                                         int use_builtin);
+struct sdr_get_rs *ipmi_sdr_get_next_header(struct ipmi_intf *intf,
+					    struct ipmi_sdr_iterator *i);
+uint8_t *ipmi_sdr_get_record(struct ipmi_intf *intf, struct sdr_get_rs *header,
+			     struct ipmi_sdr_iterator *i);
+void ipmi_sdr_end(struct ipmi_intf *intf, struct ipmi_sdr_iterator *i);
+int ipmi_sdr_print_sdr(struct ipmi_intf *intf, uint8_t type);
+
+int ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf,uint16_t id,
+                                      uint8_t type,uint8_t * raw);
+int ipmi_sdr_print_rawentry(struct ipmi_intf *intf, uint8_t type, uint8_t * raw,
+			    int len);
+int ipmi_sdr_print_listentry(struct ipmi_intf *intf,
+			     struct sdr_record_list *entry);
+void ipmi_sdr_print_sensor_hysteresis(struct sdr_record_common_sensor *sensor,
+		 struct sdr_record_full_sensor   *full,
+		 uint8_t hysteresis_value,
+		 const char *hdrstr);
+const char *ipmi_sdr_get_unit_string(uint8_t pct, uint8_t type,
+				      uint8_t base, uint8_t modifier);
+struct sensor_reading *
+ipmi_sdr_read_sensor_value(struct ipmi_intf *intf,
+		struct sdr_record_common_sensor *sensor,
+		uint8_t sdr_record_type, int precision);
+const char *ipmi_sdr_get_thresh_status(struct sensor_reading *sr,
+					const char *invalidstr);
+const char *ipmi_sdr_get_status(int, const char *, uint8_t stat);
+double sdr_convert_sensor_tolerance(struct sdr_record_full_sensor *sensor,
+				  uint8_t val);
+double sdr_convert_sensor_reading(struct sdr_record_full_sensor *sensor,
+				  uint8_t val);
+double sdr_convert_sensor_hysterisis(struct sdr_record_full_sensor *sensor,
+				  uint8_t val);
+uint8_t sdr_convert_sensor_value_to_raw(struct sdr_record_full_sensor *sensor,
+					double val);
+struct ipmi_rs *ipmi_sdr_get_sensor_reading(struct ipmi_intf *intf,
+					    uint8_t sensor);
+struct ipmi_rs *ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf,
+						 uint8_t sensor,
+						 uint8_t target,
+						 uint8_t lun,
+						 uint8_t channel);
+struct ipmi_rs *ipmi_sdr_get_sensor_thresholds(struct ipmi_intf *intf,
+					       uint8_t sensor,
+					       uint8_t target, uint8_t lun, uint8_t channel);
+struct ipmi_rs *ipmi_sdr_get_sensor_hysteresis(struct ipmi_intf *intf,
+					       uint8_t sensor,
+					       uint8_t target, uint8_t lun, uint8_t channel);
+int ipmi_sdr_get_reservation(struct ipmi_intf *intf, int use_builtin,
+                             uint16_t * reserve_id);
+
+int ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+				    struct sdr_record_eventonly_sensor *sensor);
+int ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+					  struct sdr_record_generic_locator
+					  *fru);
+int ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+				      struct sdr_record_fru_locator *fru);
+int ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+				     struct sdr_record_mc_locator *mc);
+int ipmi_sdr_print_sensor_entity_assoc(struct ipmi_intf *intf,
+				       struct sdr_record_entity_assoc *assoc);
+
+struct sdr_record_list *ipmi_sdr_find_sdr_byentity(struct ipmi_intf *intf,
+						   struct entity_id *entity);
+struct sdr_record_list *ipmi_sdr_find_sdr_bynumtype(struct ipmi_intf *intf,
+					uint16_t gen_id, uint8_t num, uint8_t type);
+struct sdr_record_list *ipmi_sdr_find_sdr_bysensortype(struct ipmi_intf *intf,
+						       uint8_t type);
+struct sdr_record_list *ipmi_sdr_find_sdr_byid(struct ipmi_intf *intf,
+					       char *id);
+struct sdr_record_list *ipmi_sdr_find_sdr_bytype(struct ipmi_intf *intf,
+						 uint8_t type);
+int ipmi_sdr_list_cache(struct ipmi_intf *intf);
+int ipmi_sdr_list_cache_fromfile(struct ipmi_intf *intf, const char *ifile);
+void ipmi_sdr_list_empty(struct ipmi_intf *intf);
+int ipmi_sdr_print_info(struct ipmi_intf *intf);
+void ipmi_sdr_print_discrete_state(struct ipmi_intf *intf,
+				const char *desc, uint8_t sensor_type,
+				uint8_t event_type, uint8_t state1,
+				uint8_t state2);
+void ipmi_sdr_print_discrete_state_mini(struct ipmi_intf *intf,
+					const char *header, const char *separator,
+					uint8_t sensor_type, uint8_t event_type,
+					uint8_t state1, uint8_t state2);
+int ipmi_sdr_print_sensor_event_status(struct ipmi_intf *intf,
+				       uint8_t sensor_num, uint8_t sensor_type,
+				       uint8_t event_type, int numeric_fmt,
+				       uint8_t target, uint8_t lun, uint8_t channel);
+int ipmi_sdr_print_sensor_event_enable(struct ipmi_intf *intf,
+				       uint8_t sensor_num, uint8_t sensor_type,
+				       uint8_t event_type, int numeric_fmt,
+				       uint8_t target, uint8_t lun, uint8_t channel);
+
+#endif				/* IPMI_SDR_H */
diff --git a/include/ipmitool/ipmi_sdradd.h b/include/ipmitool/ipmi_sdradd.h
new file mode 100644
index 0000000..b39e82b
--- /dev/null
+++ b/include/ipmitool/ipmi_sdradd.h
@@ -0,0 +1,46 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+ 
+#ifndef IPMI_SDRADD_H
+#define IPMI_SDRADD_H
+
+/*
+ * Methods to add SDRs to repository from built-in sensors or files
+ */
+int
+ipmi_sdr_add_from_sensors(struct ipmi_intf *intf, int maxslot);
+
+int
+ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile);
+
+int
+ipmi_sdr_add_from_list(struct ipmi_intf *intf, const char *rangeList);
+
+#endif /* IPMI_SDRADD_H */
diff --git a/include/ipmitool/ipmi_sel.h b/include/ipmitool/ipmi_sel.h
new file mode 100644
index 0000000..1c325db
--- /dev/null
+++ b/include/ipmitool/ipmi_sel.h
@@ -0,0 +1,691 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SEL_H
+#define IPMI_SEL_H
+
+#include <inttypes.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+
+#define IPMI_CMD_GET_SEL_INFO		0x40
+#define IPMI_CMD_GET_SEL_ALLOC_INFO	0x41
+#define IPMI_CMD_RESERVE_SEL		0x42
+#define IPMI_CMD_GET_SEL_ENTRY		0x43
+#define IPMI_CMD_ADD_SEL_ENTRY		0x44
+#define IPMI_CMD_PARTIAL_ADD_SEL_ENTRY	0x45
+#define IPMI_CMD_DELETE_SEL_ENTRY	0x46
+#define IPMI_CMD_CLEAR_SEL		0x47
+#define IPMI_CMD_GET_SEL_TIME		0x48
+#define IPMI_CMD_SET_SEL_TIME		0x49
+#define IPMI_CMD_GET_AUX_LOG_STATUS	0x5A
+#define IPMI_CMD_SET_AUX_LOG_STATUS	0x5B
+
+enum {
+	IPMI_EVENT_CLASS_DISCRETE,
+	IPMI_EVENT_CLASS_DIGITAL,
+	IPMI_EVENT_CLASS_THRESHOLD,
+	IPMI_EVENT_CLASS_OEM,
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sel_get_rq {
+	uint16_t	reserve_id;
+	uint16_t	record_id;
+	uint8_t	offset;
+	uint8_t	length;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct standard_spec_sel_rec{
+	uint32_t	timestamp;
+	uint16_t	gen_id;
+	uint8_t	evm_rev;
+	uint8_t	sensor_type;
+	uint8_t	sensor_num;
+#if WORDS_BIGENDIAN
+	uint8_t	event_dir  : 1;
+	uint8_t	event_type : 7;
+#else
+	uint8_t	event_type : 7;
+	uint8_t	event_dir  : 1;
+#endif
+#define DATA_BYTE2_SPECIFIED_MASK	0xc0    /* event_data[0] bit mask */
+#define DATA_BYTE3_SPECIFIED_MASK	0x30    /* event_data[0] bit mask */
+#define EVENT_OFFSET_MASK		0x0f    /* event_data[0] bit mask */
+	uint8_t	event_data[3];
+};
+/* Dell Specific MACRO's */
+#define	OEM_CODE_IN_BYTE2		0x80	  /* Dell specific OEM Byte in Byte 2 Mask */
+#define	OEM_CODE_IN_BYTE3		0x20	  /* Dell specific OEM Byte in Byte 3 Mask */
+/* MASK MACROS */
+#define	MASK_LOWER_NIBBLE		0x0F
+#define	MASK_HIGHER_NIBBLE		0xF0
+/*Senosr type Macro's */
+#define	SENSOR_TYPE_MEMORY		0x0C
+#define	SENSOR_TYPE_CRIT_INTR		0x13
+#define	SENSOR_TYPE_EVT_LOG		0x10
+#define	SENSOR_TYPE_SYS_EVENT		0x12
+#define	SENSOR_TYPE_PROCESSOR		0x07
+#define	SENSOR_TYPE_OEM_SEC_EVENT	0xC1
+#define SENSOR_TYPE_VER_CHANGE		0x2B
+#define	SENSOR_TYPE_FRM_PROG		0x0F
+#define	SENSOR_TYPE_WTDOG		0x23
+#define	SENSOR_TYPE_OEM_NFATAL_ERROR	0xC2
+#define	SENSOR_TYPE_OEM_FATAL_ERROR	0xC3
+#define SENSOR_TYPE_TXT_CMD_ERROR	0x20
+#define SENSOR_TYPE_SUPERMICRO_OEM 0xD0
+/* End of Macro for DELL Specific */
+#define SEL_OEM_TS_DATA_LEN		6
+#define SEL_OEM_NOTS_DATA_LEN		13
+struct oem_ts_spec_sel_rec{
+	uint32_t timestamp;
+	uint8_t manf_id[3];
+	uint8_t	oem_defined[SEL_OEM_TS_DATA_LEN];
+};
+
+struct oem_nots_spec_sel_rec{
+	uint8_t oem_defined[SEL_OEM_NOTS_DATA_LEN];
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sel_event_record {
+	uint16_t	record_id;
+	uint8_t	record_type;
+	union{
+		struct standard_spec_sel_rec standard_type;
+		struct oem_ts_spec_sel_rec oem_ts_type;
+		struct oem_nots_spec_sel_rec oem_nots_type;
+	} sel_type;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct ipmi_event_sensor_types {
+	uint8_t	code;
+	uint8_t	offset;
+#define ALL_OFFSETS_SPECIFIED  0xff
+	uint8_t   data;
+	const char	* desc;
+};
+
+static const struct ipmi_event_sensor_types generic_event_types[] = {
+    /* Threshold Based States */
+    { 0x01, 0x00, 0xff, "Lower Non-critical going low " },
+    { 0x01, 0x01, 0xff, "Lower Non-critical going high" },
+    { 0x01, 0x02, 0xff, "Lower Critical going low " },
+    { 0x01, 0x03, 0xff, "Lower Critical going high" },
+    { 0x01, 0x04, 0xff, "Lower Non-recoverable going low " },
+    { 0x01, 0x05, 0xff, "Lower Non-recoverable going high" },
+    { 0x01, 0x06, 0xff, "Upper Non-critical going low " },
+    { 0x01, 0x07, 0xff, "Upper Non-critical going high" },
+    { 0x01, 0x08, 0xff, "Upper Critical going low " },
+    { 0x01, 0x09, 0xff, "Upper Critical going high" },
+    { 0x01, 0x0a, 0xff, "Upper Non-recoverable going low " },
+    { 0x01, 0x0b, 0xff, "Upper Non-recoverable going high" },
+    /* DMI-based "usage state" States */
+    { 0x02, 0x00, 0xff, "Transition to Idle" },
+    { 0x02, 0x01, 0xff, "Transition to Active" },
+    { 0x02, 0x02, 0xff, "Transition to Busy" },
+    /* Digital-Discrete Event States */
+    { 0x03, 0x00, 0xff, "State Deasserted" },
+    { 0x03, 0x01, 0xff, "State Asserted" },
+    { 0x04, 0x00, 0xff, "Predictive Failure Deasserted" },
+    { 0x04, 0x01, 0xff, "Predictive Failure Asserted" },
+    { 0x05, 0x00, 0xff, "Limit Not Exceeded" },
+    { 0x05, 0x01, 0xff, "Limit Exceeded" },
+    { 0x06, 0x00, 0xff, "Performance Met" },
+    { 0x06, 0x01, 0xff, "Performance Lags" },
+    /* Severity Event States */
+    { 0x07, 0x00, 0xff, "Transition to OK" },
+    { 0x07, 0x01, 0xff, "Transition to Non-critical from OK" },
+    { 0x07, 0x02, 0xff, "Transition to Critical from less severe" },
+    { 0x07, 0x03, 0xff, "Transition to Non-recoverable from less severe" },
+    { 0x07, 0x04, 0xff, "Transition to Non-critical from more severe" },
+    { 0x07, 0x05, 0xff, "Transition to Critical from Non-recoverable" },
+    { 0x07, 0x06, 0xff, "Transition to Non-recoverable" },
+    { 0x07, 0x07, 0xff, "Monitor" },
+    { 0x07, 0x08, 0xff, "Informational" },
+    /* Availability Status States */
+    { 0x08, 0x00, 0xff, "Device Absent" },
+    { 0x08, 0x01, 0xff, "Device Present" },
+    { 0x09, 0x00, 0xff, "Device Disabled" },
+    { 0x09, 0x01, 0xff, "Device Enabled" },
+    { 0x0a, 0x00, 0xff, "Transition to Running" },
+    { 0x0a, 0x01, 0xff, "Transition to In Test" },
+    { 0x0a, 0x02, 0xff, "Transition to Power Off" },
+    { 0x0a, 0x03, 0xff, "Transition to On Line" },
+    { 0x0a, 0x04, 0xff, "Transition to Off Line" },
+    { 0x0a, 0x05, 0xff, "Transition to Off Duty" },
+    { 0x0a, 0x06, 0xff, "Transition to Degraded" },
+    { 0x0a, 0x07, 0xff, "Transition to Power Save" },
+    { 0x0a, 0x08, 0xff, "Install Error" },
+    /* Redundancy States */
+    { 0x0b, 0x00, 0xff, "Fully Redundant" },
+    { 0x0b, 0x01, 0xff, "Redundancy Lost" },
+    { 0x0b, 0x02, 0xff, "Redundancy Degraded" },
+    { 0x0b, 0x03, 0xff, "Non-Redundant: Sufficient from Redundant" },
+    { 0x0b, 0x04, 0xff, "Non-Redundant: Sufficient from Insufficient" },
+    { 0x0b, 0x05, 0xff, "Non-Redundant: Insufficient Resources" },
+    { 0x0b, 0x06, 0xff, "Redundancy Degraded from Fully Redundant" },
+    { 0x0b, 0x07, 0xff, "Redundancy Degraded from Non-Redundant" },
+    /* ACPI Device Power States */
+    { 0x0c, 0x00, 0xff, "D0 Power State" },
+    { 0x0c, 0x01, 0xff, "D1 Power State" },
+    { 0x0c, 0x02, 0xff, "D2 Power State" },
+    { 0x0c, 0x03, 0xff, "D3 Power State" },
+    /* END */
+    { 0x00, 0x00, 0xff, NULL },
+};
+
+static const struct ipmi_event_sensor_types sensor_specific_event_types[] = {
+    /* Physical Security */
+    { 0x05, 0x00, 0xff, "General Chassis intrusion" },
+    { 0x05, 0x01, 0xff, "Drive Bay intrusion" },
+    { 0x05, 0x02, 0xff, "I/O Card area intrusion" },
+    { 0x05, 0x03, 0xff, "Processor area intrusion" },
+    { 0x05, 0x04, 0xff, "System unplugged from LAN" },
+    { 0x05, 0x05, 0xff, "Unauthorized dock" },
+    { 0x05, 0x06, 0xff, "FAN area intrusion" },
+    /* Platform Security */
+    { 0x06, 0x00, 0xff, "Front Panel Lockout violation attempted" },
+    { 0x06, 0x01, 0xff, "Pre-boot password violation - user password" },
+    { 0x06, 0x02, 0xff, "Pre-boot password violation - setup password" },
+    { 0x06, 0x03, 0xff, "Pre-boot password violation - network boot password" },
+    { 0x06, 0x04, 0xff, "Other pre-boot password violation" },
+    { 0x06, 0x05, 0xff, "Out-of-band access password violation" },
+    /* Processor */
+    { 0x07, 0x00, 0xff, "IERR" },
+    { 0x07, 0x01, 0xff, "Thermal Trip" },
+    { 0x07, 0x02, 0xff, "FRB1/BIST failure" },
+    { 0x07, 0x03, 0xff, "FRB2/Hang in POST failure" },
+    { 0x07, 0x04, 0xff, "FRB3/Processor startup/init failure" },
+    { 0x07, 0x05, 0xff, "Configuration Error" },
+    { 0x07, 0x06, 0xff, "SM BIOS Uncorrectable CPU-complex Error" },
+    { 0x07, 0x07, 0xff, "Presence detected" },
+    { 0x07, 0x08, 0xff, "Disabled" },
+    { 0x07, 0x09, 0xff, "Terminator presence detected" },
+    { 0x07, 0x0a, 0xff, "Throttled" },
+    { 0x07, 0x0b, 0xff, "Uncorrectable machine check exception" },
+    { 0x07, 0x0c, 0xff, "Correctable machine check error" },
+    /* Power Supply */
+    { 0x08, 0x00, 0xff, "Presence detected" },
+    { 0x08, 0x01, 0xff, "Failure detected" },
+    { 0x08, 0x02, 0xff, "Predictive failure" },
+    { 0x08, 0x03, 0xff, "Power Supply AC lost" },
+    { 0x08, 0x04, 0xff, "AC lost or out-of-range" },
+    { 0x08, 0x05, 0xff, "AC out-of-range, but present" },
+    { 0x08, 0x06, 0x00, "Config Error: Vendor Mismatch" },
+    { 0x08, 0x06, 0x01, "Config Error: Revision Mismatch" },
+    { 0x08, 0x06, 0x02, "Config Error: Processor Missing" },
+    { 0x08, 0x06, 0x03, "Config Error: Power Supply Rating Mismatch" },
+    { 0x08, 0x06, 0x04, "Config Error: Voltage Rating Mismatch" },
+    { 0x08, 0x06, 0xff, "Config Error" },
+    { 0x08, 0x06, 0xff, "Power Supply Inactive" },
+    /* Power Unit */
+    { 0x09, 0x00, 0xff, "Power off/down" },
+    { 0x09, 0x01, 0xff, "Power cycle" },
+    { 0x09, 0x02, 0xff, "240VA power down" },
+    { 0x09, 0x03, 0xff, "Interlock power down" },
+    { 0x09, 0x04, 0xff, "AC lost" },
+    { 0x09, 0x05, 0xff, "Soft-power control failure" },
+    { 0x09, 0x06, 0xff, "Failure detected" },
+    { 0x09, 0x07, 0xff, "Predictive failure" },
+    /* Memory */
+    { 0x0c, 0x00, 0xff, "Correctable ECC" },
+    { 0x0c, 0x01, 0xff, "Uncorrectable ECC" },
+    { 0x0c, 0x02, 0xff, "Parity" },
+    { 0x0c, 0x03, 0xff, "Memory Scrub Failed" },
+    { 0x0c, 0x04, 0xff, "Memory Device Disabled" },
+    { 0x0c, 0x05, 0xff, "Correctable ECC logging limit reached" },
+    { 0x0c, 0x06, 0xff, "Presence Detected" },
+    { 0x0c, 0x07, 0xff, "Configuration Error" },
+    { 0x0c, 0x08, 0xff, "Spare" },
+    { 0x0c, 0x09, 0xff, "Throttled" },
+    { 0x0c, 0x0a, 0xff, "Critical Overtemperature" },
+    /* Drive Slot */
+    { 0x0d, 0x00, 0xff, "Drive Present" },
+    { 0x0d, 0x01, 0xff, "Drive Fault" },
+    { 0x0d, 0x02, 0xff, "Predictive Failure" },
+    { 0x0d, 0x03, 0xff, "Hot Spare" },
+    { 0x0d, 0x04, 0xff, "Parity Check In Progress" },
+    { 0x0d, 0x05, 0xff, "In Critical Array" },
+    { 0x0d, 0x06, 0xff, "In Failed Array" },
+    { 0x0d, 0x07, 0xff, "Rebuild In Progress" },
+    { 0x0d, 0x08, 0xff, "Rebuild Aborted" },
+    /* System Firmware Error */
+    { 0x0f, 0x00, 0x00, "Unspecified" },
+    { 0x0f, 0x00, 0x01, "No system memory installed" },
+    { 0x0f, 0x00, 0x02, "No usable system memory" },
+    { 0x0f, 0x00, 0x03, "Unrecoverable IDE device failure" },
+    { 0x0f, 0x00, 0x04, "Unrecoverable system-board failure" },
+    { 0x0f, 0x00, 0x05, "Unrecoverable diskette failure" },
+    { 0x0f, 0x00, 0x06, "Unrecoverable hard-disk controller failure" },
+    { 0x0f, 0x00, 0x07, "Unrecoverable PS/2 or USB keyboard failure" },
+    { 0x0f, 0x00, 0x08, "Removable boot media not found" },
+    { 0x0f, 0x00, 0x09, "Unrecoverable video controller failure" },
+    { 0x0f, 0x00, 0x0a, "No video device selected" },
+    { 0x0f, 0x00, 0x0b, "BIOS corruption detected" },
+    { 0x0f, 0x00, 0x0c, "CPU voltage mismatch" },
+    { 0x0f, 0x00, 0x0d, "CPU speed mismatch failure" },
+    { 0x0f, 0x00, 0xff, "Unknown Error" },
+    /* System Firmware Hang */
+    { 0x0f, 0x01, 0x00, "Unspecified" },
+    { 0x0f, 0x01, 0x01, "Memory initialization" },
+    { 0x0f, 0x01, 0x02, "Hard-disk initialization" },
+    { 0x0f, 0x01, 0x03, "Secondary CPU Initialization" },
+    { 0x0f, 0x01, 0x04, "User authentication" },
+    { 0x0f, 0x01, 0x05, "User-initiated system setup" },
+    { 0x0f, 0x01, 0x06, "USB resource configuration" },
+    { 0x0f, 0x01, 0x07, "PCI resource configuration" },
+    { 0x0f, 0x01, 0x08, "Option ROM initialization" },
+    { 0x0f, 0x01, 0x09, "Video initialization" },
+    { 0x0f, 0x01, 0x0a, "Cache initialization" },
+    { 0x0f, 0x01, 0x0b, "SMBus initialization" },
+    { 0x0f, 0x01, 0x0c, "Keyboard controller initialization" },
+    { 0x0f, 0x01, 0x0d, "Management controller initialization" },
+    { 0x0f, 0x01, 0x0e, "Docking station attachment" },
+    { 0x0f, 0x01, 0x0f, "Enabling docking station" },
+    { 0x0f, 0x01, 0x10, "Docking station ejection" },
+    { 0x0f, 0x01, 0x11, "Disabling docking station" },
+    { 0x0f, 0x01, 0x12, "Calling operating system wake-up vector" },
+    { 0x0f, 0x01, 0x13, "System boot initiated" },
+    { 0x0f, 0x01, 0x14, "Motherboard initialization" },
+    { 0x0f, 0x01, 0x15, "reserved" },
+    { 0x0f, 0x01, 0x16, "Floppy initialization" },
+    { 0x0f, 0x01, 0x17, "Keyboard test" },
+    { 0x0f, 0x01, 0x18, "Pointing device test" },
+    { 0x0f, 0x01, 0x19, "Primary CPU initialization" },
+    { 0x0f, 0x01, 0xff, "Unknown Hang" },
+    /* System Firmware Progress */
+    { 0x0f, 0x02, 0x00, "Unspecified" },
+    { 0x0f, 0x02, 0x01, "Memory initialization" },
+    { 0x0f, 0x02, 0x02, "Hard-disk initialization" },
+    { 0x0f, 0x02, 0x03, "Secondary CPU Initialization" },
+    { 0x0f, 0x02, 0x04, "User authentication" },
+    { 0x0f, 0x02, 0x05, "User-initiated system setup" },
+    { 0x0f, 0x02, 0x06, "USB resource configuration" },
+    { 0x0f, 0x02, 0x07, "PCI resource configuration" },
+    { 0x0f, 0x02, 0x08, "Option ROM initialization" },
+    { 0x0f, 0x02, 0x09, "Video initialization" },
+    { 0x0f, 0x02, 0x0a, "Cache initialization" },
+    { 0x0f, 0x02, 0x0b, "SMBus initialization" },
+    { 0x0f, 0x02, 0x0c, "Keyboard controller initialization" },
+    { 0x0f, 0x02, 0x0d, "Management controller initialization" },
+    { 0x0f, 0x02, 0x0e, "Docking station attachment" },
+    { 0x0f, 0x02, 0x0f, "Enabling docking station" },
+    { 0x0f, 0x02, 0x10, "Docking station ejection" },
+    { 0x0f, 0x02, 0x11, "Disabling docking station" },
+    { 0x0f, 0x02, 0x12, "Calling operating system wake-up vector" },
+    { 0x0f, 0x02, 0x13, "System boot initiated" },
+    { 0x0f, 0x02, 0x14, "Motherboard initialization" },
+    { 0x0f, 0x02, 0x15, "reserved" },
+    { 0x0f, 0x02, 0x16, "Floppy initialization" },
+    { 0x0f, 0x02, 0x17, "Keyboard test" },
+    { 0x0f, 0x02, 0x18, "Pointing device test" },
+    { 0x0f, 0x02, 0x19, "Primary CPU initialization" },
+    { 0x0f, 0x02, 0xff, "Unknown Progress" },
+    /* Event Logging Disabled */
+    { 0x10, 0x00, 0xff, "Correctable memory error logging disabled" },
+    { 0x10, 0x01, 0xff, "Event logging disabled" },
+    { 0x10, 0x02, 0xff, "Log area reset/cleared" },
+    { 0x10, 0x03, 0xff, "All event logging disabled" },
+    { 0x10, 0x04, 0xff, "Log full" },
+    { 0x10, 0x05, 0xff, "Log almost full" },
+    /* Watchdog 1 */
+    { 0x11, 0x00, 0xff, "BIOS Reset" },
+    { 0x11, 0x01, 0xff, "OS Reset" },
+    { 0x11, 0x02, 0xff, "OS Shut Down" },
+    { 0x11, 0x03, 0xff, "OS Power Down" },
+    { 0x11, 0x04, 0xff, "OS Power Cycle" },
+    { 0x11, 0x05, 0xff, "OS NMI/Diag Interrupt" },
+    { 0x11, 0x06, 0xff, "OS Expired" },
+    { 0x11, 0x07, 0xff, "OS pre-timeout Interrupt" },
+    /* System Event */
+    { 0x12, 0x00, 0xff, "System Reconfigured" },
+    { 0x12, 0x01, 0xff, "OEM System boot event" },
+    { 0x12, 0x02, 0xff, "Undetermined system hardware failure" },
+    { 0x12, 0x03, 0xff, "Entry added to auxiliary log" },
+    { 0x12, 0x04, 0xff, "PEF Action" },
+    { 0x12, 0x05, 0xff, "Timestamp Clock Sync" },
+    /* Critical Interrupt */
+    { 0x13, 0x00, 0xff, "NMI/Diag Interrupt" },
+    { 0x13, 0x01, 0xff, "Bus Timeout" },
+    { 0x13, 0x02, 0xff, "I/O Channel check NMI" },
+    { 0x13, 0x03, 0xff, "Software NMI" },
+    { 0x13, 0x04, 0xff, "PCI PERR" },
+    { 0x13, 0x05, 0xff, "PCI SERR" },
+    { 0x13, 0x06, 0xff, "EISA failsafe timeout" },
+    { 0x13, 0x07, 0xff, "Bus Correctable error" },
+    { 0x13, 0x08, 0xff, "Bus Uncorrectable error" },
+    { 0x13, 0x09, 0xff, "Fatal NMI" },
+    { 0x13, 0x0a, 0xff, "Bus Fatal Error" },
+    { 0x13, 0x0b, 0xff, "Bus Degraded" },
+    /* Button */
+    { 0x14, 0x00, 0xff, "Power Button pressed" },
+    { 0x14, 0x01, 0xff, "Sleep Button pressed" },
+    { 0x14, 0x02, 0xff, "Reset Button pressed" },
+    { 0x14, 0x03, 0xff, "FRU Latch" },
+    { 0x14, 0x04, 0xff, "FRU Service" },
+    /* Chip Set */
+    { 0x19, 0x00, 0xff, "Soft Power Control Failure" },
+    { 0x19, 0x01, 0xff, "Thermal Trip" },
+    /* Cable/Interconnect */
+    { 0x1b, 0x00, 0xff, "Connected" },
+    { 0x1b, 0x01, 0xff, "Config Error" },
+    /* System Boot Initiated */
+    { 0x1d, 0x00, 0xff, "Initiated by power up" },
+    { 0x1d, 0x01, 0xff, "Initiated by hard reset" },
+    { 0x1d, 0x02, 0xff, "Initiated by warm reset" },
+    { 0x1d, 0x03, 0xff, "User requested PXE boot" },
+    { 0x1d, 0x04, 0xff, "Automatic boot to diagnostic" },
+    { 0x1d, 0x05, 0xff, "OS initiated hard reset" },
+    { 0x1d, 0x06, 0xff, "OS initiated warm reset" },
+    { 0x1d, 0x07, 0xff, "System Restart" },
+    /* Boot Error */
+    { 0x1e, 0x00, 0xff, "No bootable media" },
+    { 0x1e, 0x01, 0xff, "Non-bootable disk in drive" },
+    { 0x1e, 0x02, 0xff, "PXE server not found" },
+    { 0x1e, 0x03, 0xff, "Invalid boot sector" },
+    { 0x1e, 0x04, 0xff, "Timeout waiting for selection" },
+    /* OS Boot */
+    { 0x1f, 0x00, 0xff, "A: boot completed" },
+    { 0x1f, 0x01, 0xff, "C: boot completed" },
+    { 0x1f, 0x02, 0xff, "PXE boot completed" },
+    { 0x1f, 0x03, 0xff, "Diagnostic boot completed" },
+    { 0x1f, 0x04, 0xff, "CD-ROM boot completed" },
+    { 0x1f, 0x05, 0xff, "ROM boot completed" },
+    { 0x1f, 0x06, 0xff, "boot completed - device not specified" },
+    { 0x1f, 0x07, 0xff, "Installation started" },
+    { 0x1f, 0x08, 0xff, "Installation completed" },
+    { 0x1f, 0x09, 0xff, "Installation aborted" },
+    { 0x1f, 0x0a, 0xff, "Installation failed" },
+    /* OS Stop/Shutdown */
+    { 0x20, 0x00, 0xff, "Error during system startup" },
+    { 0x20, 0x01, 0xff, "Run-time critical stop" },
+    { 0x20, 0x02, 0xff, "OS graceful stop" },
+    { 0x20, 0x03, 0xff, "OS graceful shutdown" },
+    { 0x20, 0x04, 0xff, "PEF initiated soft shutdown" },
+    { 0x20, 0x05, 0xff, "Agent not responding" },
+    /* Slot/Connector */
+    { 0x21, 0x00, 0xff, "Fault Status" },
+    { 0x21, 0x01, 0xff, "Identify Status" },
+    { 0x21, 0x02, 0xff, "Device Installed" },
+    { 0x21, 0x03, 0xff, "Ready for Device Installation" },
+    { 0x21, 0x04, 0xff, "Ready for Device Removal" },
+    { 0x21, 0x05, 0xff, "Slot Power is Off" },
+    { 0x21, 0x06, 0xff, "Device Removal Request" },
+    { 0x21, 0x07, 0xff, "Interlock" },
+    { 0x21, 0x08, 0xff, "Slot is Disabled" },
+    { 0x21, 0x09, 0xff, "Spare Device" },
+    /* System ACPI Power State */
+    { 0x22, 0x00, 0xff, "S0/G0: working" },
+    { 0x22, 0x01, 0xff, "S1: sleeping with system hw & processor context maintained" },
+    { 0x22, 0x02, 0xff, "S2: sleeping, processor context lost" },
+    { 0x22, 0x03, 0xff, "S3: sleeping, processor & hw context lost, memory retained" },
+    { 0x22, 0x04, 0xff, "S4: non-volatile sleep/suspend-to-disk" },
+    { 0x22, 0x05, 0xff, "S5/G2: soft-off" },
+    { 0x22, 0x06, 0xff, "S4/S5: soft-off" },
+    { 0x22, 0x07, 0xff, "G3: mechanical off" },
+    { 0x22, 0x08, 0xff, "Sleeping in S1/S2/S3 state" },
+    { 0x22, 0x09, 0xff, "G1: sleeping" },
+    { 0x22, 0x0a, 0xff, "S5: entered by override" },
+    { 0x22, 0x0b, 0xff, "Legacy ON state" },
+    { 0x22, 0x0c, 0xff, "Legacy OFF state" },
+    { 0x22, 0x0e, 0xff, "Unknown" },
+    /* Watchdog 2 */
+    { 0x23, 0x00, 0xff, "Timer expired" },
+    { 0x23, 0x01, 0xff, "Hard reset" },
+    { 0x23, 0x02, 0xff, "Power down" },
+    { 0x23, 0x03, 0xff, "Power cycle" },
+    { 0x23, 0x04, 0xff, "reserved" },
+    { 0x23, 0x05, 0xff, "reserved" },
+    { 0x23, 0x06, 0xff, "reserved" },
+    { 0x23, 0x07, 0xff, "reserved" },
+    { 0x23, 0x08, 0xff, "Timer interrupt" },
+    /* Platform Alert */
+    { 0x24, 0x00, 0xff, "Platform generated page" },
+    { 0x24, 0x01, 0xff, "Platform generated LAN alert" },
+    { 0x24, 0x02, 0xff, "Platform Event Trap generated" },
+    { 0x24, 0x03, 0xff, "Platform generated SNMP trap, OEM format" },
+    /* Entity Presence */
+    { 0x25, 0x00, 0xff, "Present" },
+    { 0x25, 0x01, 0xff, "Absent" },
+    { 0x25, 0x02, 0xff, "Disabled" },
+    /* LAN */
+    { 0x27, 0x00, 0xff, "Heartbeat Lost" },
+    { 0x27, 0x01, 0xff, "Heartbeat" },
+    /* Management Subsystem Health */
+    { 0x28, 0x00, 0xff, "Sensor access degraded or unavailable" },
+    { 0x28, 0x01, 0xff, "Controller access degraded or unavailable" },
+    { 0x28, 0x02, 0xff, "Management controller off-line" },
+    { 0x28, 0x03, 0xff, "Management controller unavailable" },
+    { 0x28, 0x04, 0xff, "Sensor failure" },
+    { 0x28, 0x05, 0xff, "FRU failure" },
+    /* Battery */
+    { 0x29, 0x00, 0xff, "Low" },
+    { 0x29, 0x01, 0xff, "Failed" },
+    { 0x29, 0x02, 0xff, "Presence Detected" },
+    /* Version Change */
+    { 0x2b, 0x00, 0xff, "Hardware change detected" },
+    { 0x2b, 0x01, 0x00, "Firmware or software change detected" },
+    { 0x2b, 0x01, 0x01, "Firmware or software change detected, Mngmt Ctrl Dev Id" },
+    { 0x2b, 0x01, 0x02, "Firmware or software change detected, Mngmt Ctrl Firm Rev" },
+    { 0x2b, 0x01, 0x03, "Firmware or software change detected, Mngmt Ctrl Dev Rev" },
+    { 0x2b, 0x01, 0x04, "Firmware or software change detected, Mngmt Ctrl Manuf Id" },
+    { 0x2b, 0x01, 0x05, "Firmware or software change detected, Mngmt Ctrl IPMI Vers" },
+    { 0x2b, 0x01, 0x06, "Firmware or software change detected, Mngmt Ctrl Aux Firm Id" },
+    { 0x2b, 0x01, 0x07, "Firmware or software change detected, Mngmt Ctrl Firm Boot Block" },
+    { 0x2b, 0x01, 0x08, "Firmware or software change detected, Mngmt Ctrl Other" },
+    { 0x2b, 0x01, 0x09, "Firmware or software change detected, BIOS/EFI change" },
+    { 0x2b, 0x01, 0x0A, "Firmware or software change detected, SMBIOS change" },
+    { 0x2b, 0x01, 0x0B, "Firmware or software change detected, O/S change" },
+    { 0x2b, 0x01, 0x0C, "Firmware or software change detected, O/S loader change" },
+    { 0x2b, 0x01, 0x0D, "Firmware or software change detected, Service Diag change" },
+    { 0x2b, 0x01, 0x0E, "Firmware or software change detected, Mngmt SW agent change" },
+    { 0x2b, 0x01, 0x0F, "Firmware or software change detected, Mngmt SW App change" },
+    { 0x2b, 0x01, 0x10, "Firmware or software change detected, Mngmt SW Middle" },
+    { 0x2b, 0x01, 0x11, "Firmware or software change detected, Prog HW Change (FPGA)" },
+    { 0x2b, 0x01, 0x12, "Firmware or software change detected, board/FRU module change" },
+    { 0x2b, 0x01, 0x13, "Firmware or software change detected, board/FRU component change" },
+    { 0x2b, 0x01, 0x14, "Firmware or software change detected, board/FRU replace equ ver" },
+    { 0x2b, 0x01, 0x15, "Firmware or software change detected, board/FRU replace new ver" },
+    { 0x2b, 0x01, 0x16, "Firmware or software change detected, board/FRU replace old ver" },
+    { 0x2b, 0x01, 0x17, "Firmware or software change detected, board/FRU HW conf change" },
+    { 0x2b, 0x02, 0xff, "Hardware incompatibility detected" },
+    { 0x2b, 0x03, 0xff, "Firmware or software incompatibility detected" },
+    { 0x2b, 0x04, 0xff, "Invalid or unsupported hardware version" },
+    { 0x2b, 0x05, 0xff, "Invalid or unsupported firmware or software version" },
+    { 0x2b, 0x06, 0xff, "Hardware change success" },
+    { 0x2b, 0x07, 0x00, "Firmware or software change success" },
+    { 0x2b, 0x07, 0x01, "Firmware or software change success, Mngmt Ctrl Dev Id" },
+    { 0x2b, 0x07, 0x02, "Firmware or software change success, Mngmt Ctrl Firm Rev" },
+    { 0x2b, 0x07, 0x03, "Firmware or software change success, Mngmt Ctrl Dev Rev" },
+    { 0x2b, 0x07, 0x04, "Firmware or software change success, Mngmt Ctrl Manuf Id" },
+    { 0x2b, 0x07, 0x05, "Firmware or software change success, Mngmt Ctrl IPMI Vers" },
+    { 0x2b, 0x07, 0x06, "Firmware or software change success, Mngmt Ctrl Aux Firm Id" },
+    { 0x2b, 0x07, 0x07, "Firmware or software change success, Mngmt Ctrl Firm Boot Block" },
+    { 0x2b, 0x07, 0x08, "Firmware or software change success, Mngmt Ctrl Other" },
+    { 0x2b, 0x07, 0x09, "Firmware or software change success, BIOS/EFI change" },
+    { 0x2b, 0x07, 0x0A, "Firmware or software change success, SMBIOS change" },
+    { 0x2b, 0x07, 0x0B, "Firmware or software change success, O/S change" },
+    { 0x2b, 0x07, 0x0C, "Firmware or software change success, O/S loader change" },
+    { 0x2b, 0x07, 0x0D, "Firmware or software change success, Service Diag change" },
+    { 0x2b, 0x07, 0x0E, "Firmware or software change success, Mngmt SW agent change" },
+    { 0x2b, 0x07, 0x0F, "Firmware or software change success, Mngmt SW App change" },
+    { 0x2b, 0x07, 0x10, "Firmware or software change success, Mngmt SW Middle" },
+    { 0x2b, 0x07, 0x11, "Firmware or software change success, Prog HW Change (FPGA)" },
+    { 0x2b, 0x07, 0x12, "Firmware or software change success, board/FRU module change" },
+    { 0x2b, 0x07, 0x13, "Firmware or software change success, board/FRU component change" },
+    { 0x2b, 0x07, 0x14, "Firmware or software change success, board/FRU replace equ ver" },
+    { 0x2b, 0x07, 0x15, "Firmware or software change success, board/FRU replace new ver" },
+    { 0x2b, 0x07, 0x16, "Firmware or software change success, board/FRU replace old ver" },
+    { 0x2b, 0x07, 0x17, "Firmware or software change success, board/FRU HW conf change" },
+    /* FRU State */
+    { 0x2c, 0x00, 0xff, "Not Installed" },
+    { 0x2c, 0x01, 0xff, "Inactive" },
+    { 0x2c, 0x02, 0xff, "Activation Requested" },
+    { 0x2c, 0x03, 0xff, "Activation in Progress" },
+    { 0x2c, 0x04, 0xff, "Active" },
+    { 0x2c, 0x05, 0xff, "Deactivation Requested" },
+    { 0x2c, 0x06, 0xff, "Deactivation in Progress" },
+    { 0x2c, 0x07, 0xff, "Communication lost" },
+    /* PICMG FRU Hot Swap */
+    { 0xF0, 0x00, 0xFF, "Transition to M0" },
+    { 0xF0, 0x01, 0xFF, "Transition to M1" },
+    { 0xF0, 0x02, 0xFF, "Transition to M2" },
+    { 0xF0, 0x03, 0xFF, "Transition to M3" },
+    { 0xF0, 0x04, 0xFF, "Transition to M4" },
+    { 0xF0, 0x05, 0xFF, "Transition to M5" },
+    { 0xF0, 0x06, 0xFF, "Transition to M6" },
+    { 0xF0, 0x07, 0xFF, "Transition to M7" },
+    /* PICMG IPMB Physical Link */
+    { 0xF1, 0x00, 0xff, "IPMB-A disabled, IPMB-B disabled" },
+    { 0xF1, 0x01, 0xff, "IPMB-A enabled, IPMB-B disabled" },
+    { 0xF1, 0x02, 0xff, "IPMB-A disabled, IPMB-B enabled" },
+    { 0xF1, 0x03, 0xff, "IPMB-A enabled, IPMP-B enabled" },
+    /* PICNG Moduke Hot Swap */
+    { 0xF2, 0x00, 0xff, "Module Handle Closed" },
+    { 0xF2, 0x01, 0xff, "Module Handle Opened" },
+    { 0xF2, 0x02, 0xff, "Quiesced" },
+    { 0x00, 0x00, 0xff, NULL },
+};
+
+static const struct ipmi_event_sensor_types vita_sensor_event_types[] = {
+    /* VITA FRU State */
+    { 0xF0, 0x00, 0xFF, "Transition to M0" },
+    { 0xF0, 0x01, 0xFF, "Transition to M1" },
+    { 0xF0, 0x04, 0xFF, "Transition to M4" },
+    { 0xF0, 0x05, 0xFF, "Transition to M5" },
+    { 0xF0, 0x06, 0xFF, "Transition to M6" },
+    { 0xF0, 0x07, 0xFF, "Transition to M7" },
+    /* VITA System IPMB Link */
+    { 0xF1, 0x00, 0xFF, "IPMB-A disabled, IPMB-B disabled" },
+    { 0xF1, 0x01, 0xFF, "IPMB-A enabled, IPMB-B disabled" },
+    { 0xF1, 0x02, 0xFF, "IPMB-A disabled, IPMB-B enabled" },
+    { 0xF1, 0x03, 0xFF, "IPMB-A enabled, IPMP-B enabled" },
+    /* VITA FRU Temperature */
+    { 0xF3, 0x00, 0xff, "At or below Lower Non-critical" },
+    { 0xF3, 0x01, 0xff, "At or below Lower Critical" },
+    { 0xF3, 0x02, 0xff, "At or below Lower Non-recoverable" },
+    { 0xF3, 0x03, 0xff, "At or above Upper Non-critical" },
+    { 0xF3, 0x04, 0xff, "At or above Upper Critical" },
+    { 0xF3, 0x05, 0xff, "At or above Upper Non-recoverable" },
+    { 0x00, 0x00, 0xff, NULL }
+};
+
+static const struct ipmi_event_sensor_types oem_kontron_event_types[] = {
+    /* Board Reset(cPCI) */
+    { 0xC1, 0x00, 0xff, "Push Button" },
+    { 0xC1, 0x01, 0xff, "Bridge Reset" },
+    { 0xC1, 0x02, 0xff, "Backplane" },
+    { 0xC1, 0x03, 0xff, "Hotswap Fault" },
+    { 0xC1, 0x04, 0xff, "Hotswap Healty" },
+    { 0xC1, 0x05, 0xff, "Unknown" },
+    { 0xC1, 0x06, 0xff, "ITP" },
+    { 0xC1, 0x07, 0xff, "Hardware Watchdog" },
+    { 0xC1, 0x08, 0xff, "Software Reset" },
+    /* IPMB-L Link State, based on PICMG IPMB-0 Link state sensor */
+    { 0xC3, 0x02, 0xff, "IPMB L Disabled" },
+    { 0xC3, 0x03, 0xff, "IPMB L Enabled" },
+    /* Board Reset */
+    { 0xC4, 0x00, 0xff, "Push Button" },
+    { 0xC4, 0x01, 0xff, "Hardware Power Failure" },
+    { 0xC4, 0x02, 0xff, "Unknown" },
+    { 0xC4, 0x03, 0xff, "Hardware Watchdog" },
+    { 0xC4, 0x04, 0xff, "Soft Reset" },
+    { 0xC4, 0x05, 0xff, "Warm Reset" },
+    { 0xC4, 0x06, 0xff, "Cold Reset" },
+    { 0xC4, 0x07, 0xff, "IPMI Command" },
+    { 0xC4, 0x08, 0xff, "Setup Reset (Save CMOS)" },
+    { 0xC4, 0x09, 0xff, "Power Up Reset" },
+    /* POST Value */
+    { 0xC6, 0x0E, 0xff, "Post Error (see data2)" },
+    /* FWUM Status */
+    { 0xC7, 0x00, 0xff, "First Boot After Upgrade" },
+    { 0xC7, 0x01, 0xff, "First Boot After Rollback(error)" },
+    { 0xC7, 0x02, 0xff, "First Boot After Errors (watchdog)" },
+    { 0xC7, 0x03, 0xff, "First Boot After Manual Rollback" },
+    { 0xC7, 0x08, 0xff, "Firmware Watchdog Bite, reset occurred" },
+    /* Switch Mngt Software Status */
+    { 0xC8, 0x00, 0xff, "Not Loaded" },
+    { 0xC8, 0x01, 0xff, "Initializing" },
+    { 0xC8, 0x02, 0xff, "Ready" },
+    { 0xC8, 0x03, 0xff, "Failure (see data2)" },
+    /* Diagnostic Status */
+    { 0xC9, 0x00, 0xff, "Started" },
+    { 0xC9, 0x01, 0xff, "Pass" },
+    { 0xC9, 0x02, 0xff, "Fail" },
+    { 0xCA, 0x00, 0xff, "In progress"},
+    { 0xCA, 0x01, 0xff, "Success"},
+    { 0xCA, 0x02, 0xff, "Failure"},
+    /* FRU Over Current */
+    { 0xCB, 0x00, 0xff, "Asserted"},
+    { 0xCB, 0x01, 0xff, "Deasserted"},
+    /* FRU Sensor Error */
+    { 0xCC, 0x00, 0xff, "Asserted"},
+    { 0xCC, 0x01, 0xff, "Deasserted"},
+    /* FRU Power Denied */
+    { 0xCD, 0x00, 0xff, "Asserted"},
+    { 0xCD, 0x01, 0xff, "Deasserted"},
+    /* Reset */
+    { 0xCF, 0x00, 0xff, "Asserted"},
+    { 0xCF, 0x01, 0xff, "Deasserted"},
+    /* END */
+    { 0x00, 0x00, 0xff, NULL },
+};
+
+int ipmi_sel_main(struct ipmi_intf *, int, char **);
+void ipmi_sel_print_std_entry(struct ipmi_intf * intf, struct sel_event_record * evt);
+void ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt);
+void ipmi_sel_print_extended_entry(struct ipmi_intf * intf, struct sel_event_record * evt);
+void ipmi_sel_print_extended_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt);
+void ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char ** desc);
+const char * ipmi_get_sensor_type(struct ipmi_intf *intf, uint8_t code);
+uint16_t ipmi_sel_get_std_entry(struct ipmi_intf * intf, uint16_t id, struct sel_event_record * evt);
+char * get_newisys_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec);
+IPMI_OEM ipmi_get_oem(struct ipmi_intf * intf);
+char * ipmi_get_oem_desc(struct ipmi_intf * intf, struct sel_event_record * rec);
+int ipmi_sel_oem_init(const char * filename);
+const struct ipmi_event_sensor_types *
+ipmi_get_first_event_sensor_type(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type);
+const struct ipmi_event_sensor_types *
+ipmi_get_next_event_sensor_type(const struct ipmi_event_sensor_types *evt);
+
+#endif /* IPMI_SEL_H */
diff --git a/include/ipmitool/ipmi_sel_supermicro.h b/include/ipmitool/ipmi_sel_supermicro.h
new file mode 100644
index 0000000..98960e6
--- /dev/null
+++ b/include/ipmitool/ipmi_sel_supermicro.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+#ifndef IPMI_SEL_SUPERMICRO_H
+# define IPMI_SEL_SUPERMICRO_H
+
+static uint16_t supermicro_x11[] = {
+		0x0958, 0x0955, 0x0953, 0x0952, 0x0941, 0x093A, 0x0939, 0x0938, 0x0937, 0x0930, 0x0927, 0x091D,
+		0x091C, 0x0917, 0x090D, 0x0909, 0x0907,	0x0901, 0x089F, 0x089C, 0x089B, 0x089A, 0x0898, 0x0896,
+		0x0895, 0x0894, 0x0891, 0x0890, 0x0888,	0x0886, 0x0885, 0x0884, 0xFFFF
+};
+
+static uint16_t supermicro_b11[] = {
+		0xFFFF
+};
+
+static uint16_t supermicro_b2[] = {
+		0x0951, 0x094E, 0x0931, 0x092E, 0x092A, 0x0928, 0x0908, 0xFFFF
+};
+
+static uint16_t supermicro_x10OBi[] = {
+		0x0923, 0xFFFF
+};
+
+static uint16_t supermicro_x10QRH[] = {
+		0x0872, 0xFFFF
+};
+
+static uint16_t supermicro_x10QBL[] = {
+		0x0853, 0xFFFF
+};
+
+static uint16_t supermicro_brickland[] = {
+		0x0726, 0x083A, 0xFFFF
+};
+
+
+static uint16_t supermicro_x9dal[] = {
+		0x0635, 0xFFFF
+};
+
+static uint16_t supermicro_x9db[] = {
+		0x0733, 0x0722, 0x0703, 0x0721, 0x0716, 0x0637, 0xFFFF
+};
+
+static uint16_t supermicro_x9sb[] = {
+		0x0651, 0xFFFF
+};
+
+static uint16_t supermicro_x9[] = {
+		0x0635, 0x0733, 0x0722, 0x0703, 0x0721, 0x0716, 0x0637, 0x0651, 0xFFFF
+};
+
+static uint16_t supermicro_romely[] = {
+		0x0841, 0x0732, 0x0731, 0x0730, 0x0727, 0x0725, 0x0724, 0x0723, 0x0720, 0x0718,	0x0717, 0x0715,
+		0x0713, 0x0711, 0x070E, 0x070A, 0x0709, 0x0708, 0x0706, 0x0705,	0x0704, 0x0702, 0x0701, 0x0700,
+		0x066F, 0x066E, 0x066D, 0x0669, 0x0667, 0x0666, 0x0665,	0x0664, 0x0662, 0x0660, 0x0636, 0x0630,
+		0x062F, 0x062C, 0x0628, 0x0626, 0x0827,	0x070F, 0x0707, 0x0840, 0x0729, 0x0719, 0x0712, 0x070D,
+		0x066C, 0x066A, 0x0625, 0x0714, 0x0710,	0x070C, 0x070B, 0x0668, 0x0663, 0x0661, 0x062B, 0x062A,
+		0x0629, 0x093E, 0x0932,	0x092D, 0x092B, 0x0924, 0x0922, 0x0921, 0x091E, 0x0919, 0x0916, 0x089D,
+		0x0899,	0x0893, 0x0892, 0x0882, 0x0881, 0x0880, 0x087F, 0x087D, 0x0879, 0x0877, 0x086F, 0x086E,
+		0x086D, 0x086C, 0x086B, 0x085C, 0x085B, 0x084B, 0x0865, 0x0864, 0x0860, 0x0859, 0x0858, 0x0857,
+		0x0854, 0x0852, 0x0845, 0x0844, 0x0843, 0x0842, 0x083B, 0x0838, 0x0837, 0x0836,	0x0835, 0x0834,
+		0x0833, 0x0832, 0x0831, 0x0830, 0x0826, 0x0825, 0x0824, 0x0822, 0x0821, 0x0819,	0x0818, 0x0817,
+		0x0816, 0x0815, 0x0814, 0x0728, 0x0813, 0x0812, 0x0810, 0x0807,	0x0806, 0x0805, 0x0804, 0x0803,
+		0x0802, 0x0801, 0x0889, 0x0861, 0x083E, 0x0846, 0x0946, 0x0950, 0xFFFF
+};
+
+static uint16_t supermicro_b8[] = {
+		0x000A, 0x061c, 0x0620, 0x0101, 0x061f, 0x0612, 0x061e, 0xFFFF
+};
+
+static uint16_t supermicro_h8[] = {
+		0xa111, 0x0408, 0x0811, 0x1411, 0x0911, 0x1211, 0x1011, 0xcd11, 0x1111, 0xbe11, 0xce11, 0xbd11,
+		0xbc11, 0xa911, 0xaa11, 0xcb11, 0xad11, 0xa811, 0xac11, 0xaf11, 0xa511, 0xa011, 0x1611, 0x2511,
+		0xbf11, 0x1511, 0x2211, 0x2411, 0x1911, 0xab11, 0xd011, 0xae11, 0xca11, 0x0409, 0xa211,	0xa311,
+		0x1311, 0xba11, 0xa711, 0xd111, 0x1711, 0xcf11, 0x2011, 0x1811, 0xFFFF
+};
+
+static uint16_t supermicro_p8[] = {
+		0x5980, 0x6280, 0x6480, 0x7380, 0x7480, 0x0933, 0x094F, 0xFFFF
+};
+
+static uint16_t supermicro_x8[] = {
+		0xa880, 0x0403, 0x0100, 0x0601, 0x0001, 0x0404, 0x0606, 0x0608, 0x0632, 0x0400, 0x0401, 0x0006,
+		0x040a, 0xf280, 0x060f, 0x0609, 0x0008, 0x0613, 0x061b, 0x0007, 0x0600, 0x060c, 0x060d, 0x0614,
+		0x0003, 0x040b, 0x0621, 0x0610, 0x0638, 0xf380, 0x060b, 0x040d, 0x0605, 0x062d, 0x060e,	0x061a,
+		0xf580, 0x062e, 0x0009, 0xFFFF
+};
+
+static uint16_t supermicro_X8[] = {
+		0x000A, 0x061c, 0x0620, 0x0101, 0x061f, 0x0612, 0x061e, 0xa111, 0x0408, 0x0811, 0x1411, 0x0911,
+		0x1211, 0x1011, 0xcd11, 0x1111, 0xbe11, 0xce11, 0xbd11, 0xbc11, 0xa911, 0xaa11, 0xcb11,	0xad11,
+		0xa811, 0xac11, 0xaf11, 0xa511, 0xa011, 0x1611, 0x2511, 0xbf11, 0x1511, 0x2211, 0x2411,	0x1911,
+		0xab11, 0xd011, 0xae11, 0xca11, 0x0409, 0xa211, 0xa311, 0x1311, 0xba11, 0xa711, 0xd111,	0x1711,
+		0xcf11, 0x2011, 0x1811, 0x5980, 0x6280, 0x6480, 0x7380, 0x7480, 0x0933, 0x094F, 0xa880, 0x0403,
+		0x0100,	0x0601,	0x0001, 0x0404, 0x0606, 0x0608, 0x0632, 0x0400, 0x0401, 0x0006, 0x040a, 0xf280,
+		0x060f,	0x0609,	0x0008, 0x0613, 0x061b, 0x0007, 0x0600, 0x060c, 0x060d, 0x0614, 0x0003, 0x040b,
+		0x0621, 0x0610,	0x0638, 0xf380, 0x060b, 0x040d, 0x0605, 0x062d, 0x060e, 0x061a, 0xf580, 0x062e,
+		0x0009, 0xFFFF
+};
+
+static uint16_t supermicro_older[] = {
+		0x8080, 0x8180, 0x8280, 0x8480, 0x8580, 0x8680, 0x8780, 0x8880, 0x8980, 0x9080, 0x9180,	0x9280,
+		0x9380, 0x9480, 0x9580, 0x9680, 0x9780, 0xA080,	0x9880, 0x9980, 0xB080, 0xB180, 0xB280, 0xB380,
+		0xB480,	0xA280, 0xB580, 0xB680, 0xA580, 0xB780, 0xD180, 0xA380, 0xA480, 0xD680, 0xBA80, 0xD280,
+		0x2111, 0xD380, 0xBC80, 0xBD80, 0xBE80, 0xC080, 0xC180, 0xAA80, 0xBE80, 0xBF80, 0xAB80, 0xD480,
+		0xD580, 0xAF80, 0xAE80, 0xC280, 0xAC80, 0xD080, 0xDA80, 0xDB80, 0xDC80, 0xDD80, 0xA680,	0xDE80,
+		0xAA80, 0xDF80, 0xBB80, 0xA780, 0xF080, 0xF180, 0xB880, 0xC380, 0xB780,	0x2311, 0xA980, 0xF480,
+		0xB980, 0x0002,	0xba80, 0x0602, 0x0603, 0x0604, 0x0607, 0x0410,	0xA611, 0x060A,	0x0611,	0xBB11,
+		0x061D,	0x0622, 0x0623, 0x0624,	0x0627,	0x0631, 0x0633, 0x0634,	0x0690, 0x0691, 0x0640, 0x0641,
+		0x0642, 0x066B,	0x0743, 0x0644,	0x0645, 0x0645,	0x0646, 0x0647, 0x0648, 0x0647,	0x0650, 0x0652,
+		0x0653, 0x0654, 0x0655, 0x0808, 0x0809, 0x0656, 0x0657,	0x0658, 0x0659,	0x0820, 0x0820,	0x0734,
+		0x0823, 0x0828, 0x0829,	0x0839, 0x083C,	0x083D, 0x083F, 0x0847,	0x0848, 0x0849, 0x0850, 0x0851,
+		0x0855, 0x0856,	0x0862, 0x0863, 0x0866, 0x0867, 0x0868, 0x0869, 0x084A,	0x084C, 0x084D, 0x084F,
+		0x085A, 0x085D, 0x085E, 0x085F, 0x086A,	0x0870, 0x0873, 0x0874, 0x0875, 0x0876, 0x0878,	0x087A,
+		0x087B, 0x087C, 0x087E, 0x0883,	0x0887, 0x088A, 0x088B, 0x088C, 0x088D, 0x088E, 0x088F,	0x0897,
+		0x089E, 0x0902, 0x0903, 0x0904, 0x0905, 0x0906, 0x090A,	0x090B, 0x090C, 0x090E, 0x090F, 0x0910,
+		0x0912, 0x0913, 0x0914, 0x0915,	0x0918, 0x091A, 0x091B, 0x091F, 0x0920,	0x0925, 0x0926, 0x0929,
+		0x092C,	0x092F, 0x0934, 0x0935, 0x0936,	0x093B, 0x093C, 0x093D, 0x093F, 0x0940, 0x0942,	0x0943,
+		0x0944, 0x0945, 0x0947, 0x0948, 0x0949, 0x094A, 0x094B, 0x094C, 0x094D, 0x094E, 0x0954, 0x0956,
+		0x0957, 0x0959, 0xFFFF
+};
+
+#endif /* IPMI_SEL_SUPERMICRO_H */
diff --git a/include/ipmitool/ipmi_sensor.h b/include/ipmitool/ipmi_sensor.h
new file mode 100644
index 0000000..63fc4aa
--- /dev/null
+++ b/include/ipmitool/ipmi_sensor.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SENSOR_H
+#define IPMI_SENSOR_H
+
+#include <math.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+
+/* threshold specification bits for analog sensors for get sensor threshold command 
+ * and set sensor threshold command 
+ */
+#define UPPER_NON_RECOV_SPECIFIED  0x20
+#define UPPER_CRIT_SPECIFIED       0x10
+#define UPPER_NON_CRIT_SPECIFIED   0x08
+#define LOWER_NON_RECOV_SPECIFIED  0x04
+#define LOWER_CRIT_SPECIFIED       0x02
+#define LOWER_NON_CRIT_SPECIFIED   0x01
+
+/* state assertion bits for discrete sensors for get sensor reading command */
+#define STATE_0_ASSERTED   0x01
+#define STATE_1_ASSERTED   0x02
+#define STATE_2_ASSERTED   0x04
+#define STATE_3_ASSERTED   0x08
+#define STATE_4_ASSERTED   0x10
+#define STATE_5_ASSERTED   0x20
+#define STATE_6_ASSERTED   0x40
+#define STATE_7_ASSERTED   0x80
+#define STATE_8_ASSERTED   0x01
+#define STATE_9_ASSERTED   0x02
+#define STATE_10_ASSERTED  0x04
+#define STATE_11_ASSERTED  0x08
+#define STATE_12_ASSERTED  0x10
+#define STATE_13_ASSERTED  0x20
+#define STATE_14_ASSERTED  0x40
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sensor_set_thresh_rq {
+	uint8_t	sensor_num;     	/* sensor # */
+	uint8_t	set_mask;       	/* threshold setting mask */
+	uint8_t	lower_non_crit;	        /* new lower non critical threshold*/
+	uint8_t	lower_crit;	        /* new lower critical threshold*/
+	uint8_t	lower_non_recov;	/* new lower non recoverable threshold*/
+	uint8_t	upper_non_crit;	        /* new upper non critical threshold*/
+	uint8_t	upper_crit;	        /* new upper critical threshold*/
+	uint8_t	upper_non_recov;	/* new upper non recoverable threshold*/
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+int ipmi_sensor_main(struct ipmi_intf *, int, char **);
+int ipmi_sensor_print_fc(struct ipmi_intf *, struct sdr_record_common_sensor *, uint8_t);
+int ipmi_sensor_get_sensor_reading_factors( struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor, uint8_t reading);
+#endif  /* IPMI_SENSOR_H */
diff --git a/include/ipmitool/ipmi_session.h b/include/ipmitool/ipmi_session.h
new file mode 100644
index 0000000..21ff12f
--- /dev/null
+++ b/include/ipmitool/ipmi_session.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SESSION_H
+#define IPMI_SESSION_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/ipmi.h>
+
+#define IPMI_GET_SESSION_INFO 0x3D
+
+/*
+ * From table 22.25 of the IPMIv2 specification
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct get_session_info_rsp
+{
+	uint8_t session_handle;
+
+	#if WORDS_BIGENDIAN
+	uint8_t __reserved1        : 2;
+	uint8_t session_slot_count : 6; /* 1-based */
+	#else
+	uint8_t session_slot_count : 6; /* 1-based */
+	uint8_t __reserved1        : 2;
+	#endif
+
+	#if WORDS_BIGENDIAN
+	uint8_t __reserved2          : 2;
+	uint8_t active_session_count : 6; /* 1-based */
+	#else
+	uint8_t active_session_count : 6; /* 1-based */
+	uint8_t __reserved2          : 2;
+	#endif
+
+	#if WORDS_BIGENDIAN
+	uint8_t __reserved3          : 2;
+	uint8_t user_id              : 6;
+	#else
+	uint8_t user_id              : 6;
+	uint8_t __reserved3          : 2;
+	#endif
+
+	#if WORDS_BIGENDIAN
+	uint8_t __reserved4          : 4;
+	uint8_t privilege_level      : 4;
+	#else
+	uint8_t privilege_level      : 4;
+	uint8_t __reserved4          : 4;
+	#endif
+
+	#if WORDS_BIGENDIAN
+	uint8_t auxiliary_data       : 4;
+	uint8_t channel_number       : 4;
+	#else
+	uint8_t channel_number       : 4;
+	uint8_t auxiliary_data       : 4;
+	#endif
+
+	union
+	{
+		/* Only exists if channel type is 802.3 LAN */
+		struct
+		{
+			uint8_t console_ip[4];  /* MSBF */
+			uint8_t console_mac[6]; /* MSBF */
+			uint16_t      console_port;   /* LSBF */
+		} lan_data;
+
+		/* Only exists if channel type is async. serial modem */
+		struct
+		{
+			uint8_t session_channel_activity_type;
+		
+			#if WORDS_BIGENDIAN
+			uint8_t __reserved5          : 4;
+			uint8_t destination_selector : 4;
+			#else
+			uint8_t destination_selector : 4;
+			uint8_t __reserved5          : 4;
+			#endif
+
+ 			uint8_t console_ip[4];   /* MSBF */
+
+			/* Only exists if session is PPP */
+			uint16_t console_port;        /* LSBF */
+		} modem_data;
+	} channel_data;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+
+int ipmi_session_main(struct ipmi_intf *, int, char **);
+
+#endif /*IPMI_CHANNEL_H*/
diff --git a/include/ipmitool/ipmi_sol.h b/include/ipmitool/ipmi_sol.h
new file mode 100644
index 0000000..6e2fd24
--- /dev/null
+++ b/include/ipmitool/ipmi_sol.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SOL_H
+#define IPMI_SOL_H
+
+#include <ipmitool/ipmi.h>
+
+#define SOL_ESCAPE_CHARACTER_DEFAULT        '~'
+#define SOL_KEEPALIVE_TIMEOUT               15
+#define SOL_KEEPALIVE_RETRIES               3
+
+#define IPMI_SOL_SERIAL_ALERT_MASK_SUCCEED  0x08
+#define IPMI_SOL_SERIAL_ALERT_MASK_DEFERRED 0x04
+#define IPMI_SOL_SERIAL_ALERT_MASK_FAIL     0x00
+#define IPMI_SOL_BMC_ASSERTS_CTS_MASK_TRUE  0x00
+#define IPMI_SOL_BMC_ASSERTS_CTS_MASK_FALSE 0x02
+
+
+struct sol_config_parameters {
+	uint8_t  set_in_progress;
+	uint8_t  enabled;
+	uint8_t  force_encryption;
+	uint8_t  force_authentication;
+	uint8_t  privilege_level;
+	uint8_t  character_accumulate_level;
+	uint8_t  character_send_threshold;
+	uint8_t  retry_count;
+	uint8_t  retry_interval;
+	uint8_t  non_volatile_bit_rate;
+	uint8_t  volatile_bit_rate;
+	uint8_t  payload_channel;
+	uint16_t payload_port;
+};
+
+
+/*
+ * The ACTIVATE PAYLOAD command response structure
+ * From table 24-2 of the IPMI v2.0 spec
+ */
+#ifdef PRAGMA_PACK
+#pramga pack(1)
+#endif
+struct activate_payload_rsp {
+	uint8_t auxiliary_data[4];
+	uint8_t inbound_payload_size[2];  /* LS byte first */
+	uint8_t outbound_payload_size[2]; /* LS byte first */
+	uint8_t payload_udp_port[2];      /* LS byte first */
+	uint8_t payload_vlan_number[2];   /* LS byte first */
+} ATTRIBUTE_PACKING;
+#ifdef PRAGMA_PACK
+#pramga pack(0)
+#endif
+
+/*
+ * Small function to validate that user-supplied SOL
+ * configuration parameter values we store in uint8_t
+ * data type falls within valid range.  With minval
+ * and maxval parameters we can use the same function
+ * to validate parameters that have different ranges
+ * of values.
+ *
+ * function will return -1 if value is not valid, or
+ * will return 0 if valid.
+ */
+int ipmi_sol_set_param_isvalid_uint8_t( const char *strval,
+					const char *name,
+					int base,
+					uint8_t minval,
+					uint8_t maxval,
+					uint8_t *out_value);
+
+int ipmi_sol_main(struct ipmi_intf *, int, char **);
+int ipmi_get_sol_info(struct ipmi_intf             * intf,
+					  uint8_t                  channel,
+					  struct sol_config_parameters * params);
+
+
+#endif /* IPMI_SOL_H */
diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h
new file mode 100644
index 0000000..63bbea9
--- /dev/null
+++ b/include/ipmitool/ipmi_strings.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_STRINGS_H
+#define IPMI_STRINGS_H
+
+#include <ipmitool/helper.h>
+
+extern const struct valstr completion_code_vals[];
+extern const struct valstr entity_id_vals[];
+extern const struct valstr entity_device_type_vals[];
+extern const struct valstr ipmi_netfn_vals[];
+extern const struct valstr ipmi_channel_activity_type_vals[];
+extern const struct valstr ipmi_privlvl_vals[];
+extern const struct valstr ipmi_bit_rate_vals[];
+extern const struct valstr ipmi_set_in_progress_vals[];
+extern const struct valstr ipmi_authtype_session_vals[];
+extern const struct valstr ipmi_authtype_vals[];
+extern const struct valstr ipmi_channel_protocol_vals[];
+extern const struct valstr ipmi_channel_medium_vals[];
+extern const struct valstr ipmi_chassis_power_control_vals[];
+extern const struct valstr ipmi_auth_algorithms[];
+extern const struct valstr ipmi_integrity_algorithms[];
+extern const struct valstr ipmi_encryption_algorithms[];
+extern const struct valstr ipmi_oem_info[];
+extern const struct valstr ipmi_user_enable_status_vals[];
+
+extern const struct valstr picmg_frucontrol_vals[];
+extern const struct valstr picmg_clk_family_vals[];
+extern const struct oemvalstr picmg_clk_accuracy_vals[];
+extern const struct oemvalstr picmg_clk_resource_vals[];
+extern const struct oemvalstr picmg_clk_id_vals[];
+
+extern const struct valstr picmg_busres_id_vals[];
+extern const struct valstr picmg_busres_board_cmd_vals[];
+extern const struct valstr picmg_busres_shmc_cmd_vals[];
+extern const struct oemvalstr picmg_busres_board_status_vals[];
+extern const struct oemvalstr picmg_busres_shmc_status_vals[];
+
+/* these are similar, expect that the lookup takes the IANA number
+   as first parameter */
+extern const struct oemvalstr ipmi_oem_product_info[];
+extern const char *ipmi_generic_sensor_type_vals[];
+extern const struct oemvalstr ipmi_oem_sensor_type_vals[];
+
+#endif /*IPMI_STRINGS_H*/
diff --git a/include/ipmitool/ipmi_sunoem.h b/include/ipmitool/ipmi_sunoem.h
new file mode 100644
index 0000000..78afbf2
--- /dev/null
+++ b/include/ipmitool/ipmi_sunoem.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_SUNOEM_H
+#define IPMI_SUNOEM_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+
+#define IPMI_NETFN_SUNOEM				0x2e
+
+#define IPMI_SUNOEM_SET_SSH_KEY				0x01
+#define IPMI_SUNOEM_DEL_SSH_KEY				0x02
+#define IPMI_SUNOEM_GET_HEALTH_STATUS			0x10
+#define IPMI_SUNOEM_CLI					0x19
+#define IPMI_SUNOEM_SET_FAN_SPEED			0x20
+#define IPMI_SUNOEM_LED_GET				0x21
+#define IPMI_SUNOEM_LED_SET				0x22
+#define IPMI_SUNOEM_ECHO				0x23
+#define IPMI_SUNOEM_VERSION				0x24
+#define IPMI_SUNOEM_NACNAME				0x29
+#define IPMI_SUNOEM_GETVAL				0x2A
+#define IPMI_SUNOEM_SETVAL				0x2C
+#define IPMI_SUNOEM_SENSOR_SET				0x3A
+#define IPMI_SUNOEM_SET_FAN_MODE			0x41
+#define IPMI_SUNOEM_CORE_TUNNEL                         0x44
+
+/*
+ * Error codes of sunoem functions
+ */
+typedef enum {
+	SUNOEM_EC_SUCCESS            = 0,
+	SUNOEM_EC_INVALID_ARG        = 1,
+	SUNOEM_EC_BMC_NOT_RESPONDING = 2,
+	SUNOEM_EC_BMC_CCODE_NONZERO  = 3
+} sunoem_ec_t;
+
+int ipmi_sunoem_main(struct ipmi_intf *, int, char **);
+
+#endif /*IPMI_SUNOEM_H*/
+
diff --git a/include/ipmitool/ipmi_tsol.h b/include/ipmitool/ipmi_tsol.h
new file mode 100644
index 0000000..8157cd8
--- /dev/null
+++ b/include/ipmitool/ipmi_tsol.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2005 Tyan Computer Corp.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_TSOL_H
+#define IPMI_TSOL_H
+
+#include <ipmitool/ipmi.h>
+
+#define IPMI_TSOL_CMD_SENDKEY	0x03
+#define IPMI_TSOL_CMD_START	0x06
+#define IPMI_TSOL_CMD_STOP	0x02
+
+#define IPMI_TSOL_DEF_PORT	6230
+
+int ipmi_tsol_main(struct ipmi_intf *, int, char **);
+
+#endif /* IPMI_TSOL_H */
diff --git a/include/ipmitool/ipmi_user.h b/include/ipmitool/ipmi_user.h
new file mode 100644
index 0000000..fd727ca
--- /dev/null
+++ b/include/ipmitool/ipmi_user.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_USER_H
+#define IPMI_USER_H
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/ipmi.h>
+
+#define IPMI_PASSWORD_DISABLE_USER  0x00
+#define IPMI_PASSWORD_ENABLE_USER   0x01
+#define IPMI_PASSWORD_SET_PASSWORD  0x02
+#define IPMI_PASSWORD_TEST_PASSWORD 0x03
+
+#define IPMI_USER_ENABLE_UNSPECIFIED 0x00
+#define IPMI_USER_ENABLE_ENABLED 0x40
+#define IPMI_USER_ENABLE_DISABLED 0x80
+#define IPMI_USER_ENABLE_RESERVED 0xC0
+
+/* (22.27) Get and (22.26) Set User Access */
+struct user_access_t {
+	uint8_t callin_callback;
+	uint8_t channel;
+	uint8_t enabled_user_ids;
+	uint8_t enable_status;
+	uint8_t fixed_user_ids;
+	uint8_t ipmi_messaging;
+	uint8_t link_auth;
+	uint8_t max_user_ids;
+	uint8_t privilege_limit;
+	uint8_t session_limit;
+	uint8_t user_id;
+};
+
+/* (22.29) Get User Name */
+struct user_name_t {
+	uint8_t user_id;
+	uint8_t user_name[17];
+};
+
+int ipmi_user_main(struct ipmi_intf *, int, char **);
+int _ipmi_get_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_rsp);
+int _ipmi_get_user_name(struct ipmi_intf *intf, struct user_name_t *user_name);
+int _ipmi_set_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_req,
+		uint8_t change_priv_limit_only);
+int _ipmi_set_user_password(struct ipmi_intf *intf,
+		uint8_t user_id, uint8_t operation,
+		const char *password, uint8_t is_twenty_byte);
+
+#endif /* IPMI_USER_H */
diff --git a/include/ipmitool/ipmi_vita.h b/include/ipmitool/ipmi_vita.h
new file mode 100644
index 0000000..71d471a
--- /dev/null
+++ b/include/ipmitool/ipmi_vita.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Pigeon Point Systems. All right reserved
+ */
+
+#ifndef _IPMI_VITA_H_
+#define _IPMI_VITA_H_
+
+/* VITA 46.11 commands */
+#define VITA_GET_VSO_CAPABILITIES_CMD		0x00
+#define VITA_FRU_CONTROL_CMD			0x04
+#define VITA_GET_FRU_LED_PROPERTIES_CMD		0x05
+#define VITA_GET_LED_COLOR_CAPABILITIES_CMD	0x06
+#define VITA_SET_FRU_LED_STATE_CMD		0x07
+#define VITA_GET_FRU_LED_STATE_CMD		0x08
+#define VITA_SET_FRU_STATE_POLICY_BITS_CMD	0x0A
+#define VITA_GET_FRU_STATE_POLICY_BITS_CMD	0x0B
+#define VITA_SET_FRU_ACTIVATION_CMD		0x0C
+#define VITA_GET_FRU_ADDRESS_INFO_CMD		0x40
+
+/* VITA 46.11 site types */
+#define VITA_FRONT_VPX_MODULE		0x00
+#define VITA_POWER_ENTRY		0x01
+#define VITA_CHASSIS_FRU		0x02
+#define VITA_DEDICATED_CHMC		0x03
+#define VITA_FAN_TRAY			0x04
+#define VITA_FAN_TRAY_FILTER		0x05
+#define VITA_ALARM_PANEL		0x06
+#define VITA_XMC			0x07
+#define VITA_VPX_RTM			0x09
+#define VITA_FRONT_VME_MODULE		0x0A
+#define VITA_FRONT_VXS_MODULE		0x0B
+#define VITA_POWER_SUPPLY		0x0C
+#define VITA_FRONT_VITA62_MODULE	0x0D
+#define VITA_71_MODULE			0x0E
+#define VITA_FMC			0x0F
+
+
+#define GROUP_EXT_VITA		0x03
+
+extern uint8_t
+vita_discover(struct ipmi_intf *intf);
+
+extern uint8_t
+ipmi_vita_ipmb_address(struct ipmi_intf *intf);
+
+extern int
+ipmi_vita_main(struct ipmi_intf * intf, int argc, char ** argv);
+
+#endif /* _IPMI_VITA_H_ */
diff --git a/include/ipmitool/log.h b/include/ipmitool/log.h
new file mode 100644
index 0000000..7199fdb
--- /dev/null
+++ b/include/ipmitool/log.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMITOOL_LOG_H
+#define IPMITOOL_LOG_H
+
+#include <syslog.h>
+
+/* sys/syslog.h:
+ * LOG_EMERG       0       system is unusable
+ * LOG_ALERT       1       action must be taken immediately
+ * LOG_CRIT        2       critical conditions
+ * LOG_ERR         3       error conditions
+ * LOG_WARNING     4       warning conditions
+ * LOG_NOTICE      5       normal but significant condition
+ * LOG_INFO        6       informational
+ * LOG_DEBUG       7       debug-level messages
+ */
+
+#define LOG_ERROR		LOG_ERR
+#define LOG_WARN		LOG_WARNING
+
+#define LOG_NAME_DEFAULT	"ipmitool"
+#define LOG_MSG_LENGTH		1024
+
+void log_init(const char * name, int isdaemon, int verbose);
+void log_halt(void);
+void log_level_set(int level);
+int log_level_get(void);
+void lprintf(int level, const char * format, ...);
+void lperror(int level, const char * format, ...);
+
+#endif /*IPMITOOL_LOG_H*/
+
diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..377bb86
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/ipmitool.spec b/ipmitool.spec
new file mode 100644
index 0000000..bbc7c49
--- /dev/null
+++ b/ipmitool.spec
@@ -0,0 +1,404 @@
+Name:         ipmitool
+Summary:      ipmitool - Utility for IPMI control
+Version:      1.8.18
+Release:      1%{?_distro:.%{_distro}}
+License:      BSD
+Group:        Utilities
+Packager:     Jim Mankovich <jmank@hp.com>
+Source:       %{name}-%{version}.tar.gz
+Buildroot:    /var/tmp/ipmitool-root
+
+%description
+This package contains a utility for interfacing with devices that support
+the Intelligent Platform Management Interface specification.  IPMI is
+an open standard for machine health, inventory, and remote power control.
+
+This utility can communicate with IPMI-enabled devices through either a
+kernel driver such as OpenIPMI or over the RMCP LAN protocol defined in
+the IPMI specification.  IPMIv2 adds support for encrypted LAN
+communications and remote Serial-over-LAN functionality.
+
+It provides commands for reading the Sensor Data Repository (SDR) and
+displaying sensor values, displaying the contents of the System Event
+Log (SEL), printing Field Replaceable Unit (FRU) information, reading and
+setting LAN configuration, and chassis power control.
+
+%prep
+if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then
+    rm -rf $RPM_BUILD_ROOT
+fi
+
+%setup
+
+%build
+./configure --with-kerneldir \
+	--with-rpm-distro= \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--sbindir=%{_sbindir} \
+	--datadir=%{_datadir} \
+	--includedir=%{_includedir} \
+	--libdir=%{_libdir} \
+	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}
+make
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install-strip
+
+%clean
+if [ "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ]; then
+    rm -rf $RPM_BUILD_ROOT
+fi
+
+%files
+%defattr(755,root,root)
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%{_datadir}/ipmitool/*
+%{_mandir}/man*/*
+%doc %{_datadir}/doc/ipmitool
+
+
+%changelog
+* Wed Feb 25 2009 <pere@hungry.com>  1.8.11-1
+- Fix new GCC compilation issues in regards to Packing
+- Fix Tracker bug #1642710 - ipmi_kcs_drv being loaded/unloaded
+  for 2.4 kernel instead of ipmi_si_drv driver module
+- New -y option added to allow specification of kg keys with
+  non-printable characters
+- New -K option added to allow kgkey settings via environmental
+  variable IPMI_KGKEY
+- Generic device support added for EEPROM with SDR Type 10h (gendev)
+- Fix to lan-bridging for a double-bridging crash and to fix
+  an issue with bridging multiple concurrent requests and
+  erroneous handling of raw Send Message
+- Lanplus fix for commands like 'sensor list' without the -t option
+  causing wrong double bridged requests of a sensor is located
+  on another satellite controller
+- Fix lan and lanplus request list entry removal bugs
+- Fix non-working issue when trying to send a bridge message with
+  Cipher 3
+- Change bridge message handling to reuse command ipmi_lan_poll_recv
+- Added PICMG 2.0 and 2.3 support
+- Fix PICMG (ATCA) extension verification and reversal of BCD encoded
+  values for "major" and "minor" fields
+- Add IANA support for Pigeon Point
+- Add OEM SW/FW Record identification
+- Fix to include I2C and LUN addresses so sensors are correctly managed
+- Patch ID 1990560 to get readings from non-linear analog sensors
+- Add support for SOL payload status command
+- SOL set parameter range checking added
+- Fixed SOL activate options usage 
+- Fixed crashes when parsing 'sol payload' and 'tsol' cmds (#216967)
+- Added retries to SOL keepalive
+- Fixed wrong mask values for Front Panel disable/enable status
+- Add support to access fru internal use area
+- Add support for new PICMG 3.0 R3.0 (March 24, 2008) to allow
+  blocks of data within the FRU storage area to be write protected.
+- Fix node reporting in GUID; Tracker bug #2339675
+- Fix watchdog use/action print strings
+- Fix endian bug in SDR add from file; Tracker bug #2075258
+- Fix crash when dumping SDRs in a file and there's an error
+  getting an SDR; improve algorithm for optimal packet size
+- Fix occasional SDR dump segfault; #1793076
+- Allow ipmitool sel delete to accept hex list entry numbers
+- Fix SEL total space reporting.
+- Fix for garbage sensor threshold values reported when none 
+  returned.  Tracker Bug #863748
+- ipmievd change to Monitor %used in SEL buffer and log warnings when
+  the buffer is 80% and 100% full
+
+* Fri Aug 08 2008 <pere@hungry.com>  1.8.10-1
+ - Added support for BULL IANA number.
+ - Fixed contrib build so the oem_ibm_sel_map file gets included in rpm 
+   builds again.
+ - Added support for Debian packages to be built from CVS
+ - Fix for sdr and sel timestamp reporting issues
+ - Fix for discrete sensor state print routines to address state bits 8-14
+ - Change ipmi_chassis_status() to non-static so it can be used externally
+ - Added retries to SOL keepalive
+ - Fix to stop sensor list command from reporting a failure due to missing 
+   sensor
+ - Fix bug in sdr free space reporting
+ - Add support for IANA number to vendor name conversion for many vendors
+ - Fix segfault bug in lan set command
+ - Fix bug in population of raw i2c wdata buffer
+ - Fix bug in ipmb sensor reading
+ - Fix misspellings, typos, incorrect strncmp lengths, white space
+ - Update/fix printed help and usages for many commands
+ - Add and update support for all commands in ipmitool man page
+ - Fix for lanplus session re-open when the target becomes unavailable following
+   a fw upgrade activation
+ - Add support for watchdog timer shutoff, reset, and get info
+ - Add support for more ibm systems in oem_ibm_sel_map
+ - Add more JEDEC support info for DIMMs; decrease request size for DIMM FRU
+   info to 16 bytes at a time to allow more DIMM FRUs to respond.
+ - Fix to change hpmfwupg to version 1.02; fix to reduce hpmfwupg buffer 
+   length more aggressively when no response from iol
+ - Fix HPM firmware activation via IOL; fake a timeout after IOL session 
+   re-open to force get upgrade status retry; Added retries on 0xD3 
+   completion code
+ - Add support for freeipmi 0.6.0; adjust autoconf for changes
+ - Fix for oemval2str size
+ - Add support for product name resolution in mc info
+ - Fix FRU display format
+ - Added PICMG ekeying analyzer module support (ekanalyzer); display point
+   to point physical connectivity and power supply information between 
+   carriers and AMC modules; display matched results of ekeying match 
+   between an on-carrier device and AMC module or between 2 AMC modules
+ - Fix AMC GUID display support
+ - Improved amcportstate operations
+ - Added resolution for new sensor types
+ - Fix segfault in SOL
+ - Fix bug that caused infinite loop on BMCs with empty SDRs
+ - Fix to move out Kontron OEM sensor resolution for other OEMs which could 
+   lead to bad event descriptions
+ - Add new FRU edit mode thereby allowing serial numbers, etc. to be changed;
+    improvements to OEM edit mode
+ - Added SPD support for parms: channel number, max read size
+ - Add SDR support for adding SDR records from a dumped file, clearing SDR, 
+   adding partial SDR records
+ - Add updates and fixes to hpmfwupg: upload block size to 32 bytes for KCS,
+   handle long response option, implement rollback override, garbage output fix
+ - Add double bridge lan support , fix bridging issue
+ - Add HPM support to pre-check which components need to be skipped
+ - Fix autodetection of maximum packet size when using IPMB
+ - Add new Kontron OEM command to set the BIOS boot option sequence
+ - Add support for dual-bridge/ dual send message
+ - Add auto-detect for local IPMB address using PICMG 2.X extension
+ - Add support for HPM.1 1.0 specification compliance
+ - Fix for improper lan/lanplus addressing
+ - Added transit_channel and transit_addr to ipmi_intf struct
+ - Fix bad password assertion bug due to rakp2 HMAC not being checked properly
+ - Added ability to interpret PPS shelf manager clia sel dump
+ - Corrected PICMG M7 state event definition macros
+ - Added FRU parsing enhancements
+ - Added "isol info", "isol set" and "isol activate" commands to support 
+   Intel IPMI v1.5 SOL functionality. Removed "isol setup" command.
+ - Fix bug in ipmi_lan_recv_packet() in lan and lanplus interfaces.
+ - Fix bug in "chassis poh" command.
+ - Fix HPM.1 upgrade to apply to only given component when instructed to do so
+ - Added configure auto-detection if dual bridge extension is supported 
+   by OpenIPMI
+
+* Tue Mar  6 2007 <pere@hungry.com>  1.8.9-1
+ - Added initial AMC ekey query operation support
+ - Improvements to ekeying support (PICMG 3.x only)
+ - Added initial interactive edition support for multirec; added IANA
+   verification before interpreting PICMG records.
+ - Added edit support for AMC activation "Maximum Internal Current"
+ - Fix bug generating garbage on the screen when handling GetDeviceId
+   and sol traffic occurs
+ - Added ability to map OEM sensor types to OEM description string using 
+   IANA number; moved IANA number table
+ - Fix lan set access command to use value already saved within parameters 
+   for PEF and authentication
+ - Fix bug in cmd ipmitool lan stats get 1
+ - Add support to allow ipmitool/ipmievd to target specific device nodes 
+   on multi-BMC systems
+ - Add support for name+privilege lookup for lanplus sessions
+ - Fix time_t conversion bug for 64-bit OS
+ - Added prefix of hostname on sel ipmievd sessions
+ - Fixed FWUM Get Info
+ - Fix ipmievd fd closing bug
+ - Add set-in-progress flag support to chassis bootdev
+ - Added new chassis bootdev options
+ - Add sol payload enable/disable comman
+ - Fix SOL set errors when commit-write not supported
+ - Fix reset of session timeout for lanplus interface
+ - Fixed lan interface accessibility timeout handling
+ - Fix bug with Function Get Channel Cipher Suites command when more 
+   than 1 page used.
+ - Fix missing firmware firewall top-level command
+ - Fix bug in SOL keepalive functionality
+ - Fix SOLv2 NACK and retry handling for Intel ESB2 BMC
+ - Added ipmi_sel_get_oem_sensor* APIs
+ - Added HPM.1 support 
+ - Fix segfault when incorrect oem option supplied
+ - Fix bus problem with spd command
+ - Fix segfault in SOL when remote BMC does not return packet
+ - Adjust packet length for AMC.0 retricting IPMB packets to 32 bytes
+ - Added lan packet size reduction mechanism
+ - Fix bug with sendMessage of bad length with different target
+ - Fix for big endian (PPC) architecture
+ - NetBSD fixes
+ - Fix segfault and channel problem with user priv command
+ - Add support for bus/chan on i2c raw command
+ - Add freeipmi interface support
+ - Add remote spd printing
+ - Add better detection of linux/compiler.h to config
+ - Makefile changes to fix makedistcheck, etc. 
+
+* Tue May 02 2006 <duncan@iceblink.org>  1.8.8-1
+ - Fix segfaults in sensor data repository list
+ - Fix ipmievd to open interface before daemonizing
+ - Fix IPMIv1.5 authtype NONE to ignore supplied password
+ - Fix cipher suite display bug in lan print
+ - Fix typo in IPMIv2 SOL output when sending break
+ - Fix improper LUN handling with Tyan SOL
+ - Add LUN support to OpenIPMI interface
+ - Add support for Kontron OEM commands
+ - Update to Kontron Firmware Update command
+
+* Sun Mar 19 2006 <duncan@iceblink.org>  1.8.7-1
+ - Add Sun OEM command for blades
+ - Increase argument size for raw commands in shell/exec
+ - Fix handling of LUNs for LAN interfaces
+ - Add IPMIv2 SOL loopback test
+ - Add support for IBM OEM SEL messages
+ - Disable file paranoia checks on read files by default
+ - 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
+ - Add support for IPMIv2 Firmware Firewall
+ - Fix gcc4 compile warnings
+ - Make ipmievd generate pidfile
+ - Add initscripts for ipmievd
+
+* Mon Jan 17 2006 <duncan@iceblink.org>  1.8.6-1
+ - Fix memory corruption when sending encrypted SOL traffic
+ - Add keepalive timer to IPMIv2 SOL sessions
+
+* Sat Jan 14 2006 <duncan@iceblink.org>  1.8.5-1
+ - Raise privilege level after creating IPMIv2 session
+ - Add support for settable SOL escape character with -e option
+ - Add support for Kg BMC key for IPMIv2 authentication with -k option
+ - Add support for Tyan IPMIv1.5 SOL with tsol command
+ - Add support for PICMG devices
+ - Add support for OEM SEL event parsing
+ - Add support for command bridging over lan and lanplus interfaces
+ - New 'chassis selftest' command
+ - Many bufxies and patches from contributors
+
+* Wed May 18 2005 <duncan@iceblink.org>  1.8.2-1
+ - Fix FRU reading for large (>255 bytes) areas.
+ - Overhaul to ipmievd to support SEL polling in addition to OpenIPMI.
+ - Fix LAN parameter segfault when no Ciphers supported by BMC.
+ - Fix IPMIv2 support on Intel v2 BMCs (use -o intelplus).
+ - Separate option parsing code from main ipmitool source file.
+ - Add raw I2C support with IPMI Master Read-Write command.
+ - Add support for new 'sdr elist' extended output format.
+ - Add support for listing sensors by type with 'sdr type' command.
+ - Add support for new 'sel elist' extended output format that
+   cross-references events with sensors.
+ - Add support for sending dynamically generated platform events
+   based on existing sensor information.
+ - New '-S' argument to read local SDR cache created with 'sdr dump'.
+ - Updated manpage for ipmitool and ipmievd.
+
+* Wed Apr 06 2005 <duncan@iceblink.org>  1.8.1-1
+ - Install ipmievd into /usr/sbin
+
+* Wed Mar 16 2005 <duncan@iceblink.org>  1.8.0-1
+ - Fix IPMIv2.0 issues
+ - Fix chassis boot parameter support
+ - Add support for linear sensors
+ - Update bmc plugin to work with new Solaris bmc driver (new ioctl
+   for interface detection and new STREAMS message-based interface)
+
+* Tue Jan 18 2005 <duncan@iceblink.org>  1.7.0-1
+ - Propogate errors correctly so exit status will be useful
+ - More consistent display of errors including completion code text
+ - Errors and debug is send to stderr now
+ - New "sel get" command that will print details about SEL entry
+   and corresponding SDR records as well as FRUs via entity association
+ - Improved event generator, now supports reading events from text file
+ - New "-o oemtype" option for specifying OEM boards
+   exsting types are "supermicro" and "intelwv2"
+ - New PEF subsystem from Tim Murphy at Dell
+ - New "bmc" plugin for Solaris 10 x86
+ - Many bugfixes and contributed patches
+ - Support for Supermicro BMC OEM authentication method
+ - Fix minor problem with LAN parameter setting
+
+* Wed Aug 18 2004 <duncan@iceblink.org>  1.6.0-1
+ - Add a README
+ - Add support for IPMIv2 and Serial-over-LAN from Newisys
+ - Add Solaris x86 lipmi interface
+ - Add support for building Solaris packages
+ - Add support for building RPMs as non-root user
+ - Fix segfault when doing "sel list" (from Matthew Braithwaite)
+ - Fix "chassis identify" on some BMCs (from ebrower@sourceforge)
+ - Add "bmc info" and related output (from ebrower@sourceforge)
+ - new "shell" and "exec" commands
+ - lots of other contributed patches
+
+* Sat May 27 2004 <duncan@iceblink.org>  1.5.9-1
+ - Add ability to get a particular sensor by name
+ - Add ability to set a particular sensor threshold
+ - Add support for displaying V2 channel authentication levels
+ - Add README for rrdtool scripts in contrib directory
+ - Improve lan interface retry handling
+ - Support prompting for password or reading from environment
+ - Move chaninfo command into channel subcommand
+ - Fix reservation ID handling when two sessions open to BMC
+ - Fix reading of large FRU data
+ - Add configure option for changing binary to ipmiadm for Solaris
+ - Fix compile problem on Solaris 8
+
+* Tue Jan 27 2004 <duncan@iceblink.org>  1.5.8-1
+ - Enable static compilation of interfaces
+ - Fix types to be 64-bit safe
+ - Fix compilation problems on Solaris
+ - Fix multiple big-endian problems for Solaris/SPARC
+ - Fix channel access to save settings to NVRAM
+ - Set channel privilege limit to ADMIN during "access on"
+ - Enable gratuitous ARP in bmcautoconf.sh
+ - Add support for Linux kernel panic messages in SEL output
+ - Add support for type 3 SDR records
+
+* Mon Jan  5 2004 <duncan@iceblink.org>  1.5.7-1
+ - add IPMIv1.5 eratta fixes
+ - additions to FRU printing and FRU multirecords
+ - better handling of SDR printing
+ - contrib scripts for creating rrdtool graphs
+
+* Thu Dec  4 2003 <duncan@iceblink.org>  1.5.6-1
+ - Fix SEL event decoding for generic events
+ - Handle empty SEL gracefully when doing "sel list"
+ - Fix sdr handling of sensors that do not return a reading
+ - Fix for CSV display of sensor readings/units from Fredrik �hrn
+
+* Tue Nov 25 2003 <duncan@iceblink.org>  1.5.5-1
+ - Add -U option for setting LAN username
+ - Fix -v usage for plugin interfaces
+
+* Fri Nov 14 2003 <duncan@iceblink.org>  1.5.4-1
+ - pull interface plugin api into library
+ - fix ipmievd
+
+* Fri Oct 31 2003 <duncan@iceblink.org>  1.5.3-1
+ - add -g optin for pedantic ipmi-over-lan communication
+
+* Fri Oct 24 2003 <duncan@iceblink.org>  1.5.2-1
+ - add gratuitous arp interval setting
+
+* Wed Oct  8 2003 <duncan@iceblink.org>  1.5.1-1
+ - better SEL support
+ - fix display bug in SDR list
+
+* Fri Sep  5 2003 <duncan@iceblink.org>  1.5.0-1
+ - use automake/autoconf/libtool
+ - dynamic loading interface plugins
+
+* Wed May 28 2003 <duncan@iceblink.org>  1.4.0-1
+ - make UDP packet handling more robust
+ - fix imb driver support
+
+* Thu May 22 2003 <duncan@iceblink.org>  1.3-1
+ - update manpage
+ - rework of low-level network handling
+ - add basic imb driver support
+
+* Wed Apr  2 2003 <duncan@iceblink.org>  1.2-1
+ - change command line option parsing
+ - support for more chassis commands
+
+* Tue Apr  1 2003 <duncan@iceblink.org>  1.1-1
+ - minor fixes.
+
+* Sun Mar 30 2003 <duncan@iceblink.org>  1.0-1
+ - Initial release.
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..cc69a8f
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,50 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+AUTOMAKE_OPTIONS		= subdir-objects
+AM_CPPFLAGS			= -I$(top_srcdir)/include
+MAINTAINERCLEANFILES		= Makefile.in
+
+noinst_LTLIBRARIES		= libipmitool.la
+libipmitool_la_SOURCES	= helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_pef.c \
+				  ipmi_lanp.c ipmi_fru.c ipmi_chassis.c ipmi_mc.c log.c            \
+				  dimm_spd.c ipmi_sensor.c ipmi_channel.c ipmi_event.c             \
+				  ipmi_session.c ipmi_strings.c ipmi_user.c ipmi_raw.c             \
+				  ipmi_oem.c ipmi_isol.c ipmi_sunoem.c ipmi_fwum.c ipmi_picmg.c    \
+				  ipmi_main.c ipmi_tsol.c ipmi_firewall.c ipmi_kontronoem.c        \
+				  ipmi_hpmfwupg.c ipmi_sdradd.c ipmi_ekanalyzer.c ipmi_gendev.c    \
+				  ipmi_ime.c ipmi_delloem.c ipmi_dcmi.c hpm2.c ipmi_vita.c \
+				  ipmi_lanp6.c ipmi_cfgp.c \
+				  ../src/plugins/lan/md5.c ../src/plugins/lan/md5.h
+
+libipmitool_la_LDFLAGS		= -export-dynamic
+libipmitool_la_LIBADD		= -lm
+libipmitool_la_DEPENDENCIES	= 
+
diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644
index 0000000..0e2b6b2
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,717 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = lib
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libipmitool_la_OBJECTS = helper.lo ipmi_sdr.lo ipmi_sel.lo \
+	ipmi_sol.lo ipmi_pef.lo ipmi_lanp.lo ipmi_fru.lo \
+	ipmi_chassis.lo ipmi_mc.lo log.lo dimm_spd.lo ipmi_sensor.lo \
+	ipmi_channel.lo ipmi_event.lo ipmi_session.lo ipmi_strings.lo \
+	ipmi_user.lo ipmi_raw.lo ipmi_oem.lo ipmi_isol.lo \
+	ipmi_sunoem.lo ipmi_fwum.lo ipmi_picmg.lo ipmi_main.lo \
+	ipmi_tsol.lo ipmi_firewall.lo ipmi_kontronoem.lo \
+	ipmi_hpmfwupg.lo ipmi_sdradd.lo ipmi_ekanalyzer.lo \
+	ipmi_gendev.lo ipmi_ime.lo ipmi_delloem.lo ipmi_dcmi.lo \
+	hpm2.lo ipmi_vita.lo ipmi_lanp6.lo ipmi_cfgp.lo \
+	../src/plugins/lan/md5.lo
+libipmitool_la_OBJECTS = $(am_libipmitool_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libipmitool_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libipmitool_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libipmitool_la_SOURCES)
+DIST_SOURCES = $(libipmitool_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = subdir-objects
+AM_CPPFLAGS = -I$(top_srcdir)/include
+MAINTAINERCLEANFILES = Makefile.in
+noinst_LTLIBRARIES = libipmitool.la
+libipmitool_la_SOURCES = helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_pef.c \
+				  ipmi_lanp.c ipmi_fru.c ipmi_chassis.c ipmi_mc.c log.c            \
+				  dimm_spd.c ipmi_sensor.c ipmi_channel.c ipmi_event.c             \
+				  ipmi_session.c ipmi_strings.c ipmi_user.c ipmi_raw.c             \
+				  ipmi_oem.c ipmi_isol.c ipmi_sunoem.c ipmi_fwum.c ipmi_picmg.c    \
+				  ipmi_main.c ipmi_tsol.c ipmi_firewall.c ipmi_kontronoem.c        \
+				  ipmi_hpmfwupg.c ipmi_sdradd.c ipmi_ekanalyzer.c ipmi_gendev.c    \
+				  ipmi_ime.c ipmi_delloem.c ipmi_dcmi.c hpm2.c ipmi_vita.c \
+				  ipmi_lanp6.c ipmi_cfgp.c \
+				  ../src/plugins/lan/md5.c ../src/plugins/lan/md5.h
+
+libipmitool_la_LDFLAGS = -export-dynamic
+libipmitool_la_LIBADD = -lm
+libipmitool_la_DEPENDENCIES = 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+../src/plugins/lan/$(am__dirstamp):
+	@$(MKDIR_P) ../src/plugins/lan
+	@: > ../src/plugins/lan/$(am__dirstamp)
+../src/plugins/lan/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ../src/plugins/lan/$(DEPDIR)
+	@: > ../src/plugins/lan/$(DEPDIR)/$(am__dirstamp)
+../src/plugins/lan/md5.lo: ../src/plugins/lan/$(am__dirstamp) \
+	../src/plugins/lan/$(DEPDIR)/$(am__dirstamp)
+
+libipmitool.la: $(libipmitool_la_OBJECTS) $(libipmitool_la_DEPENDENCIES) $(EXTRA_libipmitool_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libipmitool_la_LINK)  $(libipmitool_la_OBJECTS) $(libipmitool_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f ../src/plugins/lan/*.$(OBJEXT)
+	-rm -f ../src/plugins/lan/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@../src/plugins/lan/$(DEPDIR)/md5.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dimm_spd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_cfgp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_channel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_chassis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_dcmi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_delloem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_ekanalyzer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_event.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_firewall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_fru.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_fwum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_gendev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_hpmfwupg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_ime.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_isol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_kontronoem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_lanp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_lanp6.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_mc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_oem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_pef.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_picmg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_raw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sdr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sdradd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sensor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_session.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_strings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_sunoem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_tsol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_user.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_vita.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf ../src/plugins/lan/.libs ../src/plugins/lan/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f ../src/plugins/lan/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ../src/plugins/lan/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ../src/plugins/lan/$(DEPDIR) ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ../src/plugins/lan/$(DEPDIR) ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
new file mode 100644
index 0000000..41e30db
--- /dev/null
+++ b/lib/dimm_spd.c
@@ -0,0 +1,1710 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_fru.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+extern int verbose;
+
+/*
+ * Also, see ipmi_fru.c.
+ *
+ * Apparently some systems have problems with FRU access greater than 16 bytes
+ * at a time, even when using byte (not word) access.	 In order to ensure we
+ * work with the widest variety of hardware request size is capped at 16 bytes.
+ * Since this may result in slowdowns on some systems with lots of FRU data you
+ * can change this define to enable larger (up to 32 bytes at a time) access.
+ */
+#define FRU_DATA_RQST_SIZE 16;
+
+const struct valstr spd_memtype_vals[] = {
+	{ 0x01, "STD FPM DRAM" },
+	{ 0x02, "EDO" },
+	{ 0x04, "SDRAM" },
+	{ 0x05, "ROM" },
+	{ 0x06, "DDR SGRAM" },
+	{ 0x07, "DDR SDRAM" },
+	{ 0x08, "DDR2 SDRAM" },
+	{ 0x09, "DDR2 SDRAM FB-DIMM" },
+	{ 0x0A, "DDR2 SDRAM FB-DIMM Probe" },
+	{ 0x0B, "DDR3 SDRAM" },
+	{ 0x0C, "DDR4 SDRAM" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr3_density_vals[] =
+{
+	{ 0, "256 Mb" },
+	{ 1, "512 Mb" },
+	{ 2, "1 Gb" },
+	{ 3, "2 Gb" },
+	{ 4, "4 Gb" },
+	{ 5, "8 Gb" },
+	{ 6, "16 Gb" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr3_banks_vals[] =
+{
+	{ 0, "3 (8 Banks)" },
+	{ 1, "4 (16 Banks)" },
+	{ 2, "5 (32 Banks)" },
+	{ 3, "6 (64 Banks)" },
+	{ 0x00, NULL },
+};
+
+
+#define ddr4_ecc_vals ddr3_ecc_vals
+const struct valstr ddr3_ecc_vals[] =
+{
+	{ 0, "0 bits" },
+	{ 1, "8 bits" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_density_vals[] =
+{
+	{ 0, "256 Mb" },
+	{ 1, "512 Mb" },
+	{ 2, "1 Gb" },
+	{ 3, "2 Gb" },
+	{ 4, "4 Gb" },
+	{ 5, "8 Gb" },
+	{ 6, "16 Gb" },
+	{ 7, "32 Gb" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_banks_vals[] =
+{
+	{ 0, "2 (4 Banks)" },
+	{ 1, "3 (8 Banks)" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_bank_groups[] =
+{
+	{ 0, "0 (no Bank Groups)" },
+	{ 1, "1 (2 Bank Groups)" },
+	{ 2, "2 (4 Bank Groups)" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_package_type[] =
+{
+	{ 0, "Monolithic DRAM Device" },
+	{ 1, "Non-Monolithic Device" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ddr4_technology_type[] =
+{
+	{ 0, "Extended module type, see byte 15" },
+	{ 1, "RDIMM" },
+	{ 2, "UDIMM" },
+	{ 3, "SO-DIMM" },
+	{ 4, "LRDIMM" },
+	{ 5, "Mini-RDIMM" },
+	{ 6, "Mini-UDIMM" },
+	{ 7, "7 - Reserved" },
+	{ 8, "72b-SO-RDIMM" },
+	{ 9, "72b-SO-UDIMM" },
+	{ 10, "10 - Reserved" },
+	{ 11, "11 - Reserved" },
+	{ 12, "16b-SO-DIMM" },
+	{ 13, "32b-SO-DIMM" },
+	{ 14, "14 - Reserved" },
+	{ 15, "No base memory present" },
+	{ 0x00, NULL },
+};
+
+const struct valstr spd_config_vals[] = {
+	{ 0x00, "None" },
+	{ 0x01, "Parity" },
+	{ 0x02, "ECC" },
+	{ 0x04, "Addr Cmd Parity" },
+	{ 0x00, NULL },
+};
+
+const struct valstr spd_voltage_vals[] = {
+	{ 0x00, "5.0V TTL" },
+	{ 0x01, "LVTTL" },
+	{ 0x02, "HSTL 1.5V" },
+	{ 0x03, "SSTL 3.3V" },
+	{ 0x04, "SSTL 2.5V" },
+	{ 0x05, "SSTL 1.8V" },
+	{ 0x00, NULL },
+};
+
+/*
+ * JEDEC Standard Manufacturers Identification Code
+ * publication JEP106N, December 2003
+ */
+
+const struct valstr jedec_id1_vals[] = {
+	{ 0x01, "AMD" },
+	{ 0x02, "AMI" },
+	{ 0x83, "Fairchild" },
+	{ 0x04, "Fujitsu" },
+	{ 0x85, "GTE" },
+	{ 0x86, "Harris" },
+	{ 0x07, "Hitachi" },
+	{ 0x08, "Inmos" },
+	{ 0x89, "Intel" },
+	{ 0x8A, "I.T.T." },
+	{ 0x0B, "Intersil" },
+	{ 0x8C, "Monolithic Memories" },
+	{ 0x0D, "Mostek" },
+	{ 0x0E, "Freescale (Motorola)" },
+	{ 0x8F, "National" },
+	{ 0x10, "NEC" },
+	{ 0x91, "RCA" },
+	{ 0x92, "Raytheon" },
+	{ 0x13, "Conexant (Rockwell)" },
+	{ 0x94, "Seeq" },
+	{ 0x15, "NXP (Philips)" },
+	{ 0x16, "Synertek" },
+	{ 0x97, "Texas Instruments" },
+	{ 0x98, "Toshiba" },
+	{ 0x19, "Xicor" },
+	{ 0x1A, "Zilog" },
+	{ 0x9B, "Eurotechnique" },
+	{ 0x1C, "Mitsubishi" },
+	{ 0x9D, "Lucent (AT&T)" },
+	{ 0x9E, "Exel" },
+	{ 0x1F, "Atmel" },
+	{ 0x20, "STMicroelectronics" },
+	{ 0xA1, "Lattice Semi." },
+	{ 0xA2, "NCR" },
+	{ 0x23, "Wafer Scale Integration" },
+	{ 0xA4, "IBM" },
+	{ 0x25, "Tristar" },
+	{ 0x26, "Visic" },
+	{ 0xA7, "Intl. CMOS Technology" },
+	{ 0xA8, "SSSI" },
+	{ 0x29, "MicrochipTechnology" },
+	{ 0x2A, "Ricoh Ltd." },
+	{ 0xAB, "VLSI" },
+	{ 0x2C, "Micron Technology" },
+	{ 0xAD, "SK Hynix" },
+	{ 0xAE, "OKI Semiconductor" },
+	{ 0x2F, "ACTEL" },
+	{ 0xB0, "Sharp" },
+	{ 0x31, "Catalyst" },
+	{ 0x32, "Panasonic" },
+	{ 0xB3, "IDT" },
+	{ 0x34, "Cypress" },
+	{ 0xB5, "DEC" },
+	{ 0xB6, "LSI Logic" },
+	{ 0x37, "Zarlink (Plessey)" },
+	{ 0x38, "UTMC" },
+	{ 0xB9, "Thinking Machine" },
+	{ 0xBA, "Thomson CSF" },
+	{ 0x3B, "Integrated CMOS (Vertex)" },
+	{ 0xBC, "Honeywell" },
+	{ 0x3D, "Tektronix" },
+	{ 0x3E, "Oracle Corporation" },
+	{ 0xBF, "Silicon Storage Technology" },
+	{ 0x40, "ProMos/Mosel Vitelic" },
+	{ 0xC1, "Infineon (Siemens)" },
+	{ 0xC2, "Macronix" },
+	{ 0x43, "Xerox" },
+	{ 0xC4, "Plus Logic" },
+	{ 0x45, "SanDisk Corporation" },
+	{ 0x46, "Elan Circuit Tech." },
+	{ 0xC7, "European Silicon Str." },
+	{ 0xC8, "Apple Computer" },
+	{ 0x49, "Xilinx" },
+	{ 0x4A, "Compaq" },
+	{ 0xCB, "Protocol Engines" },
+	{ 0x4C, "SCI" },
+	{ 0xCD, "Seiko Instruments" },
+	{ 0xCE, "Samsung" },
+	{ 0x4F, "I3 Design System" },
+	{ 0xD0, "Klic" },
+	{ 0x51, "Crosspoint Solutions" },
+	{ 0x52, "Alliance Semiconductor" },
+	{ 0xD3, "Tandem" },
+	{ 0x54, "Hewlett-Packard" },
+	{ 0xD5, "Integrated Silicon Solutions" },
+	{ 0xD6, "Brooktree" },
+	{ 0x57, "New Media" },
+	{ 0x58, "MHS Electronic" },
+	{ 0xD9, "Performance Semi." },
+	{ 0xDA, "Winbond Electronic" },
+	{ 0x5B, "Kawasaki Steel" },
+	{ 0xDC, "Bright Micro" },
+	{ 0x5D, "TECMAR" },
+	{ 0x5E, "Exar" },
+	{ 0xDF, "PCMCIA" },
+	{ 0xE0, "LG Semi (Goldstar)" },
+	{ 0x61, "Northern Telecom" },
+	{ 0x62, "Sanyo" },
+	{ 0xE3, "Array Microsystems" },
+	{ 0x64, "Crystal Semiconductor" },
+	{ 0xE5, "Analog Devices" },
+	{ 0xE6, "PMC-Sierra" },
+	{ 0x67, "Asparix" },
+	{ 0x68, "Convex Computer" },
+	{ 0xE9, "Quality Semiconductor" },
+	{ 0xEA, "Nimbus Technology" },
+	{ 0x6B, "Transwitch" },
+	{ 0xEC, "Micronas (ITT Intermetall)" },
+	{ 0x6D, "Cannon" },
+	{ 0x6E, "Altera" },
+	{ 0xEF, "NEXCOM" },
+	{ 0x70, "Qualcomm" },
+	{ 0xF1, "Sony" },
+	{ 0xF2, "Cray Research" },
+	{ 0x73, "AMS(Austria Micro)" },
+	{ 0xF4, "Vitesse" },
+	{ 0x75, "Aster Electronics" },
+	{ 0x76, "Bay Networks (Synoptic)" },
+	{ 0xF7, "Zentrum/ZMD" },
+	{ 0xF8, "TRW" },
+	{ 0x79, "Thesys" },
+	{ 0x7A, "Solbourne Computer" },
+	{ 0xFB, "Allied-Signal" },
+	{ 0x7C, "Dialog Semiconductor" },
+	{ 0xFD, "Media Vision" },
+	{ 0xFE, "Numonyx Corporation" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id2_vals[] = {
+	{ 0x01, "Cirrus Logic" },
+	{ 0x02, "National Instruments" },
+	{ 0x83, "ILC Data Device" },
+	{ 0x04, "Alcatel Mietec" },
+	{ 0x85, "Micro Linear" },
+	{ 0x86, "Univ. of NC" },
+	{ 0x07, "JTAG Technologies" },
+	{ 0x08, "BAE Systems (Loral)" },
+	{ 0x89, "Nchip" },
+	{ 0x8A, "Galileo Tech" },
+	{ 0x0B, "Bestlink Systems" },
+	{ 0x8C, "Graychip" },
+	{ 0x0D, "GENNUM" },
+	{ 0x0E, "VideoLogic" },
+	{ 0x8F, "Robert Bosch" },
+	{ 0x10, "Chip Express" },
+	{ 0x91, "DATARAM" },
+	{ 0x92, "United Microelectronics Corp." },
+	{ 0x13, "TCSI" },
+	{ 0x94, "Smart Modular" },
+	{ 0x15, "Hughes Aircraft" },
+	{ 0x16, "Lanstar Semiconductor" },
+	{ 0x97, "Qlogic" },
+	{ 0x98, "Kingston" },
+	{ 0x19, "Music Semi" },
+	{ 0x1A, "Ericsson Components" },
+	{ 0x9B, "SpaSE" },
+	{ 0x1C, "Eon Silicon Devices" },
+	{ 0x9D, "Integrated Silicon Solution (ISSI)" },
+	{ 0x9E, "DoD" },
+	{ 0x1F, "Integ. Memories Tech." },
+	{ 0x20, "Corollary Inc." },
+	{ 0xA1, "Dallas Semiconductor" },
+	{ 0xA2, "Omnivision" },
+	{ 0x23, "EIV(Switzerland)" },
+	{ 0xA4, "Novatel Wireless" },
+	{ 0x25, "Zarlink (Mitel)" },
+	{ 0x26, "Clearpoint" },
+	{ 0xA7, "Cabletron" },
+	{ 0xA8, "STEC (Silicon Tech)" },
+	{ 0x29, "Vanguard" },
+	{ 0x2A, "Hagiwara Sys-Com" },
+	{ 0xAB, "Vantis" },
+	{ 0x2C, "Celestica" },
+	{ 0xAD, "Century" },
+	{ 0xAE, "Hal Computers" },
+	{ 0x2F, "Rohm Company Ltd." },
+	{ 0xB0, "Juniper Networks" },
+	{ 0x31, "Libit Signal Processing" },
+	{ 0x32, "Mushkin Enhanced Memory" },
+	{ 0xB3, "Tundra Semiconductor" },
+	{ 0x34, "Adaptec Inc." },
+	{ 0xB5, "LightSpeed Semi." },
+	{ 0xB6, "ZSP Corp." },
+	{ 0x37, "AMIC Technology" },
+	{ 0x38, "Adobe Systems" },
+	{ 0xB9, "Dynachip" },
+	{ 0xBA, "PNY Technologies, Inc." },
+	{ 0x3B, "Newport Digital" },
+	{ 0xBC, "MMC Networks" },
+	{ 0x3D, "T Square" },
+	{ 0x3E, "Seiko Epson" },
+	{ 0xBF, "Broadcom" },
+	{ 0x40, "Viking Components" },
+	{ 0xC1, "V3 Semiconductor" },
+	{ 0xC2, "Flextronics (Orbit Semiconductor)" },
+	{ 0x43, "Suwa Electronics" },
+	{ 0xC4, "Transmeta" },
+	{ 0x45, "Micron CMS" },
+	{ 0x46, "American Computer & Digital Components Inc." },
+	{ 0xC7, "Enhance 3000 Inc." },
+	{ 0xC8, "Tower Semiconductor" },
+	{ 0x49, "CPU Design" },
+	{ 0x4A, "Price Point" },
+	{ 0xCB, "Maxim Integrated Product" },
+	{ 0x4C, "Tellabs" },
+	{ 0xCD, "Centaur Technology" },
+	{ 0xCE, "Unigen Corporation" },
+	{ 0x4F, "Transcend Information" },
+	{ 0xD0, "Memory Card Technology" },
+	{ 0x51, "CKD Corporation Ltd." },
+	{ 0x52, "Capital Instruments, Inc." },
+	{ 0xD3, "Aica Kogyo, Ltd." },
+	{ 0x54, "Linvex Technology" },
+	{ 0xD5, "MSC Vertriebs GmbH" },
+	{ 0xD6, "AKM Company, Ltd." },
+	{ 0x57, "Dynamem, Inc." },
+	{ 0x58, "NERA ASA" },
+	{ 0xD9, "GSI Technology" },
+	{ 0xDA, "Dane-Elec (C Memory)" },
+	{ 0x5B, "Acorn Computers" },
+	{ 0xDC, "Lara Technology" },
+	{ 0x5D, "Oak Technology, Inc." },
+	{ 0x5E, "Itec Memory" },
+	{ 0xDF, "Tanisys Technology" },
+	{ 0xE0, "Truevision" },
+	{ 0x61, "Wintec Industries" },
+	{ 0x62, "Super PC Memory" },
+	{ 0xE3, "MGV Memory" },
+	{ 0x64, "Galvantech" },
+	{ 0xE5, "Gadzoox Networks" },
+	{ 0xE6, "Multi Dimensional Cons." },
+	{ 0x67, "GateField" },
+	{ 0x68, "Integrated Memory System" },
+	{ 0xE9, "Triscend" },
+	{ 0xEA, "XaQti" },
+	{ 0x6B, "Goldenram" },
+	{ 0xEC, "Clear Logic" },
+	{ 0x6D, "Cimaron Communications" },
+	{ 0x6E, "Nippon Steel Semi. Corp." },
+	{ 0xEF, "Advantage Memory" },
+	{ 0x70, "AMCC" },
+	{ 0xF1, "LeCroy" },
+	{ 0xF2, "Yamaha Corporation" },
+	{ 0x73, "Digital Microwave" },
+	{ 0xF4, "NetLogic Microsystems" },
+	{ 0x75, "MIMOS Semiconductor" },
+	{ 0x76, "Advanced Fibre" },
+	{ 0xF7, "BF Goodrich Data." },
+	{ 0xF8, "Epigram" },
+	{ 0x79, "Acbel Polytech Inc." },
+	{ 0x7A, "Apacer Technology" },
+	{ 0xFB, "Admor Memory" },
+	{ 0x7C, "FOXCONN" },
+	{ 0xFD, "Quadratics Superconductor" },
+	{ 0xFE, "3COM" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id3_vals[] = {
+	{ 0x01, "Camintonn Corporation" },
+	{ 0x02, "ISOA Incorporated" },
+	{ 0x83, "Agate Semiconductor" },
+	{ 0x04, "ADMtek Incorporated" },
+	{ 0x85, "HYPERTEC" },
+	{ 0x86, "Adhoc Technologies" },
+	{ 0x07, "MOSAID Technologies" },
+	{ 0x08, "Ardent Technologies" },
+	{ 0x89, "Switchcore" },
+	{ 0x8A, "Cisco Systems, Inc." },
+	{ 0x0B, "Allayer Technologies" },
+	{ 0x8C, "WorkX AG (Wichman)" },
+	{ 0x0D, "Oasis Semiconductor" },
+	{ 0x0E, "Novanet Semiconductor" },
+	{ 0x8F, "E-M Solutions" },
+	{ 0x10, "Power General" },
+	{ 0x91, "Advanced Hardware Arch." },
+	{ 0x92, "Inova Semiconductors GmbH" },
+	{ 0x13, "Telocity" },
+	{ 0x94, "Delkin Devices" },
+	{ 0x15, "Symagery Microsystems" },
+	{ 0x16, "C-Port Corporation" },
+	{ 0x97, "SiberCore Technologies" },
+	{ 0x98, "Southland Microsystems" },
+	{ 0x19, "Malleable Technologies" },
+	{ 0x1A, "Kendin Communications" },
+	{ 0x9B, "Great Technology Microcomputer" },
+	{ 0x1C, "Sanmina Corporation" },
+	{ 0x9D, "HADCO Corporation" },
+	{ 0x9E, "Corsair" },
+	{ 0x1F, "Actrans System Inc." },
+	{ 0x20, "ALPHA Technologies" },
+	{ 0xA1, "Silicon Laboratories, Inc. (Cygnal)" },
+	{ 0xA2, "Artesyn Technologies" },
+	{ 0x23, "Align Manufacturing" },
+	{ 0xA4, "Peregrine Semiconductor" },
+	{ 0x25, "Chameleon Systems" },
+	{ 0x26, "Aplus Flash Technology" },
+	{ 0xA7, "MIPS Technologies" },
+	{ 0xA8, "Chrysalis ITS" },
+	{ 0x29, "ADTEC Corporation" },
+	{ 0x2A, "Kentron Technologies" },
+	{ 0xAB, "Win Technologies" },
+	{ 0x2C, "Tezzaron Semiconductor" },
+	{ 0xAD, "Extreme Packet Devices" },
+	{ 0xAE, "RF Micro Devices" },
+	{ 0x2F, "Siemens AG" },
+	{ 0xB0, "Sarnoff Corporation" },
+	{ 0x31, "Itautec SA" },
+	{ 0x32, "Radiata Inc." },
+	{ 0xB3, "Benchmark Elect. (AVEX)" },
+	{ 0x34, "Legend" },
+	{ 0xB5, "SpecTek Incorporated" },
+	{ 0xB6, "Hi/fn" },
+	{ 0x37, "Enikia Incorporated" },
+	{ 0x38, "SwitchOn Networks" },
+	{ 0xB9, "AANetcom Incorporated" },
+	{ 0xBA, "Micro Memory Bank" },
+	{ 0x3B, "ESS Technology" },
+	{ 0xBC, "Virata Corporation" },
+	{ 0x3D, "Excess Bandwidth" },
+	{ 0x3E, "West Bay Semiconductor" },
+	{ 0xBF, "DSP Group" },
+	{ 0x40, "Newport Communications" },
+	{ 0xC1, "Chip2Chip Incorporated" },
+	{ 0xC2, "Phobos Corporation" },
+	{ 0x43, "Intellitech Corporation" },
+	{ 0xC4, "Nordic VLSI ASA" },
+	{ 0x45, "Ishoni Networks" },
+	{ 0x46, "Silicon Spice" },
+	{ 0xC7, "Alchemy Semiconductor" },
+	{ 0xC8, "Agilent Technologies" },
+	{ 0x49, "Centillium Communications" },
+	{ 0x4A, "W.L. Gore" },
+	{ 0xCB, "HanBit Electronics" },
+	{ 0x4C, "GlobeSpan" },
+	{ 0xCD, "Element 14" },
+	{ 0xCE, "Pycon" },
+	{ 0x4F, "Saifun Semiconductors" },
+	{ 0xD0, "Sibyte, Incorporated" },
+	{ 0x51, "MetaLink Technologies" },
+	{ 0x52, "Feiya Technology" },
+	{ 0xD3, "I & C Technology" },
+	{ 0x54, "Shikatronics" },
+	{ 0xD5, "Elektrobit" },
+	{ 0xD6, "Megic" },
+	{ 0x57, "Com-Tier" },
+	{ 0x58, "Malaysia Micro Solutions" },
+	{ 0xD9, "Hyperchip" },
+	{ 0xDA, "Gemstone Communications" },
+	{ 0x5B, "Anadigm (Anadyne)" },
+	{ 0xDC, "3ParData" },
+	{ 0x5D, "Mellanox Technologies" },
+	{ 0x5E, "Tenx Technologies" },
+	{ 0xDF, "Helix AG" },
+	{ 0xE0, "Domosys" },
+	{ 0x61, "Skyup Technology" },
+	{ 0x62, "HiNT Corporation" },
+	{ 0xE3, "Chiaro" },
+	{ 0x64, "MDT Technologies GmbH" },
+	{ 0xE5, "Exbit Technology A/S" },
+	{ 0xE6, "Integrated Technology Express" },
+	{ 0x67, "AVED Memory" },
+	{ 0x68, "Legerity" },
+	{ 0xE9, "Jasmine Networks" },
+	{ 0xEA, "Caspian Networks" },
+	{ 0x6B, "nCUBE" },
+	{ 0xEC, "Silicon Access Networks" },
+	{ 0x6D, "FDK Corporation" },
+	{ 0x6E, "High Bandwidth Access" },
+	{ 0xEF, "MultiLink Technology" },
+	{ 0x70, "BRECIS" },
+	{ 0xF1, "World Wide Packets" },
+	{ 0xF2, "APW" },
+	{ 0x73, "Chicory Systems" },
+	{ 0xF4, "Xstream Logic" },
+	{ 0x75, "Fast-Chip" },
+	{ 0x76, "Zucotto Wireless" },
+	{ 0xF7, "Realchip" },
+	{ 0xF8, "Galaxy Power" },
+	{ 0x79, "eSilicon" },
+	{ 0x7A, "Morphics Technology" },
+	{ 0xFB, "Accelerant Networks" },
+	{ 0x7C, "Silicon Wave" },
+	{ 0xFD, "SandCraft" },
+	{ 0xFE, "Elpida" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id4_vals[] = {
+	{ 0x01, "Solectron" },
+	{ 0x02, "Optosys Technologies" },
+	{ 0x83, "Buffalo (Formerly Melco)" },
+	{ 0x04, "TriMedia Technologies" },
+	{ 0x85, "Cyan Technologies" },
+	{ 0x86, "Global Locate" },
+	{ 0x07, "Optillion" },
+	{ 0x08, "Terago Communications" },
+	{ 0x89, "Ikanos Communications" },
+	{ 0x8A, "Princeton Technology" },
+	{ 0x0B, "Nanya Technology" },
+	{ 0x8C, "Elite Flash Storage" },
+	{ 0x0D, "Mysticom" },
+	{ 0x0E, "LightSand Communications" },
+	{ 0x8F, "ATI Technologies" },
+	{ 0x10, "Agere Systems" },
+	{ 0x91, "NeoMagic" },
+	{ 0x92, "AuroraNetics" },
+	{ 0x13, "Golden Empire" },
+	{ 0x94, "Mushkin" },
+	{ 0x15, "Tioga Technologies" },
+	{ 0x16, "Netlist" },
+	{ 0x97, "TeraLogic" },
+	{ 0x98, "Cicada Semiconductor" },
+	{ 0x19, "Centon Electronics" },
+	{ 0x1A, "Tyco Electronics" },
+	{ 0x9B, "Magis Works" },
+	{ 0x1C, "Zettacom" },
+	{ 0x9D, "Cogency Semiconductor" },
+	{ 0x9E, "Chipcon AS" },
+	{ 0x1F, "Aspex Technology" },
+	{ 0x20, "F5 Networks" },
+	{ 0xA1, "Programmable Silicon Solutions" },
+	{ 0xA2, "ChipWrights" },
+	{ 0x23, "Acorn Networks" },
+	{ 0xA4, "Quicklogic" },
+	{ 0x25, "Kingmax Semiconductor" },
+	{ 0x26, "BOPS" },
+	{ 0xA7, "Flasys" },
+	{ 0xA8, "BitBlitz Communications" },
+	{ 0x29, "eMemory Technology" },
+	{ 0x2A, "Procket Networks" },
+	{ 0xAB, "Purple Ray" },
+	{ 0x2C, "Trebia Networks" },
+	{ 0xAD, "Delta Electronics" },
+	{ 0xAE, "Onex Communications" },
+	{ 0x2F, "Ample Communications" },
+	{ 0xB0, "Memory Experts Intl" },
+	{ 0x31, "Astute Networks" },
+	{ 0x32, "Azanda Network Devices" },
+	{ 0xB3, "Dibcom" },
+	{ 0x34, "Tekmos" },
+	{ 0xB5, "API NetWorks" },
+	{ 0xB6, "Bay Microsystems" },
+	{ 0x37, "Firecron Ltd" },
+	{ 0x38, "Resonext Communications" },
+	{ 0xB9, "Tachys Technologies" },
+	{ 0xBA, "Equator Technology" },
+	{ 0x3B, "Concept Computer" },
+	{ 0xBC, "SILCOM" },
+	{ 0x3D, "3Dlabs" },
+	{ 0x3E, "c’t Magazine" },
+	{ 0xBF, "Sanera Systems" },
+	{ 0x40, "Silicon Packets" },
+	{ 0xC1, "Viasystems Group" },
+	{ 0xC2, "Simtek" },
+	{ 0x43, "Semicon Devices Singapore" },
+	{ 0xC4, "Satron Handelsges" },
+	{ 0x45, "Improv Systems" },
+	{ 0x46, "INDUSYS GmbH" },
+	{ 0xC7, "Corrent" },
+	{ 0xC8, "Infrant Technologies" },
+	{ 0x49, "Ritek Corp" },
+	{ 0x4A, "empowerTel Networks" },
+	{ 0xCB, "Hypertec" },
+	{ 0x4C, "Cavium Networks" },
+	{ 0xCD, "PLX Technology" },
+	{ 0xCE, "Massana Design" },
+	{ 0x4F, "Intrinsity" },
+	{ 0xD0, "Valence Semiconductor" },
+	{ 0x51, "Terawave Communications" },
+	{ 0x52, "IceFyre Semiconductor" },
+	{ 0xD3, "Primarion" },
+	{ 0x54, "Picochip Designs Ltd" },
+	{ 0xD5, "Silverback Systems" },
+	{ 0xD6, "Jade Star Technologies" },
+	{ 0x57, "Pijnenburg Securealink" },
+	{ 0x58, "takeMS - Ultron AG" },
+	{ 0xD9, "Cambridge Silicon Radio" },
+	{ 0xDA, "Swissbit" },
+	{ 0x5B, "Nazomi Communications" },
+	{ 0xDC, "eWave System" },
+	{ 0x5D, "Rockwell Collins" },
+	{ 0x5E, "Picocel Co. Ltd. (Paion)" },
+	{ 0xDF, "Alphamosaic Ltd" },
+	{ 0xE0, "Sandburst" },
+	{ 0x61, "SiCon Video" },
+	{ 0x62, "NanoAmp Solutions" },
+	{ 0xE3, "Ericsson Technology" },
+	{ 0x64, "PrairieComm" },
+	{ 0xE5, "Mitac International" },
+	{ 0xE6, "Layer N Networks" },
+	{ 0x67, "MtekVision (Atsana)" },
+	{ 0x68, "Allegro Networks" },
+	{ 0xE9, "Marvell Semiconductors" },
+	{ 0xEA, "Netergy Microelectronic" },
+	{ 0x6B, "NVIDIA" },
+	{ 0xEC, "Internet Machines" },
+	{ 0x6D, "Memorysolution GmbH" },
+	{ 0x6E, "Litchfield Communication" },
+	{ 0xEF, "Accton Technology" },
+	{ 0x70, "Teradiant Networks" },
+	{ 0xF1, "Scaleo Chip" },
+	{ 0xF2, "Cortina Systems" },
+	{ 0x73, "RAM Components" },
+	{ 0xF4, "Raqia Networks" },
+	{ 0x75, "ClearSpeed" },
+	{ 0x76, "Matsushita Battery" },
+	{ 0xF7, "Xelerated" },
+	{ 0xF8, "SimpleTech" },
+	{ 0x79, "Utron Technology" },
+	{ 0x7A, "Astec International" },
+	{ 0xFB, "AVM gmbH" },
+	{ 0x7C, "Redux Communications" },
+	{ 0xFD, "Dot Hill Systems" },
+	{ 0xFE, "TeraChip" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id5_vals[] = {
+	{ 0x01, "T-RAM Incorporated" },
+	{ 0x02, "Innovics Wireless" },
+	{ 0x83, "Teknovus" },
+	{ 0x04, "KeyEye Communications" },
+	{ 0x85, "Runcom Technologies" },
+	{ 0x86, "RedSwitch" },
+	{ 0x07, "Dotcast" },
+	{ 0x08, "Silicon Mountain Memory" },
+	{ 0x89, "Signia Technologies" },
+	{ 0x8A, "Pixim" },
+	{ 0x0B, "Galazar Networks" },
+	{ 0x8C, "White Electronic Designs" },
+	{ 0x0D, "Patriot Scientific" },
+	{ 0x0E, "Neoaxiom Corporation" },
+	{ 0x8F, "3Y Power Technology" },
+	{ 0x10, "Scaleo Chip" },
+	{ 0x91, "Potentia Power Systems" },
+	{ 0x92, "C-guys Incorporated" },
+	{ 0x13, "Digital Communications Technology Incorporated" },
+	{ 0x94, "Silicon-Based Technology" },
+	{ 0x15, "Fulcrum Microsystems" },
+	{ 0x16, "Positivo Informatica Ltd" },
+	{ 0x97, "XIOtech Corporation" },
+	{ 0x98, "PortalPlayer" },
+	{ 0x19, "Zhiying Software" },
+	{ 0x1A, "ParkerVision, Inc." },
+	{ 0x9B, "Phonex Broadband" },
+	{ 0x1C, "Skyworks Solutions" },
+	{ 0x9D, "Entropic Communications" },
+	{ 0x9E, "I’M Intelligent Memory Ltd." },
+	{ 0x1F, "Zensys A/S" },
+	{ 0x20, "Legend Silicon Corp." },
+	{ 0xA1, "Sci-worx GmbH" },
+	{ 0xA2, "SMSC (Standard Microsystems)" },
+	{ 0x23, "Renesas Electronics" },
+	{ 0xA4, "Raza Microelectronics" },
+	{ 0x25, "Phyworks" },
+	{ 0x26, "MediaTek" },
+	{ 0xA7, "Non-cents Productions" },
+	{ 0xA8, "US Modular" },
+	{ 0x29, "Wintegra Ltd." },
+	{ 0x2A, "Mathstar" },
+	{ 0xAB, "StarCore" },
+	{ 0x2C, "Oplus Technologies" },
+	{ 0xAD, "Mindspeed" },
+	{ 0xAE, "Just Young Computer" },
+	{ 0x2F, "Radia Communications" },
+	{ 0xB0, "OCZ" },
+	{ 0x31, "Emuzed" },
+	{ 0x32, "LOGIC Devices" },
+	{ 0xB3, "Inphi Corporation" },
+	{ 0x34, "Quake Technologies" },
+	{ 0xB5, "Vixel" },
+	{ 0xB6, "SolusTek" },
+	{ 0x37, "Kongsberg Maritime" },
+	{ 0x38, "Faraday Technology" },
+	{ 0xB9, "Altium Ltd." },
+	{ 0xBA, "Insyte" },
+	{ 0x3B, "ARM Ltd." },
+	{ 0xBC, "DigiVision" },
+	{ 0x3D, "Vativ Technologies" },
+	{ 0x3E, "Endicott Interconnect Technologies" },
+	{ 0xBF, "Pericom" },
+	{ 0x40, "Bandspeed" },
+	{ 0xC1, "LeWiz Communications" },
+	{ 0xC2, "CPU Technology" },
+	{ 0x43, "Ramaxel Technology" },
+	{ 0xC4, "DSP Group" },
+	{ 0x45, "Axis Communications" },
+	{ 0x46, "Legacy Electronics" },
+	{ 0xC7, "Chrontel" },
+	{ 0xC8, "Powerchip Semiconductor" },
+	{ 0x49, "MobilEye Technologies" },
+	{ 0x4A, "Excel Semiconductor" },
+	{ 0xCB, "A-DATA Technology" },
+	{ 0x4C, "VirtualDigm" },
+	{ 0xCD, "G Skill Intl" },
+	{ 0xCE, "Quanta Computer" },
+	{ 0x4F, "Yield Microelectronics" },
+	{ 0xD0, "Afa Technologies" },
+	{ 0x51, "KINGBOX Technology Co. Ltd." },
+	{ 0x52, "Ceva" },
+	{ 0xD3, "iStor Networks" },
+	{ 0x54, "Advance Modules" },
+	{ 0xD5, "Microsoft" },
+	{ 0xD6, "Open-Silicon" },
+	{ 0x57, "Goal Semiconductor" },
+	{ 0x58, "ARC International" },
+	{ 0xD9, "Simmtec" },
+	{ 0xDA, "Metanoia" },
+	{ 0x5B, "Key Stream" },
+	{ 0xDC, "Lowrance Electronics" },
+	{ 0x5D, "Adimos" },
+	{ 0x5E, "SiGe Semiconductor" },
+	{ 0xDF, "Fodus Communications" },
+	{ 0xE0, "Credence Systems Corp." },
+	{ 0x61, "Genesis Microchip Inc." },
+	{ 0x62, "Vihana, Inc." },
+	{ 0xE3, "WIS Technologies" },
+	{ 0x64, "GateChange Technologies" },
+	{ 0xE5, "High Density Devices AS" },
+	{ 0xE6, "Synopsys" },
+	{ 0x67, "Gigaram" },
+	{ 0x68, "Enigma Semiconductor Inc." },
+	{ 0xE9, "Century Micro Inc." },
+	{ 0xEA, "Icera Semiconductor" },
+	{ 0x6B, "Mediaworks Integrated Systems" },
+	{ 0xEC, "O’Neil Product Development" },
+	{ 0x6D, "Supreme Top Technology Ltd." },
+	{ 0x6E, "MicroDisplay Corporation" },
+	{ 0xEF, "Team Group Inc." },
+	{ 0x70, "Sinett Corporation" },
+	{ 0xF1, "Toshiba Corporation" },
+	{ 0xF2, "Tensilica" },
+	{ 0x73, "SiRF Technology" },
+	{ 0xF4, "Bacoc Inc." },
+	{ 0x75, "SMaL Camera Technologies" },
+	{ 0x76, "Thomson SC" },
+	{ 0xF7, "Airgo Networks" },
+	{ 0xF8, "Wisair Ltd." },
+	{ 0x79, "SigmaTel" },
+	{ 0x7A, "Arkados" },
+	{ 0xFB, "Compete IT gmbH Co. KG" },
+	{ 0x7C, "Eudar Technology Inc." },
+	{ 0xFD, "Focus Enhancements" },
+	{ 0xFE, "Xyratex" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id6_vals[] = {
+	{ 0x01, "Specular Networks" },
+	{ 0x02, "Patriot Memory (PDP Systems)" },
+	{ 0x83, "U-Chip Technology Corp." },
+	{ 0x04, "Silicon Optix" },
+	{ 0x85, "Greenfield Networks" },
+	{ 0x86, "CompuRAM GmbH" },
+	{ 0x07, "Stargen, Inc." },
+	{ 0x08, "NetCell Corporation" },
+	{ 0x89, "Excalibrus Technologies Ltd" },
+	{ 0x8A, "SCM Microsystems" },
+	{ 0x0B, "Xsigo Systems, Inc." },
+	{ 0x8C, "CHIPS & Systems Inc" },
+	{ 0x0D, "Tier 1 Multichip Solutions" },
+	{ 0x0E, "CWRL Labs" },
+	{ 0x8F, "Teradici" },
+	{ 0x10, "Gigaram, Inc." },
+	{ 0x91, "g2 Microsystems" },
+	{ 0x92, "PowerFlash Semiconductor" },
+	{ 0x13, "P.A. Semi, Inc." },
+	{ 0x94, "NovaTech Solutions, S.A." },
+	{ 0x15, "c2 Microsystems, Inc." },
+	{ 0x16, "Level5 Networks" },
+	{ 0x97, "COS Memory AG" },
+	{ 0x98, "Innovasic Semiconductor" },
+	{ 0x19, "02IC Co. Ltd" },
+	{ 0x1A, "Tabula, Inc." },
+	{ 0x9B, "Crucial Technology" },
+	{ 0x1C, "Chelsio Communications" },
+	{ 0x9D, "Solarflare Communications" },
+	{ 0x9E, "Xambala Inc." },
+	{ 0x1F, "EADS Astrium" },
+	{ 0x20, "Terra Semiconductor, Inc." },
+	{ 0xA1, "Imaging Works, Inc." },
+	{ 0xA2, "Astute Networks, Inc." },
+	{ 0x23, "Tzero" },
+	{ 0xA4, "Emulex" },
+	{ 0x25, "Power-One" },
+	{ 0x26, "Pulse~LINK Inc." },
+	{ 0xA7, "Hon Hai Precision Industry" },
+	{ 0xA8, "White Rock Networks Inc." },
+	{ 0x29, "Telegent Systems USA, Inc." },
+	{ 0x2A, "Atrua Technologies, Inc." },
+	{ 0xAB, "Acbel Polytech Inc." },
+	{ 0x2C, "eRide Inc." },
+	{ 0xAD, "ULi Electronics Inc." },
+	{ 0xAE, "Magnum Semiconductor Inc." },
+	{ 0x2F, "neoOne Technology, Inc." },
+	{ 0xB0, "Connex Technology, Inc." },
+	{ 0x31, "Stream Processors, Inc." },
+	{ 0x32, "Focus Enhancements" },
+	{ 0xB3, "Telecis Wireless, Inc." },
+	{ 0x34, "uNav Microelectronics" },
+	{ 0xB5, "Tarari, Inc." },
+	{ 0xB6, "Ambric, Inc." },
+	{ 0x37, "Newport Media, Inc." },
+	{ 0x38, "VMTS" },
+	{ 0xB9, "Enuclia Semiconductor, Inc." },
+	{ 0xBA, "Virtium Technology Inc." },
+	{ 0x3B, "Solid State System Co., Ltd." },
+	{ 0xBC, "Kian Tech LLC" },
+	{ 0x3D, "Artimi" },
+	{ 0x3E, "Power Quotient International" },
+	{ 0xBF, "Avago Technologies" },
+	{ 0x40, "ADTechnology" },
+	{ 0xC1, "Sigma Designs" },
+	{ 0xC2, "SiCortex, Inc." },
+	{ 0x43, "Ventura Technology Group" },
+	{ 0xC4, "eASIC" },
+	{ 0x45, "M.H.S. SAS" },
+	{ 0x46, "Micro Star International" },
+	{ 0xC7, "Rapport Inc." },
+	{ 0xC8, "Makway International" },
+	{ 0x49, "Broad Reach Engineering Co." },
+	{ 0x4A, "Semiconductor Mfg Intl Corp" },
+	{ 0xCB, "SiConnect" },
+	{ 0x4C, "FCI USA Inc." },
+	{ 0xCD, "Validity Sensors" },
+	{ 0xCE, "Coney Technology Co. Ltd." },
+	{ 0x4F, "Spans Logic" },
+	{ 0xD0, "Neterion Inc." },
+	{ 0x51, "Qimonda" },
+	{ 0x52, "New Japan Radio Co. Ltd." },
+	{ 0xD3, "Velogix" },
+	{ 0x54, "Montalvo Systems" },
+	{ 0xD5, "iVivity Inc." },
+	{ 0xD6, "Walton Chaintech" },
+	{ 0x57, "AENEON" },
+	{ 0x58, "Lorom Industrial Co. Ltd." },
+	{ 0xD9, "Radiospire Networks" },
+	{ 0xDA, "Sensio Technologies, Inc." },
+	{ 0x5B, "Nethra Imaging" },
+	{ 0xDC, "Hexon Technology Pte Ltd" },
+	{ 0x5D, "CompuStocx (CSX)" },
+	{ 0x5E, "Methode Electronics, Inc." },
+	{ 0xDF, "Connect One Ltd." },
+	{ 0xE0, "Opulan Technologies" },
+	{ 0x61, "Septentrio NV" },
+	{ 0x62, "Goldenmars Technology Inc." },
+	{ 0xE3, "Kreton Corporation" },
+	{ 0x64, "Cochlear Ltd." },
+	{ 0xE5, "Altair Semiconductor" },
+	{ 0xE6, "NetEffect, Inc." },
+	{ 0x67, "Spansion, Inc." },
+	{ 0x68, "Taiwan Semiconductor Mfg" },
+	{ 0xE9, "Emphany Systems Inc." },
+	{ 0xEA, "ApaceWave Technologies" },
+	{ 0x6B, "Mobilygen Corporation" },
+	{ 0xEC, "Tego" },
+	{ 0x6D, "Cswitch Corporation" },
+	{ 0x6E, "Haier (Beijing) IC Design Co." },
+	{ 0xEF, "MetaRAM" },
+	{ 0x70, "Axel Electronics Co. Ltd." },
+	{ 0xF1, "Tilera Corporation" },
+	{ 0xF2, "Aquantia" },
+	{ 0x73, "Vivace Semiconductor" },
+	{ 0xF4, "Redpine Signals" },
+	{ 0x75, "Octalica" },
+	{ 0x76, "InterDigital Communications" },
+	{ 0xF7, "Avant Technology" },
+	{ 0xF8, "Asrock, Inc." },
+	{ 0x79, "Availink" },
+	{ 0x7A, "Quartics, Inc." },
+	{ 0xFB, "Element CXI" },
+	{ 0x7C, "Innovaciones Microelectronicas" },
+	{ 0xFD, "VeriSilicon Microelectronics" },
+	{ 0xFE, "W5 Networks" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id7_vals[] = {
+	{ 0x01, "MOVEKING" },
+	{ 0x02, "Mavrix Technology, Inc." },
+	{ 0x83, "CellGuide Ltd." },
+	{ 0x04, "Faraday Technology" },
+	{ 0x85, "Diablo Technologies, Inc." },
+	{ 0x86, "Jennic" },
+	{ 0x07, "Octasic" },
+	{ 0x08, "Molex Incorporated" },
+	{ 0x89, "3Leaf Networks" },
+	{ 0x8A, "Bright Micron Technology" },
+	{ 0x0B, "Netxen" },
+	{ 0x8C, "NextWave Broadband Inc." },
+	{ 0x0D, "DisplayLink" },
+	{ 0x0E, "ZMOS Technology" },
+	{ 0x8F, "Tec-Hill" },
+	{ 0x10, "Multigig, Inc." },
+	{ 0x91, "Amimon" },
+	{ 0x92, "Euphonic Technologies, Inc." },
+	{ 0x13, "BRN Phoenix" },
+	{ 0x94, "InSilica" },
+	{ 0x15, "Ember Corporation" },
+	{ 0x16, "Avexir Technologies Corporation" },
+	{ 0x97, "Echelon Corporation" },
+	{ 0x98, "Edgewater Computer Systems" },
+	{ 0x19, "XMOS Semiconductor Ltd." },
+	{ 0x1A, "GENUSION, Inc." },
+	{ 0x9B, "Memory Corp NV" },
+	{ 0x1C, "SiliconBlue Technologies" },
+	{ 0x9D, "Rambus Inc." },
+	{ 0x9E, "Andes Technology Corporation" },
+	{ 0x1F, "Coronis Systems" },
+	{ 0x20, "Achronix Semiconductor" },
+	{ 0xA1, "Siano Mobile Silicon Ltd." },
+	{ 0xA2, "Semtech Corporation" },
+	{ 0x23, "Pixelworks Inc." },
+	{ 0xA4, "Gaisler Research AB" },
+	{ 0x25, "Teranetics" },
+	{ 0x26, "Toppan Printing Co. Ltd." },
+	{ 0xA7, "Kingxcon" },
+	{ 0xA8, "Silicon Integrated Systems" },
+	{ 0x29, "I-O Data Device, Inc." },
+	{ 0x2A, "NDS Americas Inc." },
+	{ 0xAB, "Solomon Systech Limited" },
+	{ 0x2C, "On Demand Microelectronics" },
+	{ 0xAD, "Amicus Wireless Inc." },
+	{ 0xAE, "SMARDTV SNC" },
+	{ 0x2F, "Comsys Communication Ltd." },
+	{ 0xB0, "Movidia Ltd." },
+	{ 0x31, "Javad GNSS, Inc." },
+	{ 0x32, "Montage Technology Group" },
+	{ 0xB3, "Trident Microsystems" },
+	{ 0x34, "Super Talent" },
+	{ 0xB5, "Optichron, Inc." },
+	{ 0xB6, "Future Waves UK Ltd." },
+	{ 0x37, "SiBEAM, Inc." },
+	{ 0x38, "Inicore,Inc." },
+	{ 0xB9, "Virident Systems" },
+	{ 0xBA, "M2000, Inc." },
+	{ 0x3B, "ZeroG Wireless, Inc." },
+	{ 0xBC, "Gingle Technology Co. Ltd." },
+	{ 0x3D, "Space Micro Inc." },
+	{ 0x3E, "Wilocity" },
+	{ 0xBF, "Novafora, Inc." },
+	{ 0x40, "iKoa Corporation" },
+	{ 0xC1, "ASint Technology" },
+	{ 0xC2, "Ramtron" },
+	{ 0x43, "Plato Networks Inc." },
+	{ 0xC4, "IPtronics AS" },
+	{ 0x45, "Infinite-Memories" },
+	{ 0x46, "Parade Technologies Inc." },
+	{ 0xC7, "Dune Networks" },
+	{ 0xC8, "GigaDevice Semiconductor" },
+	{ 0x49, "Modu Ltd." },
+	{ 0x4A, "CEITEC" },
+	{ 0xCB, "Northrop Grumman" },
+	{ 0x4C, "XRONET Corporation" },
+	{ 0xCD, "Sicon Semiconductor AB" },
+	{ 0xCE, "Atla Electronics Co. Ltd." },
+	{ 0x4F, "TOPRAM Technology" },
+	{ 0xD0, "Silego Technology Inc." },
+	{ 0x51, "Kinglife" },
+	{ 0x52, "Ability Industries Ltd." },
+	{ 0xD3, "Silicon Power Computer & Communications" },
+	{ 0x54, "Augusta Technology, Inc." },
+	{ 0xD5, "Nantronics Semiconductors" },
+	{ 0xD6, "Hilscher Gesellschaft" },
+	{ 0x57, "Quixant Ltd." },
+	{ 0x58, "Percello Ltd." },
+	{ 0xD9, "NextIO Inc." },
+	{ 0xDA, "Scanimetrics Inc." },
+	{ 0x5B, "FS-Semi Company Ltd." },
+	{ 0xDC, "Infinera Corporation" },
+	{ 0x5D, "SandForce Inc." },
+	{ 0x5E, "Lexar Media" },
+	{ 0xDF, "Teradyne Inc." },
+	{ 0xE0, "Memory Exchange Corp." },
+	{ 0x61, "Suzhou Smartek Electronics" },
+	{ 0x62, "Avantium Corporation" },
+	{ 0xE3, "ATP Electronics Inc." },
+	{ 0x64, "Valens Semiconductor Ltd" },
+	{ 0xE5, "Agate Logic, Inc." },
+	{ 0xE6, "Netronome" },
+	{ 0x67, "Zenverge, Inc." },
+	{ 0x68, "N-trig Ltd" },
+	{ 0xE9, "SanMax Technologies Inc." },
+	{ 0xEA, "Contour Semiconductor Inc." },
+	{ 0x6B, "TwinMOS" },
+	{ 0xEC, "Silicon Systems, Inc." },
+	{ 0x6D, "V-Color Technology Inc." },
+	{ 0x6E, "Certicom Corporation" },
+	{ 0xEF, "JSC ICC Milandr" },
+	{ 0x70, "PhotoFast Global Inc." },
+	{ 0xF1, "InnoDisk Corporation" },
+	{ 0xF2, "Muscle Power" },
+	{ 0x73, "Energy Micro" },
+	{ 0xF4, "Innofidei" },
+	{ 0x75, "CopperGate Communications" },
+	{ 0x76, "Holtek Semiconductor Inc." },
+	{ 0xF7, "Myson Century, Inc." },
+	{ 0xF8, "FIDELIX" },
+	{ 0x79, "Red Digital Cinema" },
+	{ 0x7A, "Densbits Technology" },
+	{ 0xFB, "Zempro" },
+	{ 0x7C, "MoSys" },
+	{ 0xFD, "Provigent" },
+	{ 0xFE, "Triad Semiconductor, Inc." },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id8_vals[] = {
+	{ 0x01, "Siklu Communication Ltd." },
+	{ 0x02, "A Force Manufacturing Ltd." },
+	{ 0x83, "Strontium" },
+	{ 0x04, "Abilis Systems" },
+	{ 0x85, "Siglead, Inc." },
+	{ 0x86, "Ubicom, Inc." },
+	{ 0x07, "Unifosa Corporation" },
+	{ 0x08, "Stretch, Inc." },
+	{ 0x89, "Lantiq Deutschland GmbH" },
+	{ 0x8A, "Visipro." },
+	{ 0x0B, "EKMemory" },
+	{ 0x8C, "Microelectronics Institute ZTE" },
+	{ 0x0D, "Cognovo Ltd." },
+	{ 0x0E, "Carry Technology Co. Ltd." },
+	{ 0x8F, "Nokia" },
+	{ 0x10, "King Tiger Technology" },
+	{ 0x91, "Sierra Wireless" },
+	{ 0x92, "HT Micron" },
+	{ 0x13, "Albatron Technology Co. Ltd." },
+	{ 0x94, "Leica Geosystems AG" },
+	{ 0x15, "BroadLight" },
+	{ 0x16, "AEXEA" },
+	{ 0x97, "ClariPhy Communications, Inc." },
+	{ 0x98, "Green Plug" },
+	{ 0x19, "Design Art Networks" },
+	{ 0x1A, "Mach Xtreme Technology Ltd." },
+	{ 0x9B, "ATO Solutions Co. Ltd." },
+	{ 0x1C, "Ramsta" },
+	{ 0x9D, "Greenliant Systems, Ltd." },
+	{ 0x9E, "Teikon" },
+	{ 0x1F, "Antec Hadron" },
+	{ 0x20, "NavCom Technology, Inc." },
+	{ 0xA1, "Shanghai Fudan Microelectronics" },
+	{ 0xA2, "Calxeda, Inc." },
+	{ 0x23, "JSC EDC Electronics" },
+	{ 0xA4, "Kandit Technology Co. Ltd." },
+	{ 0x25, "Ramos Technology" },
+	{ 0x26, "Goldenmars Technology" },
+	{ 0xA7, "XeL Technology Inc." },
+	{ 0xA8, "Newzone Corporation" },
+	{ 0x29, "ShenZhen MercyPower Tech" },
+	{ 0x2A, "Nanjing Yihuo Technology" },
+	{ 0xAB, "Nethra Imaging Inc." },
+	{ 0x2C, "SiTel Semiconductor BV" },
+	{ 0xAD, "SolidGear Corporation" },
+	{ 0xAE, "Topower Computer Ind Co Ltd." },
+	{ 0x2F, "Wilocity" },
+	{ 0xB0, "Profichip GmbH" },
+	{ 0x31, "Gerad Technologies" },
+	{ 0x32, "Ritek Corporation" },
+	{ 0xB3, "Gomos Technology Limited" },
+	{ 0x34, "Memoright Corporation" },
+	{ 0xB5, "D-Broad, Inc." },
+	{ 0xB6, "HiSilicon Technologies" },
+	{ 0x37, "Syndiant Inc.." },
+	{ 0x38, "Enverv Inc." },
+	{ 0xB9, "Cognex" },
+	{ 0xBA, "Xinnova Technology Inc." },
+	{ 0x3B, "Ultron AG" },
+	{ 0xBC, "Concord Idea Corporation" },
+	{ 0x3D, "AIM Corporation" },
+	{ 0x3E, "Lifetime Memory Products" },
+	{ 0xBF, "Ramsway" },
+	{ 0x40, "Recore Systems B.V." },
+	{ 0xC1, "Haotian Jinshibo Science Tech" },
+	{ 0xC2, "Being Advanced Memory" },
+	{ 0x43, "Adesto Technologies" },
+	{ 0xC4, "Giantec Semiconductor, Inc." },
+	{ 0x45, "HMD Electronics AG" },
+	{ 0x46, "Gloway International (HK)" },
+	{ 0xC7, "Kingcore" },
+	{ 0xC8, "Anucell Technology Holding" },
+	{ 0x49, "Accord Software & Systems Pvt. Ltd." },
+	{ 0x4A, "Active-Semi Inc." },
+	{ 0xCB, "Denso Corporation" },
+	{ 0x4C, "TLSI Inc." },
+	{ 0xCD, "Qidan" },
+	{ 0xCE, "Mustang" },
+	{ 0x4F, "Orca Systems" },
+	{ 0xD0, "Passif Semiconductor" },
+	{ 0x51, "GigaDevice Semiconductor (Beijing) Inc." },
+	{ 0x52, "Memphis Electronic" },
+	{ 0xD3, "Beckhoff Automation GmbH" },
+	{ 0x54, "Harmony Semiconductor Corp" },
+	{ 0xD5, "Air Computers SRL" },
+	{ 0xD6, "TMT Memory" },
+	{ 0x57, "Eorex Corporation" },
+	{ 0x58, "Xingtera" },
+	{ 0xD9, "Netsol" },
+	{ 0xDA, "Bestdon Technology Co. Ltd." },
+	{ 0x5B, "Baysand Inc." },
+	{ 0xDC, "Uroad Technology Co. Ltd." },
+	{ 0x5D, "Wilk Elektronik S.A." },
+	{ 0x5E, "AAI" },
+	{ 0xDF, "Harman" },
+	{ 0xE0, "Berg Microelectronics Inc." },
+	{ 0x61, "ASSIA, Inc." },
+	{ 0x62, "Visiontek Products LLC" },
+	{ 0xE3, "OCMEMORY" },
+	{ 0x64, "Welink Solution Inc." },
+	{ 0xE5, "Shark Gaming" },
+	{ 0xE6, "Avalanche Technology" },
+	{ 0x67, "R&D Center ELVEES OJSC" },
+	{ 0x68, "KingboMars Technology Co. Ltd." },
+	{ 0xE9, "High Bridge Solutions Industria Eletronica" },
+	{ 0xEA, "Transcend Technology Co. Ltd." },
+	{ 0x6B, "Everspin Technologies" },
+	{ 0xEC, "Hon-Hai Precision" },
+	{ 0x6D, "Smart Storage Systems" },
+	{ 0x6E, "Toumaz Group" },
+	{ 0xEF, "Zentel Electronics Corporation" },
+	{ 0x70, "Panram International Corporation" },
+	{ 0xF1, "Silicon Space Technology" },
+	{ 0xF2, "LITE-ON IT Corporation" },
+	{ 0x73, "Inuitive" },
+	{ 0xF4, "HMicro" },
+	{ 0x75, "BittWare, Inc." },
+	{ 0x76, "GLOBALFOUNDRIES" },
+	{ 0xF7, "ACPI Digital Co. Ltd." },
+	{ 0xF8, "Annapurna Labs" },
+	{ 0x79, "AcSiP Technology Corporation" },
+	{ 0x7A, "Idea! Electronic Systems" },
+	{ 0xFB, "Gowe Technology Co. Ltd." },
+	{ 0x7C, "Hermes Testing Solutions, Inc." },
+	{ 0xFD, "Positivo BGH" },
+	{ 0xFE, "Intelligence Silicon Technology" },
+	{ 0x00, NULL },
+};
+
+const struct valstr jedec_id9_vals[] = {
+	{ 0x01, "3D PLUS" },
+	{ 0x02, "Diehl Aerospace" },
+	{ 0x83, "Fairchild" },
+	{ 0x04, "Mercury Systems" },
+	{ 0x85, "Sonics, Inc." },
+	{ 0x86, "GE Intelligent Platforms GmbH & Co." },
+	{ 0x07, "Shenzhen Jinge Information Co. Ltd." },
+	{ 0x08, "SCWW" },
+	{ 0x89, "Silicon Motion Inc." },
+	{ 0x8A, "Anurag" },
+	{ 0x0B, "King Kong" },
+	{ 0x8C, "FROM30 Co. Ltd." },
+	{ 0x0D, "Gowin Semiconductor Corp" },
+	{ 0x0E, "Fremont Micro Devices Ltd." },
+	{ 0x8F, "Ericsson Modems" },
+	{ 0x10, "Exelis" },
+	{ 0x91, "Satixfy Ltd." },
+	{ 0x92, "Galaxy Microsystems Ltd." },
+	{ 0x13, "Gloway International Co. Ltd." },
+	{ 0x94, "Lab" },
+	{ 0x15, "Smart Energy Instruments" },
+	{ 0x16, "Approved Memory Corporation" },
+	{ 0x97, "Axell Corporation" },
+	{ 0x98, "Essencore Limited" },
+	{ 0x19, "Phytium" },
+	{ 0x1A, "Xi’an SinoChip Semiconductor" },
+	{ 0x9B, "Ambiq Micro" },
+	{ 0x1C, "eveRAM Technology, Inc." },
+	{ 0x9D, "Infomax" },
+	{ 0x9E, "Butterfly Network, Inc." },
+	{ 0x1F, "Shenzhen City Gcai Electronics" },
+	{ 0x20, "Stack Devices Corporation" },
+	{ 0xA1, "ADK Media Group" },
+	{ 0xA2, "TSP Global Co., Ltd." },
+	{ 0x23, "HighX" },
+	{ 0xA4, "Shenzhen Elicks Technology" },
+	{ 0x25, "ISSI/Chingis" },
+	{ 0x26, "Google, Inc." },
+	{ 0xA7, "Dasima International Development" },
+	{ 0xA8, "Leahkinn Technology Limited" },
+	{ 0x29, "HIMA Paul Hildebrandt GmbH Co KG" },
+	{ 0x2A, "Keysight Technologies" },
+	{ 0xAB, "Techcomp International (Fastable)" },
+	{ 0x2C, "Ancore Technology Corporation" },
+	{ 0xAD, "Nuvoton" },
+	{ 0xAE, "Korea Uhbele International Group Ltd." },
+	{ 0x2F, "Ikegami Tsushinki Co Ltd." },
+	{ 0xB0, "RelChip, Inc." },
+	{ 0x31, "Baikal Electronics" },
+	{ 0x32, "Nemostech Inc." },
+	{ 0xB3, "Memorysolution GmbH" },
+	{ 0x34, "Silicon Integrated Systems Corporation" },
+	{ 0xB5, "Xiede" },
+	{ 0xB6, "Multilaser Components" },
+	{ 0x37, "Flash Chi" },
+	{ 0x38, "Jone" },
+	{ 0xB9, "GCT Semiconductor Inc." },
+	{ 0xBA, "Hong Kong Zetta Device Technology" },
+	{ 0x3B, "Unimemory Technology(s) Pte Ltd." },
+	{ 0xBC, "Cuso" },
+	{ 0x3D, "Kuso" },
+	{ 0x3E, "Uniquify Inc." },
+	{ 0xBF, "Skymedi Corporation" },
+	{ 0x40, "Core Chance Co. Ltd." },
+	{ 0xC1, "Tekism Co. Ltd." },
+	{ 0xC2, "Seagate Technology PLC" },
+	{ 0x43, "Hong Kong Gaia Group Co. Limited" },
+	{ 0xC4, "Gigacom Semiconductor LLC" },
+	{ 0x45, "V2 Technologies" },
+	{ 0x46, "TLi" },
+	{ 0xC7, "Neotion" },
+	{ 0xC8, "Lenovo" },
+	{ 0x49, "Shenzhen Zhongteng Electronic Corp. Ltd." },
+	{ 0x4A, "Compound Photonics" },
+	{ 0xCB, "in2H2 inc" },
+	{ 0x4C, "Shenzhen Pango Microsystems Co. Ltd" },
+	{ 0xCD, "Vasekey" },
+	{ 0xCE, "Cal-Comp Industria de Semicondutores" },
+	{ 0x4F, "Eyenix Co., Ltd." },
+	{ 0xD0, "Heoriady" },
+	{ 0x51, "Accelerated Memory Production Inc." },
+	{ 0x52, "INVECAS, Inc." },
+	{ 0xD3, "AP Memory" },
+	{ 0x54, "Douqi Technology" },
+	{ 0xD5, "Etron Technology, Inc." },
+	{ 0xD6, "Indie Semiconductor" },
+	{ 0x57, "Socionext Inc." },
+	{ 0x58, "HGST" },
+	{ 0xD9, "EVGA" },
+	{ 0xDA, "Audience Inc." },
+	{ 0x5B, "EpicGear" },
+	{ 0xDC, "Vitesse Enterprise Co." },
+	{ 0x5D, "Foxtronn International Corporation" },
+	{ 0x5E, "Bretelon Inc." },
+	{ 0xDF, "Zbit Semiconductor, Inc." },
+	{ 0xE0, "Eoplex Inc" },
+	{ 0x61, "MaxLinear, Inc." },
+	{ 0x62, "ETA Devices" },
+	{ 0xE3, "LOKI" },
+	{ 0x64, "IMS Semiconductor Co., Ltd" },
+	{ 0xE5, "Dosilicon Co., Ltd." },
+	{ 0xE6, "Dolphin Integration" },
+	{ 0x67, "Shenzhen Mic Electronics Technology" },
+	{ 0x68, "Boya Microelectronics Inc." },
+	{ 0xE9, "Geniachip (Roche)" },
+	{ 0xEA, "Axign" },
+	{ 0x6B, "Kingred Electronic Technology Ltd." },
+	{ 0xEC, "Chao Yue Zhuo Computer Business Dept." },
+	{ 0x6D, "Guangzhou Si Nuo Electronic Technology." },
+	{ 0x00, NULL },
+};
+
+int
+ipmi_spd_print(uint8_t *spd_data, int len)
+{
+	int k = 0;
+	int ii = 0;
+
+	if (len < 92)
+		return -1; /* we need first 91 bytes to do our thing */
+
+	printf(" Memory Type           : %s\n",
+	       val2str(spd_data[2], spd_memtype_vals));
+
+	if (spd_data[2] == 0x0B)	/* DDR3 SDRAM */
+	{
+		int iPN;
+		int sdram_cap = 0;
+		int pri_bus_width = 0;
+		int sdram_width = 0;
+		int ranks = 0;
+		int mem_size = 0;
+
+		if (len < 148)
+			return -1; /* we need first 91 bytes to do our thing */
+
+
+		sdram_cap = ldexp(256,(spd_data[4]&15));
+		pri_bus_width = ldexp(8,(spd_data[8]&7));
+		sdram_width = ldexp(4,(spd_data[7]&7));
+		ranks = ldexp(1,((spd_data[7]&0x3F)>>3));
+		mem_size = (sdram_cap/8) * (pri_bus_width/sdram_width) * ranks;
+		printf(" SDRAM Capacity        : %d MB\n", sdram_cap );
+		printf(" Memory Banks          : %s\n", val2str(spd_data[4]>>4, ddr3_banks_vals));
+		printf(" Primary Bus Width     : %d bits\n", pri_bus_width );
+		printf(" SDRAM Device Width    : %d bits\n", sdram_width );
+		printf(" Number of Ranks       : %d\n", ranks );
+		printf(" Memory size           : %d MB\n", mem_size );
+
+		/* printf(" Memory Density        : %s\n", val2str(spd_data[4]&15, ddr3_density_vals)); */
+		printf(" 1.5 V Nominal Op      : %s\n", (((spd_data[6]&1) != 0) ? "No":"Yes" ) );
+		printf(" 1.35 V Nominal Op     : %s\n", (((spd_data[6]&2) != 0) ? "No":"Yes" ) );
+		printf(" 1.2X V Nominal Op     : %s\n", (((spd_data[6]&4) != 0) ? "No":"Yes" ) );
+		printf(" Error Detect/Cor      : %s\n", val2str(spd_data[8]>>3, ddr3_ecc_vals));
+
+		printf(" Manufacturer          : ");
+		switch (spd_data[117]&127)
+		{
+		case	0:
+			printf("%s\n", val2str(spd_data[118], jedec_id1_vals));
+			break;
+
+		case	1:
+			printf("%s\n", val2str(spd_data[118], jedec_id2_vals));
+			break;
+
+		case	2:
+			printf("%s\n", val2str(spd_data[118], jedec_id3_vals));
+			break;
+
+		case	3:
+			printf("%s\n", val2str(spd_data[118], jedec_id4_vals));
+			break;
+
+		case	4:
+			printf("%s\n", val2str(spd_data[118], jedec_id5_vals));
+			break;
+
+		case	5:
+			printf("%s\n", val2str(spd_data[118], jedec_id6_vals));
+			break;
+
+		case	6:
+			printf("%s\n", val2str(spd_data[118], jedec_id7_vals));
+			break;
+
+		case	7:
+			printf("%s\n", val2str(spd_data[118], jedec_id8_vals));
+			break;
+
+		case	8:
+			printf("%s\n", val2str(spd_data[118], jedec_id9_vals));
+			break;
+
+		default:
+			printf("%s\n", "JEDEC JEP106 update required" );
+
+		}
+
+		printf(" Manufacture Date      : year %c%c week %c%c\n",
+		'0'+(spd_data[120]>>4), '0'+(spd_data[120]&15), '0'+(spd_data[121]>>4), '0'+(spd_data[121]&15) );
+
+		printf(" Serial Number         : %02x%02x%02x%02x\n",
+		spd_data[122], spd_data[123], spd_data[124], spd_data[125]);
+
+		printf(" Part Number           : ");
+		for (iPN = 128; iPN < 146; iPN++) {
+			printf("%c", spd_data[iPN]);
+		}
+		printf("\n");
+	} else if (spd_data[2] == 0x0C)	/* DDR4 SDRAM */
+	{
+		int i;
+		int sdram_cap = 0;
+		int pri_bus_width = 0;
+		int sdram_width = 0;
+		int mem_size = 0;
+		int lrank_dimm;
+		uint32_t year;
+		uint32_t week;
+
+		if (len < 348)
+			return -1;
+
+		/* "Logical rank" referes to the individually addressable die
+		 * in a 3DS stack and has no meaning for monolithic or
+		 * multi-load stacked SDRAMs; however, for the purposes of
+		 * calculating the capacity of the module, one should treat
+		 * monolithic and multi-load stack SDRAMs as having one logical
+		 * rank per package rank.
+		 */
+		lrank_dimm = (spd_data[12]>>3&0x3) + 1; /* Number of Package Ranks per DIMM */
+		if ((spd_data[6] & 0x3) == 0x2) { /* 3DS package Type */
+			lrank_dimm *= ((spd_data[6]>>4)&0x3) + 1; /* Die Count */
+		}
+		sdram_cap = ldexp(256,(spd_data[4]&15));
+		pri_bus_width = ldexp(8,(spd_data[13]&7));
+		sdram_width = ldexp(4,(spd_data[12]&7));
+		mem_size = (sdram_cap/8) * (pri_bus_width/sdram_width) * lrank_dimm;
+		printf(" SDRAM Package Type    : %s\n", val2str((spd_data[6]>>7), ddr4_package_type));
+		printf(" Technology            : %s\n", val2str((spd_data[3]&15), ddr4_technology_type));
+		printf(" SDRAM Die Count       : %d\n", ((spd_data[6]>>4) & 3)+1);
+		printf(" SDRAM Capacity        : %d Mb\n", sdram_cap );
+		printf(" Memory Bank Group     : %s\n", val2str((spd_data[4]>>6 & 0x3), ddr4_bank_groups));
+		printf(" Memory Banks          : %s\n", val2str((spd_data[4]>>4 & 0x3), ddr4_banks_vals));
+		printf(" Primary Bus Width     : %d bits\n", pri_bus_width );
+		printf(" SDRAM Device Width    : %d bits\n", sdram_width );
+		printf(" Logical Rank per DIMM : %d\n", lrank_dimm );
+		printf(" Memory size           : %d MB\n", mem_size );
+
+		printf(" Memory Density        : %s\n", val2str(spd_data[4]&15, ddr4_density_vals));
+		printf(" 1.2 V Nominal Op      : %s\n", (((spd_data[11]&3) != 3) ? "No":"Yes" ) );
+		printf(" TBD1 V Nominal Op     : %s\n", (((spd_data[11]>>2&3) != 3) ? "No":"Yes" ) );
+		printf(" TBD2 V Nominal Op     : %s\n", (((spd_data[11]>>4&3) != 3) ? "No":"Yes" ) );
+		printf(" Error Detect/Cor      : %s\n", val2str(spd_data[13]>>3, ddr4_ecc_vals));
+
+		printf(" Manufacturer          : ");
+		switch (spd_data[320]&127)
+		{
+		case	0:
+			printf("%s\n", val2str(spd_data[321], jedec_id1_vals));
+			break;
+
+		case	1:
+			printf("%s\n", val2str(spd_data[321], jedec_id2_vals));
+			break;
+
+		case	2:
+			printf("%s\n", val2str(spd_data[321], jedec_id3_vals));
+			break;
+
+		case	3:
+			printf("%s\n", val2str(spd_data[321], jedec_id4_vals));
+			break;
+
+		case	4:
+			printf("%s\n", val2str(spd_data[321], jedec_id5_vals));
+			break;
+
+		case	5:
+			printf("%s\n", val2str(spd_data[321], jedec_id6_vals));
+			break;
+
+		case	6:
+			printf("%s\n", val2str(spd_data[321], jedec_id7_vals));
+			break;
+
+		case	7:
+			printf("%s\n", val2str(spd_data[321], jedec_id8_vals));
+			break;
+
+		case	8:
+			printf("%s\n", val2str(spd_data[321], jedec_id9_vals));
+			break;
+
+		default:
+			printf("%s\n", "JEDEC JEP106 update required");
+
+		}
+
+		year = ((spd_data[323] >> 4) * 10) + (spd_data[323] & 15);
+		week = ((spd_data[324]>>4) * 10) + (spd_data[324] & 15);
+		printf(" Manufacture Date      : year %4d week %2d\n",
+		       2000 + year, week);
+
+		printf(" Serial Number         : %02x%02x%02x%02x\n",
+		spd_data[325], spd_data[326], spd_data[327], spd_data[328]);
+
+		printf(" Part Number           : ");
+		for (i=329; i <= 348; i++)
+		{
+			printf( "%c", spd_data[i]);
+		}
+		printf("\n");
+	}
+	else
+	{
+		if (len < 100) {
+			return (-1);
+		}
+		ii = (spd_data[3] & 0x0f) + (spd_data[4] & 0x0f) - 17;
+		k = ((spd_data[5] & 0x7) + 1) * spd_data[17];
+
+		if(ii > 0 && ii <= 12 && k > 0) {
+			printf(" Memory Size           : %d MB\n", ((1 << ii) * k));
+		} else {
+			printf(" Memory Size    INVALID: %d, %d, %d, %d\n", spd_data[3],
+					spd_data[4], spd_data[5], spd_data[17]);
+		}
+		printf(" Voltage Intf          : %s\n",
+		val2str(spd_data[8], spd_voltage_vals));
+		printf(" Error Detect/Cor      : %s\n",
+		val2str(spd_data[11], spd_config_vals));
+
+		/* handle jedec table bank continuation values */
+		printf(" Manufacturer          : ");
+		if (spd_data[64] != 0x7f)
+			printf("%s\n",
+			val2str(spd_data[64], jedec_id1_vals));
+		else {
+			if (spd_data[65] != 0x7f)
+				printf("%s\n",
+				val2str(spd_data[65], jedec_id2_vals));
+			else {
+				if (spd_data[66] != 0x7f)
+					printf("%s\n",
+					val2str(spd_data[66], jedec_id3_vals));
+				else {
+					if (spd_data[67] != 0x7f)
+						printf("%s\n",
+						val2str(spd_data[67], jedec_id4_vals));
+					else {
+						if (spd_data[68] != 0x7f)
+							printf("%s\n",
+							val2str(spd_data[68], jedec_id5_vals));
+						else {
+							if (spd_data[69] != 0x7f)
+								printf("%s\n",
+								val2str(spd_data[69], jedec_id6_vals));
+							else {
+								if (spd_data[70] != 0x7f)
+									printf("%s\n",
+									val2str(spd_data[70], jedec_id7_vals));
+								else {
+									if (spd_data[71] != 0x7f)
+										printf("%s\n",
+										val2str(spd_data[71], jedec_id8_vals));
+									else
+										printf("%s\n",
+										val2str(spd_data[72], jedec_id9_vals));
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (spd_data[73]) {
+			char part[19];
+			memcpy(part, spd_data+73, 18);
+			part[18] = 0;
+			printf(" Part Number           : %s\n", part);
+		}
+
+		printf(" Serial Number         : %02x%02x%02x%02x\n",
+		spd_data[95], spd_data[96], spd_data[97], spd_data[98]);
+	}
+
+	if (verbose) {
+		printf("\n");
+		printbuf(spd_data, len, "SPD DATA");
+	}
+
+	return 0;
+}
+
+int
+ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	uint8_t *spd_data, msg_data[4];
+	int len, offset;
+
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
+		fru.size, fru.access ? "words" : "bytes");
+
+
+	if (fru.size < 1) {
+		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
+		return -1;
+	}
+
+        spd_data = malloc(fru.size);
+
+        if (spd_data == NULL) {
+		printf(" Unable to malloc memory for spd array of size=%d\n",
+		       fru.size);
+		return -1;
+        }
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	offset = 0;
+	memset(spd_data, 0, fru.size);
+	do {
+		msg_data[0] = id;
+		msg_data[1] = offset & 0xFF;
+		msg_data[2] = offset >> 8;
+		msg_data[3] = FRU_DATA_RQST_SIZE;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			printf(" Device not present (No Response)\n");
+                        free(spd_data);
+                        spd_data = NULL;
+			return -1;
+		}
+		if (rsp->ccode > 0) {
+			printf(" Device not present (%s)\n",
+			       val2str(rsp->ccode, completion_code_vals));
+
+                        free(spd_data);
+                        spd_data = NULL;
+			/* Timeouts are acceptable. No DIMM in the socket */
+			if (rsp->ccode == 0xc3)
+				return 1;
+
+			return -1;
+		}
+
+		len = rsp->data[0];
+		memcpy(&spd_data[offset], rsp->data + 1, len);
+		offset += len;
+	} while (offset < fru.size);
+
+	/* now print spd info */
+	ipmi_spd_print(spd_data, offset);
+        free(spd_data);
+        spd_data = NULL;
+
+	return 0;
+}
diff --git a/lib/helper.c b/lib/helper.c
new file mode 100644
index 0000000..de91438
--- /dev/null
+++ b/lib/helper.c
@@ -0,0 +1,1028 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _POSIX_SOURCE
+#define /* glibc 2.19 and earlier */ _BSD_SOURCE || \
+	/* Since glibc 2.20 */_DEFAULT_SOURCE || \
+	_XOPEN_SOURCE >= 500 || \
+	_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED || \
+	/* Since glibc 2.10: */ _POSIX_C_SOURCE >= 200112L \
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>  /* For TIOCNOTTY */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <assert.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#else
+# define _PATH_VARRUN "/var/run/"
+#endif
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+
+extern int verbose;
+
+uint32_t buf2long(uint8_t * buf)
+{
+	return (uint32_t)(buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]);
+}
+
+uint16_t buf2short(uint8_t * buf)
+{
+	return (uint16_t)(buf[1] << 8 | buf[0]);
+}
+
+/* buf2str_extended - convert sequence of bytes to hexadecimal string with
+ * optional separator
+ *
+ * @param buf - data to convert
+ * @param len - size of data
+ * @param sep - optional separator (can be NULL)
+ *
+ * @returns     buf representation in hex, possibly truncated to fit
+ *              allocated static memory
+ */
+const char *
+buf2str_extended(const uint8_t *buf, int len, const char *sep)
+{
+	static char str[BUF2STR_MAXIMUM_OUTPUT_SIZE];
+	char *cur;
+	int i;
+	int sz;
+	int left;
+	int sep_len;
+
+	if (buf == NULL) {
+		snprintf(str, sizeof(str), "<NULL>");
+		return (const char *)str;
+	}
+	cur = str;
+	left = sizeof(str);
+	if (sep) {
+		sep_len = strlen(sep);
+	} else {
+		sep_len = 0;
+	}
+	for (i = 0; i < len; i++) {
+		/* may return more than 2, depending on locale */
+		sz = snprintf(cur, left, "%2.2x", buf[i]);
+		if (sz >= left) {
+			/* buffer overflow, truncate */
+			break;
+		}
+		cur += sz;
+		left -= sz;
+		/* do not write separator after last byte */
+		if (sep && i != (len - 1)) {
+			if (sep_len >= left) {
+				break;
+			}
+			strncpy(cur, sep, left - sz);
+			cur += sep_len;
+			left -= sep_len;
+		}
+	}
+	*cur = '\0';
+
+	return (const char *)str;
+}
+
+const char *
+buf2str(const uint8_t *buf, int len)
+{
+	return buf2str_extended(buf, len, NULL);
+}
+
+/* ipmi_parse_hex - convert hexadecimal numbers to ascii string
+ *                  Input string must be composed of two-characer
+ *                  hexadecimal numbers.
+ *                  There is no separator between the numbers. Each number
+ *                  results in one byte of the converted string.
+ *
+ *                  Example: ipmi_parse_hex("50415353574F5244")
+ *                  returns 'PASSWORD'
+ *
+ * @param str:  input string. It must contain only even number
+ *              of '0'-'9','a'-'f' and 'A-F' characters.
+ * @param out: pointer to output data
+ * @param size: size of the output buffer
+ * @returns 0 for empty input string
+ *         -1 for string with odd length
+ *         -2 if out is NULL
+ *         -3 if there is non-hexadecimal char in string
+ *         >0 length of resulting binary data even if it is > size
+ */
+int
+ipmi_parse_hex(const char *str, uint8_t *out, int size)
+{
+	const char *p;
+	uint8_t *q;
+	uint8_t d = 0;
+	uint8_t b = 0;
+	int shift = 4;
+	int len;
+
+	len = strlen(str);
+	if (len == 0) {
+		return 0;
+	}
+
+	if (len % 2 != 0) {
+		return -1;
+	}
+
+	len /= 2; /* out bytes */
+	if (out == NULL) {
+		return -2;
+	}
+
+	for (p = str, q = out; *p; p++) {
+		if (!isxdigit(*p)) {
+			return -3;
+		}
+
+		if (*p < 'A') {
+			/* it must be 0-9 */
+			d = *p - '0';
+		} else {
+			/* it's A-F or a-f */
+			/* convert to lowercase and to 10-15 */
+			d = (*p | 0x20) - 'a' + 10;
+		}
+
+		if (q < (out + size)) {
+			/* there is space, store */
+			b += d << shift;
+			if (shift) {
+				shift = 0;
+			} else {
+				shift = 4;
+				*q = b;
+				b = 0;
+				q++;
+			}
+		}
+	}
+
+	return len;
+}
+
+void printbuf(const uint8_t * buf, int len, const char * desc)
+{
+	int i;
+
+	if (len <= 0)
+		return;
+
+	if (verbose < 1)
+		return;
+
+	fprintf(stderr, "%s (%d bytes)\n", desc, len);
+	for (i=0; i<len; i++) {
+		if (((i%16) == 0) && (i != 0))
+			fprintf(stderr, "\n");
+		fprintf(stderr, " %2.2x", buf[i]);
+	}
+	fprintf(stderr, "\n");
+}
+
+/* str2mac - parse-out MAC address from given string and store it
+ * into buffer.
+ *
+ * @arg: string to be parsed.
+ * @buf: buffer of 6 to hold parsed MAC address.
+ *
+ * returns zero on success, (-1) on error and error message is printed-out.
+ */
+int
+str2mac(const char *arg, uint8_t *buf)
+{
+	unsigned int m1 = 0;
+	unsigned int m2 = 0;
+	unsigned int m3 = 0;
+	unsigned int m4 = 0;
+	unsigned int m5 = 0;
+	unsigned int m6 = 0;
+	if (sscanf(arg, "%02x:%02x:%02x:%02x:%02x:%02x",
+		   &m1, &m2, &m3, &m4, &m5, &m6) != 6) {
+		lprintf(LOG_ERR, "Invalid MAC address: %s", arg);
+		return -1;
+	}
+	if (m1 > UINT8_MAX || m2 > UINT8_MAX
+			|| m3 > UINT8_MAX || m4 > UINT8_MAX
+			|| m5 > UINT8_MAX || m6 > UINT8_MAX) {
+		lprintf(LOG_ERR, "Invalid MAC address: %s", arg);
+		return -1;
+	}
+	buf[0] = (uint8_t)m1;
+	buf[1] = (uint8_t)m2;
+	buf[2] = (uint8_t)m3;
+	buf[3] = (uint8_t)m4;
+	buf[4] = (uint8_t)m5;
+	buf[5] = (uint8_t)m6;
+	return 0;
+}
+
+/* mac2str   -- return MAC address as a string
+ *
+ * @buf: buffer of 6 to hold parsed MAC address.
+ */
+const char *
+mac2str(const uint8_t *buf)
+{
+	return buf2str_extended(buf, 6, ":");
+}
+
+const char * val2str(uint16_t val, const struct valstr *vs)
+{
+	static char un_str[32];
+	int i;
+
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (vs[i].val == val)
+			return vs[i].str;
+	}
+
+	memset(un_str, 0, 32);
+	snprintf(un_str, 32, "Unknown (0x%02X)", val);
+
+	return un_str;
+}
+
+const char * oemval2str(uint32_t oem, uint16_t val,
+                                             const struct oemvalstr *vs)
+{
+	static char un_str[32];
+	int i;
+
+	for (i = 0; vs[i].oem != 0xffffff &&  vs[i].str != NULL; i++) {
+		/* FIXME: for now on we assume PICMG capability on all IANAs */
+		if ( (vs[i].oem == oem || vs[i].oem == IPMI_OEM_PICMG) &&
+				vs[i].val == val ) {
+			return vs[i].str;
+		}
+	}
+
+	memset(un_str, 0, 32);
+	snprintf(un_str, 32, "Unknown (0x%X)", val);
+
+	return un_str;
+}
+
+/* str2double - safely convert string to double
+ *
+ * @str: source string to convert from
+ * @double_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2double(const char * str, double * double_ptr)
+{
+	char * end_ptr = 0;
+	if (!str || !double_ptr)
+		return (-1);
+
+	*double_ptr = 0;
+	errno = 0;
+	*double_ptr = strtod(str, &end_ptr);
+
+	if (*end_ptr != '\0')
+		return (-2);
+
+	if (errno != 0)
+		return (-3);
+
+	return 0;
+} /* str2double(...) */
+
+/* str2long - safely convert string to int64_t
+ *
+ * @str: source string to convert from
+ * @lng_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2long(const char * str, int64_t * lng_ptr)
+{
+	char * end_ptr = 0;
+	if (!str || !lng_ptr)
+		return (-1);
+
+	*lng_ptr = 0;
+	errno = 0;
+	*lng_ptr = strtol(str, &end_ptr, 0);
+
+	if (*end_ptr != '\0')
+		return (-2);
+
+	if (errno != 0)
+		return (-3);
+
+	return 0;
+} /* str2long(...) */
+
+/* str2ulong - safely convert string to uint64_t
+ *
+ * @str: source string to convert from
+ * @ulng_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2ulong(const char * str, uint64_t * ulng_ptr)
+{
+	char * end_ptr = 0;
+	if (!str || !ulng_ptr)
+		return (-1);
+
+	*ulng_ptr = 0;
+	errno = 0;
+	*ulng_ptr = strtoul(str, &end_ptr, 0);
+
+	if (*end_ptr != '\0')
+		return (-2);
+
+	if (errno != 0)
+		return (-3);
+
+	return 0;
+} /* str2ulong(...) */
+
+/* str2int - safely convert string to int32_t
+ *
+ * @str: source string to convert from
+ * @int_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2int(const char * str, int32_t * int_ptr)
+{
+	int rc = 0;
+	int64_t arg_long = 0;
+	if (!str || !int_ptr)
+		return (-1);
+
+	if ( (rc = str2long(str, &arg_long)) != 0 ) {
+		*int_ptr = 0;
+		return rc;
+	}
+
+	if (arg_long < INT32_MIN || arg_long > INT32_MAX)
+		return (-3);
+
+	*int_ptr = (int32_t)arg_long;
+	return 0;
+} /* str2int(...) */
+
+/* str2uint - safely convert string to uint32_t
+ *
+ * @str: source string to convert from
+ * @uint_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2uint(const char * str, uint32_t * uint_ptr)
+{
+	int rc = 0;
+	uint64_t arg_ulong = 0;
+	if (!str || !uint_ptr)
+		return (-1);
+
+	if ( (rc = str2ulong(str, &arg_ulong)) != 0) {
+		*uint_ptr = 0;
+		return rc;
+	}
+
+	if (arg_ulong > UINT32_MAX)
+		return (-3);
+
+	*uint_ptr = (uint32_t)arg_ulong;
+	return 0;
+} /* str2uint(...) */
+
+/* str2short - safely convert string to int16_t
+ *
+ * @str: source string to convert from
+ * @shrt_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2short(const char * str, int16_t * shrt_ptr)
+{
+	int rc = (-3);
+	int64_t arg_long = 0;
+	if (!str || !shrt_ptr)
+		return (-1);
+
+	if ( (rc = str2long(str, &arg_long)) != 0 ) {
+		*shrt_ptr = 0;
+		return rc;
+	}
+
+	if (arg_long < INT16_MIN || arg_long > INT16_MAX)
+		return (-3);
+
+	*shrt_ptr = (int16_t)arg_long;
+	return 0;
+} /* str2short(...) */
+
+/* str2ushort - safely convert string to uint16_t
+ *
+ * @str: source string to convert from
+ * @ushrt_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) invalid input, (-3) for *flow
+ */
+int str2ushort(const char * str, uint16_t * ushrt_ptr)
+{
+	int rc = (-3);
+	uint64_t arg_ulong = 0;
+	if (!str || !ushrt_ptr)
+		return (-1);
+
+	if ( (rc = str2ulong(str, &arg_ulong)) != 0 ) {
+		*ushrt_ptr = 0;
+		return rc;
+	}
+
+	if (arg_ulong > UINT16_MAX)
+		return (-3);
+
+	*ushrt_ptr = (uint16_t)arg_ulong;
+	return 0;
+} /* str2ushort(...) */
+
+/* str2char - safely convert string to int8
+ *
+ * @str: source string to convert from
+ * @chr_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) or (-3) if conversion fails
+ */
+int str2char(const char *str, int8_t * chr_ptr)
+{
+	int rc = (-3);
+	int64_t arg_long = 0;
+	if (!str || !chr_ptr) {
+		return (-1);
+	}
+	if ((rc = str2long(str, &arg_long)) != 0) {
+		*chr_ptr = 0;
+		return rc;
+	}
+	if (arg_long < INT8_MIN || arg_long > INT8_MAX) {
+		return (-3);
+	}
+	*chr_ptr = (uint8_t)arg_long;
+	return 0;
+} /* str2char(...) */
+
+/* str2uchar - safely convert string to uint8
+ *
+ * @str: source string to convert from
+ * @uchr_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) if one of args is NULL, (-2) or (-3) if conversion fails
+ */
+int str2uchar(const char * str, uint8_t * uchr_ptr)
+{
+	int rc = (-3);
+	uint64_t arg_ulong = 0;
+	if (!str || !uchr_ptr)
+		return (-1);
+
+	if ( (rc = str2ulong(str, &arg_ulong)) != 0 ) {
+		*uchr_ptr = 0;
+		return rc;
+	}
+
+	if (arg_ulong > UINT8_MAX)
+		return (-3);
+
+	*uchr_ptr = (uint8_t)arg_ulong;
+	return 0;
+} /* str2uchar(...) */
+
+uint16_t str2val(const char *str, const struct valstr *vs)
+{
+	int i;
+
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (strncasecmp(vs[i].str, str, __maxlen(str, vs[i].str)) == 0)
+			return vs[i].val;
+	}
+
+	return vs[i].val;
+}
+
+/* print_valstr  -  print value string list to log or stdout
+ *
+ * @vs:		value string list to print
+ * @title:	name of this value string list
+ * @loglevel:	what log level to print, -1 for stdout
+ */
+void
+print_valstr(const struct valstr * vs, const char * title, int loglevel)
+{
+	int i;
+
+	if (vs == NULL)
+		return;
+
+	if (title != NULL) {
+		if (loglevel < 0)
+			printf("\n%s:\n\n", title);
+		else
+			lprintf(loglevel, "\n%s:\n", title);
+	}
+
+	if (loglevel < 0) {
+		printf("  VALUE\tHEX\tSTRING\n");
+		printf("==============================================\n");
+	} else {
+		lprintf(loglevel, "  VAL\tHEX\tSTRING");
+		lprintf(loglevel, "==============================================");
+	}
+
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (loglevel < 0) {
+			if (vs[i].val < 256)
+				printf("  %d\t0x%02x\t%s\n", vs[i].val, vs[i].val, vs[i].str);
+			else
+				printf("  %d\t0x%04x\t%s\n", vs[i].val, vs[i].val, vs[i].str);
+		} else {
+			if (vs[i].val < 256)
+				lprintf(loglevel, "  %d\t0x%02x\t%s", vs[i].val, vs[i].val, vs[i].str);
+			else
+				lprintf(loglevel, "  %d\t0x%04x\t%s", vs[i].val, vs[i].val, vs[i].str);
+		}
+	}
+
+	if (loglevel < 0)
+		printf("\n");
+	else
+		lprintf(loglevel, "");
+}
+
+/* print_valstr_2col  -  print value string list in two columns to log or stdout
+ *
+ * @vs:		value string list to print
+ * @title:	name of this value string list
+ * @loglevel:	what log level to print, -1 for stdout
+ */
+void
+print_valstr_2col(const struct valstr * vs, const char * title, int loglevel)
+{
+	int i;
+
+	if (vs == NULL)
+		return;
+
+	if (title != NULL) {
+		if (loglevel < 0)
+			printf("\n%s:\n\n", title);
+		else
+			lprintf(loglevel, "\n%s:\n", title);
+	}
+
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (vs[i+1].str == NULL) {
+			/* last one */
+			if (loglevel < 0) {
+				printf("  %4d  %-32s\n", vs[i].val, vs[i].str);
+			} else {
+				lprintf(loglevel, "  %4d  %-32s\n", vs[i].val, vs[i].str);
+			}
+		}
+		else {
+			if (loglevel < 0) {
+				printf("  %4d  %-32s    %4d  %-32s\n",
+				       vs[i].val, vs[i].str, vs[i+1].val, vs[i+1].str);
+			} else {
+				lprintf(loglevel, "  %4d  %-32s    %4d  %-32s\n",
+					vs[i].val, vs[i].str, vs[i+1].val, vs[i+1].str);
+			}
+			i++;
+		}
+	}
+
+	if (loglevel < 0)
+		printf("\n");
+	else
+		lprintf(loglevel, "");
+}
+
+/* ipmi_csum  -  calculate an ipmi checksum
+ *
+ * @d:		buffer to check
+ * @s:		position in buffer to start checksum from
+ */
+uint8_t
+ipmi_csum(uint8_t * d, int s)
+{
+	uint8_t c = 0;
+	for (; s > 0; s--, d++)
+		c += *d;
+	return -c;
+}
+
+/* ipmi_open_file  -  safely open a file for reading or writing
+ *
+ * @file:	filename
+ * @rw:		read-write flag, 1=write
+ *
+ * returns pointer to file handler on success
+ * returns NULL on error
+ */
+FILE *
+ipmi_open_file(const char * file, int rw)
+{
+	struct stat st1, st2;
+	FILE * fp;
+
+	/* verify existance */
+	if (lstat(file, &st1) < 0) {
+		if (rw) {
+			/* does not exist, ok to create */
+			fp = fopen(file, "w");
+			if (fp == NULL) {
+				lperror(LOG_ERR, "Unable to open file %s "
+					"for write", file);
+				return NULL;
+			}
+			/* created ok, now return the descriptor */
+			return fp;
+		} else {
+			lprintf(LOG_ERR, "File %s does not exist", file);
+			return NULL;
+		}
+	}
+
+#ifndef ENABLE_FILE_SECURITY
+	if (!rw) {
+		/* on read skip the extra checks */
+		fp = fopen(file, "r");
+		if (fp == NULL) {
+			lperror(LOG_ERR, "Unable to open file %s", file);
+			return NULL;
+		}
+		return fp;
+	}
+#endif
+
+	/* it exists - only regular files, not links */
+	if (S_ISREG(st1.st_mode) == 0) {
+		lprintf(LOG_ERR, "File %s has invalid mode: %d",
+			file, st1.st_mode);
+		return NULL;
+	}
+
+	/* allow only files with 1 link (itself) */
+	if (st1.st_nlink != 1) {
+		lprintf(LOG_ERR, "File %s has invalid link count: %d != 1",
+		       file, (int)st1.st_nlink);
+		return NULL;
+	}
+
+	fp = fopen(file, rw ? "w+" : "r");
+	if (fp == NULL) {
+		lperror(LOG_ERR, "Unable to open file %s", file);
+		return NULL;
+	}
+
+	/* stat again */
+	if (fstat(fileno(fp), &st2) < 0) {
+		lperror(LOG_ERR, "Unable to stat file %s", file);
+		fclose(fp);
+		return NULL;
+	}
+
+	/* verify inode */
+	if (st1.st_ino != st2.st_ino) {
+		lprintf(LOG_ERR, "File %s has invalid inode: %d != %d",
+			file, st1.st_ino, st2.st_ino);
+		fclose(fp);
+		return NULL;
+	}
+
+	/* verify owner */
+	if (st1.st_uid != st2.st_uid) {
+		lprintf(LOG_ERR, "File %s has invalid user id: %d != %d",
+			file, st1.st_uid, st2.st_uid);
+		fclose(fp);
+		return NULL;
+	}
+
+	/* verify inode */
+	if (st2.st_nlink != 1) {
+		lprintf(LOG_ERR, "File %s has invalid link count: %d != 1",
+			file, st2.st_nlink);
+		fclose(fp);
+		return NULL;
+	}
+
+	return fp;
+}
+
+void
+ipmi_start_daemon(struct ipmi_intf *intf)
+{
+	pid_t pid;
+	int fd;
+#ifdef SIGHUP
+	sigset_t sighup;
+#endif
+
+#ifdef SIGHUP
+	sigemptyset(&sighup);
+	sigaddset(&sighup, SIGHUP);
+	if (sigprocmask(SIG_UNBLOCK, &sighup, NULL) < 0)
+		fprintf(stderr, "ERROR: could not unblock SIGHUP signal\n");
+	signal(SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGTTOU
+	signal(SIGTTOU, SIG_IGN);
+#endif
+#ifdef SIGTTIN
+	signal(SIGTTIN, SIG_IGN);
+#endif
+#ifdef SIGQUIT
+	signal(SIGQUIT, SIG_IGN);
+#endif
+#ifdef SIGTSTP
+	signal(SIGTSTP, SIG_IGN);
+#endif
+
+	pid = (pid_t) fork();
+	if (pid < 0 || pid > 0)
+		exit(0);
+
+#if defined(SIGTSTP) && defined(TIOCNOTTY)
+	if (setpgid(0, getpid()) == -1)
+		exit(1);
+	if ((fd = open(_PATH_TTY, O_RDWR)) >= 0) {
+		ioctl(fd, TIOCNOTTY, NULL);
+		close(fd);
+	}
+#else
+	if (setpgid(0, 0) == -1)
+		exit(1);
+	pid = (pid_t) fork();
+	if (pid < 0 || pid > 0)
+		exit(0);
+#endif
+
+	chdir("/");
+	umask(0);
+
+	for (fd=0; fd<64; fd++) {
+		if (fd != intf->fd)
+			close(fd);
+	}
+
+	fd = open("/dev/null", O_RDWR);
+	assert(0 == fd);
+	dup(fd);
+	dup(fd);
+}
+
+/* eval_ccode - evaluate return value of _ipmi_* functions and print error error
+ * message, if conditions are met.
+ *
+ * @ccode - return value of _ipmi_* function.
+ *
+ * returns - 0 if ccode is 0, otherwise (-1) and error might get printed-out.
+ */
+int
+eval_ccode(const int ccode)
+{
+	if (ccode == 0) {
+		return 0;
+	} else if (ccode < 0) {
+		switch (ccode) {
+			case (-1):
+				lprintf(LOG_ERR, "IPMI response is NULL.");
+				break;
+			case (-2):
+				lprintf(LOG_ERR, "Unexpected data length received.");
+				break;
+			case (-3):
+				lprintf(LOG_ERR, "Invalid function parameter.");
+				break;
+			case (-4):
+				lprintf(LOG_ERR, "ipmitool: malloc failure.");
+				break;
+			default:
+				break;
+		}
+		return (-1);
+	} else {
+		lprintf(LOG_ERR, "IPMI command failed: %s",
+				val2str(ccode, completion_code_vals));
+		return (-1);
+	}
+}
+
+/* is_fru_id - wrapper for str-2-int FRU ID conversion. Message is printed
+ * on error.
+ * FRU ID range: <0..255>
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @fru_id_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) on error and message is printed on STDERR
+ */
+int
+is_fru_id(const char *argv_ptr, uint8_t *fru_id_ptr)
+{
+	if (!argv_ptr || !fru_id_ptr) {
+		lprintf(LOG_ERR, "is_fru_id(): invalid argument(s).");
+		return (-1);
+	}
+
+	if (str2uchar(argv_ptr, fru_id_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "FRU ID '%s' is either invalid or out of range.",
+			argv_ptr);
+	return (-1);
+} /* is_fru_id(...) */
+
+/* is_ipmi_channel_num - wrapper for str-2-int Channel conversion. Message is
+ * printed on error.
+ *
+ * 6.3 Channel Numbers, p. 49, IPMIv2 spec. rev1.1
+ * Valid channel numbers are: <0x0..0xB>, <0xE-0xF>
+ * Reserved channel numbers: <0xC-0xD>
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @channel_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) on error and message is printed on STDERR
+ */
+int
+is_ipmi_channel_num(const char *argv_ptr, uint8_t *channel_ptr)
+{
+	if (!argv_ptr || !channel_ptr) {
+		lprintf(LOG_ERR,
+				"is_ipmi_channel_num(): invalid argument(s).");
+		return (-1);
+	}
+	if ((str2uchar(argv_ptr, channel_ptr) == 0)
+			&& (*channel_ptr <= 0xB
+				|| (*channel_ptr >= 0xE && *channel_ptr <= 0xF))) {
+		return 0;
+	}
+	lprintf(LOG_ERR,
+			"Given Channel number '%s' is either invalid or out of range.",
+			argv_ptr);
+	lprintf(LOG_ERR, "Channel number must be from ranges: <0x0..0xB>, <0xE..0xF>");
+	return (-1);
+}
+
+/* is_ipmi_user_id() - wrapper for str-2-uint IPMI UID conversion. Message is
+ * printed on error.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @ipmi_uid_ptr: pointer where to store result
+ *
+ * returns zero on success
+ * returns (-1) on error and message is printed on STDERR
+ */
+int
+is_ipmi_user_id(const char *argv_ptr, uint8_t *ipmi_uid_ptr)
+{
+	if (!argv_ptr || !ipmi_uid_ptr) {
+		lprintf(LOG_ERR,
+				"is_ipmi_user_id(): invalid argument(s).");
+		return (-1);
+	}
+	if ((str2uchar(argv_ptr, ipmi_uid_ptr) == 0)
+			&& *ipmi_uid_ptr >= IPMI_UID_MIN
+			&& *ipmi_uid_ptr <= IPMI_UID_MAX) {
+		return 0;
+	}
+	lprintf(LOG_ERR,
+			"Given User ID '%s' is either invalid or out of range.",
+			argv_ptr);
+	lprintf(LOG_ERR, "User ID is limited to range <%i..%i>.",
+			IPMI_UID_MIN, IPMI_UID_MAX);
+	return (-1);
+}
+
+/* is_ipmi_user_priv_limit - check whether given value is valid User Privilege
+ * Limit, eg. IPMI v2 spec, 22.27 Get User Access Command.
+ *
+ * @priv_limit: User Privilege Limit
+ *
+ * returns 0 if Priv Limit is valid
+ * returns (-1) when Priv Limit is invalid
+ */
+int
+is_ipmi_user_priv_limit(const char *argv_ptr, uint8_t *ipmi_priv_limit_ptr)
+{
+	if (!argv_ptr || !ipmi_priv_limit_ptr) {
+		lprintf(LOG_ERR,
+				"is_ipmi_user_priv_limit(): invalid argument(s).");
+		return (-1);
+	}
+	if ((str2uchar(argv_ptr, ipmi_priv_limit_ptr) != 0)
+			|| ((*ipmi_priv_limit_ptr < 0x01
+				|| *ipmi_priv_limit_ptr > 0x05)
+				&& *ipmi_priv_limit_ptr != 0x0F)) {
+		lprintf(LOG_ERR,
+				"Given Privilege Limit '%s' is invalid.",
+				argv_ptr);
+		lprintf(LOG_ERR,
+				"Privilege Limit is limited to <0x1..0x5> and <0xF>.");
+		return (-1);
+	}
+	return 0;
+}
+
+uint16_t
+ipmi_get_oem_id(struct ipmi_intf *intf)
+{
+	/* Execute a Get Board ID command to determine the board */
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint16_t oem_id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TSOL;
+	req.msg.cmd   = 0x21;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Board ID command failed");
+		return 0;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Board ID command failed: %#x %s",
+			rsp->ccode, val2str(rsp->ccode, completion_code_vals));
+		return 0;
+	}
+	oem_id = rsp->data[0] | (rsp->data[1] << 8);
+	lprintf(LOG_DEBUG,"Board ID: %x", oem_id);
+
+	return oem_id;
+}
diff --git a/lib/hpm2.c b/lib/hpm2.c
new file mode 100644
index 0000000..52e5366
--- /dev/null
+++ b/lib/hpm2.c
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2012 Pigeon Point Systems.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pigeon Point Systems nor the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <ipmitool/bswap.h>
+#include <ipmitool/hpm2.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+
+/* From src/plugins/ipmi_intf.c: */
+void
+ipmi_intf_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size);
+void
+ipmi_intf_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size);
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(push, 1)
+#endif
+
+/* HPM.x Get Capabilities request */
+struct hpmx_cmd_get_capabilities_rq {
+	uint8_t picmg_id;
+	uint8_t hpmx_id;
+} ATTRIBUTE_PACKING;
+
+/* HPM.2 Get Capabilities response */
+struct hpm2_cmd_get_capabilities_rp {
+	uint8_t picmg_id;
+	struct hpm2_lan_attach_capabilities caps;
+} ATTRIBUTE_PACKING;
+
+#if HAVE_PRAGMA_PACK
+# pragma pack(pop)
+#endif
+
+/* IPMI Get LAN Configuration Parameters command */
+#define IPMI_LAN_GET_CONFIG	0x02
+
+int hpm2_get_capabilities(struct ipmi_intf * intf,
+		struct hpm2_lan_attach_capabilities * caps)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	struct hpmx_cmd_get_capabilities_rq rq;
+
+	/* reset result */
+	memset(caps, 0, sizeof(struct hpm2_lan_attach_capabilities));
+
+	/* prepare request */
+	rq.picmg_id = 0;
+	rq.hpmx_id = 2;
+
+	/* prepare request */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPM2_GET_LAN_ATTACH_CAPABILITIES;
+	req.msg.data = (uint8_t *)&rq;
+	req.msg.data_len = sizeof(rq);
+
+
+	/* send */
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_NOTICE, "Error sending request.");
+		return -1;
+	}
+
+	if (rsp->ccode == 0xC1) {
+		lprintf(LOG_DEBUG, "IPM Controller is not HPM.2 compatible");
+		return rsp->ccode;
+	} else if (rsp->ccode) {
+		lprintf(LOG_NOTICE, "Get HPM.x Capabilities request failed,"
+				" compcode = %x", rsp->ccode);
+		return rsp->ccode;
+	}
+
+	/* check response length */
+	if (rsp->data_len < 2 || rsp->data_len > 10) {
+		lprintf(LOG_NOTICE, "Bad response length, len=%d", rsp->data_len);
+		return -1;
+	}
+
+	/* check HPM.x identifier */
+	if (rsp->data[1] != 2) {
+		lprintf(LOG_NOTICE, "Bad HPM.x ID, id=%d", rsp->data[1]);
+		return rsp->ccode;
+	}
+
+	/*
+	 * this hardly can happen, since completion code is already checked.
+	 * but check for safety
+	 */
+	if (rsp->data_len < 4) {
+		lprintf(LOG_NOTICE, "Bad response length, len=%d", rsp->data_len);
+		return -1;
+	}
+
+	/* copy HPM.2 capabilities */
+	memcpy(caps, rsp->data + 2, rsp->data_len - 2);
+
+#if WORDS_BIGENDIAN
+	/* swap bytes to convert from little-endian format */
+	caps->lan_channel_mask = BSWAP_16(caps->lan_channel_mask);
+#endif
+
+	/* check HPM.2 revision */
+	if (caps->hpm2_revision_id == 0) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 revision, rev=%d",
+				caps->hpm2_revision_id);
+		return -1;
+	}
+
+	if (!caps->lan_channel_mask) {
+		return -1;
+	}
+
+	/* check response length */
+	if (rsp->data_len < 8) {
+		lprintf(LOG_NOTICE, "Bad response length, len=%d", rsp->data_len);
+		return -1;
+	}
+
+	/* check HPM.2 LAN parameters start */
+	if (caps->hpm2_lan_params_start < 0xC0) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 LAN params start, start=%x",
+				caps->hpm2_lan_params_start);
+		return -1;
+	}
+
+	/* check HPM.2 LAN parameters revision */
+	if (caps->hpm2_lan_params_rev != HPM2_LAN_PARAMS_REV) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 LAN params revision, rev=%d",
+				caps->hpm2_lan_params_rev);
+		return -1;
+	}
+
+	/* check for HPM.2 SOL extension */
+	if (!(caps->hpm2_caps & HPM2_CAPS_SOL_EXTENSION)) {
+		/* no further checks */
+		return 0;
+	}
+
+	/* check response length */
+	if (rsp->data_len < 10) {
+		lprintf(LOG_NOTICE, "Bad response length, len=%d", rsp->data_len);
+		return -1;
+	}
+
+	/* check HPM.2 SOL parameters start */
+	if (caps->hpm2_sol_params_start < 0xC0) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 SOL params start, start=%x",
+				caps->hpm2_sol_params_start);
+		return -1;
+	}
+
+	/* check HPM.2 SOL parameters revision */
+	if (caps->hpm2_sol_params_rev != HPM2_SOL_PARAMS_REV) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 SOL params revision, rev=%d",
+				caps->hpm2_sol_params_rev);
+		return -1;
+	}
+
+	return 0;
+}
+
+int hpm2_get_lan_channel_capabilities(struct ipmi_intf * intf,
+		uint8_t hpm2_lan_params_start,
+		struct hpm2_lan_channel_capabilities * caps)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	uint8_t rq[4];
+
+	/* reset result */
+	memset(caps, 0, sizeof(struct hpm2_lan_channel_capabilities));
+
+	/* prepare request */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_LAN_GET_CONFIG;
+	req.msg.data = (uint8_t *)&rq;
+	req.msg.data_len = sizeof(rq);
+
+	/* prepare request data */
+	rq[0] = 0xE;					/* sending channel */
+	rq[1] = hpm2_lan_params_start;	/* HPM.2 Channel Caps */
+	rq[2] = rq[3] = 0;
+
+	/* send */
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_NOTICE, "Error sending request.");
+		return -1;
+	}
+
+	if (rsp->ccode == 0x80) {
+		lprintf(LOG_DEBUG, "HPM.2 Channel Caps parameter is not supported");
+		return rsp->ccode;
+	} else if (rsp->ccode) {
+		lprintf(LOG_NOTICE, "Get LAN Configuration Parameters request failed,"
+				" compcode = %x", rsp->ccode);
+		return rsp->ccode;
+	}
+
+	/* check response length */
+	if (rsp->data_len != sizeof (struct hpm2_lan_channel_capabilities) + 1) {
+		lprintf(LOG_NOTICE, "Bad response length, len=%d", rsp->data_len);
+		return -1;
+	}
+
+	/* check parameter revision */
+	if (rsp->data[0] !=
+			LAN_PARAM_REV(HPM2_LAN_PARAMS_REV, HPM2_LAN_PARAMS_REV)) {
+		lprintf(LOG_NOTICE, "Bad HPM.2 LAN parameter revision, rev=%d",
+				rsp->data[0]);
+		return -1;
+	}
+
+	/* copy parameter data */
+	memcpy(caps, &rsp->data[1], sizeof (struct hpm2_lan_channel_capabilities));
+
+#if WORDS_BIGENDIAN
+	/* swap bytes to convert from little-endian format */
+	caps->max_inbound_pld_size = BSWAP_16(caps->max_inbound_pld_size);
+	caps->max_outbound_pld_size = BSWAP_16(caps->max_outbound_pld_size);
+#endif
+
+	return 0;
+}
+
+int hpm2_detect_max_payload_size(struct ipmi_intf * intf)
+{
+	struct hpm2_lan_attach_capabilities attach_caps;
+	struct hpm2_lan_channel_capabilities channel_caps;
+	int err;
+
+	/* query HPM.2 support */
+	err = hpm2_get_capabilities(intf, &attach_caps);
+
+	/* check if HPM.2 is supported */
+	if (err != 0 || !attach_caps.lan_channel_mask) {
+		return err;
+	}
+
+	/* query channel capabilities */
+	err = hpm2_get_lan_channel_capabilities(intf,
+			attach_caps.hpm2_lan_params_start, &channel_caps);
+
+	/* check if succeeded */
+	if (err != 0) {
+		return err;
+	}
+
+	/* update request and response sizes */
+	ipmi_intf_set_max_request_data_size(intf,
+			channel_caps.max_inbound_pld_size - 7);
+	ipmi_intf_set_max_response_data_size(intf,
+			channel_caps.max_outbound_pld_size - 8);
+
+	/* print debug info */
+	lprintf(LOG_DEBUG, "Set maximum request size to %d\n"
+			"Set maximum response size to %d",
+			intf->max_request_data_size, intf->max_response_data_size);
+
+	return 0;
+}
diff --git a/lib/ipmi_cfgp.c b/lib/ipmi_cfgp.c
new file mode 100644
index 0000000..b8af80d
--- /dev/null
+++ b/lib/ipmi_cfgp.c
@@ -0,0 +1,542 @@
+/*
+ * Copyright (c) 2016 Pentair Technical Products. All right reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pentair Technical Products or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * PENTAIR TECHNICAL SOLUTIONS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <malloc.h>
+#include <string.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_cfgp.h>
+#include <ipmitool/log.h>
+
+/* ipmi_cfgp_init  initialize configuration parameter context
+ * @param ctx      context to initialize
+ * @param set      array of parameter descriptors
+ * @param count    amount of descriptors supplied
+ * @param handler  function to do real job on parameters from the set
+ * @param priv     private data for the handler
+ */
+int
+ipmi_cfgp_init(struct ipmi_cfgp_ctx *ctx, const struct ipmi_cfgp *set,
+		unsigned int count, const char *cmdname,
+		ipmi_cfgp_handler_t handler, void *priv)
+{
+	if (ctx == NULL || set == NULL || handler == NULL || !cmdname) {
+		return -1;
+	}
+
+	memset(ctx, 0, sizeof(struct ipmi_cfgp_ctx));
+
+	ctx->set = set;
+	ctx->count = count;
+	ctx->cmdname = cmdname;
+	ctx->handler = handler;
+	ctx->priv = priv;
+
+	return 0;
+}
+
+/* ipmi_cfgp_uninit  destroy data list attached to context
+ * @param ctx          parameter context to clear
+ * @returns  0 -- list destroyed
+ *          -1 -- ctx is NULL
+ */
+int
+ipmi_cfgp_uninit(struct ipmi_cfgp_ctx *ctx)
+{
+	struct ipmi_cfgp_data *d;
+
+	if (ctx == NULL) {
+		return -1;
+	}
+
+	while (ctx->v) {
+		d = ctx->v;
+		ctx->v = d->next;
+		free(d);
+		d = NULL;
+	}
+
+	return 0;
+}
+
+/* lookup_cfgp -- find a parameter in a set*/
+static const struct ipmi_cfgp *
+lookup_cfgp(const struct ipmi_cfgp_ctx *ctx, const char *name)
+{
+	const struct ipmi_cfgp *p;
+	int i;
+
+	for (i = 0; i < ctx->count; i++) {
+		p = &ctx->set[i];
+
+		if (p->name && !strcasecmp(p->name, name)) {
+			return p;
+		}
+	}
+
+	return NULL;
+}
+
+/* ipmi_cfgp_parse_sel parse parameter selector
+ * (parameter ID, set selector, block selector) from cmdline.
+ *
+ * @param ctx     configuration parameter context to use
+ * @param argc    elements left in argv
+ * @param argv    array of arguments
+ * @param sel     where to store parsed selector
+ *
+ * @returns       >=0 number of argv elements used
+ *                <0 error
+ */
+int
+ipmi_cfgp_parse_sel(struct ipmi_cfgp_ctx *ctx,
+		int argc, const char **argv, struct ipmi_cfgp_sel *sel)
+{
+	const struct ipmi_cfgp *p;
+
+	if (ctx == NULL || argv == NULL || sel == NULL) {
+		return -1;
+	}
+
+	sel->param = -1;
+	sel->set = -1;
+	sel->block = -1;
+
+	if (argc == 0) {
+		/* no parameter specified, good for print, save */
+		return 0;
+	}
+
+	p = lookup_cfgp(ctx, argv[0]);
+	if (p == NULL) {
+		lprintf(LOG_ERR, "invalid parameter");
+		return -1;
+	}
+
+	sel->param = p - ctx->set;
+	sel->set = p->is_set ? -1 : 0;
+	sel->block = p->has_blocks ? -1 : 0;
+
+	if (argc == 1 || !p->is_set) {
+		/* No set and block selector applicable or specified */
+		return 1;
+	}
+
+	if (str2int(argv[1], &sel->set)
+		|| sel->set < 0
+		|| (sel->set == 0 && p->first_set)) {
+		lprintf(LOG_ERR, "invalid set selector");
+		return -1;
+	}
+
+	if (argc == 2 || !p->has_blocks) {
+		/* No block selector applicable or specified */
+		return 2;
+	}
+
+	if (str2int(argv[2], &sel->block)
+		|| sel->block < 0
+		|| (sel->block == 0 && p->first_block)) {
+		lprintf(LOG_ERR, "invalid block selector");
+		return -1;
+	}
+
+	return 3;
+}
+
+/* cfgp_add_data  adds block of data to list in the configuration
+ * parameter context
+ *
+ * @param ctx    context to add data to
+ * @param data   parameter data
+ */
+static void
+cfgp_add_data(struct ipmi_cfgp_ctx *ctx, struct ipmi_cfgp_data *data)
+{
+	struct ipmi_cfgp_data **pprev = &ctx->v;
+
+	data->next = NULL;
+
+	while (*pprev) {
+		pprev = &(*pprev)->next;
+	}
+
+	*pprev = data;
+}
+
+/* cfgp_usage     prints format for configuration parameter
+ *
+ * @param p       configuration parameter descriptor
+ * @param write   0 if no value is expected, !=0 otherwise
+ */
+static void
+cfgp_usage(const struct ipmi_cfgp *p, int write)
+{
+	if (p->name == NULL) {
+		return;
+	}
+
+	if (write && p->format == NULL) {
+		return;
+	}
+
+	printf("    %s%s%s %s\n",
+		p->name, p->is_set ? " <set_sel>" : "",
+		p->has_blocks ? " <block_sel>" : "",
+		write ? p->format : "");
+}
+
+/* ipmi_cfgp_usage     prints format for configuration parameter set
+ *
+ * @param set       configuration parameter descriptor array
+ * @param count     number of elements in set
+ * @param write     0 if no value is expected, !=0 otherwise
+ */
+void
+ipmi_cfgp_usage(const struct ipmi_cfgp *set, int count, int write)
+{
+	const struct ipmi_cfgp *p;
+	int i;
+
+	if (set == NULL) {
+		return;
+	}
+
+	for (i = 0; i < count; i++) {
+		p = &set[i];
+
+		if (write && p->access == CFGP_RDONLY) {
+			continue;
+		}
+
+		if (!write && p->access == CFGP_WRONLY) {
+			continue;
+		}
+
+		cfgp_usage(p, write);
+	}
+}
+
+/* ipmi_cfgp_parse_data   parse parameter data from command line into context
+ * @param ctx        context to add data
+ * @param sel        parameter selector
+ * @param argc       number of elements in argv
+ * @param argv       array of unparsed arguments
+ *
+ * @returns          0 on success
+ *                  <0 on error
+ */
+int
+ipmi_cfgp_parse_data(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, int argc, const char **argv)
+{
+	const struct ipmi_cfgp *p;
+	struct ipmi_cfgp_data *data;
+	struct ipmi_cfgp_action action;
+
+	if (ctx == NULL || sel == NULL || argv == NULL) {
+		return -1;
+	}
+
+	if (sel->param == -1 || sel->param >= ctx->count) {
+		lprintf(LOG_ERR, "invalid parameter, must be one of:");
+		ipmi_cfgp_usage(ctx->set, ctx->count, 1);
+		return -1;
+	}
+
+	if (sel->set == -1) {
+		lprintf(LOG_ERR, "set selector is not specified");
+		return -1;
+	}
+
+	if (sel->block == -1) {
+		lprintf(LOG_ERR, "block selector is not specified");
+		return -1;
+	}
+
+	p = &ctx->set[sel->param];
+
+	if (p->size == 0) {
+		return -1;
+	}
+
+	data = malloc(sizeof(struct ipmi_cfgp_data) + p->size);
+	if (data == NULL) {
+		return -1;
+	}
+
+	memset(data, 0, sizeof(struct ipmi_cfgp_data) + p->size);
+
+	action.type = CFGP_PARSE;
+	action.set = sel->set;
+	action.block = sel->block;
+	action.argc = argc;
+	action.argv = argv;
+	action.file = NULL;
+
+	if (ctx->handler(ctx->priv, p, &action, data->data) != 0) {
+		ipmi_cfgp_usage(p, 1, 1);
+		free(data);
+		data = NULL;
+		return -1;
+	}
+
+	data->sel = *sel;
+
+	cfgp_add_data(ctx, data);
+	return 0;
+}
+
+/* cfgp_get_param -- get parameter data from MC into data list within context
+ *
+ * @param ctx      context
+ * @param p        parameter descriptor
+ * @param set      parameter set selector, can be -1 to scan all set selectors
+ * @param block    parameter block selector, can be -1 to get all blocks
+ * @param quiet    set to non-zero to continue on errors
+ *                 (required for -1 to work)
+ * @returns        0 on success, non-zero otherwise
+ */
+static int
+cfgp_get_param(struct ipmi_cfgp_ctx *ctx, const struct ipmi_cfgp *p,
+		int set, int block, int quiet)
+{
+	struct ipmi_cfgp_data *data;
+	struct ipmi_cfgp_action action;
+	int cset;
+	int cblock;
+	int ret;
+
+	if (p->size == 0) {
+		return -1;
+	}
+
+	action.type = CFGP_GET;
+	action.argc = 0;
+	action.argv = NULL;
+	action.file = NULL;
+
+	if (set == -1 && !p->is_set) {
+		set = 0;
+	}
+
+	if (block == -1 && !p->has_blocks) {
+		block = 0;
+	}
+
+	if (set == -1) {
+		cset = p->first_set;
+	} else {
+		cset = set;
+	}
+
+	action.quiet = quiet;
+
+	do {
+		if (block == -1) {
+			cblock = p->first_block;
+		} else {
+			cblock = block;
+		}
+
+		do {
+			data = malloc(sizeof(struct ipmi_cfgp_data) + p->size);
+			if (data == NULL) {
+				return -1;
+			}
+
+			memset(data, 0, sizeof(struct ipmi_cfgp_data) + p->size);
+
+			action.set = cset;
+			action.block = cblock;
+
+			ret = ctx->handler(ctx->priv, p, &action, data->data);
+			if (ret != 0) {
+				free(data);
+				data = NULL;
+
+				if (!action.quiet) {
+					return ret;
+				}
+				break;
+			}
+
+			data->sel.param = p - ctx->set;
+			data->sel.set = cset;
+			data->sel.block = cblock;
+
+			cfgp_add_data(ctx, data);
+
+			cblock++;
+			action.quiet = 1;
+		} while (block == -1);
+
+		if (ret != 0 && cblock == p->first_block) {
+			break;
+		}
+
+		cset++;
+	} while (set == -1);
+
+	return 0;
+}
+
+/* ipmi_cfgp_get -- get parameters data from MC into data list within context
+ *
+ * @param ctx      context
+ * @param sel      parameter selector
+ * @returns        0 on success, non-zero otherwise
+ */
+int
+ipmi_cfgp_get(struct ipmi_cfgp_ctx *ctx, const struct ipmi_cfgp_sel *sel)
+{
+	int i;
+	int ret;
+
+	if (ctx == NULL || sel == NULL) {
+		return -1;
+	}
+
+	if (sel->param != -1) {
+		if (sel->param >= ctx->count) {
+			return -1;
+		}
+
+		ret = cfgp_get_param(ctx, &ctx->set[sel->param],
+			sel->set, sel->block, 0);
+		if (ret) {
+			return -1;
+		}
+		return 0;
+	}
+
+	for (i = 0; i < ctx->count; i++) {
+		if (ctx->set[i].access == CFGP_WRONLY) {
+			continue;
+		}
+
+		if (cfgp_get_param(ctx, &ctx->set[i], sel->set, sel->block, 1)) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int
+cfgp_do_action(struct ipmi_cfgp_ctx *ctx, int action_type,
+		const struct ipmi_cfgp_sel *sel, FILE *file, int filter)
+{
+	const struct ipmi_cfgp *p;
+	struct ipmi_cfgp_data *data;
+	struct ipmi_cfgp_action action;
+	int ret;
+
+	if (ctx == NULL || sel == NULL) {
+		return -1;
+	}
+
+	action.type = action_type;
+	action.argc = 0;
+	action.argv = NULL;
+	action.file = file;
+
+	for (data = ctx->v; data != NULL; data = data->next) {
+		if (sel->param != -1 && sel->param != data->sel.param) {
+			continue;
+		}
+		if (sel->set != -1 && sel->set != data->sel.set) {
+			continue;
+		}
+		if (sel->block != -1 && sel->block != data->sel.block) {
+			continue;
+		}
+		if (ctx->set[data->sel.param].access == filter) {
+			continue;
+		}
+
+		p = &ctx->set[data->sel.param];
+
+		action.set = data->sel.set;
+		action.block = data->sel.block;
+
+		if (action_type == CFGP_SAVE) {
+			fprintf(file, "%s %s ", ctx->cmdname, p->name);
+			if (p->is_set) {
+				fprintf(file, "%d ", data->sel.set);
+			}
+			if (p->has_blocks) {
+				fprintf(file, "%d ", data->sel.block);
+			}
+		}
+
+		ret = ctx->handler(ctx->priv, p, &action, data->data);
+
+		if (action_type == CFGP_SAVE) {
+			fputc('\n', file);
+		}
+
+		if (ret != 0) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int
+ipmi_cfgp_set(struct ipmi_cfgp_ctx *ctx, const struct ipmi_cfgp_sel *sel)
+{
+	return cfgp_do_action(ctx, CFGP_SET, sel, NULL, CFGP_RDONLY);
+}
+
+int
+ipmi_cfgp_save(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, FILE *file)
+{
+	if (file == NULL) {
+		return -1;
+	}
+
+	return cfgp_do_action(ctx, CFGP_SAVE, sel, file, CFGP_RDONLY);
+}
+
+int
+ipmi_cfgp_print(struct ipmi_cfgp_ctx *ctx,
+		const struct ipmi_cfgp_sel *sel, FILE *file)
+{
+	if (file == NULL) {
+		return -1;
+	}
+
+	return cfgp_do_action(ctx, CFGP_PRINT, sel, file, CFGP_RESERVED);
+}
diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
new file mode 100644
index 0000000..fab2e54
--- /dev/null
+++ b/lib/ipmi_channel.c
@@ -0,0 +1,932 @@
+/* -*-mode: C; indent-tabs-mode: t; -*-
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_user.h>
+
+extern int csv_output;
+extern int verbose;
+
+void printf_channel_usage(void);
+
+/* _ipmi_get_channel_access - Get Channel Access for given channel. Results are
+ * stored into passed struct.
+ *
+ * @intf - IPMI interface
+ * @channel_access - ptr to channel_access_t with Channel set.
+ * @get_volatile_settings - get volatile if != 0, else non-volatile settings.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_get_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t *channel_access,
+		uint8_t get_volatile_settings)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req = {0};
+	uint8_t data[2];
+
+	if (channel_access == NULL) {
+		return (-3);
+	}
+	data[0] = channel_access->channel & 0x0F;
+	/* volatile - 0x80; non-volatile - 0x40 */
+	data[1] = get_volatile_settings ? 0x80 : 0x40;
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_CHANNEL_ACCESS;
+	req.msg.data = data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 2) {
+		return (-2);
+	}
+	channel_access->alerting = rsp->data[0] & 0x20;
+	channel_access->per_message_auth = rsp->data[0] & 0x10;
+	channel_access->user_level_auth = rsp->data[0] & 0x08;
+	channel_access->access_mode = rsp->data[0] & 0x07;
+	channel_access->privilege_limit = rsp->data[1] & 0x0F;
+	return 0;
+}
+
+/* _ipmi_get_channel_info - Get Channel Info for given channel. Results are
+ * stored into passed struct.
+ *
+ * @intf - IPMI interface
+ * @channel_info - ptr to channel_info_t with Channel set.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_get_channel_info(struct ipmi_intf *intf,
+		struct channel_info_t *channel_info)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req = {0};
+	uint8_t data[1];
+
+	if (channel_info == NULL) {
+		return (-3);
+	}
+	data[0] = channel_info->channel & 0x0F;
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_CHANNEL_INFO;
+	req.msg.data = data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 9) {
+		return (-2);
+	}
+	channel_info->channel = rsp->data[0] & 0x0F;
+	channel_info->medium = rsp->data[1] & 0x7F;
+	channel_info->protocol = rsp->data[2] & 0x1F;
+	channel_info->session_support = rsp->data[3] & 0xC0;
+	channel_info->active_sessions = rsp->data[3] & 0x3F;
+	memcpy(channel_info->vendor_id, &rsp->data[4],
+			sizeof(channel_info->vendor_id));
+	memcpy(channel_info->aux_info, &rsp->data[7],
+			sizeof(channel_info->aux_info));
+	return 0;
+}
+
+/* _ipmi_set_channel_access - Set Channel Access values for given channel.
+ *
+ * @intf - IPMI interface
+ * @channel_access - channel_access_t with desired values and channel set.
+ * @access_option:
+ *   - 0 = don't set/change Channel Access
+ *   - 1 = set non-volatile settings of Channel Access
+ *   - 2 = set volatile settings of Channel Access
+ * @privilege_option:
+ *   - 0 = don't set/change Privilege Level Limit
+ *   - 1 = set non-volatile settings of Privilege Limit
+ *   - 2 = set volatile settings of Privilege Limit
+ *
+ * returns - negative number means error, positive is a ccode. See IPMI
+ *   specification for further information on ccodes for Set Channel Access.
+ * 0x82 - set not supported on selected channel, eg. session-less channel.
+ * 0x83 - access mode not supported
+ */
+int
+_ipmi_set_channel_access(struct ipmi_intf *intf,
+		struct channel_access_t channel_access,
+		uint8_t access_option,
+		uint8_t privilege_option)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t data[3];
+	/* Only values from <0..2> are accepted as valid. */
+	if (access_option > 2 || privilege_option > 2) {
+		return (-3);
+	}
+
+	memset(&data, 0, sizeof(data));
+	data[0] = channel_access.channel & 0x0F;
+	data[1] = (access_option << 6);
+	if (channel_access.alerting) {
+		data[1] |= 0x20;
+	}
+	if (channel_access.per_message_auth) {
+		data[1] |= 0x10;
+	}
+	if (channel_access.user_level_auth) {
+		data[1] |= 0x08;
+	}
+	data[1] |= (channel_access.access_mode & 0x07);
+	data[2] = (privilege_option << 6);
+	data[2] |= (channel_access.privilege_limit & 0x0F);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_SET_CHANNEL_ACCESS;
+	req.msg.data = data;
+	req.msg.data_len = 3;
+	
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	}
+	return rsp->ccode;
+}
+
+static const char *
+iana_string(uint32_t iana)
+{
+	static char s[10];
+
+	if (iana) {
+		sprintf(s, "%06x", iana);
+		return s;
+	} else {
+		return "N/A";
+	}
+}
+
+/**
+ * ipmi_1_5_authtypes
+ *
+ * Create a string describing the supported authentication types as 
+ * specificed by the parameter n
+ */
+static const char *
+ipmi_1_5_authtypes(uint8_t n)
+{
+	uint32_t i;
+	static char supportedTypes[128];
+
+	memset(supportedTypes, 0, sizeof(supportedTypes));
+	for (i = 0; ipmi_authtype_vals[i].val != 0; i++) {
+		if (n & ipmi_authtype_vals[i].val) {
+			strcat(supportedTypes, ipmi_authtype_vals[i].str);
+			strcat(supportedTypes, " ");
+		}
+	}
+
+	return supportedTypes;
+}
+
+uint8_t
+ipmi_current_channel_medium(struct ipmi_intf *intf)
+{
+	return ipmi_get_channel_medium(intf, 0xE);
+}
+
+/**
+ * ipmi_get_channel_auth_cap
+ *
+ * return 0 on success
+ *        -1 on failure
+ */
+int
+ipmi_get_channel_auth_cap(struct ipmi_intf *intf, uint8_t channel, uint8_t priv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct get_channel_auth_cap_rsp auth_cap;
+	uint8_t msg_data[2];
+
+	/* Ask for IPMI v2 data as well */
+	msg_data[0] = channel | 0x80;
+	msg_data[1] = priv;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_CHANNEL_AUTH_CAP;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if ((rsp == NULL) || (rsp->ccode > 0)) {
+		/*
+		 * It's very possible that this failed because we asked for IPMI v2 data
+		 * Ask again, without requesting IPMI v2 data
+		 */
+		msg_data[0] &= 0x7F;
+		
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Unable to Get Channel Authentication Capabilities");
+			return (-1);
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Get Channel Authentication Capabilities failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+		}
+	}
+
+	memcpy(&auth_cap, rsp->data, sizeof(struct get_channel_auth_cap_rsp));
+
+	printf("Channel number             : %d\n",
+		   auth_cap.channel_number);
+	printf("IPMI v1.5  auth types      : %s\n",
+		   ipmi_1_5_authtypes(auth_cap.enabled_auth_types));
+
+	if (auth_cap.v20_data_available) {
+		printf("KG status                  : %s\n",
+			   (auth_cap.kg_status) ? "non-zero" : "default (all zeroes)");
+	}
+
+	printf("Per message authentication : %sabled\n",
+		   (auth_cap.per_message_auth) ? "dis" : "en");
+	printf("User level authentication  : %sabled\n",
+		   (auth_cap.user_level_auth) ? "dis" : "en");
+
+	printf("Non-null user names exist  : %s\n",
+		   (auth_cap.non_null_usernames) ? "yes" : "no");
+	printf("Null user names exist      : %s\n",
+		   (auth_cap.null_usernames) ? "yes" : "no");
+	printf("Anonymous login enabled    : %s\n",
+		   (auth_cap.anon_login_enabled) ? "yes" : "no");
+
+	if (auth_cap.v20_data_available) {
+		printf("Channel supports IPMI v1.5 : %s\n",
+			   (auth_cap.ipmiv15_support) ? "yes" : "no");
+		printf("Channel supports IPMI v2.0 : %s\n",
+			   (auth_cap.ipmiv20_support) ? "yes" : "no");
+	}
+
+	/*
+	 * If there is support for an OEM authentication type, there is some
+	 * information.
+	 */
+	if (auth_cap.enabled_auth_types & IPMI_1_5_AUTH_TYPE_BIT_OEM) {
+		printf("IANA Number for OEM        : %d\n",
+			   auth_cap.oem_id[0]      | 
+			   auth_cap.oem_id[1] << 8 | 
+			   auth_cap.oem_id[2] << 16);
+		printf("OEM Auxiliary Data         : 0x%x\n",
+			   auth_cap.oem_aux_data);
+	}
+
+	return 0;
+}
+
+static int
+ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+		uint8_t channel)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	uint8_t rqdata[3];
+	uint32_t iana;
+	uint8_t auth_alg, integrity_alg, crypt_alg;
+	uint8_t cipher_suite_id;
+	uint8_t list_index = 0;
+	/* 0x40 sets * 16 bytes per set */
+	uint8_t cipher_suite_data[1024];
+	uint16_t offset = 0;
+	/* how much was returned, total */
+	uint16_t cipher_suite_data_length = 0;
+
+	memset(cipher_suite_data, 0, sizeof(cipher_suite_data));
+	
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_CHANNEL_CIPHER_SUITES;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rqdata[0] = channel;
+	rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1);
+	/* Always ask for cipher suite format */
+	rqdata[2] = 0x80;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+
+	/*
+	 * Grab the returned channel number once.  We assume it's the same
+	 * in future calls.
+	 */
+	if (rsp->data_len >= 1) {
+		channel = rsp->data[0];
+	}
+
+	while ((rsp->data_len > 1) && (rsp->data_len == 17) && (list_index < 0x3F)) {
+		/*
+		 * We got back cipher suite data -- store it.
+		 * printf("copying data to offset %d\n", offset);
+		 * printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data");
+		 */
+		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
+		offset += rsp->data_len - 1;
+		
+		/*
+		 * Increment our list for the next call
+		 */
+		++list_index;
+		rqdata[2] =  (rqdata[2] & 0x80) + list_index; 
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+			return -1;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+					val2str(rsp->ccode, completion_code_vals));
+			return -1;
+		}
+	}
+
+	/* Copy last chunk */
+	if(rsp->data_len > 1) {
+		/*
+		 * We got back cipher suite data -- store it.
+		 * printf("copying data to offset %d\n", offset);
+		 * printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data");
+		 */
+		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
+		offset += rsp->data_len - 1;
+	}
+
+	/* We can chomp on all our data now. */
+	cipher_suite_data_length = offset;
+	offset = 0;
+
+	if (! csv_output) {
+		printf("ID   IANA    Auth Alg        Integrity Alg   Confidentiality Alg\n");
+	}
+	while (offset < cipher_suite_data_length) {
+		if (cipher_suite_data[offset++] == 0xC0) {
+			/* standard type */
+			iana = 0;
+
+			/* Verify that we have at least a full record left; id + 3 algs */
+			if ((cipher_suite_data_length - offset) < 4) {
+				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
+				return -1;
+			}
+			cipher_suite_id = cipher_suite_data[offset++];
+		} else if (cipher_suite_data[offset++] == 0xC1) {
+			/* OEM record type */
+			/* Verify that we have at least a full record left
+			 * id + iana + 3 algs
+			 */
+			if ((cipher_suite_data_length - offset) < 4) {
+				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
+				return -1;
+			}
+
+			cipher_suite_id = cipher_suite_data[offset++];
+
+			/* Grab the IANA */
+			iana =
+				cipher_suite_data[offset]            | 
+				(cipher_suite_data[offset + 1] << 8) | 
+				(cipher_suite_data[offset + 2] << 16);
+			offset += 3;
+		} else {
+			lprintf(LOG_ERR, "Bad start of record byte in cipher suite data");
+			return -1;
+		}
+
+		/*
+		 * Grab the algorithms for this cipher suite.  I guess we can't be
+		 * sure of what order they'll come in.  Also, I suppose we default
+		 * to the NONE algorithm if one were absent.  This part of the spec is
+		 * poorly written -- I have read the errata document.  For now, I'm only
+		 * allowing one algorithm per type (auth, integrity, crypt) because I
+		 * don't I understand how it could be otherwise.
+		 */
+		auth_alg      = IPMI_AUTH_RAKP_NONE;
+		integrity_alg = IPMI_INTEGRITY_NONE;
+		crypt_alg     = IPMI_CRYPT_NONE;
+		
+		while (((cipher_suite_data[offset] & 0xC0) != 0xC0) &&
+			   ((cipher_suite_data_length - offset) > 0))
+		{
+			switch (cipher_suite_data[offset] & 0xC0)
+			{
+			case 0x00:
+				/* Authentication algorithm specifier */
+				auth_alg = cipher_suite_data[offset++] & 0x3F;
+				break;
+			case 0x40:
+				/* Interity algorithm specifier */
+				integrity_alg = cipher_suite_data[offset++] & 0x3F;
+				break;
+			case 0x80:
+				/* Confidentiality algorithm specifier */
+				crypt_alg = cipher_suite_data[offset++] & 0x3F;
+				break;
+			}
+		}
+		/* We have everything we need to spit out a cipher suite record */
+		printf((csv_output? "%d,%s,%s,%s,%s\n" :
+			"%-4d %-7s %-15s %-15s %-15s\n"),
+		       cipher_suite_id,
+		       iana_string(iana),
+		       val2str(auth_alg, ipmi_auth_algorithms),
+		       val2str(integrity_alg, ipmi_integrity_algorithms),
+		       val2str(crypt_alg, ipmi_encryption_algorithms));
+	}
+	return 0;
+}
+
+/**
+ * ipmi_get_channel_info
+ *
+ * returns 0 on success
+ *         -1 on failure
+ *
+ */
+int
+ipmi_get_channel_info(struct ipmi_intf *intf, uint8_t channel)
+{
+	struct channel_info_t channel_info = {0};
+	struct channel_access_t channel_access = {0};
+	int ccode = 0;
+
+	channel_info.channel = channel;
+	ccode = _ipmi_get_channel_info(intf, &channel_info);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Unable to Get Channel Info");
+		return (-1);
+	}
+
+	printf("Channel 0x%x info:\n", channel_info.channel);
+	printf("  Channel Medium Type   : %s\n",
+		   val2str(channel_info.medium,
+			   ipmi_channel_medium_vals));
+	printf("  Channel Protocol Type : %s\n",
+		   val2str(channel_info.protocol,
+			   ipmi_channel_protocol_vals));
+	printf("  Session Support       : ");
+	switch (channel_info.session_support) {
+		case IPMI_CHANNEL_SESSION_LESS:
+			printf("session-less\n");
+			break;
+		case IPMI_CHANNEL_SESSION_SINGLE:
+			printf("single-session\n");
+			break;
+		case IPMI_CHANNEL_SESSION_MULTI:
+			printf("multi-session\n");
+			break;
+		case IPMI_CHANNEL_SESSION_BASED:
+			printf("session-based\n");
+			break;
+		default:
+			printf("unknown\n");
+			break;
+	}
+	printf("  Active Session Count  : %d\n",
+		   channel_info.active_sessions);
+	printf("  Protocol Vendor ID    : %d\n",
+		   channel_info.vendor_id[0]      |
+		   channel_info.vendor_id[1] << 8 |
+		   channel_info.vendor_id[2] << 16);
+
+	/* only proceed if this is LAN channel */
+	if (channel_info.medium != IPMI_CHANNEL_MEDIUM_LAN
+		&& channel_info.medium != IPMI_CHANNEL_MEDIUM_LAN_OTHER) {
+		return 0;
+	}
+
+	channel_access.channel = channel_info.channel;
+	ccode = _ipmi_get_channel_access(intf, &channel_access, 1);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Unable to Get Channel Access (volatile)");
+		return (-1);
+	}
+
+	printf("  Volatile(active) Settings\n");
+	printf("    Alerting            : %sabled\n",
+			(channel_access.alerting) ? "dis" : "en");
+	printf("    Per-message Auth    : %sabled\n",
+			(channel_access.per_message_auth) ? "dis" : "en");
+	printf("    User Level Auth     : %sabled\n",
+			(channel_access.user_level_auth) ? "dis" : "en");
+	printf("    Access Mode         : ");
+	switch (channel_access.access_mode) {
+		case 0:
+			printf("disabled\n");
+			break;
+		case 1:
+			printf("pre-boot only\n");
+			break;
+		case 2:
+			printf("always available\n");
+			break;
+		case 3:
+			printf("shared\n");
+			break;
+		default:
+			printf("unknown\n");
+			break;
+	}
+
+	memset(&channel_access, 0, sizeof(channel_access));
+	channel_access.channel = channel_info.channel;
+	/* get non-volatile settings */
+	ccode = _ipmi_get_channel_access(intf, &channel_access, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Unable to Get Channel Access (non-volatile)");
+		return (-1);
+	}
+
+	printf("  Non-Volatile Settings\n");
+	printf("    Alerting            : %sabled\n",
+			(channel_access.alerting) ? "dis" : "en");
+	printf("    Per-message Auth    : %sabled\n",
+			(channel_access.per_message_auth) ? "dis" : "en");
+	printf("    User Level Auth     : %sabled\n",
+			(channel_access.user_level_auth) ? "dis" : "en");
+	printf("    Access Mode         : ");
+	switch (channel_access.access_mode) {
+		case 0:
+			printf("disabled\n");
+			break;
+		case 1:
+			printf("pre-boot only\n");
+			break;
+		case 2:
+			printf("always available\n");
+			break;
+		case 3:
+			printf("shared\n");
+			break;
+		default:
+			printf("unknown\n");
+			break;
+	}
+	return 0;
+}
+
+/* ipmi_get_channel_medium - Return Medium of given IPMI Channel.
+ *
+ * @channel - IPMI Channel
+ *
+ * returns - IPMI Channel Medium, IPMI_CHANNEL_MEDIUM_RESERVED if ccode > 0,
+ * 0 on error.
+ */
+uint8_t
+ipmi_get_channel_medium(struct ipmi_intf *intf, uint8_t channel)
+{
+	struct channel_info_t channel_info = {0};
+	int ccode = 0;
+
+	channel_info.channel = channel;
+	ccode = _ipmi_get_channel_info(intf, &channel_info);
+	if (ccode == 0xCC) {
+		return IPMI_CHANNEL_MEDIUM_RESERVED;
+	} else if (ccode < 0 && eval_ccode(ccode) != 0) {
+		return 0;
+	} else if (ccode > 0) {
+		lprintf(LOG_ERR, "Get Channel Info command failed: %s",
+				val2str(ccode, completion_code_vals));
+		return IPMI_CHANNEL_MEDIUM_RESERVED;
+	}
+	lprintf(LOG_DEBUG, "Channel type: %s",
+			val2str(channel_info.medium, ipmi_channel_medium_vals));
+	return channel_info.medium;
+}
+
+/* ipmi_get_user_access - Get User Access for given Channel and User or Users.
+ *
+ * @intf - IPMI interface
+ * @channel - IPMI Channel we're getting access for
+ * @user_id - User ID. If 0 is passed, all IPMI users will be listed
+ *
+ * returns - 0 on success, (-1) on error
+ */
+static int
+ipmi_get_user_access(struct ipmi_intf *intf, uint8_t channel, uint8_t user_id)
+{
+	struct user_access_t user_access;
+	struct user_name_t user_name;
+	int ccode = 0;
+	int curr_uid;
+	int init = 1;
+	int max_uid = 0;
+
+	curr_uid = user_id ? user_id : 1;
+	do {
+		memset(&user_access, 0, sizeof(user_access));
+		user_access.channel = channel;
+		user_access.user_id = curr_uid;
+		ccode = _ipmi_get_user_access(intf, &user_access);
+		if (eval_ccode(ccode) != 0) {
+			lprintf(LOG_ERR,
+					"Unable to Get User Access (channel %d id %d)",
+					channel, curr_uid);
+			return (-1);
+		}
+
+		memset(&user_name, 0, sizeof(user_name));
+		user_name.user_id = curr_uid;
+		ccode = _ipmi_get_user_name(intf, &user_name);
+		if (ccode == 0xCC) {
+			user_name.user_id = curr_uid;
+			memset(&user_name.user_name, '\0', 17);
+		} else if (eval_ccode(ccode) != 0) {
+			lprintf(LOG_ERR, "Unable to Get User Name (id %d)", curr_uid);
+			return (-1);
+		}
+		if (init) {
+			printf("Maximum User IDs     : %d\n", user_access.max_user_ids);
+			printf("Enabled User IDs     : %d\n", user_access.enabled_user_ids);
+			max_uid = user_access.max_user_ids;
+			init = 0;
+		}
+
+		printf("\n");
+		printf("User ID              : %d\n", curr_uid);
+		printf("User Name            : %s\n", user_name.user_name);
+		printf("Fixed Name           : %s\n",
+		       (curr_uid <= user_access.fixed_user_ids) ? "Yes" : "No");
+		printf("Access Available     : %s\n",
+		       (user_access.callin_callback) ? "callback" : "call-in / callback");
+		printf("Link Authentication  : %sabled\n",
+		       (user_access.link_auth) ? "en" : "dis");
+		printf("IPMI Messaging       : %sabled\n",
+		       (user_access.ipmi_messaging) ? "en" : "dis");
+		printf("Privilege Level      : %s\n",
+		       val2str(user_access.privilege_limit, ipmi_privlvl_vals));
+		printf("Enable Status        : %s\n",
+			val2str(user_access.enable_status, ipmi_user_enable_status_vals));
+		curr_uid ++;
+	} while (!user_id && curr_uid <= max_uid);
+
+	return 0;
+}
+
+/* ipmi_set_user_access - Query BMC for current Channel ACLs, parse CLI args
+ * and update current ACLs.
+ *
+ * returns - 0 on success, (-1) on error
+ */
+int
+ipmi_set_user_access(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct user_access_t user_access = {0};
+	int ccode = 0;
+	int i = 0;
+	uint8_t channel = 0;
+	uint8_t priv = 0;
+	uint8_t user_id = 0;
+	if (argc > 0 && strncmp(argv[0], "help", 4) == 0) {
+		printf_channel_usage();
+		return 0;
+	} else if (argc < 3) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_channel_usage();
+		return (-1);
+	}
+	if (is_ipmi_channel_num(argv[0], &channel) != 0
+			|| is_ipmi_user_id(argv[1], &user_id) != 0) {
+		return (-1);
+	}
+	user_access.channel = channel;
+	user_access.user_id = user_id;
+	ccode = _ipmi_get_user_access(intf, &user_access);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Get User Access (channel %d id %d)",
+				channel, user_id);
+		return (-1);
+	}
+	for (i = 2; i < argc; i ++) {
+		if (strncmp(argv[i], "callin=", 7) == 0) {
+			if (strncmp(argv[i] + 7, "off", 3) == 0) {
+				user_access.callin_callback = 1;
+			} else {
+				user_access.callin_callback = 0;
+			}
+		} else if (strncmp(argv[i], "link=", 5) == 0) {
+			if (strncmp(argv[i] + 5, "off", 3) == 0) {
+				user_access.link_auth = 0;
+			} else {
+				user_access.link_auth = 1;
+			}
+		} else if (strncmp(argv[i], "ipmi=", 5) == 0) {
+			if (strncmp(argv[i] + 5, "off", 3) == 0) {
+				user_access.ipmi_messaging = 0;
+			} else {
+				user_access.ipmi_messaging = 1;
+			}
+		} else if (strncmp(argv[i], "privilege=", 10) == 0) {
+			if (str2uchar(argv[i] + 10, &priv) != 0) {
+				lprintf(LOG_ERR,
+						"Numeric value expected, but '%s' given.",
+						argv[i] + 10);
+				return (-1);
+			}
+			user_access.privilege_limit = priv;
+		} else {
+			lprintf(LOG_ERR, "Invalid option: %s\n", argv[i]);
+			return (-1);
+		}
+	}
+	ccode = _ipmi_set_user_access(intf, &user_access, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Set User Access (channel %d id %d)",
+				channel, user_id);
+		return (-1);
+	}
+	printf("Set User Access (channel %d id %d) successful.\n",
+			channel, user_id);
+	return 0;
+}
+
+int
+ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int retval = 0;
+	uint8_t channel;
+	uint8_t priv = 0;
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_channel_usage();
+		return (-1);
+	} else if (strncmp(argv[0], "help", 4) == 0) {
+		printf_channel_usage();
+		return 0;
+	} else if (strncmp(argv[0], "authcap", 7) == 0) {
+		if (argc != 3) {
+			printf_channel_usage();
+			return (-1);
+		}
+		if (is_ipmi_channel_num(argv[1], &channel) != 0
+				|| is_ipmi_user_priv_limit(argv[2], &priv) != 0) {
+			return (-1);
+		}
+		retval = ipmi_get_channel_auth_cap(intf, channel, priv);
+	} else if (strncmp(argv[0], "getaccess", 10) == 0) {
+		uint8_t user_id = 0;
+		if ((argc < 2) || (argc > 3)) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			printf_channel_usage();
+			return (-1);
+		}
+		if (is_ipmi_channel_num(argv[1], &channel) != 0) {
+			return (-1);
+		}
+		if (argc == 3) {
+			if (is_ipmi_user_id(argv[2], &user_id) != 0) {
+				return (-1);
+			}
+		}
+		retval = ipmi_get_user_access(intf, channel, user_id);
+	} else if (strncmp(argv[0], "setaccess", 9) == 0) {
+		return ipmi_set_user_access(intf, (argc - 1), &(argv[1]));
+	} else if (strncmp(argv[0], "info", 4) == 0) {
+		channel = 0xE;
+		if (argc > 2) {
+			printf_channel_usage();
+			return (-1);
+		}
+		if (argc == 2) {
+			if (is_ipmi_channel_num(argv[1], &channel) != 0) {
+				return (-1);
+			}
+		}
+		retval = ipmi_get_channel_info(intf, channel);
+	} else if (strncmp(argv[0], "getciphers", 10) == 0) {
+		/* channel getciphers <ipmi|sol> [channel] */
+		channel = 0xE;
+		if ((argc < 2) || (argc > 3) ||
+		    (strncmp(argv[1], "ipmi", 4) && strncmp(argv[1], "sol",  3))) {
+			printf_channel_usage();
+			return (-1);
+		}
+		if (argc == 3) {
+			if (is_ipmi_channel_num(argv[2], &channel) != 0) {
+				return (-1);
+			}
+		}
+		retval = ipmi_get_channel_cipher_suites(intf,
+							argv[1], /* ipmi | sol */
+							channel);
+	} else {
+		lprintf(LOG_ERR, "Invalid CHANNEL command: %s\n", argv[0]);
+		printf_channel_usage();
+		retval = -1;
+	}
+	return retval;
+}
+
+/* printf_channel_usage - print-out help. */
+void
+printf_channel_usage()
+{
+	lprintf(LOG_NOTICE,
+"Channel Commands: authcap   <channel number> <max privilege>");
+	lprintf(LOG_NOTICE,
+"                  getaccess <channel number> [user id]");
+	lprintf(LOG_NOTICE,
+"                  setaccess <channel number> "
+"<user id> [callin=on|off] [ipmi=on|off] [link=on|off] [privilege=level]");
+	lprintf(LOG_NOTICE,
+"                  info      [channel number]");
+	lprintf(LOG_NOTICE,
+"                  getciphers <ipmi | sol> [channel]");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"Possible privilege levels are:");
+	lprintf(LOG_NOTICE,
+"   1   Callback level");
+	lprintf(LOG_NOTICE,
+"   2   User level");
+	lprintf(LOG_NOTICE,
+"   3   Operator level");
+	lprintf(LOG_NOTICE,
+"   4   Administrator level");
+	lprintf(LOG_NOTICE,
+"   5   OEM Proprietary level");
+	lprintf(LOG_NOTICE,
+"  15   No access");
+}
diff --git a/lib/ipmi_chassis.c b/lib/ipmi_chassis.c
new file mode 100644
index 0000000..7b5c2a8
--- /dev/null
+++ b/lib/ipmi_chassis.c
@@ -0,0 +1,1389 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _SVID_SOURCE || _BSD_SOURCE || _POSIX_C_SOURCE >= 1 || \
+	_XOPEN_SOURCE || _POSIX_SOURCE
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <ipmitool/bswap.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_chassis.h>
+
+extern int verbose;
+
+int
+ipmi_chassis_power_status(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x1;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to get Chassis Power Status");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Chassis Power Status failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return rsp->data[0] & 1;
+}
+
+static int
+ipmi_chassis_print_power_status(struct ipmi_intf * intf)
+{
+	int ps = ipmi_chassis_power_status(intf);
+
+	if (ps < 0)
+		return -1;
+
+	printf("Chassis Power is %s\n", ps ? "on" : "off");
+
+	return 0;
+}
+
+int
+ipmi_chassis_power_control(struct ipmi_intf * intf, uint8_t ctl)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x2;
+	req.msg.data = &ctl;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to set Chassis Power Control to %s",
+				val2str(ctl, ipmi_chassis_power_control_vals));
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Chassis Power Control to %s failed: %s",
+				val2str(ctl, ipmi_chassis_power_control_vals),
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("Chassis Power Control: %s\n",
+			val2str(ctl, ipmi_chassis_power_control_vals));
+	return 0;
+}
+
+static int
+ipmi_chassis_identify(struct ipmi_intf * intf, char * arg)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	int rc = (-3);
+
+	struct {
+		uint8_t interval;
+		uint8_t force_on;
+	} identify_data = { .interval = 0, .force_on = 0 };
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x4;
+
+	if (arg != NULL) {
+		if (strncmp(arg, "force", 5) == 0) {
+			identify_data.force_on = 1;
+		} else {
+			if ( (rc = str2uchar(arg, &identify_data.interval)) != 0) {
+				if (rc == (-2)) {
+					lprintf(LOG_ERR, "Invalid interval given.");
+				} else {
+					lprintf(LOG_ERR, "Given interval is too big.");
+				}
+				return (-1);
+			}
+		}
+		req.msg.data = (uint8_t *)&identify_data;
+		/* The Force Identify On byte is optional and not
+		 * supported by all devices-- if force is not specified,
+		 * we pass only one data byte; if specified, we pass two
+		 * data bytes and check for an error completion code
+		 */
+		req.msg.data_len = (identify_data.force_on) ? 2 : 1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to set Chassis Identify");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Chassis Identify failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		if (identify_data.force_on != 0) {
+			/* Intel SE7501WV2 F/W 1.2 returns CC 0xC7, but
+			 * the IPMI v1.5 spec does not standardize a CC
+			 * if unsupported, so we warn
+			 */
+			lprintf(LOG_WARNING, "Chassis may not support Force Identify On\n");
+		}
+		return -1;
+	}
+
+	printf("Chassis identify interval: ");
+	if (arg == NULL) {
+		printf("default (15 seconds)\n");
+	} else {
+		if (identify_data.force_on != 0) {
+			printf("indefinite\n");
+		} else {
+			if (identify_data.interval == 0)
+				printf("off\n");
+			else
+				printf("%i seconds\n", identify_data.interval);
+		}
+	}
+	return 0;
+}
+
+static int
+ipmi_chassis_poh(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t mins_per_count;
+	uint32_t count;
+	float minutes;
+	uint32_t days, hours;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0xf;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to get Chassis Power-On-Hours");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Chassis Power-On-Hours failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	mins_per_count = rsp->data[0];
+	memcpy(&count, rsp->data+1, 4);
+#if WORDS_BIGENDIAN
+	count = BSWAP_32(count);
+#endif
+
+	minutes = (float)count * mins_per_count;
+	days = minutes / 1440;
+	minutes -= (float)days * 1440;
+	hours = minutes / 60;
+	minutes -= hours * 60;
+
+	if (mins_per_count < 60) {
+		printf("POH Counter  : %i days, %i hours, %li minutes\n",
+				days, hours, (long)minutes);
+	} else {
+		printf("POH Counter  : %i days, %i hours\n", days, hours);
+	}
+
+	return 0;
+}
+
+static int
+ipmi_chassis_restart_cause(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x7;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to get Chassis Restart Cause");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Chassis Restart Cause failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("System restart cause: ");
+
+	switch (rsp->data[0] & 0xf) {
+	case 0:
+		printf("unknown\n");
+		break;
+	case 1:
+		printf("chassis power control command\n");
+		break;
+	case 2:
+		printf("reset via pushbutton\n");
+		break;
+	case 3:
+		printf("power-up via pushbutton\n");
+		break;
+	case 4:
+		printf("watchdog expired\n");
+		break;
+	case 5:
+		printf("OEM\n");
+		break;
+	case 6:
+		printf("power-up due to always-restore power policy\n");
+		break;
+	case 7:
+		printf("power-up due to restore-previous power policy\n");
+		break;
+	case 8:
+		printf("reset via PEF\n");
+		break;
+	case 9:
+		printf("power-cycle via PEF\n");
+		break;
+	default:
+		printf("invalid\n");
+	}
+
+	return 0;
+}
+
+int
+ipmi_chassis_status(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error sending Chassis Status command");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error sending Chassis Status command: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	/* byte 1 */
+	printf("System Power         : %s\n", (rsp->data[0] & 0x1) ? "on" : "off");
+	printf("Power Overload       : %s\n", (rsp->data[0] & 0x2) ? "true" : "false");
+	printf("Power Interlock      : %s\n", (rsp->data[0] & 0x4) ? "active" : "inactive");
+	printf("Main Power Fault     : %s\n", (rsp->data[0] & 0x8) ? "true" : "false");
+	printf("Power Control Fault  : %s\n", (rsp->data[0] & 0x10) ? "true" : "false");
+	printf("Power Restore Policy : ");
+	switch ((rsp->data[0] & 0x60) >> 5) {
+	case 0x0:
+		printf("always-off\n");
+		break;
+	case 0x1:
+		printf("previous\n");
+		break;
+	case 0x2:
+		printf("always-on\n");
+		break;
+	case 0x3:
+	default:
+		printf("unknown\n");
+	}
+
+	/* byte 2 */
+	printf("Last Power Event     : ");
+	if (rsp->data[1] & 0x1)
+		printf("ac-failed ");
+	if (rsp->data[1] & 0x2)
+		printf("overload ");
+	if (rsp->data[1] & 0x4)
+		printf("interlock ");
+	if (rsp->data[1] & 0x8)
+		printf("fault ");
+	if (rsp->data[1] & 0x10)
+		printf("command");
+	printf("\n");
+
+	/* byte 3 */
+	printf("Chassis Intrusion    : %s\n", (rsp->data[2] & 0x1) ? "active" : "inactive");
+	printf("Front-Panel Lockout  : %s\n", (rsp->data[2] & 0x2) ? "active" : "inactive");
+	printf("Drive Fault          : %s\n", (rsp->data[2] & 0x4) ? "true" : "false");
+	printf("Cooling/Fan Fault    : %s\n", (rsp->data[2] & 0x8) ? "true" : "false");
+
+	if (rsp->data_len > 3) {
+		/* optional byte 4 */
+		if (rsp->data[3] == 0) {
+			printf("Front Panel Control  : none\n");
+		} else {
+			printf("Sleep Button Disable : %s\n", (rsp->data[3] & 0x80) ? "allowed" : "not allowed");
+			printf("Diag Button Disable  : %s\n", (rsp->data[3] & 0x40) ? "allowed" : "not allowed");
+			printf("Reset Button Disable : %s\n", (rsp->data[3] & 0x20) ? "allowed" : "not allowed");
+			printf("Power Button Disable : %s\n", (rsp->data[3] & 0x10) ? "allowed" : "not allowed");
+			printf("Sleep Button Disabled: %s\n", (rsp->data[3] & 0x08) ? "true" : "false");
+			printf("Diag Button Disabled : %s\n", (rsp->data[3] & 0x04) ? "true" : "false");
+			printf("Reset Button Disabled: %s\n", (rsp->data[3] & 0x02) ? "true" : "false");
+			printf("Power Button Disabled: %s\n", (rsp->data[3] & 0x01) ? "true" : "false");
+		}
+	}
+
+	return 0;
+}
+
+
+static int
+ipmi_chassis_selftest(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = 0x4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error sending Get Self Test command");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error sending Get Self Test command: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("Self Test Results    : ");
+	switch (rsp->data[0]) {
+	case 0x55:
+		printf("passed\n");
+		break;
+
+	case 0x56:
+		printf("not implemented\n");
+		break;
+
+	case 0x57:
+	{
+		int i;
+		const struct valstr broken_dev_vals[] = {
+			{ 0, "firmware corrupted" },
+			{ 1, "boot block corrupted" },
+			{ 2, "FRU Internal Use Area corrupted" },
+			{ 3, "SDR Repository empty" },
+			{ 4, "IPMB not responding" },
+			{ 5, "cannot access BMC FRU" },
+			{ 6, "cannot access SDR Repository" },
+			{ 7, "cannot access SEL Device" },
+			{ 0xff, NULL },
+		};
+		printf("device error\n");
+		for (i=0; i<8; i++) {
+			if (rsp->data[1] & (1<<i)) {
+				printf("                       [%s]\n",
+						val2str(i, broken_dev_vals));
+			}
+		}
+	}
+	break;
+
+	case 0x58:
+		printf("Fatal hardware error: %02xh\n", rsp->data[1]);
+		break;
+
+	default:
+		printf("Device-specific failure %02xh:%02xh\n",
+				rsp->data[0], rsp->data[1]);
+		break;
+	}
+
+	return 0;
+}
+
+static int
+ipmi_chassis_set_bootparam(struct ipmi_intf * intf, uint8_t param, uint8_t * data, int len)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[16];
+
+	memset(msg_data, 0, 16);
+	msg_data[0] = param & 0x7f;
+	memcpy(msg_data+1, data, len);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x8;
+	req.msg.data = msg_data;
+	req.msg.data_len = len + 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting Chassis Boot Parameter %d", param);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		if (param != 0) {
+			lprintf(LOG_ERR, "Set Chassis Boot Parameter %d failed: %s",
+					param, val2str(rsp->ccode, completion_code_vals));
+		}
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Chassis Set Boot Parameter %d to %s", param, buf2str(data, len));
+	return 0;
+}
+
+static int
+ipmi_chassis_get_bootparam(struct ipmi_intf * intf, char * arg)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[3];
+	uint8_t param_id = 0;
+
+	if (arg == NULL)
+		return -1;
+
+	if (str2uchar(arg, &param_id) != 0) {
+		lprintf(LOG_ERR, "Invalid parameter '%s' given instead of bootparam.",
+				arg);
+		return (-1);
+	}
+
+	memset(msg_data, 0, 3);
+
+	msg_data[0] = param_id & 0x7f;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x9;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error Getting Chassis Boot Parameter %s", arg);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Chassis Boot Parameter %s failed: %s",
+				arg, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "Boot Option");
+
+	param_id = 0;
+	param_id = (rsp->data[1] & 0x7f);
+
+	printf("Boot parameter version: %d\n", rsp->data[0]);
+	printf("Boot parameter %d is %s\n", rsp->data[1] & 0x7f,
+			(rsp->data[1] & 0x80) ? "invalid/locked" : "valid/unlocked");
+	printf("Boot parameter data: %s\n", buf2str(rsp->data+2, rsp->data_len - 2));
+
+	switch(param_id)
+	{
+		case 0:
+		{
+			printf(" Set In Progress : ");
+			switch((rsp->data[2]) &0x03)
+			{
+				case 0: printf("set complete\n"); break;
+				case 1: printf("set in progress\n"); break;
+				case 2: printf("commit write\n"); break;
+				default: printf("error, reserved bit\n"); break;
+			}
+		}
+		break;
+		case 1:
+		{
+			printf(" Service Partition Selector : ");
+			if((rsp->data[2]) == 0)
+			{
+				printf("unspecified\n");
+			}
+			else
+			{
+				printf("%d\n",(rsp->data[2]));
+			}
+		}
+		break;
+		case 2:
+		{
+			printf(   " Service Partition Scan :\n");
+			if((rsp->data[2]&0x03) != 0)
+			{
+				if((rsp->data[2]&0x01) == 0x01)
+					printf("     - Request BIOS to scan\n");
+				if((rsp->data[2]&0x02) == 0x02)
+					printf("     - Service Partition Discovered\n");
+			}
+			else
+			{
+				printf("     No flag set\n");
+			}
+		}
+		break;
+		case 3:
+		{
+			printf(   " BMC boot flag valid bit clearing :\n");
+			if((rsp->data[2]&0x1f) != 0)
+			{
+				if((rsp->data[2]&0x10) == 0x10)
+					printf("     - Don't clear valid bit on reset/power cycle cause by PEF\n");
+				if((rsp->data[2]&0x08) == 0x08)
+					printf("     - Don't automatically clear boot flag valid bit on timeout\n");
+				if((rsp->data[2]&0x04) == 0x04)
+					printf("     - Don't clear valid bit on reset/power cycle cause by watchdog\n");
+				if((rsp->data[2]&0x02) == 0x02)
+					printf("     - Don't clear valid bit on push button reset // soft reset\n");
+				if((rsp->data[2]&0x01) == 0x01)
+					printf("     - Don't clear valid bit on power up via power push button or wake event\n");
+			}
+			else
+			{
+				printf("     No flag set\n");
+			}
+		}
+		break;
+		case 4:
+		{
+			printf(   " Boot Info Acknowledge :\n");
+			if((rsp->data[3]&0x1f) != 0)
+			{
+				if((rsp->data[3]&0x10) == 0x10)
+					printf("    - OEM has handled boot info\n");
+				if((rsp->data[3]&0x08) == 0x08)
+					printf("    - SMS has handled boot info\n");
+				if((rsp->data[3]&0x04) == 0x04)
+					printf("    - OS // service partition has handled boot info\n");
+				if((rsp->data[3]&0x02) == 0x02)
+					printf("    - OS Loader has handled boot info\n");
+				if((rsp->data[3]&0x01) == 0x01)
+					printf("    - BIOS/POST has handled boot info\n");
+			}
+			else
+			{
+				printf("     No flag set\n");
+			}
+		}
+		break;
+		case 5:
+		{
+			printf(   " Boot Flags :\n");
+
+			if((rsp->data[2]&0x80) == 0x80)
+				printf("   - Boot Flag Valid\n");
+			else
+				printf("   - Boot Flag Invalid\n");
+
+			if((rsp->data[2]&0x40) == 0x40)
+				printf("   - Options apply to all future boots\n");
+			else
+				printf("   - Options apply to only next boot\n");
+
+			if((rsp->data[2]&0x20) == 0x20)
+				printf("   - BIOS EFI boot \n");
+			else
+				printf("   - BIOS PC Compatible (legacy) boot \n");
+
+			if((rsp->data[3]&0x80) == 0x80)
+				printf("   - CMOS Clear\n");
+			if((rsp->data[3]&0x40) == 0x40)
+				printf("   - Lock Keyboard\n");
+			printf("   - Boot Device Selector : ");
+			switch( ((rsp->data[3]>>2)&0x0f))
+			{
+				case 0: printf("No override\n"); break;
+				case 1: printf("Force PXE\n"); break;
+				case 2: printf("Force Boot from default Hard-Drive\n"); break;
+				case 3: printf("Force Boot from default Hard-Drive, request Safe-Mode\n"); break;
+				case 4: printf("Force Boot from Diagnostic Partition\n"); break;
+				case 5: printf("Force Boot from CD/DVD\n"); break;
+				case 6: printf("Force Boot into BIOS Setup\n"); break;
+				case 15: printf("Force Boot from Floppy/primary removable media\n"); break;
+				default: printf("Flag error\n"); break;
+			}
+			if((rsp->data[3]&0x02) == 0x02)
+				printf("   - Screen blank\n");
+			if((rsp->data[3]&0x01) == 0x01)
+				printf("   - Lock out Reset buttons\n");
+
+			if((rsp->data[4]&0x80) == 0x80)
+				printf("   - Lock out (power off/sleep request) vi Power Button\n");
+			printf("   - Console Redirection control : ");
+			switch( ((rsp->data[4]>>5)&0x03))
+			{
+				case 0: printf("System Default\n"); break;
+				case 1: printf("Request Quiet Display\n"); break;
+				case 2: printf("Request Verbose Display\n"); break;
+				default: printf("Flag error\n"); break;
+			}
+			if((rsp->data[4]&0x10) == 0x10)
+				printf("   - Force progress event traps\n");
+			if((rsp->data[4]&0x08) == 0x08)
+				printf("   - User password bypass\n");
+			if((rsp->data[4]&0x04) == 0x04)
+				printf("   - Lock Out Sleep Button\n");
+			if((rsp->data[4]&0x02) == 0x02)
+				printf("   - Lock Out Sleep Button\n");
+			printf("   - BIOS verbosity : ");
+			switch( ((rsp->data[4]>>0)&0x03))
+			{
+				case 0: printf("Console redirection occurs per BIOS configuration setting (default)\n"); break;
+				case 1: printf("Suppress (skip) console redirection if enabled\n"); break;
+				case 2: printf("Request console redirection be enabled\n"); break;
+				default: printf("Flag error\n"); break;
+			}
+
+			if((rsp->data[5]&0x08) == 0x08)
+				printf("   - BIOS Shared Mode Override\n");
+			printf("   - BIOS Mux Control Override : ");
+			switch( ((rsp->data[5]>>0)&0x07))
+			{
+				case 0: printf("BIOS uses recommended setting of the mux at the end of POST\n"); break;
+				case 1: printf("Requests BIOS to force mux to BMC at conclusion of POST/start of OS boot\n"); break;
+				case 2: printf("Requests BIOS to force mux to system at conclusion of POST/start of OS boot\n"); break;
+				default: printf("Flag error\n"); break;
+			}
+		}
+		break;
+		case 6:
+		{
+			unsigned long session_id;
+			unsigned long timestamp;
+			char time_buf[40];
+			time_t out_time;
+
+			session_id  = ((unsigned long) rsp->data[3]);
+			session_id |= (((unsigned long) rsp->data[4])<<8);
+			session_id |= (((unsigned long) rsp->data[5])<<16);
+			session_id |= (((unsigned long) rsp->data[6])<<24);
+
+			timestamp  = ((unsigned long) rsp->data[7]);
+			timestamp |= (((unsigned long) rsp->data[8])<<8);
+			timestamp |= (((unsigned long) rsp->data[9])<<16);
+			timestamp |= (((unsigned long) rsp->data[10])<<24);
+
+			memset(time_buf, 0, 40);
+			strftime(
+					time_buf,
+					sizeof(time_buf),
+					"%m/%d/%Y %H:%M:%S", localtime(&out_time)
+			);
+
+			printf(" Boot Initiator Info :\n");
+			printf("    Channel Number : %d\n", (rsp->data[2] & 0x0f));
+			printf("    Session Id     : %08lXh\n",session_id);
+			if(timestamp != 0)
+			{
+				printf("    Timestamp      : %08lXh, %s\n",timestamp,time_buf);
+			}
+			else
+			{
+				printf("    Timestamp      : %08lXh, undefined\n",timestamp);
+			}
+
+		}
+		break;
+		case 7:
+		{
+			printf(" Selector   : %d\n", rsp->data[2] );
+			printf(" Block Data : %s\n", buf2str(rsp->data+3, rsp->data_len - 2));
+		}
+		break;
+		default:
+			printf(" Undefined byte\n");
+			break;
+	}
+
+	return 0;
+}
+
+static int
+get_bootparam_options(char *optstring,
+		unsigned char *set_flag, unsigned char *clr_flag)
+{
+	char *token;
+	char *saveptr = NULL;
+	int optionError = 0;
+	*set_flag = 0;
+	*clr_flag = 0;
+	static struct {
+		char *name;
+		unsigned char value;
+		char *desc;
+	} options[] = {
+	{"PEF",          0x10,
+	    "Clear valid bit on reset/power cycle cause by PEF"},
+	{"timeout",      0x08,
+	    "Automatically clear boot flag valid bit on timeout"},
+	{"watchdog",     0x04,
+	    "Clear valid bit on reset/power cycle cause by watchdog"},
+	{"reset",        0x02,
+	    "Clear valid bit on push button reset/soft reset"},
+	{"power", 0x01,
+	    "Clear valid bit on power up via power push button or wake event"},
+
+	{NULL}	/* End marker */
+	}, *op;
+
+	if (strncmp(optstring, "options=", 8) != 0) {
+		lprintf(LOG_ERR, "No options= keyword found \"%s\"", optstring);
+		return -1;
+	}
+	token = strtok_r(optstring + 8, ",", &saveptr);
+	while (token != NULL) {
+		int setbit = 0;
+		if (strcmp(token, "help") == 0) {
+			optionError = 1;
+			break;
+		}
+		if (strncmp(token, "no-", 3) == 0) {
+			setbit = 1;
+			token += 3;
+		}
+		for (op = options; op->name != NULL; ++op) {
+			if (strncmp(token, op->name, strlen(op->name)) == 0) {
+				if (setbit) {
+				    *set_flag |= op->value;
+				} else {
+				    *clr_flag |= op->value;
+				}
+				break;
+			}
+		}
+		if (op->name == NULL) {
+			/* Option not found */
+			optionError = 1;
+			if (setbit) {
+				token -=3;
+			}
+			lprintf(LOG_ERR, "Invalid option: %s", token);
+		}
+		token = strtok_r(NULL, ",", &saveptr);
+	}
+	if (optionError) {
+		lprintf(LOG_NOTICE, " Legal options are:");
+		lprintf(LOG_NOTICE, "  %-8s: print this message", "help");
+		for (op = options; op->name != NULL; ++op) {
+			lprintf(LOG_NOTICE, "  %-8s: %s", op->name, op->desc);
+		}
+		lprintf(LOG_NOTICE, " Any Option may be prepended with no-"
+				    " to invert sense of operation\n");
+		return (-1);
+	}
+	return (0);
+}
+
+static int
+ipmi_chassis_get_bootvalid(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[3];
+	uint8_t param_id = IPMI_CHASSIS_BOOTPARAM_FLAG_VALID;
+	memset(msg_data, 0, 3);
+
+	msg_data[0] = param_id & 0x7f;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x9;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR,
+			"Error Getting Chassis Boot Parameter %d", param_id);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Chassis Boot Parameter %d failed: %s",
+			param_id, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "Boot Option");
+
+	return(rsp->data[2]);
+}
+
+static int
+ipmi_chassis_set_bootvalid(struct ipmi_intf *intf, uint8_t set_flag, uint8_t clr_flag)
+{
+	int bootvalid;
+	uint8_t flags[5];
+	int rc = 0;
+	int use_progress = 1;
+	uint8_t param_id = IPMI_CHASSIS_BOOTPARAM_FLAG_VALID;
+
+	if (use_progress) {
+		/* set set-in-progress flag */
+		memset(flags, 0, 5);
+		flags[0] = 0x01;
+		rc = ipmi_chassis_set_bootparam(intf,
+				IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS, flags, 1);
+		if (rc < 0)
+			use_progress = 0;
+	}
+
+	memset(flags, 0, 5);
+	flags[0] = 0x01;
+	flags[1] = 0x01;
+	rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_INFO_ACK,
+			flags, 2);
+
+	if (rc < 0) {
+		if (use_progress) {
+			/* set-in-progress = set-complete */
+			memset(flags, 0, 5);
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+		return -1;
+	}
+
+	bootvalid = ipmi_chassis_get_bootvalid(intf);
+
+	if (bootvalid < 0) {
+		if (use_progress) {
+			/* set-in-progress = set-complete */
+			memset(flags, 0, 5);
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+		return -1;
+	}
+	flags[0] = (bootvalid & ~clr_flag) | set_flag;
+
+	rc = ipmi_chassis_set_bootparam(intf, param_id, flags, 1);
+
+	if (rc == 0) {
+		if (use_progress) {
+			/* set-in-progress = commit-write */
+			memset(flags, 0, 5);
+			flags[0] = 0x02;
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+	}
+
+	if (use_progress) {
+		/* set-in-progress = set-complete */
+		memset(flags, 0, 5);
+		ipmi_chassis_set_bootparam(intf,
+				IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+				flags, 1);
+	}
+
+	return rc;
+}
+
+static int
+ipmi_chassis_set_bootdev(struct ipmi_intf * intf, char * arg, uint8_t *iflags)
+{
+	uint8_t flags[5];
+	int rc = 0;
+	int use_progress = 1;
+
+	if (use_progress) {
+		/* set set-in-progress flag */
+		memset(flags, 0, 5);
+		flags[0] = 0x01;
+		rc = ipmi_chassis_set_bootparam(intf,
+				IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS, flags, 1);
+		if (rc < 0)
+			use_progress = 0;
+	}
+
+	memset(flags, 0, 5);
+	flags[0] = 0x01;
+	flags[1] = 0x01;
+	rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_INFO_ACK,
+			flags, 2);
+
+	if (rc < 0) {
+		if (use_progress) {
+			/* set-in-progress = set-complete */
+			memset(flags, 0, 5);
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+		return -1;
+	}
+
+	if (iflags == NULL)
+		memset(flags, 0, 5);
+	else
+		memcpy(flags, iflags, sizeof (flags));
+
+	if (arg == NULL)
+		flags[1] |= 0x00;
+	else if (strncmp(arg, "none", 4) == 0)
+		flags[1] |= 0x00;
+	else if (strncmp(arg, "pxe", 3) == 0 ||
+		strncmp(arg, "force_pxe", 9) == 0)
+		flags[1] |= 0x04;
+	else if (strncmp(arg, "disk", 4) == 0 ||
+		strncmp(arg, "force_disk", 10) == 0)
+		flags[1] |= 0x08;
+	else if (strncmp(arg, "safe", 4) == 0 ||
+		strncmp(arg, "force_safe", 10) == 0)
+		flags[1] |= 0x0c;
+	else if (strncmp(arg, "diag", 4) == 0 ||
+		strncmp(arg, "force_diag", 10) == 0)
+		flags[1] |= 0x10;
+	else if (strncmp(arg, "cdrom", 5) == 0 ||
+		strncmp(arg, "force_cdrom", 11) == 0)
+		flags[1] |= 0x14;
+	else if (strncmp(arg, "floppy", 6) == 0 ||
+		strncmp(arg, "force_floppy", 12) == 0)
+		flags[1] |= 0x3c;
+	else if (strncmp(arg, "bios", 4) == 0 ||
+		strncmp(arg, "force_bios", 10) == 0)
+		flags[1] |= 0x18;
+	else {
+		lprintf(LOG_ERR, "Invalid argument: %s", arg);
+		if (use_progress) {
+			/* set-in-progress = set-complete */
+			memset(flags, 0, 5);
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+		return -1;
+	}
+
+	/* set flag valid bit */
+	flags[0] |= 0x80;
+
+	rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_BOOT_FLAGS,
+			flags, 5);
+	if (rc == 0) {
+		if (use_progress) {
+			/* set-in-progress = commit-write */
+			memset(flags, 0, 5);
+			flags[0] = 0x02;
+			ipmi_chassis_set_bootparam(intf,
+					IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+					flags, 1);
+		}
+
+		printf("Set Boot Device to %s\n", arg);
+	}
+
+	if (use_progress) {
+		/* set-in-progress = set-complete */
+		memset(flags, 0, 5);
+		ipmi_chassis_set_bootparam(intf,
+				IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
+				flags, 1);
+	}
+
+	return rc;
+}
+
+static int
+ipmi_chassis_power_policy(struct ipmi_intf * intf, uint8_t policy)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_CHASSIS;
+	req.msg.cmd = 0x6;
+	req.msg.data = &policy;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in Power Restore Policy command");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Power Restore Policy command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	if (policy == IPMI_CHASSIS_POLICY_NO_CHANGE) {
+		printf("Supported chassis power policy:  ");
+		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_ALWAYS_OFF))
+			printf("always-off ");
+		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_ALWAYS_ON))
+			printf("always-on ");
+		if (rsp->data[0] & (1<<IPMI_CHASSIS_POLICY_PREVIOUS))
+			printf("previous");
+		printf("\n");
+	}
+	else {
+		printf("Set chassis power restore policy to ");
+		switch (policy) {
+		case IPMI_CHASSIS_POLICY_ALWAYS_ON:
+			printf("always-on\n");
+			break;
+		case IPMI_CHASSIS_POLICY_ALWAYS_OFF:
+			printf("always-off\n");
+			break;
+		case IPMI_CHASSIS_POLICY_PREVIOUS:
+			printf("previous\n");
+			break;
+		default:
+			printf("unknown\n");
+		}
+	}
+	return 0;
+}
+
+int
+ipmi_power_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	uint8_t ctl = 0;
+
+	if ((argc < 1) || (strncmp(argv[0], "help", 4) == 0)) {
+		lprintf(LOG_NOTICE, "chassis power Commands: status, on, off, cycle, reset, diag, soft");
+		return 0;
+	}
+	if (strncmp(argv[0], "status", 6) == 0) {
+		rc = ipmi_chassis_print_power_status(intf);
+		return rc;
+	}
+	if ((strncmp(argv[0], "up", 2) == 0) || (strncmp(argv[0], "on", 2) == 0))
+		ctl = IPMI_CHASSIS_CTL_POWER_UP;
+	else if ((strncmp(argv[0], "down", 4) == 0) || (strncmp(argv[0], "off", 3) == 0))
+		ctl = IPMI_CHASSIS_CTL_POWER_DOWN;
+	else if (strncmp(argv[0], "cycle", 5) == 0)
+		ctl = IPMI_CHASSIS_CTL_POWER_CYCLE;
+	else if (strncmp(argv[0], "reset", 5) == 0)
+		ctl = IPMI_CHASSIS_CTL_HARD_RESET;
+	else if (strncmp(argv[0], "diag", 4) == 0)
+		ctl = IPMI_CHASSIS_CTL_PULSE_DIAG;
+	else if ((strncmp(argv[0], "acpi", 4) == 0) || (strncmp(argv[0], "soft", 4) == 0))
+		ctl = IPMI_CHASSIS_CTL_ACPI_SOFT;
+	else {
+		lprintf(LOG_ERR, "Invalid chassis power command: %s", argv[0]);
+		return -1;
+	}
+
+	rc = ipmi_chassis_power_control(intf, ctl);
+	return rc;
+}
+
+void
+ipmi_chassis_set_bootflag_help()
+{
+	unsigned char set_flag;
+	unsigned char clr_flag;
+	lprintf(LOG_NOTICE, "bootparam set bootflag <device> [options=...]");
+	lprintf(LOG_NOTICE, " Legal devices are:");
+	lprintf(LOG_NOTICE, "  none        : No override");
+	lprintf(LOG_NOTICE, "  force_pxe   : Force PXE boot");
+	lprintf(LOG_NOTICE, "  force_disk  : Force boot from default Hard-drive");
+	lprintf(LOG_NOTICE, "  force_safe  : Force boot from default Hard-drive, request Safe Mode");
+	lprintf(LOG_NOTICE, "  force_diag  : Force boot from Diagnostic Partition");
+	lprintf(LOG_NOTICE, "  force_cdrom : Force boot from CD/DVD");
+	lprintf(LOG_NOTICE, "  force_bios  : Force boot into BIOS Setup");
+	get_bootparam_options("options=help", &set_flag, &clr_flag);
+}
+
+int
+ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if ((argc == 0) || (strncmp(argv[0], "help", 4) == 0)) {
+		lprintf(LOG_NOTICE, "Chassis Commands:  status, power, identify, policy, restart_cause, poh, bootdev, bootparam, selftest");
+	}
+	else if (strncmp(argv[0], "status", 6) == 0) {
+		rc = ipmi_chassis_status(intf);
+	}
+	else if (strncmp(argv[0], "selftest", 8) == 0) {
+		rc = ipmi_chassis_selftest(intf);
+	}
+	else if (strncmp(argv[0], "power", 5) == 0) {
+		uint8_t ctl = 0;
+
+		if ((argc < 2) || (strncmp(argv[1], "help", 4) == 0)) {
+			lprintf(LOG_NOTICE, "chassis power Commands: status, on, off, cycle, reset, diag, soft");
+			return 0;
+		}
+		if (strncmp(argv[1], "status", 6) == 0) {
+			rc = ipmi_chassis_print_power_status(intf);
+			return rc;
+		}
+		if ((strncmp(argv[1], "up", 2) == 0) || (strncmp(argv[1], "on", 2) == 0))
+			ctl = IPMI_CHASSIS_CTL_POWER_UP;
+		else if ((strncmp(argv[1], "down", 4) == 0) || (strncmp(argv[1], "off", 3) == 0))
+			ctl = IPMI_CHASSIS_CTL_POWER_DOWN;
+		else if (strncmp(argv[1], "cycle", 5) == 0)
+			ctl = IPMI_CHASSIS_CTL_POWER_CYCLE;
+		else if (strncmp(argv[1], "reset", 5) == 0)
+			ctl = IPMI_CHASSIS_CTL_HARD_RESET;
+		else if (strncmp(argv[1], "diag", 4) == 0)
+			ctl = IPMI_CHASSIS_CTL_PULSE_DIAG;
+		else if ((strncmp(argv[1], "acpi", 4) == 0) || (strncmp(argv[1], "soft", 4) == 0))
+			ctl = IPMI_CHASSIS_CTL_ACPI_SOFT;
+		else {
+			lprintf(LOG_ERR, "Invalid chassis power command: %s", argv[1]);
+			return -1;
+		}
+
+		rc = ipmi_chassis_power_control(intf, ctl);
+	}
+	else if (strncmp(argv[0], "identify", 8) == 0) {
+		if (argc < 2) {
+			rc = ipmi_chassis_identify(intf, NULL);
+		}
+		else if (strncmp(argv[1], "help", 4) == 0) {
+			lprintf(LOG_NOTICE, "chassis identify <interval>");
+			lprintf(LOG_NOTICE, "                 default is 15 seconds");
+			lprintf(LOG_NOTICE, "                 0 to turn off");
+			lprintf(LOG_NOTICE, "                 force to turn on indefinitely");
+		} else {
+			rc = ipmi_chassis_identify(intf, argv[1]);
+		}
+	}
+	else if (strncmp(argv[0], "poh", 3) == 0) {
+		rc = ipmi_chassis_poh(intf);
+	}
+	else if (strncmp(argv[0], "restart_cause", 13) == 0) {
+		rc = ipmi_chassis_restart_cause(intf);
+	}
+	else if (strncmp(argv[0], "policy", 4) == 0) {
+		if ((argc < 2) || (strncmp(argv[1], "help", 4) == 0)) {
+			lprintf(LOG_NOTICE, "chassis policy <state>");
+			lprintf(LOG_NOTICE, "   list        : return supported policies");
+			lprintf(LOG_NOTICE, "   always-on   : turn on when power is restored");
+			lprintf(LOG_NOTICE, "   previous    : return to previous state when power is restored");
+			lprintf(LOG_NOTICE, "   always-off  : stay off after power is restored");
+		} else {
+			uint8_t ctl;
+			if (strncmp(argv[1], "list", 4) == 0)
+				ctl = IPMI_CHASSIS_POLICY_NO_CHANGE;
+			else if (strncmp(argv[1], "always-on", 9) == 0)
+				ctl = IPMI_CHASSIS_POLICY_ALWAYS_ON;
+			else if (strncmp(argv[1], "previous", 8) == 0)
+				ctl = IPMI_CHASSIS_POLICY_PREVIOUS;
+			else if (strncmp(argv[1], "always-off", 10) == 0)
+				ctl = IPMI_CHASSIS_POLICY_ALWAYS_OFF;
+			else {
+				lprintf(LOG_ERR, "Invalid chassis policy: %s", argv[1]);
+				return -1;
+			}
+			rc = ipmi_chassis_power_policy(intf, ctl);
+		}
+	}
+	else if (strncmp(argv[0], "bootparam", 9) == 0) {
+		if ((argc < 3) || (strncmp(argv[1], "help", 4) == 0)) {
+			lprintf(LOG_NOTICE, "bootparam get <param #>");
+		    ipmi_chassis_set_bootflag_help();
+		}
+		else {
+			if (strncmp(argv[1], "get", 3) == 0) {
+				rc = ipmi_chassis_get_bootparam(intf, argv[2]);
+			}
+			else if (strncmp(argv[1], "set", 3) == 0) {
+			    unsigned char set_flag=0;
+			    unsigned char clr_flag=0;
+				if (strncmp(argv[2], "help", 4) == 0  ||
+						argc < 4 || (argc >= 4 &&
+							 strncmp(argv[2], "bootflag", 8) != 0)) {
+					ipmi_chassis_set_bootflag_help();
+				} else {
+					if (argc == 5) {
+						get_bootparam_options(argv[4], &set_flag, &clr_flag);
+					}
+					rc = ipmi_chassis_set_bootdev(intf, argv[3], NULL);
+					if (argc == 5 && (set_flag != 0 || clr_flag != 0)) {
+						rc = ipmi_chassis_set_bootvalid(intf, set_flag, clr_flag);
+					}
+				}
+			}
+			else
+				lprintf(LOG_NOTICE, "bootparam get|set <option> [value ...]");
+		}
+	}
+	else if (strncmp(argv[0], "bootdev", 7) == 0) {
+		if ((argc < 2) || (strncmp(argv[1], "help", 4) == 0)) {
+			lprintf(LOG_NOTICE, "bootdev <device> [clear-cmos=yes|no]");
+			lprintf(LOG_NOTICE, "bootdev <device> [options=help,...]");
+			lprintf(LOG_NOTICE, "  none  : Do not change boot device order");
+			lprintf(LOG_NOTICE, "  pxe   : Force PXE boot");
+			lprintf(LOG_NOTICE, "  disk  : Force boot from default Hard-drive");
+			lprintf(LOG_NOTICE, "  safe  : Force boot from default Hard-drive, request Safe Mode");
+			lprintf(LOG_NOTICE, "  diag  : Force boot from Diagnostic Partition");
+			lprintf(LOG_NOTICE, "  cdrom : Force boot from CD/DVD");
+			lprintf(LOG_NOTICE, "  bios  : Force boot into BIOS Setup");
+			lprintf(LOG_NOTICE, "  floppy: Force boot from Floppy/primary removable media");
+		} else {
+			if (argc < 3)
+				rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL);
+			else if (strncmp(argv[2], "clear-cmos=", 11) == 0) {
+				if (strncmp(argv[2]+11, "yes", 3) == 0) {
+					uint8_t flags[5] = {0, (1<<7), 0, 0, 0};
+					rc = ipmi_chassis_set_bootdev(intf, argv[1], flags);
+				} else
+					rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL);
+			}
+			else if (strncmp(argv[2], "options=", 8) == 0) {
+				char *token;
+				char *saveptr = NULL;
+				int optionError = 0;
+				unsigned char flags[5];
+				static struct {
+					char *name;
+					int i;
+					unsigned char mask;
+					unsigned char value;
+					char *desc;
+				} options[] = {
+					/* data 1 */
+					{"valid", 0, (1<<7), (1<<7),
+						"Boot flags valid"},
+					{"persistent", 0, (1<<6), (1<<6),
+						"Changes are persistent for all future boots"},
+					{"efiboot", 0, (1<<5), (1<<5),
+						"Extensible Firmware Interface Boot (EFI)"},
+					/* data 2 */
+					{"clear-cmos", 1, (1<<7), (1<<7),
+						"CMOS clear"},
+					{"lockkbd", 1, (1<<6), (1<<6),
+						"Lock Keyboard"},
+					/* data2[5:2] is parsed elsewhere */
+					{"screenblank", 1, (1<<1), (1<<1),
+						"Screen Blank"},
+					{"lockoutreset", 1, (1<<0), (1<<0),
+						"Lock out Resetbuttons"},
+					/* data 3 */
+					{"lockout_power", 2, (1<<7), (1<<7),
+						"Lock out (power off/sleep request) via Power Button"},
+					{"verbose=default", 2, (3<<5), (0<<5),
+						"Request quiet BIOS display"},
+					{"verbose=no", 2, (3<<5), (1<<5),
+						"Request quiet BIOS display"},
+					{"verbose=yes", 2, (3<<5), (2<<5),
+						"Request verbose BIOS display"},
+					{"force_pet", 2, (1<<4), (1<<4),
+						"Force progress event traps"},
+					{"upw_bypass", 2, (1<<3), (1<<3),
+						"User password bypass"},
+					{"lockout_sleep", 2, (1<<2), (1<<2),
+						"Log Out Sleep Button"},
+					{"cons_redirect=default", 2, (3<<0), (0<<0),
+						"Console redirection occurs per BIOS configuration setting"},
+					{"cons_redirect=skip", 2, (3<<0), (1<<0),
+						"Suppress (skip) console redirection if enabled"},
+					{"cons_redirect=enable", 2, (3<<0), (2<<0),
+						"Suppress (skip) console redirection if enabled"},
+					/* data 4 */
+					/* data4[7:4] reserved */
+					/* data4[3] BIOS Shared Mode Override, not implemented here */
+					/* data4[2:0] BIOS Mux Control Override, not implemented here */
+
+					/* data5 reserved */
+
+					{NULL}	/* End marker */
+			}, *op;
+
+			memset(&flags[0], 0, sizeof(flags));
+			token = strtok_r(argv[2] + 8, ",", &saveptr);
+			while (token != NULL) {
+				if (strcmp(token, "help") == 0) {
+					optionError = 1;
+					break;
+				}
+				for (op = options; op->name != NULL; ++op) {
+					if (strcmp(token, op->name) == 0) {
+						flags[op->i] &= op->mask;
+						flags[op->i] |= op->value;
+						break;
+					}
+				}
+				if (op->name == NULL) {
+					/* Option not found */
+					optionError = 1;
+					lprintf(LOG_ERR, "Invalid option: %s", token);
+				}
+				token = strtok_r(NULL, ",", &saveptr);
+			}
+			if (optionError) {
+				lprintf(LOG_NOTICE, "Legal options settings are:");
+				lprintf(LOG_NOTICE, "\thelp:\tprint this message");
+				for (op = options; op->name != NULL; ++op) {
+					lprintf(LOG_NOTICE, "\t%s:\t%s", op->name, op->desc);
+				}
+				return (-1);
+			}
+			rc = ipmi_chassis_set_bootdev(intf, argv[1], flags);
+		}
+		else
+			rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL);
+		}
+	}
+	else {
+		lprintf(LOG_ERR, "Invalid chassis command: %s", argv[0]);
+		return -1;
+	}
+
+	return rc;
+}
diff --git a/lib/ipmi_dcmi.c b/lib/ipmi_dcmi.c
new file mode 100755
index 0000000..2cfe48f
--- /dev/null
+++ b/lib/ipmi_dcmi.c
@@ -0,0 +1,3882 @@
+/*
+ * Copyright (C) 2008 Intel Corporation.
+ * All rights reserved
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */
+
+/* Theory of operation
+ * 
+ * DCMI is the Data Center Management Interface which is a subset of IPMI v2.0.
+ * DCMI incorporates the ability to locate a system with DCMI functionality,
+ * its available temperature sensors, and power limiting control.
+ *
+ * All of the available DCMI commands are contained in a struct with a numeric
+ * value and a string.  When the user specifies a command the string is
+ * compared to one of several structs and is then given a numeric value based
+ * on the matched string.  A case statement is used to select the desired
+ * action from the user.  If an invalid string is entered, or a string that is
+ * not a command option is entered, the available commands are printed to the
+ * screen.  This allows the strings to be changed quickly with the DCMI spec.
+ *
+ * Each called function usually executes whichever command was requested to
+ * keep the main() from being overly complicated.
+ *
+ * This code conforms to the 1.0 DCMI Specification
+ *  released by Hari Ramachandran of the Intel Corporation
+ */
+#define _BSD_SOURCE
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <time.h>
+#include <netdb.h>
+
+#include <ipmitool/ipmi_dcmi.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_entity.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_sensor.h>
+
+#include "../src/plugins/lanplus/lanplus.h"
+
+#define IPMI_LAN_PORT       0x26f
+
+extern int verbose;
+extern int csv_output;
+static int ipmi_print_sensor_info(struct ipmi_intf *intf, uint16_t rec_id);
+
+/*******************************************************************************
+ * The structs below are the DCMI command option strings.  They are printed    *
+ * when the user does not issue enough options or the wrong ones.  The reason  *
+ * that the DMCI command strings are in a struct is so that when the           *
+ * specification changes, the strings can be changed quickly with out having   *
+ * to change a lot of the code in the main().                                  *
+ ******************************************************************************/
+
+/* Main set of DCMI commands */
+const struct dcmi_cmd dcmi_cmd_vals[] = {
+	{ 0x00, "discover", "           Used to discover supported DCMI capabilities" },
+	{ 0x01, "power", "              Platform power limit command options"         },
+	{ 0x02, "sensors", "            Prints the available DCMI sensors"            },
+	{ 0x03, "asset_tag", "          Prints the platform's asset tag"              },
+	{ 0x04, "set_asset_tag", "      Sets the platform's asset tag"                },
+	{ 0x05, "get_mc_id_string", "   Get management controller ID string"          },
+	{ 0x06, "set_mc_id_string", "   Set management controller ID string"          },
+	{ 0x07, "thermalpolicy", "      Thermal policy get/set"                       },
+	{ 0x08, "get_temp_reading", "   Get Temperature Readings"                     },
+	{ 0x09, "get_conf_param", "     Get DCMI Config Parameters"                   },
+	{ 0x0A, "set_conf_param", "     Set DCMI Config Parameters"                   },
+	{ 0x0B, "oob_discover", "       Ping/Pong Message for DCMI Discovery"         },
+	{ 0xFF, NULL, NULL                                                        }
+};
+
+/* get capabilites */
+const struct dcmi_cmd dcmi_capable_vals[] = {
+	{ 0x01, "platform", "            Lists the system capabilities" },
+	{ 0x02, "mandatory_attributes", "Lists SEL, identification and"
+		"temperature attributes"                                    },
+	{ 0x03, "optional_attributes", " Lists power capabilities"      },
+	{ 0x04, "managebility access", " Lists OOB channel information" },
+	{ 0xFF, NULL, NULL                                              }
+};
+
+/* platform capabilities
+ * Since they are actually in two bytes, we need three structs to make this
+ * human readable...
+ */
+const struct dcmi_cmd dcmi_mandatory_platform_capabilities[] = {
+	{ 0x01, "Identification support available", "" },
+	{ 0x02, "SEL logging available", ""            },
+	{ 0x03, "Chassis power available", ""          },
+	{ 0x04, "Temperature monitor available", ""  },
+	{ 0xFF, NULL, NULL                   }
+};
+
+/* optional capabilities */
+const struct dcmi_cmd dcmi_optional_platform_capabilities[] = {
+	{ 0x01, "Power management available", ""       },
+	{ 0xFF, NULL, NULL                   }
+};
+
+/* access capabilties */
+const struct dcmi_cmd dcmi_management_access_capabilities[] = {
+	{ 0x01, "In-band KCS channel available", ""               },
+	{ 0x02, "Out-of-band serial TMODE available", ""          },
+	{ 0x03, "Out-of-band secondary LAN channel available", "" },
+	{ 0x04, "Out-of-band primary LAN channel available", ""   },
+	{ 0x05, "SOL enabled", ""                       },
+	{ 0x06, "VLAN capable", ""      },
+	{ 0xFF, NULL, NULL                              }
+};
+
+/* identification capabilities */
+const struct dcmi_cmd dcmi_id_capabilities_vals[] = {
+	{ 0x01, "GUID", ""          },
+	{ 0x02, "DHCP hostname", "" },
+	{ 0x03, "Asset tag", ""    },
+	{ 0xFF, NULL, NULL          }
+};
+
+/* Configuration parameters*/
+const struct dcmi_cmd dcmi_conf_param_vals[] = {
+	{ 0x01, "activate_dhcp",   "\tActivate DHCP"},
+	{ 0x02, "dhcp_config",     "\tDHCP Configuration" },
+	{ 0x03, "init",            "\t\tInitial timeout interval"  },
+	{ 0x04, "timeout",         "\t\tServer contact timeout interval"  },
+	{ 0x05, "retry",           "\t\tServer contact retry interval"  },
+	{ 0xFF, NULL, NULL          }
+};
+
+
+/* temperature monitoring capabilities */
+const struct dcmi_cmd dcmi_temp_monitoring_vals[] = {
+	{ 0x01, "inlet", "    Inlet air temperature sensors"  },
+	{ 0x02, "cpu", "      CPU temperature sensors"        },
+	{ 0x03, "baseboard", "Baseboard temperature sensors"  },
+	{ 0xff, NULL, NULL                                    }
+};
+
+/* These are not comands.  These are the DCMI temp sensors and their numbers
+ * If new sensors are added, they need to be added to this list with their
+ * sensor number
+ */
+const struct dcmi_cmd dcmi_discvry_snsr_vals[] = {
+	{ 0x40, "Inlet", "    Inlet air temperature sensors"  },
+	{ 0x41, "CPU", "      CPU temperature sensors"        },
+	{ 0x42, "Baseboard", "Baseboard temperature sensors"  },
+	{ 0xff, NULL, NULL                                    }
+};
+
+/* Temperature Readings */
+const struct dcmi_cmd dcmi_temp_read_vals[] = {
+	{ 0x40, "Inlet",        "Inlet air temperature(40h)         " },
+	{ 0x41, "CPU",          "CPU temperature sensors(41h)       " },
+	{ 0x42, "Baseboard",    "Baseboard temperature sensors(42h) " },
+	{ 0xff, NULL, NULL                                    }
+};
+
+/* power management/control commands */
+const struct dcmi_cmd dcmi_pwrmgmt_vals[] = {
+	{ 0x00, "reading", "   Get power related readings from the system" },
+	{ 0x01, "get_limit", " Get the configured power limits"            },
+	{ 0x02, "set_limit", " Set a power limit option"                   },
+	{ 0x03, "activate", "  Activate the set power limit"               },
+	{ 0x04, "deactivate", "Deactivate the set power limit"             },
+	{ 0xFF, NULL, NULL                                                 }
+};
+
+/* set power limit commands */
+const struct dcmi_cmd dcmi_pwrmgmt_set_usage_vals[] = {
+	{ 0x00, "action", "    <no_action | sel_logging | power_off>" },
+	{ 0x01, "limit", "     <number in Watts>" },
+	{ 0x02, "correction", "<number in milliseconds>" },
+	{ 0x03, "sample", "    <number in seconds>" },
+	{ 0xFF, NULL, NULL }
+};
+
+/* power management/get action commands */
+const struct dcmi_cmd dcmi_pwrmgmt_get_action_vals[] = {
+	{ 0x00, "No Action", ""},
+	{ 0x01, "Hard Power Off & Log Event to SEL", ""},
+
+	{ 0x02, "OEM reserved (02h)", ""},
+	{ 0x03, "OEM reserved (03h)", ""},
+	{ 0x04, "OEM reserved (04h)", ""},
+	{ 0x05, "OEM reserved (05h)", ""},
+	{ 0x06, "OEM reserved (06h)", ""},
+	{ 0x07, "OEM reserved (07h)", ""},
+	{ 0x08, "OEM reserved (08h)", ""},
+	{ 0x09, "OEM reserved (09h)", ""},
+	{ 0x0a, "OEM reserved (0ah)", ""},
+	{ 0x0b, "OEM reserved (0bh)", ""},
+	{ 0x0c, "OEM reserved (0ch)", ""},
+	{ 0x0d, "OEM reserved (0dh)", ""},
+	{ 0x0e, "OEM reserved (0eh)", ""},
+	{ 0x0f, "OEM reserved (0fh)", ""},
+	{ 0x10, "OEM reserved (10h)", ""},
+
+	{ 0x11, "Log Event to SEL", ""},
+	{ 0xFF, NULL, NULL      }
+};
+
+/* power management/set action commands */
+const struct dcmi_cmd dcmi_pwrmgmt_action_vals[] = {
+	{ 0x00, "no_action",   "No Action"},
+	{ 0x01, "power_off",   "Hard Power Off & Log Event to SEL"},
+	{ 0x11, "sel_logging", "Log Event to SEL"},
+
+	{ 0x02, "oem_02", "OEM reserved (02h)"},
+	{ 0x03, "oem_03", "OEM reserved (03h)"},
+	{ 0x04, "oem_04", "OEM reserved (04h)"},
+	{ 0x05, "oem_05", "OEM reserved (05h)"},
+	{ 0x06, "oem_06", "OEM reserved (06h)"},
+	{ 0x07, "oem_07", "OEM reserved (07h)"},
+	{ 0x08, "oem_08", "OEM reserved (08h)"},
+	{ 0x09, "oem_09", "OEM reserved (09h)"},
+	{ 0x0a, "oem_0a", "OEM reserved (0ah)"},
+	{ 0x0b, "oem_0b", "OEM reserved (0bh)"},
+	{ 0x0c, "oem_0c", "OEM reserved (0ch)"},
+	{ 0x0d, "oem_0d", "OEM reserved (0dh)"},
+	{ 0x0e, "oem_0e", "OEM reserved (0eh)"},
+	{ 0x0f, "oem_0f", "OEM reserved (0fh)"},
+	{ 0x10, "oem_10", "OEM reserved (10h)"},
+
+	{ 0xFF, NULL, NULL      }
+};
+
+/* thermal policy action commands */
+const struct dcmi_cmd dcmi_thermalpolicy_vals[] = {
+	{ 0x00, "get", "Get thermal policy"  },
+	{ 0x01, "set", "Set thermal policy"  },
+	{ 0xFF, NULL, NULL      }
+};
+
+/* thermal policy action commands */
+const struct dcmi_cmd dcmi_confparameters_vals[] = {
+	{ 0x00, "get", "Get configuration parameters"  },
+	{ 0x01, "set", "Set configuration parameters"  },
+	{ 0xFF, NULL, NULL      }
+};
+
+/* entityIDs used in thermap policy */
+const struct dcmi_cmd dcmi_thermalpolicy_set_parameters_vals[] = {
+	{ 0x00, "volatile", "   Current Power Cycle"        },
+	{ 0x01, "nonvolatile", "Set across power cycles"        },
+	{ 0x01, "poweroff", "   Hard Power Off system"          },
+	{ 0x00, "nopoweroff", " No 'Hard Power Off' action"         },
+	{ 0x01, "sel", "        Log event to SEL"   },
+	{ 0x00, "nosel", "      No 'Log event to SEL' action"   },
+	{ 0x00, "disabled", "   Disabled"   },
+	{ 0x00, NULL,    NULL                   }
+};
+
+
+/* DCMI command specific completion code results per 1.0 spec
+ * 80h - parameter not supported.
+ * 81h - attempt to set the ‘set in progress’ value (in parameter #0) when not
+ *       in the ‘set complete’ state. (This completion code provides a way to
+ *       recognize that another party has already ‘claimed’ the parameters)
+ * 82h - attempt to write read-only parameter
+ * 82h - set not supported on selected channel (e.g. channel is session-less.)
+ * 83h - access mode not supported
+ * 84h – Power Limit out of range
+ * 85h – Correction Time out of range
+ * 89h – Statistics Reporting Period out of range
+ */
+const struct valstr dcmi_ccode_vals[] = {
+	{ 0x80, "Parameter not supported" },
+	{ 0x81, "Something else has already claimed these parameters" },
+	{ 0x82, "Not supported or failed to write a read-only parameter" },
+	{ 0x83, "Access mode is not supported" },
+	{ 0x84, "Power/Thermal limit out of range" },
+	{ 0x85, "Correction/Exception time out of range" },
+	{ 0x89, "Sample/Statistics Reporting period out of range" },
+	{ 0x8A, "Power limit already active" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * Start of Node Manager Operations
+ */
+
+const struct dcmi_cmd dcmi_sampling_vals[] = {
+	{ 0x05, "5_sec", "" },
+	{ 0x0f, "15_sec", "" },
+	{ 0x1E, "30_sec", "" },
+	{ 0x41, "1_min", "" },
+	{ 0x43, "3_min", "" },
+	{ 0x47, "7_min", "" },
+	{ 0x4F, "15_min", "" },
+	{ 0x5E, "30_min", "" },
+	{ 0x81, "1_hour", ""},
+	{ 0x00, NULL, NULL },
+};
+
+/* Primary Node Manager commands */
+const struct dcmi_cmd nm_cmd_vals[] = {
+	{ 0x00, "discover", "Discover Node Manager " },
+	{ 0x01, "capability", "Get Node Manager Capabilities" },
+	{ 0x02, "control", "Enable/Disable Policy Control" },
+	{ 0x03, "policy", "Add/Remove Policies" },
+	{ 0x04, "statistics", "Get Statistics" },
+	{ 0x05, "power", "Set Power Draw Range" },
+	{ 0x06, "suspend", "Set/Get Policy suspend periods" },
+	{ 0x07, "reset", "Reset Statistics" },
+	{ 0x08, "alert", "Set/Get/Clear Alert destination" },
+	{ 0x09, "threshold", "Set/Get Alert Thresholds" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_ctl_cmds[] = {
+	{ 0x01, "enable", " <control scope>" },
+	{ 0x00, "disable", "<control scope>"},
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_ctl_domain[] = {
+	{ 0x00, "global", "" },
+	{ 0x02, "per_domain", "<platform|CPU|Memory> (default is platform)" },
+	{ 0x04, "per_policy", "<0-7>" },
+	{ 0xFF, NULL, NULL },
+};
+
+/* Node Manager Domain codes */
+const struct dcmi_cmd nm_domain_vals[] = {
+	{ 0x00, "platform", ""  },
+	{ 0x01, "CPU", ""  },
+	{ 0x02, "Memory", "" },
+	{ 0x03, "protection", "" },
+	{ 0x04, "I/O", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_version_vals[] = {
+	{ 0x01, "1.0", "" },
+	{ 0x02, "1.5", "" },
+	{ 0x03, "2.0", "" },
+	{ 0x04, "2.5", "" },
+	{ 0x05, "3.0", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_capability_opts[] = {
+	{ 0x01, "domain", "<platform|CPU|Memory> (default is platform)" },
+	{ 0x02, "inlet", "Inlet temp trigger" },
+	{ 0x03, "missing", "Missing Power reading trigger" },
+	{ 0x04, "reset", "Time after Host reset trigger" },
+	{ 0x05, "boot", "Boot time policy" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct  dcmi_cmd nm_policy_type_vals[] = {
+	{ 0x00, "No trigger, use Power Limit", "" },
+	{ 0x01, "Inlet temp trigger", "" },
+	{ 0x02, "Missing Power reading trigger", "" },
+	{ 0x03, "Time after Host reset trigger", "" },
+	{ 0x04, "number of cores to disable at boot time", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_stats_opts[] = {
+	{ 0x01, "domain", "<platform|CPU|Memory> (default is platform)" },
+	{ 0x02, "policy_id", "<0-7>" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_stats_mode[] = {
+	{ 0x01, "power", "global power" },
+	{ 0x02, "temps", "inlet temperature" },
+	{ 0x11, "policy_power", "per policy power" },
+	{ 0x12, "policy_temps", "per policy inlet temp" },
+	{ 0x13, "policy_throt", "per policy throttling stats" },
+	{ 0x1B, "requests", "unhandled requests" },
+	{ 0x1C, "response", "response time" },
+	{ 0x1D, "cpu_throttling", "CPU throttling" },
+	{ 0x1E, "mem_throttling", "memory throttling" },
+	{ 0x1F, "comm_fail", "host communication failures" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_policy_action[] = {
+	{ 0x00, "get", "nm policy get policy_id <0-7> [domain <platform|CPU|Memory>]" },
+	{ 0x04, "add", "nm policy add policy_id <0-7> [domain <platform|CPU|Memory>] correction auto|soft|hard power <watts>|inlet <temp> trig_lim <param> stats <seconds> enable|disable" },
+	{ 0x05, "remove", "nm policy remove policy_id <0-7> [domain <platform|CPU|Memory>]" },
+	{ 0x06, "limiting", "nm policy limiting [domain <platform|CPU|Memory>]" },
+	{ 0xFF, NULL, NULL },
+};
+const struct dcmi_cmd nm_policy_options[] = {
+	{ 0x01, "enable", "" },
+	{ 0x02, "disable", "" },
+	{ 0x03, "domain", "" },
+	{ 0x04, "inlet", "inlet air temp full limiting (SCRAM)"},
+	{ 0x06, "correction", "auto, soft, hard" },
+	{ 0x08, "power", "power limit in watts" },
+	{ 0x09, "trig_lim", "time to send alert" },
+	{ 0x0A, "stats", "moving window averaging time" },
+	{ 0x0B, "policy_id", "policy number" },
+	{ 0x0C, "volatile", "save policy in volatiel memory" },
+	{ 0x0D, "cores_off", "at boot time, disable N cores" },
+	{ 0xFF, NULL, NULL },
+};
+
+/* if "trigger" command used from nm_policy_options */
+const struct dcmi_cmd nm_trigger[] = {
+	{ 0x00, "none", "" },
+	{ 0x01, "temp", "" },
+	{ 0x02, "reset", "" },
+	{ 0x03, "boot", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+/* if "correction" used from nm_policy_options */
+const struct dcmi_cmd nm_correction[] = {
+	{ 0x00, "auto", "" },
+	{ 0x01, "soft", "" },
+	{ 0x02, "hard", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+/* returned codes from get policy */
+const struct dcmi_cmd nm_correction_vals[] = {
+	{ 0x00, "no T-state use", "" },
+	{ 0x01, "no T-state use", "" },
+	{ 0x02, "use T-states", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+/* if "exception" used from nm_policy_options */
+const struct dcmi_cmd nm_exception[] = {
+	{ 0x00, "none", "" },
+	{ 0x01, "alert", "" },
+	{ 0x02, "shutdown", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_reset_mode[] = {
+	{ 0x00, "global", "" },
+	{ 0x01, "per_policy", "" },
+	{ 0x1B, "requests", "" },
+	{ 0x1C, "response", "" },
+	{ 0x1D, "throttling", "" },
+	{ 0x1E, "memory", "", },
+	{ 0x1F, "comm", "" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_power_range[] = {
+	{ 0x01, "domain", "domain <platform|CPU|Memory> (default is platform)" },
+	{ 0x02, "min", " min <integer value>" },
+	{ 0x03, "max", "max <integer value>" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_alert_opts[] = {
+	{ 0x01, "set", "nm alert set chan <chan> dest <dest> string <string>" },
+	{ 0x02, "get", "nm alert get" },
+	{ 0x03, "clear", "nm alert clear dest <dest>" },
+};
+
+const struct dcmi_cmd nm_set_alert_param[] = {
+	{ 0x01, "chan", "chan <channel>" },
+	{ 0x02, "dest", "dest <destination>" },
+	{ 0x03, "string", "string <string>" },
+};
+
+const struct dcmi_cmd nm_thresh_cmds[] = {
+	{ 0x01, "set", "nm thresh set [domain <platform|CPU|Memory>] policy_id <policy> thresh_array" },
+	{ 0x02, "get", "nm thresh get [domain <platform|CPU|Memory>] policy_id <policy>" },
+};
+
+const struct dcmi_cmd nm_thresh_param[] = {
+	{ 0x01, "domain", "<platform|CPU|Memory> (default is platform)" },
+	{ 0x02, "policy_id", "<0-7>" },
+	{ 0xFF, NULL, NULL },
+};
+
+const struct dcmi_cmd nm_suspend_cmds[] = {
+	{ 0x01, "set", "nm suspend set [domain <platform|CPU|Memory]> policy_id <policy> <start> <stop> <pattern>" },
+	{ 0x02, "get", "nm suspend get [domain <platform|CPU|Memory]> policy_id <policy>" },
+};
+
+const struct valstr nm_ccode_vals[] = {
+	{ 0x80, "Policy ID Invalid"},
+	{ 0x81, "Domain ID Invalid"},
+	{ 0x82, "Unknown policy trigger type"},
+	{ 0x84, "Power Limit out of range"},
+	{ 0x85, "Correction Time out of range"},
+	{ 0x86, "Policy Trigger value out of range"},
+	{ 0x88, "Invalid Mode"},
+	{ 0x89, "Statistics Reporting Period out of range"},
+	{ 0x8B, "Invalid value for Aggressive CPU correction field"},
+	{ 0xA1, "No policy is currently limiting for the specified domain ID"},
+	{ 0xC4, "No space available"},
+	{ 0xD4, "Insufficient privledge level due wrong responder LUN"},
+	{ 0xD5, "Policy exists and param unchangeable while enabled"},
+	{ 0xD6, "Command subfunction disabled or unavailable"},
+	{ 0xFF, NULL },
+};
+
+
+/* End strings */
+
+/* This was taken from print_valstr() from helper.c.  It serves the same
+ * purpose but with out the extra formatting.  This function simply prints
+ * the dcmi_cmd struct provided.  verthorz specifies to print vertically or
+ * horizontally.  If the string is printed horizontally then a | will be
+ * printed between each instance of vs[i].str until it is NULL
+ *
+ * @vs:         value string list to print
+ * @title:      name of this value string list
+ * @loglevel:   what log level to print, -1 for stdout
+ * @verthorz:   printed vertically or horizontally, 0 or 1
+ */
+void
+print_strs(const struct dcmi_cmd * vs, const char * title, int loglevel,
+		int verthorz)
+{
+	int i;
+
+	if (vs == NULL)
+		return;
+
+	if (title != NULL) {
+		if (loglevel < 0)
+			printf("\n%s\n", title);
+		else
+			lprintf(loglevel, "\n%s", title);
+	}
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (loglevel < 0) {
+			if (vs[i].val < 256)
+				if (verthorz == 0)
+					printf("    %s    %s\n", vs[i].str, vs[i].desc);
+				else
+					printf("%s", vs[i].str);
+			else if (verthorz == 0)
+				printf("    %s    %s\n", vs[i].str, vs[i].desc);
+			else
+				printf("%s", vs[i].str);
+		} else {
+			if (vs[i].val < 256)
+				lprintf(loglevel, "    %s    %s", vs[i].str, vs[i].desc);
+			else
+				lprintf(loglevel, "    %s    %s", vs[i].str, vs[i].desc);
+		}
+		/* Check to see if this is NOT the last element in vs.str if true
+		 * print the | else don't print anything.
+		 */
+		if ((verthorz == 1) && (vs[i+1].str != NULL))
+			printf(" | ");
+	}
+	if (verthorz == 0) {
+		if (loglevel < 0) {
+			printf("\n");
+		} else {
+			lprintf(loglevel, "");
+		}
+	}
+}
+
+/* This was taken from str2val() from helper.c.  It serves the same
+ * purpose but with the addition of a desc field from the structure.
+ * This function converts the str from the dcmi_cmd struct provided to the
+ * value associated to the compared string in the struct.
+ * 
+ * @str:        string to compare against
+ * @vs:         dcmi_cmd structure
+ */
+uint16_t
+str2val2(const char *str, const struct dcmi_cmd *vs)
+{
+	int i;
+	if (vs == NULL || str == NULL) {
+		return 0;
+	}
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (strncasecmp(vs[i].str, str,
+					__maxlen(str, vs[i].str)) == 0) {
+			return vs[i].val;
+		}
+	}
+	return vs[i].val;
+}
+
+/* This was taken from val2str() from helper.c.  It serves the same
+ * purpose but with the addition of a desc field from the structure.
+ * This function converts the val and returns a string from the dcmi_cmd
+ * struct provided in the struct.
+ * 
+ * @val:        value to compare against
+ * @vs:         dcmi_cmd structure
+ */
+const char *
+val2str2(uint16_t val, const struct dcmi_cmd *vs)
+{
+	static char un_str[32];
+	int i;
+
+	if (vs == NULL)
+		return NULL;
+
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (vs[i].val == val)
+			return vs[i].str;
+	}
+	memset(un_str, 0, sizeof (un_str));
+	snprintf(un_str, 32, "Unknown (0x%x)", val);
+	return un_str;
+}
+
+/* check the DCMI response   from the BMC
+ * @rsp:       Response data structure
+ */
+static int
+chk_rsp(struct ipmi_rs * rsp)
+{
+	/* if the response from the intf is NULL then the BMC is experiencing
+	 * some issue and cannot complete the command
+	 */
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "\n    Unable to get DCMI information");
+		return 1;
+	}
+	/* if the completion code is greater than zero there was an error.  We'll
+	 * use val2str from helper.c to print the error from either the DCMI
+	 * completion code struct or the generic IPMI completion_code_vals struct
+	 */
+	if ((rsp->ccode >= 0x80) && (rsp->ccode <= 0x8F)) {
+		lprintf(LOG_ERR, "\n    DCMI request failed because: %s (%x)",
+				val2str(rsp->ccode, dcmi_ccode_vals), rsp->ccode);
+		return 1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "\n    DCMI request failed because: %s (%x)",
+				val2str(rsp->ccode, completion_code_vals), rsp->ccode);
+		return 1;
+	}
+	/* check to make sure this is a DCMI firmware */
+	if(rsp->data[0] != IPMI_DCMI) {
+		printf("\n    A valid DCMI command was not returned! (%x)", rsp->data[0]);
+		return 1;
+	}
+	return 0;
+}
+
+/* check the Node Manager response from the BMC
+ * @rsp:       Response data structure
+ */
+static int
+chk_nm_rsp(struct ipmi_rs * rsp)
+{
+	/* if the response from the intf is NULL then the BMC is experiencing
+	 * some issue and cannot complete the command
+	 */
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "\n    No response to NM request");
+		return 1;
+	}
+	/* if the completion code is greater than zero there was an error.  We'll
+	 * use val2str from helper.c to print the error from either the DCMI
+	 * completion code struct or the generic IPMI completion_code_vals struct
+	 */
+	if ((rsp->ccode >= 0x80) && (rsp->ccode <= 0xD6)) {
+		lprintf(LOG_ERR, "\n    NM request failed because: %s (%x)",
+		val2str(rsp->ccode, nm_ccode_vals), rsp->ccode);
+		return 1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "\n    NM request failed because: %s (%x)",
+			val2str(rsp->ccode, completion_code_vals), rsp->ccode);
+		return 1;
+	}
+	/* check to make sure this is a DCMI firmware */
+	if(rsp->data[0] != 0x57) {
+		printf("\n    A valid NM command was not returned! (%x)", rsp->data[0]);
+		return 1;
+	}
+	return 0;
+}
+
+/* Get capabilities ipmi response
+ *
+ * This function returns the available capabilities of the platform.
+ * The reason it returns in the rsp struct is so that it can be used for other
+ * purposes.
+ * 
+ * returns ipmi response structure
+ * 
+ * @intf:   ipmi interface handler
+ * @selector: Parameter selector
+ */
+struct ipmi_rs *
+ipmi_dcmi_getcapabilities(struct ipmi_intf * intf, uint8_t selector)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	uint8_t msg_data[2]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = selector;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP; /* 0x2C per 1.0 spec */
+	req.msg.cmd = IPMI_DCMI_COMPAT; /* 0x01 per 1.0 spec */
+	req.msg.data = msg_data; /* 0xDC 0x01 or the msg_data above */
+	req.msg.data_len = 2; /* How many times does req.msg.data need to read */
+
+	return intf->sendrecv(intf, &req);
+}
+/* end capabilities struct */
+
+/* Displays capabilities from structure
+ * returns void
+ *
+ * @cmd:        dcmi_cmd structure
+ * @data_val:  holds value of what to display
+ */
+void
+display_capabilities_attributes(const struct dcmi_cmd *cmd, uint8_t data_val)
+{
+	uint8_t i;
+	for (i = 0x01; cmd[i-1].val != 0xFF; i++) {
+		if (data_val & (1<<(i-1))) {
+			printf("        %s\n", val2str2(i, cmd));
+		}
+	}
+}
+
+static int
+ipmi_dcmi_prnt_oobDiscover(struct ipmi_intf * intf)
+{
+# ifndef IPMI_INTF_LANPLUS
+	lprintf(LOG_ERR,
+			"DCMI Discovery is available only when LANplus(IPMI v2.0) is enabled.");
+	return (-1);
+# else
+	struct ipmi_session_params *p;
+
+	if (intf->opened == 0 && intf->open != NULL) {
+		if (intf->open(intf) < 0)
+			return (-1);
+	}
+	if (intf == NULL || intf->session == NULL)
+		return -1;
+
+	p = &intf->ssn_params;
+
+	if (p->port == 0)
+		p->port = IPMI_LAN_PORT;
+	if (p->privlvl == 0)
+		p->privlvl = IPMI_SESSION_PRIV_ADMIN;
+	if (p->timeout == 0)
+		p->timeout = IPMI_LAN_TIMEOUT;
+	if (p->retry == 0)
+		p->retry = IPMI_LAN_RETRY;
+
+	if (p->hostname == NULL || strlen((const char *)p->hostname) == 0) {
+		lprintf(LOG_ERR, "No hostname specified!");
+		return -1;
+	}
+
+	intf->abort = 1;
+	intf->session->sol_data.sequence_number = 1;
+
+	if (ipmi_intf_socket_connect (intf)  == -1) {
+		lprintf(LOG_ERR, "Could not open socket!");
+		return -1;
+	}
+
+	if (intf->fd < 0) {
+		lperror(LOG_ERR, "Connect to %s failed",
+			p->hostname);
+		intf->close(intf);
+		return -1;
+	}
+
+	intf->opened = 1;
+
+	/* Lets ping/pong */
+	return ipmiv2_lan_ping(intf);
+# endif
+}
+
+/* This is the get DCMI Capabilities function to see what the BMC supports.
+ * 
+ * returns 0 with out error -1 with any errors
+ * 
+ * @intf:      ipmi interface handler
+ * @selector:  selection parameter
+ */
+static int
+ipmi_dcmi_prnt_getcapabilities(struct ipmi_intf * intf, uint8_t selector)
+{
+	struct capabilities cape;
+	struct ipmi_rs * rsp;
+	uint8_t reply[16];
+	rsp = ipmi_dcmi_getcapabilities(intf, selector);
+	int j;
+
+	if(chk_rsp(rsp))
+		return -1;
+
+	/* if there were no errors, the command worked! */
+	memcpy(&cape, rsp->data, sizeof (cape));
+	memcpy(&reply, rsp->data, sizeof (reply));
+	/* check to make sure that this is a 1.0/1.1/1.5 command */
+	if ((cape.conformance != IPMI_DCMI_CONFORM)
+			&& (cape.conformance != IPMI_DCMI_1_1_CONFORM)
+			&& (cape.conformance != IPMI_DCMI_1_5_CONFORM)) {
+		lprintf(LOG_ERR,
+				"ERROR!  This command is not available on this platform");
+		return -1;
+	}
+	/* check to make sure that this is a rev .01 or .02 */
+	if (cape.revision != 0x01 && cape.revision != 0x02) {
+		lprintf(LOG_ERR,
+				"ERROR!  This command is not compatible with this version");
+		return -1;
+	}
+	/* 0x01 - platform capabilities
+	 * 0x02 - Manageability Access Capabilities
+	 * 0x03 - SEL Capability
+	 * 0x04 - Identification Capability
+	 * 0x05 - LAN Out-Of-Band Capability
+	 * 0x06 - Serial Out-Of-Band TMODE Capability
+	 */
+	switch (selector) {
+	case 0x01:
+		printf("    Supported DCMI capabilities:\n");
+		/* loop through each of the entries in the first byte from the
+		 * struct
+		 */
+		printf("\n         Mandatory platform capabilties\n");
+		display_capabilities_attributes(
+				dcmi_mandatory_platform_capabilities, cape.data_byte1);
+		/* loop through each of the entries in the second byte from the
+		 * struct
+		 */
+		printf("\n         Optional platform capabilties\n");
+		display_capabilities_attributes(
+				dcmi_optional_platform_capabilities, cape.data_byte2);
+		/* loop through each of the entries in the third byte from the
+		 * struct
+		 */
+		printf("\n         Managebility access capabilties\n");
+		display_capabilities_attributes(
+				dcmi_management_access_capabilities, cape.data_byte3);
+		break;
+	case 0x02:
+		printf("\n    Mandatory platform attributes:\n");
+		/* byte 1 & 2 data */
+		printf("\n         SEL Attributes: ");
+		printf("\n               SEL automatic rollover is ");
+		/* mask the 2nd byte of the data response with 10000000b or 0x80
+		 * because of the endian-ness the 15th bit is in the second byte
+		 */
+		if ((cape.data_byte2 & 0x80))
+			printf("enabled");
+		else
+			printf("not present");
+		/* since the number of SEL entries is split across the two data
+		 * bytes we will need to bit shift and append them together again
+		 */
+		/* cast cape.data_byte1 as 16 bits */
+		uint16_t sel_entries = (uint16_t)cape.data_byte1;
+		/* or sel_entries with byte 2 and shift it 8 places  */
+		sel_entries |= (uint16_t)cape.data_byte2 << 8;
+		printf("\n               %d SEL entries\n", sel_entries & 0xFFF);
+		/* byte 3 data */
+		printf("\n         Identification Attributes: \n");
+		display_capabilities_attributes(
+				dcmi_id_capabilities_vals, cape.data_byte3);
+		/* byte 4 data */
+		printf("\n         Temperature Monitoring Attributes: \n");
+		display_capabilities_attributes(dcmi_temp_monitoring_vals,
+				cape.data_byte4);
+		break;
+	case 0x03:
+		printf("\n    Optional Platform Attributes: \n");
+		/* Power Management */
+		printf("\n         Power Management:\n");
+		if (cape.data_byte1 == 0x40) {
+			printf("                Slave address of device: 20h (BMC)\n" );
+		} else {
+			printf("                Slave address of device: %xh (8bits)"
+					"(Satellite/External controller)\n",
+					cape.data_byte1);
+		}
+		/* Controller channel number (4-7) bits */
+		if ((cape.data_byte2>>4) == 0x00) {
+			printf("                Channel number is 0h (Primary BMC)\n");
+		} else {
+			printf("                Channel number is %xh \n",
+					(cape.data_byte2>>4));
+		}
+		/* Device revision (0-3) */
+		printf("                    Device revision is %d \n",
+				cape.data_byte2 &0xf);
+		break;
+	case 0x04:
+		/* LAN */
+		printf("\n    Manageability Access Attributes: \n");
+		if (cape.data_byte1 == 0xFF) {
+			printf("         Primary LAN channel is not available for OOB\n");
+		} else {
+			printf("         Primary LAN channel number: %d is available\n",
+					cape.data_byte1);
+		}
+		if (cape.data_byte2 == 0xFF) {
+			printf("         Secondary LAN channel is not available for OOB\n");
+		} else {
+			printf("         Secondary LAN channel number: %d is available\n",
+					cape.data_byte2);
+		}
+		/* serial */
+		if (cape.data_byte3 == 0xFF) {
+			printf("         No serial channel is available\n");
+		} else {
+			printf("         Serial channel number: %d is available\n",
+					cape.data_byte3);
+		}
+		break;
+	case 0x05:
+		/* Node Manager */
+		printf("\n    Node Manager Get DCMI Capability Info: \n");
+		printf("         DCMI Specification %d.%d\n", reply[1], reply[2]);
+		printf("         Rolling average time period options: %d\n", reply[4]);
+		printf("         Sample time options: ");
+		for (j = 1; dcmi_sampling_vals[j-1].str != NULL; j++)
+			printf(" %s ", val2str2(reply[4+j],dcmi_sampling_vals));
+		printf("\n");
+		break;
+	default:
+		return -1;
+	}
+	return 0;
+	/* return intf->sendrecv(intf, &req); */
+}
+
+/* This is the get asset tag command.  This checks the length of the asset tag
+ * with the first read, then reads n number of bytes thereafter to get the
+ * complete asset tag.
+ * 
+ * @intf:   ipmi interface handler
+ * @offset: where to start reading the asset tag
+ * @length: how much to read
+ * 
+ * returns ipmi_rs structure
+ */
+struct ipmi_rs *
+ipmi_dcmi_getassettag(struct ipmi_intf * intf, uint8_t offset, uint8_t length)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	uint8_t msg_data[3]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = offset; /* offset 0 */
+	msg_data[2] = length; /* read one byte */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP; /* 0x2C per 1.1 spec */
+	req.msg.cmd = IPMI_DCMI_GETASSET; /* 0x01 per 1.1 spec */
+	req.msg.data = msg_data; /* msg_data above */
+	req.msg.data_len = 3; /* How many times does req.msg.data need to read */
+	return intf->sendrecv(intf, &req);
+}
+
+/* This is the get asset tag command.  The function first checks to see if the
+ * platform is capable of getting the asset tag by calling the getcapabilities
+ * function and checking the response.  Then it checks the length of the asset
+ * tag with the first read, then x number of reads thereafter to get the asset
+ * complete asset tag then print it.
+ * 
+ * @intf:   ipmi interface handler
+ * 
+ * returns 0 if no failure, -1 with a failure
+ */
+static int
+ipmi_dcmi_prnt_getassettag(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp; /* ipmi response */
+	uint8_t taglength = 0;
+	uint8_t getlength = 0;
+	uint8_t offset = 0;
+	uint8_t i;
+	/* now let's get the asset tag length */
+	rsp = ipmi_dcmi_getassettag(intf, 0, 0);
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	taglength = rsp->data[1];
+	printf("\n Asset tag: ");
+	while (taglength) {
+		getlength = taglength / DCMI_MAX_BYTE_SIZE ?
+			DCMI_MAX_BYTE_SIZE : taglength%DCMI_MAX_BYTE_SIZE;
+		rsp = ipmi_dcmi_getassettag(intf, offset, getlength);
+		/* macro has no effect here where can generate sig segv
+		 * if rsp occurs with null
+		 */
+		if (rsp != NULL) {
+			GOOD_ASSET_TAG_CCODE(rsp->ccode);
+		}
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+		for (i=0; i<getlength; i++) {
+			printf("%c", rsp->data[i+2]);
+		}
+		offset += getlength;
+		taglength -= getlength;
+	}
+	printf("\n");
+	return 0;
+}
+
+/* This is the set asset tag command.  This checks the length of the asset tag
+ * with the first read, then reads n number of bytes thereafter to set the
+ * complete asset tag.
+ *
+ * @intf:   ipmi interface handler
+ * @offset: offset to write
+ * @length: number of bytes to write (16 bytes maximum)
+ * @data:   data to write
+ *
+ * returns ipmi_rs structure
+ */
+struct ipmi_rs *
+ipmi_dcmi_setassettag(struct ipmi_intf * intf, uint8_t offset, uint8_t length,
+		uint8_t *data)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	uint8_t msg_data[3+length]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = offset; /* offset 0 */
+	msg_data[2] = length; /* read one byte */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP; /* 0x2C per 1.1 spec */
+	req.msg.cmd = IPMI_DCMI_SETASSET; /* 0x08 per 1.1 spec */
+	req.msg.data = msg_data; /* msg_data above */
+	/* How many times does req.msg.data need to read */
+	req.msg.data_len = length + 3;
+	memcpy(req.msg.data + 3, data, length);
+
+	return intf->sendrecv(intf, &req);
+}
+
+static int
+ipmi_dcmi_prnt_setassettag(struct ipmi_intf * intf, uint8_t * data)
+{
+	struct ipmi_rs * rsp; /* ipmi response */
+	uint8_t tmpData[DCMI_MAX_BYTE_SIZE];
+	int32_t taglength = 0;
+	uint8_t getlength = 0;
+	uint8_t offset = 0;
+	uint8_t i;
+
+	/* now let's get the asset tag length */
+	taglength = strlen((char *)data);
+	if (taglength > 64){
+		lprintf(LOG_ERR, "\nValue is too long.");
+		return -1;
+	}
+	printf("\n Set Asset Tag: ");
+	while (taglength) {
+		getlength = taglength / DCMI_MAX_BYTE_SIZE ?
+			DCMI_MAX_BYTE_SIZE : taglength%DCMI_MAX_BYTE_SIZE;
+		memcpy(tmpData, data + offset, getlength);
+		rsp = ipmi_dcmi_setassettag(intf, offset, getlength, tmpData);
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+		for (i=0; i<getlength; i++) {
+			printf("%c", tmpData[i]);
+		}
+		offset += getlength;
+		taglength -= getlength;
+	}
+	printf("\n");
+	return 0;
+}
+
+/* Management Controller Identifier String is provided in order to accommodate
+ * the requirement for the management controllers to identify themselves.
+ * 
+ * @intf:   ipmi interface handler
+ * @offset: offset to read
+ * @length: number of bytes to read (16 bytes maximum)
+ * 
+ * returns ipmi_rs structure
+ */
+struct ipmi_rs *
+ipmi_dcmi_getmngctrlids(struct ipmi_intf * intf, uint8_t offset, uint8_t length)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	uint8_t msg_data[3]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = offset; /* offset 0 */
+	msg_data[2] = length; /* read one byte */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP; /* 0x2C per 1.1 spec */
+	req.msg.cmd = IPMI_DCMI_GETMNGCTRLIDS; /* 0x09 per 1.1 spec */
+	req.msg.data = msg_data; /* msg_data above */
+	/* How many times does req.msg.data need to read */
+	req.msg.data_len = 3;
+	return intf->sendrecv(intf, &req);
+}
+
+static int
+ipmi_dcmi_prnt_getmngctrlids(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp; /* ipmi response */
+	uint8_t taglength = 0;
+	uint8_t getlength = 0;
+	uint8_t offset = 0;
+	uint8_t i;
+
+	/* now let's get the asset tag length */
+	rsp = ipmi_dcmi_getmngctrlids(intf, 0, 1);
+
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+
+	taglength = rsp->data[1];
+
+	printf("\n Get Management Controller Identifier String: ");
+	while (taglength) {
+		getlength = taglength / DCMI_MAX_BYTE_SIZE ?
+			DCMI_MAX_BYTE_SIZE : taglength%DCMI_MAX_BYTE_SIZE;
+		rsp = ipmi_dcmi_getmngctrlids(intf, offset, getlength);
+
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+		for (i=0; i<getlength; i++) {
+			printf("%c", rsp->data[i+2]);
+		}
+		offset += getlength;
+		taglength -= getlength;
+	}
+	printf("\n");
+	return 0;
+}
+
+/* Management Controller Identifier String is provided in order to accommodate
+ * the requirement for the management controllers to identify themselves.
+ *
+ * @intf:   ipmi interface handler
+ * @offset: offset to write
+ * @length: number of bytes to write (16 bytes maximum)
+ * @data:   data to write
+ * 
+ * returns ipmi_rs structure
+ */
+struct ipmi_rs *
+ipmi_dcmi_setmngctrlids(struct ipmi_intf * intf, uint8_t offset, uint8_t length,
+		uint8_t *data)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	uint8_t msg_data[3+length]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = offset; /* offset 0 */
+	msg_data[2] = length; /* read one byte */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP; /* 0x2C per 1.1 spec */
+	req.msg.cmd = IPMI_DCMI_SETMNGCTRLIDS; /* 0x0A per 1.1 spec */
+	req.msg.data = msg_data; /* msg_data above */
+	/* How many times does req.msg.data need to read */
+	req.msg.data_len = 3 + length;
+	memcpy(req.msg.data + 3, data, length);
+
+	return intf->sendrecv(intf, &req);
+}
+
+/* Set Asset Tag command provides ability for the management console to set the
+ * asset tag as appropriate. Management controller is not responsible for the
+ * data format used for the Asset Tag once modified by IPDC.
+ * 
+ * @intf:   ipmi interface handler
+ *
+ * returns 0 if no failure, -1 with a failure
+ */
+static int
+ipmi_dcmi_prnt_setmngctrlids(struct ipmi_intf * intf, uint8_t * data)
+{
+	struct ipmi_rs * rsp; /* ipmi response */
+	uint8_t tmpData[DCMI_MAX_BYTE_SIZE];
+	uint8_t taglength = 0;
+	uint8_t getlength = 0;
+	uint8_t offset = 0;
+	uint8_t i;
+
+	data += '\0';
+	taglength = strlen((char *)data) +1;
+
+	if (taglength > 64) {
+		lprintf(LOG_ERR, "\nValue is too long.");
+		return -1;
+	}
+
+	printf("\n Set Management Controller Identifier String Command: ");
+	while (taglength) {
+		getlength = taglength / DCMI_MAX_BYTE_SIZE ?
+			DCMI_MAX_BYTE_SIZE : taglength%DCMI_MAX_BYTE_SIZE;
+		memcpy(tmpData, data + offset, getlength);
+		rsp = ipmi_dcmi_setmngctrlids(intf, offset, getlength, tmpData);
+		/* because after call "Set mc id string" RMCP+ will go down
+		 * we have no "rsp"
+		 */
+		if (strncmp(intf->name, "lanplus", 7)) {
+			if (chk_rsp(rsp)) {
+				return -1;
+			}
+		}
+		for (i=0; i<getlength; i++) {
+			printf("%c", tmpData[i]);
+		}
+		offset += getlength;
+		taglength -= getlength;
+	}
+	printf("\n");
+	return 0;
+}
+
+/* Issues a discovery command to see what sensors are available on the target.
+ * system.
+ *
+ * @intf:   ipmi interface handler
+ * @isnsr:  entity ID
+ * @offset:   offset (Entity instace start)
+ * 
+ * returns ipmi_rs structure
+ */
+struct ipmi_rs *
+ipmi_dcmi_discvry_snsr(struct ipmi_intf * intf, uint8_t isnsr, uint8_t offset)
+{
+	struct ipmi_rq req; /* ipmi request struct */
+	uint8_t msg_data[5]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = 0x01; /* Senser Type = Temp (01h) */
+	msg_data[2] = isnsr; /* Sensor Number */
+	msg_data[3] = 0x00; /* Entity Instance, set to read all instances */
+	msg_data[4] = offset; /* Entity instace start */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETSNSR;
+	req.msg.data = msg_data; /* Contents above */
+	req.msg.data_len = 5; /* how many times does req.msg.data need to read */
+
+	return intf->sendrecv(intf, &req);
+}
+
+/* DCMI sensor discovery
+ * Uses the dcmi_discvry_snsr_vals struct to print its string and
+ * uses the numeric values to request the sensor sdr record id.
+ *
+ * @intf:   ipmi interface handler
+ * @isnsr:  entity ID
+ * @ient:   sensor entity id
+ */
+static int
+ipmi_dcmi_prnt_discvry_snsr(struct ipmi_intf * intf, uint8_t isnsr)
+{
+	int i = 0;
+	struct ipmi_rs * rsp; /* ipmi response */
+	uint8_t records = 0;
+	int8_t instances = 0;
+	uint8_t offset = 0;
+	uint16_t record_id = 0;
+	uint8_t id_buff[16]; /* enough for 8 record IDs */
+	rsp = ipmi_dcmi_discvry_snsr(intf, isnsr, 0);
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	instances = rsp->data[1];
+	printf("\n%s: %d temperature sensor%s found:\n",
+			val2str2(isnsr, dcmi_discvry_snsr_vals),
+			instances,
+			(instances > 1) ? "s" : "");
+	while(instances > 0) {
+		ipmi_dcmi_discvry_snsr(intf, isnsr, offset);
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+		records = rsp->data[2];
+		/* cache the data since it may be destroyed by subsequent
+		 * ipmi_xxx calls
+		 */
+		memcpy(id_buff, &rsp->data[3], sizeof (id_buff));
+		for (i=0; i<records; i++) {
+			/* Record ID is in little endian format */
+			record_id = (id_buff[2*i + 1] << 8) + id_buff[2*i];
+			printf("Record ID 0x%04x: ", record_id);
+			ipmi_print_sensor_info(intf, record_id);
+		}
+		offset += 8;
+		instances -= records;
+	}
+	return 0;
+}
+/* end sensor discovery */
+
+/* Power Management get power reading
+ *
+ * @intf:   ipmi interface handler
+ */
+static int
+ipmi_dcmi_pwr_rd(struct ipmi_intf * intf, uint8_t sample_time)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct power_reading val;
+	struct tm tm_t;
+	time_t t;
+	uint8_t msg_data[4]; /* number of request data bytes */
+	memset(&tm_t, 0, sizeof(tm_t));
+	memset(&t, 0, sizeof(t));
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	if (sample_time) {
+		msg_data[1] = 0x02; /* Enhanced Power Statistics */
+		msg_data[2] = sample_time;
+	} else {
+		msg_data[1] = 0x01; /* Mode Power Status */
+		msg_data[2] = 0x00; /* reserved */
+	}
+	msg_data[3] = 0x00; /* reserved */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETRED; /* Get power reading */
+	req.msg.data = msg_data; /* msg_data above */
+	req.msg.data_len = 4; /* how many times does req.msg.data need to read */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	/* rsp->data[0] is equal to response data byte 2 in spec */
+	/* printf("Group Extension Identification: %02x\n", rsp->data[0]); */
+	memcpy(&val, rsp->data, sizeof (val));
+	t = val.time_stamp;
+	gmtime_r(&t, &tm_t);
+	printf("\n");
+	printf("    Instantaneous power reading:              %8d Watts\n",
+			val.curr_pwr);
+	printf("    Minimum during sampling period:           %8d Watts\n",
+			val.min_sample);
+	printf("    Maximum during sampling period:           %8d Watts\n",
+			val.max_sample);
+	printf("    Average power reading over sample period: %8d Watts\n",
+			val.avg_pwr);
+	printf("    IPMI timestamp:                           %s",
+			asctime(&tm_t));
+	printf("    Sampling period:                          ");
+	if (sample_time)
+		printf("%s \n", val2str2(val.sample,dcmi_sampling_vals));
+	else
+		printf("%08u Seconds.\n", val.sample/1000);
+	printf("    Power reading state is:                   ");
+	/* mask the rsp->data so that we only care about bit 6 */
+	if((val.state & 0x40) == 0x40) {
+		printf("activated");
+	} else {
+		printf("deactivated");
+	}
+	printf("\n\n");
+	return 0;
+}
+/* end Power Management get reading */
+
+
+/* This is the get thermalpolicy command.
+ *
+ * @intf:   ipmi interface handler
+ */
+int
+ipmi_dcmi_getthermalpolicy(struct ipmi_intf * intf, uint8_t entityID,
+		uint8_t entityInstance)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct thermal_limit val;
+	uint8_t msg_data[3]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = entityID; /* Inlet Temperature DCMI ID*/
+	msg_data[2] = entityInstance; /* Entity Instance */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETTERMALLIMIT; /* Get thermal policy reading */
+	req.msg.data = msg_data; /* msg_data above */
+	req.msg.data_len = 3; /* how many times does req.msg.data need to read */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	/* rsp->data[0] is equal to response data byte 2 in spec */
+	memcpy(&val, rsp->data, sizeof (val));
+	printf("\n");
+	printf("    Persistence flag is:                      %s\n",
+			((val.exceptionActions & 0x80) ? "set" : "notset"));
+	printf("    Exception Actions, taken if the Temperature Limit exceeded:\n");
+	printf("        Hard Power Off system and log event:  %s\n",
+			((val.exceptionActions & 0x40) ? "active":"inactive"));
+	printf("        Log event to SEL only:                %s\n",
+			((val.exceptionActions & 0x20) ? "active":"inactive"));
+	printf("    Temperature Limit                         %d degrees\n",
+			val.tempLimit);
+	printf("    Exception Time                            %d seconds\n",
+			val.exceptionTime);
+	printf("\n\n");
+	return 0;
+}
+
+/* This is the set thermalpolicy command.
+ *
+ * @intf:   ipmi interface handler
+ */
+int
+ipmi_dcmi_setthermalpolicy(struct ipmi_intf * intf,
+		uint8_t entityID,
+		uint8_t entityInst,
+		uint8_t persistanceFlag,
+		uint8_t actionHardPowerOff,
+		uint8_t actionLogToSEL,
+		uint8_t tempLimit,
+		uint8_t samplingTimeLSB,
+		uint8_t samplingTimeMSB)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[7]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = entityID; /* Inlet Temperature DCMI ID*/
+	msg_data[2] = entityInst; /* Entity Instance */
+	/* persistance and actions or disabled if no actions */
+	msg_data[3] = (((persistanceFlag ? 1 : 0) << 7) |
+			((actionHardPowerOff? 1 : 0) << 6) |
+			((actionLogToSEL ? 1 : 0) << 5));
+	msg_data[4] = tempLimit;
+	msg_data[5] = samplingTimeLSB;
+	msg_data[6] = samplingTimeMSB;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	/* Get thermal policy reading */
+	req.msg.cmd = IPMI_DCMI_SETTERMALLIMIT;
+	req.msg.data = msg_data; /* msg_data above */
+	/* how many times does req.msg.data need to read */
+	req.msg.data_len = 7;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	/* rsp->data[0] is equal to response data byte 2 in spec */
+	printf("\nThermal policy %d for %0Xh entity successfully set.\n\n",
+			entityInst, entityID);
+	return 0;
+}
+
+/* This is Get Temperature Readings Command
+ *
+ * returns ipmi response structure
+ *
+ * @intf:   ipmi interface handler
+ */
+struct ipmi_rs *
+ipmi_dcmi_get_temp_readings(struct ipmi_intf * intf,
+		uint8_t entityID,
+		uint8_t entityInst,
+		uint8_t entityInstStart)
+{
+	struct ipmi_rq req;
+	uint8_t msg_data[5]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = 0x01; /* Sensor type */
+	msg_data[2] = entityID; /* Entity Instance */
+	msg_data[3] = entityInst;
+	msg_data[4] = entityInstStart;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETTEMPRED; /* Get thermal policy reading */
+	req.msg.data = msg_data; /* msg_data above */
+	/* how many times does req.msg.data need to read */
+	req.msg.data_len = 5;
+	return intf->sendrecv(intf, &req);
+}
+
+static int
+ipmi_dcmi_prnt_get_temp_readings(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	int i,j, tota_inst, get_inst, offset = 0;
+	/* Print sensor description */
+	printf("\n\tEntity ID\t\t\tEntity Instance\t   Temp. Readings");
+	for (i = 0; dcmi_temp_read_vals[i].str != NULL; i++) {
+		/* get all of the information about this sensor */
+		rsp = ipmi_dcmi_get_temp_readings(intf,
+				dcmi_temp_read_vals[i].val, 0, 0);
+		if (chk_rsp(rsp)) {
+			continue;
+		}
+		/* Total number of available instances for the Entity ID */
+		offset = 0;
+		tota_inst = rsp->data[1];
+		while (tota_inst > 0) {
+			get_inst = ((tota_inst / DCMI_MAX_BYTE_TEMP_READ_SIZE) ?
+					DCMI_MAX_BYTE_TEMP_READ_SIZE :
+					(tota_inst % DCMI_MAX_BYTE_TEMP_READ_SIZE));
+			rsp = ipmi_dcmi_get_temp_readings(intf,
+					dcmi_temp_read_vals[i].val, offset, 0);
+			if (chk_rsp(rsp)) {
+				continue;
+			}
+			/* Number of sets of Temperature Data in this
+			 * response (Max 8 per response)
+			 */
+			for (j=0; j < rsp->data[2]*2; j=j+2) {
+				/* Print Instance temperature info */
+				printf("\n%s",dcmi_temp_read_vals[i].desc);
+				printf("\t\t%i\t\t%c%i C", rsp->data[j+4],
+						((rsp->data[j+3]) >> 7) ?
+						'-' : '+', (rsp->data[j+3] & 127));
+			}
+			offset += get_inst;
+			tota_inst -= get_inst;
+		}
+	}
+	return 0;
+}
+
+/* This is Get DCMI Config Parameters Command
+ *
+ * returns ipmi response structure
+ *
+ * @intf:   ipmi interface handler
+ */
+struct ipmi_rs *
+ipmi_dcmi_getconfparam(struct ipmi_intf * intf, int param_selector)
+{
+	struct ipmi_rq req;
+	uint8_t msg_data[3]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = param_selector; /* Parameter selector */
+	/* Set Selector. Selects a given set of parameters under a given Parameter
+	 * selector value. 00h if parameter doesn't use a Set Selector.
+	 */
+	msg_data[2] = 0x00;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETCONFPARAM; /* Get DCMI Config Parameters */
+	req.msg.data = msg_data; /* Contents above */
+	/* how many times does req.msg.data need to read */
+	req.msg.data_len = 3;
+	return intf->sendrecv(intf, &req);
+}
+
+static int
+ipmi_dcmi_prnt_getconfparam(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	const int dcmi_conf_params = 5;
+	int param_selector;
+	uint16_t tmp_value = 0;
+	/* We are not interested in parameter 1 which always will return 0 */
+	for (param_selector = 2 ; param_selector <= dcmi_conf_params;
+			param_selector++) {
+		rsp = ipmi_dcmi_getconfparam(intf, param_selector);
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+		/* Time to print what we have got */
+		switch(param_selector) {
+		case 2:
+			tmp_value = (rsp->data[4])& 1;
+			printf("\n\tDHCP Discovery method\t: ");
+			printf("\n\t\tManagement Controller ID String is %s",
+					tmp_value ? "enabled" : "disabled");
+			printf("\n\t\tVendor class identifier DCMI IANA and Vendor class-specific Informationa are %s",
+					((rsp->data[4])& 2) ? "enabled" : "disabled" );
+			break;
+		case 3:
+			printf("\n\tInitial timeout interval\t: %i seconds",
+					rsp->data[4]);
+			break;
+		case 4:
+			printf("\n\tServer contact timeout interval\t: %i seconds",
+					rsp->data[4] + (rsp->data[5]<<8));
+			break;
+		case 5:
+			printf("\n\tServer contact retry interval\t: %i seconds",
+					rsp->data[4] + (rsp->data[5] << 8));
+			break;
+		default:
+			printf("\n\tConfiguration Parameter not supported.");
+		}
+	}
+	return 0;
+}
+
+/* This is Set DCMI Config Parameters Command
+ *
+ * returns ipmi response structure
+ *
+ * @intf:   ipmi interface handler
+ */
+struct ipmi_rs *
+ipmi_dcmi_setconfparam(struct ipmi_intf * intf, uint8_t param_selector,
+		uint16_t value)
+{
+	struct ipmi_rq req;
+	uint8_t msg_data[5]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = param_selector; /* Parameter selector */
+	/* Set Selector (use 00h for parameters that only have one set). */
+	msg_data[2] = 0x00;
+
+	if (param_selector > 3) {
+		/* One bite more */
+		msg_data[3] = value & 0xFF;
+		msg_data[4] = value >> 8;
+	} else {
+		msg_data[3] = value;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_SETCONFPARAM; /* Set DCMI Config Parameters */
+	req.msg.data = msg_data; /* Contents above */
+	if (param_selector > 3) {
+		/* One bite more */
+		/* how many times does req.msg.data need to read */
+		req.msg.data_len = 5;
+	} else {
+		/* how many times does req.msg.data need to read */
+		req.msg.data_len = 4;
+	}
+	return intf->sendrecv(intf, &req);
+}
+
+/*  Power Management get limit ipmi response
+ *
+ * This function returns the currently set power management settings as an
+ * ipmi response structure.  The reason it returns in the rsp struct is so
+ * that it can be used in the set limit [slimit()] function to populate
+ * un-changed or un-edited values.
+ *
+ * returns ipmi response structure
+ *
+ * @intf:   ipmi interface handler
+ */
+struct ipmi_rs * ipmi_dcmi_pwr_glimit(struct ipmi_intf * intf)
+{
+	struct ipmi_rq req;
+	uint8_t msg_data[3]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = 0x00; /* reserved */
+	msg_data[2] = 0x00; /* reserved */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_GETLMT; /* Get power limit */
+	req.msg.data = msg_data; /* Contents above */
+	/* how many times does req.msg.data need to read */
+	req.msg.data_len = 3;
+
+	return intf->sendrecv(intf, &req);
+}
+/* end Power Management get limit response */
+
+/*  Power Management print the get limit command
+ *
+ * This function calls the get limit function that returns an ipmi response.
+ *
+ * returns 0 else 1 with error
+ * @intf:   ipmi interface handler
+ */
+static int
+ipmi_dcmi_pwr_prnt_glimit(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct power_limit val;
+	uint8_t realCc = 0xff;
+
+	rsp = ipmi_dcmi_pwr_glimit(intf);
+	/* rsp can be a null so check response before any operation
+	 * on it to avoid sig segv
+	 */
+	if (rsp != NULL) {
+		realCc = rsp->ccode;
+		GOOD_PWR_GLIMIT_CCODE(rsp->ccode);
+	}
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	/* rsp->data[0] is equal to response data byte 2 in spec */
+	/* printf("Group Extension Identification: %02x\n", rsp->data[0]); */
+	memcpy(&val, rsp->data, sizeof (val));
+	printf("\n    Current Limit State: %s\n",
+			(realCc == 0) ?
+			"Power Limit Active" : "No Active Power Limit");
+	printf("    Exception actions:   %s\n",
+			val2str2(val.action, dcmi_pwrmgmt_get_action_vals));
+	printf("    Power Limit:         %i Watts\n", val.limit);
+	printf("    Correction time:     %i milliseconds\n", val.correction);
+	printf("    Sampling period:     %i seconds\n", val.sample);
+	printf("\n");
+	return 0;
+}
+/* end print get limit */
+
+/*  Power Management set limit
+ *
+ * Undocumented bounds:
+ * Power limit: 0 - 0xFFFF
+ * Correction period 5750ms to 28751ms or 0x1676 to 0x704F
+ * sample period: 3 sec to 65 sec and 69+
+ *
+ * @intf:    ipmi interface handler
+ * @option:  Power option to change
+ * @value:   Value of the desired change
+ */
+static int
+ipmi_dcmi_pwr_slimit(struct ipmi_intf * intf, const char * option,
+		const char * value)
+{
+	struct ipmi_rs * rsp; /* ipmi response */
+	struct ipmi_rq req; /* ipmi request (to send) */
+	struct power_limit val;
+	uint8_t msg_data[15]; /* number of request data bytes */
+	uint32_t lvalue = 0;
+
+	rsp = ipmi_dcmi_pwr_glimit(intf); /* get the power limit settings */
+	/* rsp can be a null so check response before any operation on it to
+	 * avoid sig segv
+	 */
+	if (rsp != NULL) {
+		GOOD_PWR_GLIMIT_CCODE(rsp->ccode);
+	}
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(&val, rsp->data, sizeof (val));
+	/* same as above; sets the values of the val struct
+	 * DCMI group ID *
+	 * val.grp_id = rsp->data[0];
+	 * exception action *
+	 * val.action = rsp->data[3]; *
+	 *
+	 * power limit in Watts *
+	 * store 16 bits of the rsp from the 4th entity *
+	 * val.limit = *(uint16_t*)(&rsp->data[4]);
+	 * correction period in mS *
+	 * store 32 bits of the rsp from the 6th entity *
+	 * val.correction = *(uint32_t*)(&rsp->data[6]);
+	 * store 16 bits of the rsp from the 12th entity *
+	 * sample period in seconds *
+	 * val.sample = *(uint16_t*)(&rsp->data[12]);
+	 */
+	lprintf(LOG_INFO,
+			"DCMI IN  Limit=%d Correction=%d Action=%d Sample=%d\n",
+			val.limit, val.correction, val.action, val.sample);
+	switch (str2val2(option, dcmi_pwrmgmt_set_usage_vals)) {
+	case 0x00:
+		/* action */
+		switch (str2val2(value, dcmi_pwrmgmt_action_vals)) {
+		case 0x00:
+			/* no_action */
+			val.action = 0;
+			break;
+		case 0x01:
+			/* power_off */
+			val.action = 1;
+			break;
+		case 0x02: 
+			/* OEM reserved action */
+			val.action = 0x02;
+			break;
+		case 0x03: 
+			/* OEM reserved action */
+			val.action = 0x03;
+			break;
+		case 0x04:
+			/* OEM reserved action */
+			val.action = 0x04;
+			break;
+		case 0x05:
+			/* OEM reserved action */
+			val.action = 0x05;
+			break;
+		case 0x06:
+			/* OEM reserved action */
+			val.action = 0x06;
+			break;
+		case 0x07:
+			/* OEM reserved action */
+			val.action = 0x07;
+			break;
+		case 0x08:
+			/* OEM reserved action */
+			val.action = 0x08;
+			break;
+		case 0x09:
+			/* OEM reserved action */
+			val.action = 0x09;
+			break;
+		case 0x0a:
+			/* OEM reserved action */
+			val.action = 0x0a;
+			break;
+		case 0x0b:
+			/* OEM reserved action */
+			val.action = 0x0b;
+			break;
+		case 0x0c:
+			/* OEM reserved action */
+			val.action = 0x0c;
+			break;
+		case 0x0d:
+			/* OEM reserved action */
+			val.action = 0x0d;
+			break;
+		case 0x0e:
+			/* OEM reserved action */
+			val.action = 0x0e;
+			break;
+		case 0x0f:
+			/* OEM reserved action */
+			val.action = 0x0f;
+			break;
+		case 0x10:
+			/* OEM reserved action */
+			val.action = 0x10;
+			break;
+		case 0x11:
+			/* sel_logging*/
+			val.action = 0x11;
+			break;
+		case 0xFF:
+			/* error - not a string we knew what to do with */
+			lprintf(LOG_ERR, "Given %s '%s' is invalid.",
+					option, value);
+			return -1;
+		}
+		break;
+	case 0x01:
+		/* limit */
+		if (str2uint(value, &lvalue) != 0) {
+			lprintf(LOG_ERR, "Given %s '%s' is invalid.",
+					option, value);
+			return (-1);
+		}
+		val.limit = *(uint16_t*)(&lvalue);
+		break;
+	case 0x02:
+		/* correction */
+		if (str2uint(value, &lvalue) != 0) {
+			lprintf(LOG_ERR, "Given %s '%s' is invalid.",
+					option, value);
+			return (-1);
+		}
+		val.correction = *(uint32_t*)(&lvalue);
+		break;
+	case 0x03:
+		/* sample */
+		if (str2uint(value, &lvalue) != 0) {
+			lprintf(LOG_ERR, "Given %s '%s' is invalid.",
+					option, value);
+			return (-1);
+		}
+		val.sample = *(uint16_t*)(&lvalue);
+		break;
+	case 0xff:
+		/* no valid options */
+		return -1;
+	}
+	lprintf(LOG_INFO, "DCMI OUT Limit=%d Correction=%d Action=%d Sample=%d\n", val.limit, val.correction, val.action, val.sample);
+
+	msg_data[0] = val.grp_id; /* Group Extension Identification */
+	msg_data[1] = 0x00; /* reserved */
+	msg_data[2] = 0x00; /* reserved */
+	msg_data[3] = 0x00; /* reserved */
+	msg_data[4] = val.action; /* exception action; 0x00 disables it */
+
+	/* fill msg_data[5] with the first 16 bits of val.limit */
+	*(uint16_t*)(&msg_data[5]) = val.limit;
+	/* msg_data[5] = 0xFF;
+	 * msg_data[6] = 0xFF;
+	 */
+	/* fill msg_data[7] with the first 32 bits of val.correction */
+	*(uint32_t*)(&msg_data[7]) = val.correction;
+	/* msg_data[7] = 0x76;
+	 * msg_data[8] = 0x16;
+	 * msg_data[9] = 0x00;
+	 * msg_data[10] = 0x00;
+	 */
+	msg_data[11] = 0x00; /* reserved */
+	msg_data[12] = 0x00; /* reserved */
+	/* fill msg_data[13] with the first 16 bits of val.sample */
+	*(uint16_t*)(&msg_data[13]) = val.sample;
+	/* msg_data[13] = 0x03; */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_SETLMT; /* Set power limit */
+	req.msg.data = msg_data; /* Contents above */
+	/* how many times does req.msg.data need to read */
+	req.msg.data_len = 15;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+/* end Power Management set limit */
+
+/*  Power Management activate deactivate
+ *
+ * @intf:    ipmi interface handler
+ * @option:  uint8_t - 0 to deactivate or 1 to activate
+ */
+static int
+ipmi_dcmi_pwr_actdeact(struct ipmi_intf * intf, uint8_t option)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4]; /* number of request data bytes */
+
+	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
+	msg_data[1] = option; /* 0 = Deactivate 1 = Activate */
+	msg_data[2] = 0x00; /* reserved */
+	msg_data[3] = 0x00; /* reserved */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_DCGRP;
+	req.msg.cmd = IPMI_DCMI_PWRACT; /* Act-deactivate power limit */
+	req.msg.data = msg_data; /* Contents above */
+	req.msg.data_len = 4; /* how mant times does req.msg.data need to read */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_rsp(rsp)) {
+		return -1;
+	}
+	printf("\n    Power limit successfully ");
+	if (option == 0x00) {
+		printf("deactivated");
+	} else {
+		printf("activated");
+	}
+	printf("\n");
+	return 0;
+}
+/* end power management activate/deactivate */
+
+/* Node Manager discover */
+static int
+_ipmi_nm_discover(struct ipmi_intf * intf, struct nm_discover *disc)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[3]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_VERSION;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(disc, rsp->data, sizeof (struct nm_discover));
+	return 0;
+}
+/* Get NM capabilities
+ *
+ * This function returns the available capabilities of the platform.
+ *
+ * returns success/failure
+ *
+ * @intf:   ipmi interface handler
+ * @caps:   fills in capability struct
+ */
+static int
+_ipmi_nm_getcapabilities(struct ipmi_intf * intf, uint8_t domain, uint8_t trigger, struct nm_capability *caps)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[5]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	msg_data[4] = trigger; /* power control policy or trigger */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_CAP;
+	req.msg.data = msg_data;
+	req.msg.data_len = 5;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(caps, rsp->data, sizeof (struct nm_capability));
+	return 0;
+}
+
+static int
+_ipmi_nm_get_policy(struct ipmi_intf * intf, uint8_t domain, uint8_t policy_id, struct nm_get_policy *policy)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[5]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	msg_data[4] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_POLICY;
+	req.msg.data = msg_data;
+	req.msg.data_len = 5;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(policy, rsp->data, sizeof (struct nm_get_policy));
+	return 0;
+}
+static int
+_ipmi_nm_set_policy(struct ipmi_intf * intf, struct nm_policy *policy)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_SET_POLICY;
+	req.msg.data = (uint8_t *)policy;
+	req.msg.data_len = sizeof(struct nm_policy);
+	policy->intel_id[0] = 0x57; policy->intel_id[1] =1; policy->intel_id[2] =0;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+static int
+_ipmi_nm_policy_limiting(struct ipmi_intf * intf, uint8_t domain)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[4]; /* 'raw' data to be sent to the BMC */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_LIMITING;
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+	rsp = intf->sendrecv(intf, &req);
+	/* check for special case error of no policy is limiting */
+	if (rsp && (rsp->ccode == 0xA1))
+		return 0x80;
+	else if (chk_nm_rsp(rsp))
+		return -1;
+	return rsp->data[0];
+}
+
+static int
+_ipmi_nm_control(struct ipmi_intf * intf, uint8_t scope, uint8_t domain, uint8_t policy_id)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[6]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = scope;
+	msg_data[4] = domain;
+	msg_data[5] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_POLICY_CTL;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+/* Get NM statistics
+ *
+ * This function returns the statistics
+ *
+ * returns success/failure
+ *
+ * @intf:   ipmi interface handler
+ * @selector: Parameter selector
+ */
+static int
+_ipmi_nm_statistics(struct ipmi_intf * intf, uint8_t mode, uint8_t domain, uint8_t policy_id, struct nm_statistics *caps)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[6]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = mode;
+	msg_data[4] = domain;
+	msg_data[5] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_STATS;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(caps, rsp->data, sizeof (struct nm_statistics));
+	return 0;
+}
+
+static int
+_ipmi_nm_reset_stats(struct ipmi_intf * intf, uint8_t mode, uint8_t domain, uint8_t policy_id)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[6]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = mode;
+	msg_data[4] = domain;
+	msg_data[5] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_RESET_STATS;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+static int
+_nm_set_range(struct ipmi_intf * intf, uint8_t domain, uint16_t minimum, uint16_t maximum)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[8]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	msg_data[4] = minimum & 0xFF;
+	msg_data[5] = minimum >> 8;
+	msg_data[6] = maximum & 0xFF;
+	msg_data[7] = maximum >> 8;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_SET_POWER;
+	req.msg.data = msg_data;
+	req.msg.data_len = 8;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+static int
+_ipmi_nm_get_alert(struct ipmi_intf * intf, struct nm_set_alert *alert)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[3]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_ALERT_DS;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	memcpy(alert, rsp->data, sizeof (struct nm_set_alert));
+	return 0;
+}
+
+static int
+_ipmi_nm_set_alert(struct ipmi_intf * intf, struct nm_set_alert *alert)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[6]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = alert->chan;
+	msg_data[4] = alert->dest;
+	msg_data[5] = alert->string;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_SET_ALERT_DS;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ *
+ * get alert threshold values.
+ *
+ * the list pointer is assumed to point to an array of 16 short integers.
+ * This array is filled in for valid thresholds returned.
+ */
+static int
+_ipmi_nm_get_thresh(struct ipmi_intf * intf, uint8_t domain, uint8_t policy_id, uint16_t *list)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[5]; /* 'raw' data to be sent to the BMC */
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	msg_data[4] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_ALERT_TH;
+	req.msg.data = msg_data;
+	req.msg.data_len = 5;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	if (rsp->data[3] > 0)
+		*list++ = (rsp->data[5] << 8) | rsp->data[4];
+	if (rsp->data[3] > 1)
+		*list++ = (rsp->data[7] << 8) | rsp->data[6];
+	if (rsp->data[3] > 2)
+		*list   = (rsp->data[9] << 8) | rsp->data[8];
+	return 0;
+}
+
+static int
+_ipmi_nm_set_thresh(struct ipmi_intf * intf, struct nm_thresh * thresh)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[IPMI_NM_SET_THRESH_LEN]; /* 'raw' data to be sent to the BMC */
+
+	memset(&msg_data, 0, sizeof(msg_data));
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = thresh->domain;
+	msg_data[4] = thresh->policy_id;
+	msg_data[5] = thresh->count;
+	if (thresh->count > 0) {
+		msg_data[7] = thresh->thresholds[0] >> 8;
+		msg_data[6] = thresh->thresholds[0] & 0xFF;
+	}
+	if (thresh->count > 1) {
+		msg_data[9] = thresh->thresholds[1] >> 8;
+		msg_data[8] = thresh->thresholds[1] & 0xFF;
+	}
+	if (thresh->count > 2) {
+		msg_data[11] = thresh->thresholds[2] >> 8;
+		msg_data[10] = thresh->thresholds[2] & 0xFF;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_SET_ALERT_TH;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6 + (thresh->count * 2);
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ *
+ * get suspend periods
+ *
+ */
+static int
+_ipmi_nm_get_suspend(struct ipmi_intf * intf, uint8_t domain, uint8_t policy_id, int *count, struct nm_period *periods)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[5]; /* 'raw' data to be sent to the BMC */
+	int i;
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = domain;
+	msg_data[4] = policy_id;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_GET_SUSPEND;
+	req.msg.data = msg_data;
+	req.msg.data_len = 5;
+	rsp = intf->sendrecv(intf, &req);
+	if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	*count = rsp->data[3];
+	for (i = 0; i < rsp->data[3]; i += 3, periods++) {
+		periods->start = rsp->data[4+i];
+		periods->stop  = rsp->data[5+i];
+		periods->repeat = rsp->data[6+i];
+	}
+	return 0;
+}
+
+static int
+_ipmi_nm_set_suspend(struct ipmi_intf * intf, struct nm_suspend *suspend)
+{
+	struct ipmi_rq req; /* request data to send to the BMC */
+	struct ipmi_rs *rsp;
+	uint8_t msg_data[21]; /* 6 control bytes + 5 suspend periods, 3 bytes per period */
+	struct nm_period *periods;
+	int i;
+
+	msg_data[0] = 0x57;
+	msg_data[1] = 1;
+	msg_data[2] = 0;
+	msg_data[3] = suspend->domain;
+        msg_data[4] = suspend->policy_id;
+	msg_data[5] = suspend->count;
+	for (i = 0, periods = &suspend->period[0]; i < (suspend->count*3); i += 3, periods++) {
+		msg_data[6+i] = periods->start;
+		msg_data[7+i] = periods->stop;
+		msg_data[8+i] = periods->repeat;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.data_len = 6 + (suspend->count*3);
+	req.msg.netfn = IPMI_NETFN_OEM;
+	req.msg.cmd = IPMI_NM_SET_SUSPEND;
+	req.msg.data = msg_data;
+        rsp = intf->sendrecv(intf, &req);
+        if (chk_nm_rsp(rsp)) {
+		return -1;
+	}
+	return 0;
+}
+
+static int
+ipmi_nm_getcapabilities(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t option;
+	uint8_t domain = 0;  /* default domain of platform */
+	uint8_t trigger = 0; /* default power policy (no trigger) */
+	struct nm_capability caps;
+
+        while (--argc > 0) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((option = str2val2(argv[0], nm_capability_opts)) == 0xFF) {
+			print_strs(nm_capability_opts, "Capability commands", LOG_ERR, 0);
+			return -1;
+		}
+		switch (option) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			break;
+		case 0x02:  /* Inlet */
+			trigger = 1;
+			break;
+		case 0x03:  /* Missing power reading */
+			trigger = 2;
+			break;
+		case 0x04:  /* Time after host reset */
+			trigger = 3;
+			break;
+		case 0x05:  /* Boot time policy */
+			trigger = 4;
+			break;
+		default:
+			break;
+		}
+		argc--;
+		argv++;
+	}
+	trigger |= 0x10;
+	memset(&caps, 0, sizeof(caps));
+	if (_ipmi_nm_getcapabilities(intf, domain, trigger, &caps))
+		return -1;
+	if (csv_output) {
+		printf("%d,%u,%u,%u,%u,%u,%u,%s\n",
+			caps.max_settings, caps.max_value,caps.min_value,
+			caps.min_corr/1000, caps.max_corr/1000,
+			caps.min_stats, caps.max_stats,
+			val2str2(caps.scope&0xF, nm_domain_vals));
+		return 0;
+	}
+	printf("    power policies:\t\t%d\n", caps.max_settings);
+	switch (trigger&0xF) {
+	case 0:  /* power */
+		printf("    max_power\t\t%7u Watts\n    min_power\t\t%7u Watts\n",
+				caps.max_value, caps.min_value);
+		break;
+	case 1:  /* Inlet */
+		printf("    max_temp\t\t%7u C\n    min_temp\t\t%7u C\n",
+				caps.max_value, caps.min_value);
+		break;
+	case 2: /* Missing reading time */
+	case 3: /* Time after host reset */
+		printf("    max_time\t\t%7u Secs\n    min_time\t\t%7u Secs\n",
+				caps.max_value/10, caps.min_value/10);
+		break;
+	case 4: /* boot time policy does not use these values */
+	default:
+		break;
+	}
+	printf("    min_corr\t\t%7u secs\n    max_corr\t\t%7u secs\n",
+				caps.min_corr/1000, caps.max_corr/1000);
+	printf("    min_stats\t\t%7u secs\n    max_stats\t\t%7u secs\n",
+				caps.min_stats, caps.max_stats);
+	printf("    domain scope:\t%s\n", val2str2(caps.scope&0xF, nm_domain_vals));
+	return 0;
+}
+
+static int
+ipmi_nm_get_policy(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t option;
+	uint8_t domain = 0; /* default domain of platform */
+	uint8_t policy_id = -1;
+	struct nm_get_policy policy;
+
+	memset(&policy, 0, sizeof(policy));
+
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((option = str2val2(argv[0], nm_policy_options)) == 0xFF) {
+			print_strs(nm_policy_options, "Get Policy commands", LOG_ERR, 0);
+			return -1;
+		}
+		switch (option) {
+		case 0x03:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			policy.domain |= domain & 0xF;
+			break;
+		case 0x0B:   /* policy id */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				lprintf(LOG_ERR,"    Policy ID must be a positive integer 0-7.\n");
+				return -1;
+			}
+			break;
+		default:
+			printf("    Unknown command 0x%x, skipping.\n", option);
+			break;
+		}
+		argc--;
+		argv++;
+	}
+        if (policy_id == 0xFF) {
+		print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+                return -1;
+        }
+	if (_ipmi_nm_get_policy(intf, policy.domain, policy_id, &policy))
+		return -1;
+	if (csv_output) {
+		printf("%s,0x%x,%s,%s,%s,%u,%u,%u,%u,%s\n",
+			val2str2(policy.domain&0xF, nm_domain_vals),
+			policy.domain,
+			(policy.policy_type & 0x10) ? "power" : "nopower ",
+			val2str2(policy.policy_type & 0xF, nm_policy_type_vals),
+			val2str2(policy.policy_exception, nm_exception),
+			policy.policy_limits,
+			policy.corr_time,
+			policy.trigger_limit,
+			policy.stats_period,
+			policy.policy_type & 0x80 ? "volatile" : "non-volatile");
+		return 0;
+	}
+	printf("    Power domain:                             %s\n",
+		val2str2(policy.domain&0xF, nm_domain_vals));
+	printf("    Policy is %s %s%s%s\n",
+		policy.domain&0x10 ? "enabled" : "not enabled",
+		policy.domain&0x20 ? "per Domain " : "",
+		policy.domain&0x40 ? "Globally " : "",
+		policy.domain&0x80 ? "via DCMI api " : "");
+	printf("    Policy is %sa power control type.\n", (policy.policy_type & 0x10) ? "" : "not ");
+	printf("    Policy Trigger Type:                      %s\n",
+		val2str2(policy.policy_type & 0xF, nm_policy_type_vals));
+	printf("    Correction Aggressiveness:                %s\n",
+		val2str2((policy.policy_type>> 5) & 0x3, nm_correction_vals));
+	printf("    Policy Exception Actions:                 %s\n",
+		val2str2(policy.policy_exception, nm_exception));
+	printf("    Power Limit:                              %u Watts\n",
+		policy.policy_limits);
+	printf("    Correction Time Limit:                    %u milliseconds\n",
+		policy.corr_time);
+	printf("    Trigger Limit:                            %u units\n",
+		policy.trigger_limit);
+	printf("    Statistics Reporting Period:              %u seconds\n",
+		policy.stats_period);
+	printf("    Policy retention:                         %s\n",
+		policy.policy_type & 0x80 ? "volatile" : "non-volatile");
+	if ( (policy_id == 0) && ((policy.domain & 0xf) == 0x3) )
+		printf("    HW Prot Power domain:                     %s\n",
+			policy.policy_type & 0x80 ? "Secondary" : "Primary");
+	return 0;
+}
+
+static int
+ipmi_nm_policy(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t action;
+	uint8_t option;
+	uint8_t correction;
+	uint8_t domain = 0; /* default domain of platform */
+	uint8_t policy_id = -1;
+	uint16_t power, period, inlet;
+	uint16_t cores;
+	uint32_t limit;
+	struct nm_policy policy;
+
+	argv++;
+	argc--;
+	if ((argv[0] == NULL) ||
+			((action = str2val2(argv[0], nm_policy_action)) == 0xFF)) {
+		print_strs(nm_policy_action, "Policy commands", LOG_ERR, 0);
+		return -1;
+	}
+	if (action == 0) /* get */
+		return (ipmi_nm_get_policy(intf, argc, argv));
+	memset(&policy, 0, sizeof(policy));
+	/*
+	 * nm policy add [domain <param>] enable|disable  policy_id <param> correction <opt> power <watts> limit <param> period <param>
+	 * nm policy remove [domain <param>]  policy_id <param>
+	 * nm policy limiting {domain <param>]
+	 */
+	while (--argc > 0) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((option = str2val2(argv[0], nm_policy_options)) == 0xFF) {
+			print_strs(nm_policy_options, "Policy options", LOG_ERR, 0);
+			return -1;
+		}
+		switch (option) {
+		case 0x01:   /* policy enable */
+			policy.domain |= IPMI_NM_POLICY_ENABLE;
+			break;
+		case 0x02:   /* policy disable */
+			break;   /* value is initialized to zero already */
+		case 0x03:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			policy.domain |= domain & 0xF;
+			break;
+		case 0x04:   /* inlet */
+			if (str2ushort(argv[1], &inlet) < 0) {
+				printf("Inlet Temp value must be 20-45.\n");
+				return -1;
+			}
+			policy.policy_type |= 1;
+			policy.policy_limits = 0;
+			policy.trigger_limit = inlet;
+			break;
+		case 0x06:   /* get correction action */
+			if (action == 0x5) break;   /* skip if this is a remove */
+			if ((correction = str2val2(argv[1], nm_correction)) == 0xFF) {
+				print_strs(nm_correction, "Correction Actions", LOG_ERR, 0);
+				return -1;
+			}
+			policy.policy_type |= (correction << 5);
+			break;
+		case 0x07:   /* not implemented */
+			break;
+		case 0x08:   /* power */
+			if (str2ushort(argv[1], &power) < 0) {
+				printf("Power limit value must be 0-500.\n");
+				return -1;
+			}
+			policy.policy_limits = power;
+			break;
+		case 0x09:   /* trigger limit */
+			if (str2uint(argv[1], &limit) < 0) {
+				printf("Trigger Limit value must be positive integer.\n");
+				return -1;
+			}
+			policy.corr_time = limit;
+			break;
+		case 0x0A:   /* statistics period */
+			if (str2ushort(argv[1], &period) < 0) {
+				printf("Statistics Reporting Period must be positive integer.\n");
+				return -1;
+			}
+			policy.stats_period = period;
+			break;
+		case 0x0B:   /* policy ID */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				printf("Policy ID must be a positive integer 0-7.\n");
+				return -1;
+			}
+			policy.policy_id = policy_id;
+			break;
+		case 0x0C:   /* volatile */
+			policy.policy_type |= 0x80;
+			break;
+		case 0x0D:   /* cores_off, number of cores to disable at boot time */
+			policy.policy_type |= 4;
+			if (str2ushort(argv[1], &cores) < 0) {
+				printf("number of cores disabled must be 1-127.\n");
+				return -1;
+			}
+			if ((cores < 1) || (cores > 127)) {
+				printf("number of cores disabled must be 1-127.\n");
+				return -1;
+			}
+			policy.policy_type |= 4;
+			policy.policy_limits = cores << 1;
+			break;
+		default:
+			break;
+		}
+		argc--;
+		argv++;
+	}
+	if (action == 0x06) { /* limiting */
+		if ((limit = _ipmi_nm_policy_limiting(intf, domain) == -1))
+			return -1;
+		printf("limit %x\n", limit);
+		return 0;
+	}
+	if (policy_id == 0xFF) {
+		print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+		return -1;
+	}
+	if (action == 0x04)   /* add */
+		policy.policy_type |= 0x10;
+	if (_ipmi_nm_set_policy(intf, &policy))
+		return -1;
+	return 0;
+}
+/* end policy */
+
+static int
+ipmi_nm_control(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t action;
+	uint8_t scope = 0;   /* default control scope of global */
+	uint8_t domain = 0;  /* default domain of platform */
+	uint8_t policy_id = -1;
+
+	argv++;
+	argc--;
+	/* nm_ctl_cmds returns 0 for disable, 1 for enable */
+	if ((argv[0] == NULL) ||
+			((action = str2val2(argv[0], nm_ctl_cmds)) == 0xFF)) {
+		print_strs(nm_ctl_cmds, "Control parameters:", LOG_ERR, 0);
+		print_strs(nm_ctl_domain, "control Scope (required):", LOG_ERR, 0);
+		return -1;
+	}
+	argv++;
+	while (--argc) {
+		/* nm_ctl_domain returns correct bit field except for action */
+		if ((argv[0] == NULL) ||
+				((scope = str2val2(argv[0], nm_ctl_domain)) == 0xFF)) {
+			print_strs(nm_ctl_domain, "Control Scope (required):", LOG_ERR, 0);
+			return -1;
+		}
+		argv++;
+		if (argv[0] == NULL) break;
+		if (scope == 0x02) { /* domain */
+			if ((domain = str2val2(argv[0], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+		} else if (scope == 0x04) { /* per_policy */
+
+			if (str2uchar(argv[0], &policy_id) < 0) {
+				lprintf(LOG_ERR,"Policy ID must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		}
+		argc--;
+		argv++;
+	}
+        if ((scope == 0x04) && (policy_id == 0xFF)) {
+		print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+		return -1;
+	}
+	if (_ipmi_nm_control(intf, scope|(action&1), domain, policy_id) < 0 )
+		return -1;
+	return 0;
+}
+
+static int
+ipmi_nm_get_statistics(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t mode = 0;
+	uint8_t option;
+	uint8_t domain = 0;   /* default domain of platform */
+	uint8_t policy_id = -1;
+	int     policy_mode = 0;
+	int     cut;
+	char   *units = "";
+	char    datebuf[27];
+	struct nm_statistics stats;
+	struct tm tm_t;
+	time_t t;
+
+	argv++;
+	if ((argv[0] == NULL) ||
+			((mode = str2val2(argv[0], nm_stats_mode)) == 0xFF)) {
+		print_strs(nm_stats_mode, "Statistics commands", LOG_ERR, 0);
+		return -1;
+	}
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((option = str2val2(argv[0], nm_stats_opts)) == 0xFF) {
+				print_strs(nm_stats_opts, "Control Scope options", LOG_ERR, 0);
+			return -1;
+		}
+		switch (option) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			break;
+		case 0x02:   /* policy ID */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				lprintf(LOG_ERR,"Policy ID must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		default:
+			break;
+		}
+		argc--;
+		argv++;
+	}
+
+	switch (mode) {
+	case 0x01:
+		units = "Watts";
+		break;
+	case 0x02:
+		units = "Celsius";
+		break;
+	case 0x03:
+		units = "%";
+		break;
+	case 0x11:
+	case 0x12:
+	case 0x13:
+		policy_mode = 1;
+		units = (mode == 0x11) ? "Watts" : (mode == 0x12) ? "Celsius" : " %";
+		if (policy_id == 0xFF) {
+			print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+			return -1;
+		}
+		break;
+	default:
+		break;
+	}
+	if (_ipmi_nm_statistics(intf, mode, domain, policy_id, &stats))
+		return -1;
+	t = stats.time_stamp;
+	gmtime_r(&t, &tm_t);
+	sprintf(datebuf, "%s", asctime(&tm_t));
+	cut = strlen(datebuf) -1;
+	datebuf[cut] = 0;
+	if (csv_output) {
+		printf("%s,%s,%s,%s,%s,%d,%d,%d,%d,%s,%d\n",
+			val2str2(stats.id_state & 0xF, nm_domain_vals),
+			((stats.id_state >> 4) & 1) ? (policy_mode ? "Policy Enabled" : "Globally Enabled") : "Disabled" ,
+			((stats.id_state >> 5) & 1) ? "active" : "suspended",
+			((stats.id_state >> 6) & 1) ? "in progress" : "suspended",
+			((stats.id_state >> 7) & 1) ? "triggered" : "not triggered",
+			stats.curr_value,
+			stats.min_value,
+			stats.max_value,
+			stats.ave_value,
+			datebuf,
+			stats.stat_period);
+		return 0;
+	}
+	printf("    Power domain:                             %s\n",
+		val2str2(stats.id_state & 0xF, nm_domain_vals));
+	printf("    Policy/Global Admin state                 %s\n",
+		((stats.id_state >> 4) & 1) ? (policy_mode ? "Policy Enabled" : "Globally Enabled") : "Disabled" );
+	printf("    Policy/Global Operational state           %s\n",
+		((stats.id_state >> 5) & 1) ? "active" : "suspended");
+	printf("    Policy/Global Measurement state           %s\n",
+		((stats.id_state >> 6) & 1) ? "in progress" : "suspended");
+	printf("    Policy Activation state                   %s\n",
+		((stats.id_state >> 7) & 1) ? "triggered" : "not triggered");
+	printf("    Instantaneous reading:                    %8d %s\n",
+		stats.curr_value, units);
+	printf("    Minimum during sampling period:           %8d %s\n",
+		stats.min_value, units);
+	printf("    Maximum during sampling period:           %8d %s\n",
+		stats.max_value, units);
+	printf("    Average reading over sample period:       %8d %s\n",
+		stats.ave_value, units);
+	printf("    IPMI timestamp:                           %s\n",
+		datebuf);
+	printf("    Sampling period:                          %08d Seconds.\n", stats.stat_period);
+	printf("\n");
+	return 0;
+}
+
+static int
+ipmi_nm_reset_statistics(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t mode;
+	uint8_t option;
+	uint8_t domain = 0;   /* default domain of platform */
+	uint8_t policy_id = -1;
+
+	argv++;
+	if ((argv[0] == NULL) ||
+			((mode = str2val2(argv[0], nm_reset_mode)) == 0xFF)) {
+		print_strs(nm_reset_mode, "Reset Statistics Modes:", LOG_ERR, 0);
+		return -1;
+	}
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((option = str2val2(argv[0], nm_stats_opts)) == 0xFF) {
+			print_strs(nm_stats_opts, "Reset Scope options", LOG_ERR, 0);
+			return -1;
+		}
+		switch (option) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			break;
+		case 0x02:   /* policy ID */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				lprintf(LOG_ERR,"Policy ID must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		default:
+			break;
+		}
+		argc--;
+		argv++;
+	}
+	if (mode && (policy_id == 0xFF)) {
+		print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+		return -1;
+	}
+	if (_ipmi_nm_reset_stats(intf, mode, domain, policy_id) < 0)
+		return -1;
+	return 0;
+}
+
+static int
+ipmi_nm_set_range(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t domain = 0;
+	uint8_t param;
+	uint16_t minimum = -1;
+	uint16_t maximum = -1;
+
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((param = str2val2(argv[0], nm_power_range)) == 0xFF) {
+			print_strs(nm_power_range, "power range parameters:", LOG_ERR, 0);
+			return -1;
+		}
+		switch (param) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			break;
+		case 0x02: /* min */
+			if (str2ushort(argv[1], &minimum) < 0) {
+				lprintf(LOG_ERR,"Power minimum must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		case 0x03: /* max */
+			if (str2ushort(argv[1], &maximum) < 0) {
+				lprintf(LOG_ERR,"Power maximum must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		default:
+			break;
+		}
+		argc--;
+		argv++;
+	}
+	if ((minimum == 0xFFFF) || (maximum == 0xFFFF)) {
+		lprintf(LOG_ERR,"Missing parameters: nm power range min <minimum> max <maximum>.\n");
+		return -1;
+	}
+	if (_nm_set_range(intf, domain, minimum, maximum) < 0)
+		return -1;
+	return 0;
+}
+
+static int
+ipmi_nm_get_alert(struct ipmi_intf * intf)
+{
+	struct nm_set_alert alert;
+
+	memset(&alert, 0, sizeof(alert));
+	if (_ipmi_nm_get_alert(intf, &alert))
+		return -1;
+	if (csv_output) {
+		printf("%d,%s,0x%x,%s,0x%x\n",
+				alert.chan&0xF,
+				(alert.chan >> 7) ? "not registered" : "registered",
+				alert.dest,
+				(alert.string >> 7) ? "yes" : "no",
+				alert.string & 0x7F);
+		return 0;
+	}
+	printf("    Alert Chan:                                  %d\n",
+		alert.chan&0xF);
+	printf("    Alert Receiver:                              %s\n",
+		(alert.chan >> 7) ? "not registered" : "registered");
+	printf("    Alert Lan Destination:                       0x%x\n",
+		alert.dest);
+	printf("    Use Alert String:                            %s\n",
+		(alert.string >> 7) ? "yes" : "no");
+	printf("    Alert String Selector:                       0x%x\n",
+		alert.string & 0x7F);
+	return 0;
+}
+
+static int
+ipmi_nm_alert(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t param;
+	uint8_t action;
+	uint8_t chan = -1;
+	uint8_t dest = -1;
+	uint8_t string = -1;
+	struct nm_set_alert alert;
+
+	argv++;
+	argc--;
+	if ((argv[0] == NULL) ||
+			((action = str2val2(argv[0], nm_alert_opts)) == 0xFF)) {
+		print_strs(nm_alert_opts, "Alert commands", LOG_ERR, 0);
+		return -1;
+	}
+	if (action == 0x02) /* get */
+		return (ipmi_nm_get_alert(intf));
+	/* set */
+	memset(&alert, 0, sizeof(alert));
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		if ((param = str2val2(argv[0], nm_set_alert_param)) == 0xFF) {
+			print_strs(nm_set_alert_param, "Set alert Parameters:", LOG_ERR, 0);
+			return -1;
+		}
+		switch (param) {
+		case 0x01: /* channnel */
+			if (str2uchar(argv[1], &chan) < 0) {
+				lprintf(LOG_ERR,"Alert Lan chan must be a positive integer.\n");
+				return -1;
+			}
+			if (action == 0x03)  /* Clear */
+				chan |= 0x80;   /* deactivate alert reciever */
+			break;
+		case 0x02:  /* dest */
+			if (str2uchar(argv[1], &dest) < 0) {
+				lprintf(LOG_ERR,"Alert Destination must be a positive integer.\n");
+				return -1;
+			}
+			break;
+		case 0x03:  /* string number */
+			if (str2uchar(argv[1], &string) < 0) {
+				lprintf(LOG_ERR,"Alert String # must be a positive integer.\n");
+				return -1;
+			}
+			string |= 0x80;   /* set string select flag */
+			break;
+		}
+		argc--;
+		argv++;
+	}
+	if ((chan == 0xFF) || (dest == 0xFF)) {
+		print_strs(nm_set_alert_param, "Must set alert chan and dest params.", LOG_ERR, 0);
+		return -1;
+	}
+	if (string == 0xFF) string = 0;
+	alert.chan = chan;
+	alert.dest = dest;
+	alert.string = string;
+	if (_ipmi_nm_set_alert(intf, &alert))
+		return -1;
+	return 0;
+}
+
+static int
+ipmi_nm_get_thresh(struct ipmi_intf *intf, uint8_t domain, uint8_t policy_id)
+{
+	uint16_t list[3];
+
+	memset(list, 0, sizeof(list));
+	if (_ipmi_nm_get_thresh(intf, domain, policy_id, &list[0]))
+		return -1;
+
+	printf("    Alert Threshold domain:                   %s\n",
+			val2str2(domain, nm_domain_vals));
+	printf("    Alert Threshold Policy ID:                %d\n",
+			policy_id);
+	printf("    Alert Threshold 1:                        %d\n",
+			list[0]);
+	printf("    Alert Threshold 2:                        %d\n",
+			list[1]);
+	printf("    Alert Threshold 3:                        %d\n",
+			list[2]);
+	return 0;
+}
+
+static int
+ipmi_nm_thresh(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t option;
+	uint8_t action;
+	uint8_t domain = 0;   /* default domain of platform */
+	uint8_t policy_id = -1;
+	struct nm_thresh thresh;
+	int i = 0;
+
+	argv++;
+	argc--;
+	/* set or get */
+	if ((argv[0] == NULL) || (argc < 3) ||
+			((action = str2val2(argv[0], nm_thresh_cmds)) == 0xFF)) {
+		print_strs(nm_thresh_cmds, "Theshold commands", LOG_ERR, 0);
+		return -1;
+	}
+	memset(&thresh, 0, sizeof(thresh));
+	while (--argc) {
+		argv++;
+		if (argv[0] == NULL) break;
+		option = str2val2(argv[0], nm_thresh_param);
+		switch (option) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			argc--;
+			argv++;
+			break;
+		case 0x02:   /* policy ID */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				lprintf(LOG_ERR,"Policy ID must be a positive integer.\n");
+				return -1;
+			}
+			argc--;
+			argv++;
+			break;
+		case 0xFF:
+			if (i > 2) {
+				lprintf(LOG_ERR,"Set Threshold requires 1, 2, or 3 threshold integer values.\n");
+				return -1;
+			}
+			if (str2ushort(argv[0], &thresh.thresholds[i++]) < 0) {
+				lprintf(LOG_ERR,"threshold value %d count must be a positive integer.\n", i);
+				return -1;
+			}
+		default:
+			break;
+		}
+	}
+	if (policy_id == 0xFF) {
+		print_strs(nm_stats_opts, "Missing policy_id parameter:", LOG_ERR, 0);
+		return -1;
+	}
+	if (action == 0x02) /* get */
+		return (ipmi_nm_get_thresh(intf, domain, policy_id));
+	thresh.domain = domain;
+	thresh.policy_id = policy_id;
+	thresh.count = i;
+	if (_ipmi_nm_set_thresh(intf, &thresh) < 0)
+		return -1;
+	return 0;
+}
+
+static inline int
+click2hour(int click)
+{
+	if ((click*6) < 60) return 0;
+	return ((click*6)/60);
+}
+
+static inline int
+click2min(int click)
+{
+	if (!click) return 0;
+	if ((click*6) < 60) return click*6;
+	return (click*6)%60;
+}
+
+static int
+ipmi_nm_get_suspend(struct ipmi_intf *intf, uint8_t domain, uint8_t policy_id)
+{
+	struct nm_period periods[5];
+	int i;
+	int j;
+	int count = 0;
+	const char *days[7] = {"M", "Tu", "W", "Th", "F", "Sa", "Su"};
+
+	memset(periods, 0, sizeof(periods));
+	if (_ipmi_nm_get_suspend(intf, domain, policy_id, &count, &periods[0]))
+		return -1;
+
+	printf("    Suspend Policy domain:                    %s\n",
+			val2str2(domain, nm_domain_vals));
+	printf("    Suspend Policy Policy ID:                 %d\n",
+			policy_id);
+	if (!count) {
+		printf("    No suspend Periods.\n");
+		return 0;
+	}
+	for (i = 0; i < count; i++) {
+		printf("    Suspend Period %d:                         %02d:%02d to %02d:%02d",
+			i, click2hour(periods[i].start), click2min(periods[i].start),
+			click2hour(periods[i].stop), click2min(periods[i].stop));
+		if (periods[i].repeat) printf(", ");
+		for (j = 0; j < 7; j++)
+			printf("%s",  (periods[i].repeat >> j)&1 ? days[j] : "");
+		printf("\n");
+	}
+	return 0;
+}
+
+static int
+ipmi_nm_suspend(struct ipmi_intf * intf, int argc, char **argv)
+{
+	uint8_t option;
+	uint8_t action;
+	uint8_t domain = 0;   /* default domain of platform */
+	uint8_t policy_id = -1;
+	uint8_t count = 0;
+	struct nm_suspend suspend;
+	int i;
+
+	argv++;
+	argc--;
+	/* set or get */
+	if ((argv[0] == NULL) || (argc < 3) ||
+			((action = str2val2(argv[0], nm_suspend_cmds)) == 0xFF)) {
+		print_strs(nm_suspend_cmds, "Suspend commands", LOG_ERR, 0);
+		return -1;
+	}
+	memset(&suspend, 0, sizeof(suspend));
+	while (--argc > 0) {
+		argv++;
+		if (argv[0] == NULL) break;
+		option = str2val2(argv[0], nm_thresh_param);
+		switch (option) {
+		case 0x01:   /* get domain scope */
+			if ((domain = str2val2(argv[1], nm_domain_vals)) == 0xFF) {
+				print_strs(nm_domain_vals, "Domain Scope:", LOG_ERR, 0);
+				return -1;
+			}
+			argc--;
+			argv++;
+			break;
+		case 0x02:   /* policy ID */
+			if (str2uchar(argv[1], &policy_id) < 0) {
+				lprintf(LOG_ERR,"Policy ID must be a positive integer.\n");
+				return -1;
+			}
+			argc--;
+			argv++;
+			break;
+                case 0xFF:   /* process periods */
+			for (i = 0; count < IPMI_NM_SUSPEND_PERIOD_MAX; i += 3, count++) {
+				if (argc < 3) {
+					lprintf(LOG_ERR,"Error: suspend period requires a start, stop, and repeat values.\n");
+					return -1;
+				}
+				if (str2uchar(argv[i+0], &suspend.period[count].start) < 0) {
+					lprintf(LOG_ERR,"suspend start value %d must be 0-239.\n", count);
+					return -1;
+				}
+				if (str2uchar(argv[i+1], &suspend.period[count].stop) < 0) {
+					lprintf(LOG_ERR,"suspend stop value %d  must be 0-239.\n", count);
+					return -1;
+				}
+				if (str2uchar(argv[i+2], &suspend.period[count].repeat) < 0) {
+					lprintf(LOG_ERR,"suspend repeat value %d unable to convert.\n", count);
+					return -1;
+				}
+				argc -= 3;
+				if (argc <= 0)
+					break;
+			}
+			if (argc <= 0)
+				break;
+			break;
+                default:
+                        break;
+                }
+        }
+	if (action == 0x02) /* get */
+		return (ipmi_nm_get_suspend(intf, domain, policy_id));
+
+	suspend.domain = domain;
+	suspend.policy_id = policy_id;
+	if (_ipmi_nm_set_suspend(intf, &suspend) < 0)
+		return -1;
+	return 0;
+}
+/* end nm */
+
+static int
+ipmi_dcmi_set_limit(struct ipmi_intf * intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	if ( argc == 10) {
+		/* Let`s initialize dcmi power parameters */
+		struct ipmi_rq req;
+		uint8_t data[256];
+		uint16_t sample = 0;
+		uint16_t limit = 0;
+		uint32_t correction = 0;
+		struct ipmi_rs *rsp;
+
+		memset(data, 0, sizeof(data));
+		memset(&req, 0, sizeof(req));
+
+		req.msg.netfn = IPMI_NETFN_DCGRP;
+		req.msg.lun = 0x00;
+		req.msg.cmd = IPMI_DCMI_SETLMT; /* Set power limit */
+		req.msg.data = data; /* Contents above */
+		req.msg.data_len =  15;
+
+		data[0] = IPMI_DCMI; /* Group Extension Identification */
+		data[1] = 0x0;  /* reserved */
+		data[2] = 0x0;  /* reserved */
+		data[3] = 0x0;  /* reserved */
+
+		/* action */
+		switch (str2val2(argv[2], dcmi_pwrmgmt_action_vals)) {
+		case 0x00:
+			/* no_action */
+			data[4] = 0x00;
+			break;
+		case 0x01:
+			/* power_off */
+			data[4] = 0x01;
+			break;
+		case 0x11:
+			/* sel_logging*/
+			data[4] = 0x11;
+			break;
+		case 0xFF:
+			/* error - not a string we knew what to do with */
+			lprintf(LOG_ERR, "Given Action '%s' is invalid.",
+				argv[2]);
+			return -1;
+		}
+		/* limit */
+		if (str2ushort(argv[4], &limit) != 0) {
+			lprintf(LOG_ERR,
+				"Given Limit '%s' is invalid.",
+				argv[4]);
+			return (-1);
+		}
+		data[5] = limit >> 0;
+		data[6] = limit >> 8;
+		/* correction */
+		if (str2uint(argv[6], &correction) != 0) {
+			lprintf(LOG_ERR,
+				"Given Correction '%s' is invalid.",
+				argv[6]);
+			return (-1);
+		}
+		data[7] = correction >> 0;
+		data[8] = correction >> 8;
+		data[9] = correction >> 16;
+		data[10] = correction >> 24;
+		data[11] = 0x00;  /* reserved */
+		data[12] = 0x00;  /* reserved */
+		/* sample */
+		if (str2ushort(argv[8], &sample) != 0) {
+			lprintf(LOG_ERR,
+				"Given Sample '%s' is invalid.",
+				argv[8]);
+			return (-1);
+		}
+		data[13] = sample >> 0;
+		data[14] = sample >> 8;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (chk_rsp(rsp)) {
+			return -1;
+		}
+	} else {
+		/* loop through each parameter and value until we have neither */
+		while ((argv[1] != NULL) && (argv[2] != NULL)) {
+			rc = ipmi_dcmi_pwr_slimit(intf, argv[1], argv[2]);
+			/* catch any error that the set limit function returned */
+			if (rc > 0) {
+				print_strs(dcmi_pwrmgmt_set_usage_vals,
+					"set_limit <parameter> <value>", LOG_ERR, 0);
+				return -1;
+			}
+			/* the first argument is the command and the second is the
+			* value.  Move argv two places; what is now 3 will be 1
+			*/
+			argv+=2;
+		}
+	}
+	return rc;
+}
+
+static int
+ipmi_dcmi_parse_power(struct ipmi_intf * intf, int argc, char **argv)
+{
+	int rc = 0;
+	uint8_t sample_time = 0;
+	/* power management */
+	switch (str2val2(argv[0], dcmi_pwrmgmt_vals)) {
+	case 0x00:
+	/* get reading */
+		if (argv[1] != NULL) {
+			if (!(sample_time = str2val2(argv[1], dcmi_sampling_vals))) {
+				print_strs(dcmi_sampling_vals,
+					"Invalid sample time. Valid times are: ",
+					LOG_ERR, 1);
+				printf("\n");
+				return -1;
+			}
+		}
+		rc = ipmi_dcmi_pwr_rd(intf, sample_time);
+		break;
+	case 0x01:
+		/* get limit */
+		/* because the get limit function is also used to
+		 * populate unchanged values for the set limit
+		 * command it returns an ipmi response structure
+		 */
+		rc = ipmi_dcmi_pwr_prnt_glimit(intf);
+		break;
+	case 0x02:
+		/* set limit */
+		if (argc < 4) {
+			print_strs(dcmi_pwrmgmt_set_usage_vals,
+				"set_limit <parameter> <value>",
+				LOG_ERR, 0);
+			return -1;
+		}
+		if (ipmi_dcmi_set_limit(intf, argc, argv) < 0)
+			return -1;
+		rc = ipmi_dcmi_pwr_prnt_glimit(intf);
+		break;
+	case 0x03:
+		/* activate */
+		rc = ipmi_dcmi_pwr_actdeact(intf, 1);
+		break;
+	case 0x04:
+		/* deactivate */
+		rc = ipmi_dcmi_pwr_actdeact(intf, 0);
+		break;
+	default:
+		/* no valid options */
+		print_strs(dcmi_pwrmgmt_vals,
+			"power <command>", LOG_ERR, 0);
+		break;
+	}
+	return rc;
+}
+/* end dcmi power command */
+
+static int
+ipmi_dcmi_thermalpolicy(struct ipmi_intf * intf, int argc, char **argv)
+{
+	int rc = 0;
+	uint8_t entityID = 0;
+	uint8_t entityInst = 0;
+	uint8_t persistanceFlag;
+	uint8_t actionHardPowerOff;
+	uint8_t actionLogToSEL;
+	uint8_t tempLimit = 0;
+	uint8_t samplingTimeLSB;
+	uint8_t samplingTimeMSB;
+	uint16_t samplingTime = 0;
+	/* Thermal policy get/set */
+	/* dcmitool dcmi thermalpolicy get */
+	switch (str2val2(argv[1], dcmi_thermalpolicy_vals)) {
+	case 0x00:
+		if (argc < 4) {
+			lprintf(LOG_NOTICE, "Get <entityID> <instanceID>");
+			return -1;
+		}
+		if (str2uchar(argv[2], &entityID) != 0) {
+			lprintf(LOG_ERR,
+					"Given Entity ID '%s' is invalid.",
+					argv[2]);
+			return (-1);
+		}
+		if (str2uchar(argv[3], &entityInst) != 0) {
+			lprintf(LOG_ERR,
+					"Given Instance ID '%s' is invalid.",
+					argv[3]);
+			return (-1);
+		}
+		rc = ipmi_dcmi_getthermalpolicy(intf,  entityID, entityInst);
+		break;
+	case 0x01:
+		if (argc < 4) {
+			lprintf(LOG_NOTICE, "Set <entityID> <instanceID>");
+			return -1;
+		} else if (argc < 9) {
+		print_strs(dcmi_thermalpolicy_set_parameters_vals,
+				"Set thermalpolicy instance parameters: "
+					"<volatile/nonvolatile/disabled> "
+					"<poweroff/nopoweroff/disabled> "
+					"<sel/nosel/disabled> <templimitByte> <exceptionTime>",
+					LOG_ERR, 0);
+			return -1;
+		}
+		if (str2uchar(argv[2], &entityID) != 0) {
+			lprintf(LOG_ERR,
+					"Given Entity ID '%s' is invalid.",
+					argv[2]);
+			return (-1);
+		}
+		if (str2uchar(argv[3], &entityInst) != 0) {
+			lprintf(LOG_ERR,
+					"Given Instance ID '%s' is invalid.",
+					argv[3]);
+			return (-1);
+		}
+		persistanceFlag = (uint8_t) str2val2(argv[4], dcmi_thermalpolicy_set_parameters_vals);
+		actionHardPowerOff = (uint8_t) str2val2(argv[5], dcmi_thermalpolicy_set_parameters_vals);
+		actionLogToSEL = (uint8_t) str2val2(argv[6], dcmi_thermalpolicy_set_parameters_vals);
+		if (str2uchar(argv[7], &tempLimit) != 0) {
+			lprintf(LOG_ERR,
+					"Given Temp Limit '%s' is invalid.",
+					argv[7]);
+			return (-1);
+		}
+		if (str2ushort(argv[8], &samplingTime) != 0) {
+			lprintf(LOG_ERR,
+					"Given Sampling Time '%s' is invalid.",
+					argv[8]);
+			return (-1);
+		}
+		samplingTimeLSB =  (samplingTime & 0xFF);
+		samplingTimeMSB = ((samplingTime & 0xFF00) >> 8);
+
+		rc = ipmi_dcmi_setthermalpolicy(intf,
+			entityID,
+			entityInst,
+			persistanceFlag,
+			actionHardPowerOff,
+			actionLogToSEL,
+			tempLimit,
+			samplingTimeLSB,
+			samplingTimeMSB);
+
+		break;
+	default:
+		print_strs(dcmi_thermalpolicy_vals,
+				"thermalpolicy <command>",
+				LOG_ERR, 0);
+		return -1;
+	}
+	return rc;
+}
+
+/*  main
+ *
+ * @intf:   dcmi interface handler
+ * @argc:   argument count
+ * @argv:   argument vector
+ */
+int
+ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char **argv)
+{
+	int rc = 0;
+	int i;
+	struct ipmi_rs *rsp;
+
+	if ((argc == 0) || (strncmp(argv[0], "help", 4) == 0)) {
+		print_strs(dcmi_cmd_vals,
+				"Data Center Management Interface commands",
+				LOG_ERR, 0);
+		return -1;
+	}
+	/* start the cmd requested */
+	switch (str2val2(argv[0], dcmi_cmd_vals)) {
+	case 0x00:
+		/* discover capabilities*/
+		for (i = 1; dcmi_capable_vals[i-1].str != NULL; i++) {
+			if (ipmi_dcmi_prnt_getcapabilities(intf, i) < 0) {
+				lprintf(LOG_ERR,"Error discovering %s capabilities!\n",
+						val2str2(i, dcmi_capable_vals));
+				return -1;
+			}
+		}
+		break;
+	case 0x01:
+		/* power */
+		argv++;
+		if (argv[0] == NULL) {
+			print_strs(dcmi_pwrmgmt_vals, "power <command>",
+					LOG_ERR, 0);
+			return -1;
+		}
+		rc = ipmi_dcmi_parse_power(intf, argc, argv);
+		break;
+		/* end power command */
+	case 0x02:
+		/* sensor print */
+		/* Look for each item in the dcmi_discvry_snsr_vals struct
+		 * and if it exists, print the sdr record id(s) for it.
+		 * Use the val from each one as the sensor number.
+		 */
+		for (i = 0; dcmi_discvry_snsr_vals[i].str != NULL; i++) {
+			/* get all of the information about this sensor */
+			rc = ipmi_dcmi_prnt_discvry_snsr(intf,
+					dcmi_discvry_snsr_vals[i].val);
+		}
+		break;
+		/* end sensor print */
+	case 0x03:
+		/* asset tag */
+		if(ipmi_dcmi_prnt_getassettag(intf) < 0) {
+			lprintf(LOG_ERR, "Error getting asset tag!");
+			return -1;
+		}
+		break;
+		/* end asset tag */
+	case 0x04:
+	{
+		/* set asset tag */
+		if (argc == 1 ) {
+			print_strs(dcmi_cmd_vals,
+					"Data Center Management Interface commands",
+					LOG_ERR, 0);
+			return -1;
+		}
+		if (ipmi_dcmi_prnt_setassettag(intf, (uint8_t *)argv[1]) < 0) {
+			lprintf(LOG_ERR, "\nError setting asset tag!");
+			return -1;
+		}
+		break;
+	}
+	/* end set asset tag */
+	case 0x05:
+		/* get management controller identifier string */
+		if (ipmi_dcmi_prnt_getmngctrlids(intf) < 0) {
+			lprintf(LOG_ERR,
+					"Error getting management controller identifier string!");
+			return -1;
+		}
+		break;
+		/* end get management controller identifier string */
+	case 0x06:
+	{
+		/* set management controller identifier string */
+		if (argc == 1 ) {
+			print_strs(dcmi_cmd_vals,
+					"Data Center Management Interface commands",
+					LOG_ERR, 0);
+			return -1;
+		}
+		if (ipmi_dcmi_prnt_setmngctrlids(intf, (uint8_t *)argv[1]) < 0) {
+			lprintf(LOG_ERR,
+					"Error setting management controller identifier string!");
+			return -1;
+		}
+		break;
+	}
+	/* end set management controller identifier string */
+	case 0x07:
+		/* get/set thermal policy */
+		rc = ipmi_dcmi_thermalpolicy(intf, argc, argv);
+		break;
+	case 0x08:
+		if(ipmi_dcmi_prnt_get_temp_readings(intf) < 0 ) {
+			lprintf(LOG_ERR,
+					"Error get temperature readings!");
+			return -1;
+		}
+		break;
+	case 0x09:
+		if(ipmi_dcmi_prnt_getconfparam(intf) < 0 ) {
+			lprintf(LOG_ERR,
+					"Error Get DCMI Configuration Parameters!");
+			return -1;
+		};
+		break;
+	case 0x0A:
+	{
+		switch (argc) {
+		case 2:
+			if (strncmp(argv[1], "activate_dhcp", 13) != 0) {
+				print_strs( dcmi_conf_param_vals,
+						"DCMI Configuration Parameters",
+						LOG_ERR, 0);
+				return -1;
+			}
+			break;
+		default:
+			if (argc != 3 || strncmp(argv[1], "help", 4) == 0) {
+				print_strs(dcmi_conf_param_vals,
+						"DCMI Configuration Parameters",
+						LOG_ERR, 0);
+				return -1;
+			}
+		}
+		if (strncmp(argv[1], "activate_dhcp", 13) == 0) {
+			rsp = ipmi_dcmi_setconfparam(intf, 1, 1);
+		} else {
+			uint16_t tmp_val = 0;
+			if (str2ushort(argv[2], &tmp_val) != 0) {
+				lprintf(LOG_ERR,
+						"Given %s '%s' is invalid.",
+						argv[1], argv[2]);
+				return (-1);
+			}
+			rsp = ipmi_dcmi_setconfparam(intf,
+					str2val2(argv[1], dcmi_conf_param_vals),
+					tmp_val);
+		}
+		if (chk_rsp(rsp)) {
+			lprintf(LOG_ERR,
+					"Error Set DCMI Configuration Parameters!");
+		}
+		break;
+	}
+	case 0x0B:
+	{
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR,
+					"\nOOB discovery is available only via RMCP interface.");
+			return -1;
+		}
+		if(ipmi_dcmi_prnt_oobDiscover(intf) < 0) {
+			lprintf(LOG_ERR, "\nOOB discovering capabilities failed.");
+			return -1;
+		}
+		break;
+	}
+	default:
+		/* couldn't detect what the user entered */
+		print_strs(dcmi_cmd_vals,
+				"Data Center Management Interface commands",
+				LOG_ERR, 0);
+		return -1;
+		break;
+	}
+	printf("\n");
+	return rc;
+}
+
+/*  Node Manager main
+ *
+ * @intf:   nm interface handler
+ * @argc:   argument count
+ * @argv:   argument vector
+ */
+int
+ipmi_nm_main(struct ipmi_intf * intf, int argc, char **argv)
+{
+	struct nm_discover disc;
+
+	if ((argc == 0) || (strncmp(argv[0], "help", 4) == 0)) {
+		print_strs(nm_cmd_vals,
+			"Node Manager Interface commands",
+			LOG_ERR, 0);
+		return -1;
+	}
+
+	switch (str2val2(argv[0], nm_cmd_vals)) {
+	/* discover */
+	case 0x00:
+		if (_ipmi_nm_discover(intf, &disc))
+			return -1;
+		printf("    Node Manager Version %s\n", val2str2(disc.nm_version, nm_version_vals));
+		printf("    revision %d.%d%d  patch version %d\n", disc.major_rev,
+				disc.minor_rev>>4, disc.minor_rev&0xf, disc.patch_version);
+		break;
+	/* capability */
+	case 0x01:
+		if (ipmi_nm_getcapabilities(intf, argc, argv))
+			return -1;
+		break;
+	/*  policy control enable-disable */
+	case 0x02:
+		if (ipmi_nm_control(intf, argc, argv))
+			return -1;
+		break;
+	/* policy */
+	case 0x03:
+		if (ipmi_nm_policy(intf, argc, argv))
+			return -1;
+		break;
+	/* Get statistics */
+	case 0x04:
+		if (ipmi_nm_get_statistics(intf, argc, argv))
+			return -1;
+		break;
+	/* set power draw range */
+	case 0x05:
+		if (ipmi_nm_set_range(intf, argc, argv))
+			return -1;
+		break;
+	/* set/get suspend periods */
+	case 0x06:
+		if (ipmi_nm_suspend(intf, argc, argv))
+			return -1;
+		break;
+	/* reset statistics */
+	case 0x07:
+		if (ipmi_nm_reset_statistics(intf, argc, argv))
+			return -1;
+		break;
+	/* set/get alert destination */
+	case 0x08:
+		if (ipmi_nm_alert(intf, argc, argv))
+			return -1;
+		break;
+	/* set/get alert thresholds */
+	case 0x09:
+		if (ipmi_nm_thresh(intf, argc, argv))
+			return -1;
+		break;
+	default:
+		print_strs(nm_cmd_vals, "Node Manager Interface commands", LOG_ERR, 0);
+		break;
+	}
+	return 0;
+}
+
+/* Display DCMI sensor information
+ * Uses the ipmi_sdr_get_next_header to read SDR header and compare to the
+ * target Record ID. Then either ipmi_sensor_print_full or
+ * ipmi_sensor_print_compact is called to print the data
+ *
+ * @intf:   ipmi interface handler
+ * @rec_id: target Record ID
+ */
+static int
+ipmi_print_sensor_info(struct ipmi_intf *intf, uint16_t rec_id)
+{
+	struct sdr_get_rs *header;
+	struct ipmi_sdr_iterator *itr;
+	int rc = 0;
+	uint8_t *rec = NULL;
+
+	itr = ipmi_sdr_start(intf, 0);
+	if (itr == NULL) {
+		lprintf(LOG_ERR, "Unable to open SDR for reading");
+		return (-1);
+	}
+
+	while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL) {
+		if (header->id == rec_id) {
+			break;
+		}
+	}
+	if (header == NULL) {
+		lprintf(LOG_DEBUG, "header == NULL");
+		ipmi_sdr_end(intf, itr);
+		return (-1);
+	}
+	/* yes, we found the SDR for this record ID, now get full record */
+	rec = ipmi_sdr_get_record(intf, header, itr);
+	if (rec == NULL) {
+		lprintf(LOG_DEBUG, "rec == NULL");
+		ipmi_sdr_end(intf, itr);
+		return (-1);
+	}
+	if ((header->type == SDR_RECORD_TYPE_FULL_SENSOR) ||
+			(header->type == SDR_RECORD_TYPE_COMPACT_SENSOR)) {
+		rc = ipmi_sdr_print_rawentry(intf, header->type,
+				rec, header->length);
+	} else {
+		rc = (-1);
+	}
+	free(rec);
+	rec = NULL;
+	ipmi_sdr_end(intf, itr);
+	return rc;
+}
diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c
new file mode 100644
index 0000000..bc78c1d
--- /dev/null
+++ b/lib/ipmi_delloem.c
@@ -0,0 +1,4247 @@
+/*
+ * Copyright (c) 2008, Dell Inc
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of Dell Inc nor the names of its contributors
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Thursday Oct 7 17:30:12 2009
+ * <deepaganesh_paulraj@dell.com>
+ *
+ * This code implements a dell OEM proprietary commands.
+ * This Code is edited and Implemented the License feature for Delloem
+ * Author Harsha S <Harsha_S1@dell.com>
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <ctype.h>
+#include <limits.h>
+#include <time.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_delloem.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_entity.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sensor.h>
+
+#define DELL_OEM_NETFN	(uint8_t)(0x30)
+#define GET_IDRAC_VIRTUAL_MAC	(uint8_t)(0xC9)
+/* 11g Support Macros */
+#define INVALID	(-1)
+#define SHARED	0
+#define SHARED_WITH_FAILOVER_LOM2	1
+#define DEDICATED	2
+#define SHARED_WITH_FAILOVER_ALL_LOMS	3
+/* 11g Support Macros */
+#define SHARED 				0
+#define SHARED_WITH_FAILOVER_LOM2 	1
+#define DEDICATED 			2
+#define SHARED_WITH_FAILOVER_ALL_LOMS 	3
+/* 12g Support Strings for nic selection */
+#define	INVAILD_FAILOVER_MODE		-2
+#define	INVAILD_FAILOVER_MODE_SETTINGS	-3
+#define	INVAILD_SHARED_MODE		-4
+
+#define	INVAILD_FAILOVER_MODE_STRING "ERROR: Cannot set shared with failover lom same as current shared lom."
+#define	INVAILD_FAILOVER_MODE_SET "ERROR: Cannot set shared with failover loms when NIC is set to dedicated Mode."
+#define	INVAILD_SHARED_MODE_SET_STRING "ERROR: Cannot set shared Mode for Blades."
+
+char AciveLOM_String [6] [10] = {
+	"None",
+	"LOM1",
+	"LOM2",
+	"LOM3",
+	"LOM4",
+	"dedicated"
+};
+/* 11g Support Strings for nic selection */
+char NIC_Selection_Mode_String [4] [50] = {
+	"shared",
+	"shared with failover lom2",
+	"dedicated",
+	"shared with Failover all loms"
+};
+
+char NIC_Selection_Mode_String_12g[] [50] = {
+	"dedicated",
+	"shared with lom1",
+	"shared with lom2",
+	"shared with lom3",
+	"shared with lom4",
+	"shared with failover lom1",
+	"shared with failover lom2",
+	"shared with failover lom3",
+	"shared with failover lom4",
+	"shared with failover all loms"
+};
+
+const struct vFlashstr vFlash_completion_code_vals[] = {
+	{0x00, "SUCCESS"},
+	{0x01, "NO_SD_CARD"},
+	{0x63, "UNKNOWN_ERROR"},
+	{0x00, NULL}
+};
+
+static int current_arg =0;
+uint8_t iDRAC_FLAG=0;
+
+/*
+ * new flags for
+ * 11G || 12G || 13G  -> _ALL
+ * 12G || 13G -> _12_13
+ *
+ */
+uint8_t iDRAC_FLAG_ALL=0;
+uint8_t iDRAC_FLAG_12_13=0;
+
+LCD_MODE lcd_mode;
+static uint8_t LcdSupported=0;
+static uint8_t SetLEDSupported=0;
+
+volatile uint8_t IMC_Type = IMC_IDRAC_10G;
+
+POWER_HEADROOM powerheadroom;
+
+uint8_t PowercapSetable_flag=0;
+uint8_t PowercapstatusFlag=0;
+
+static void usage(void);
+/* LCD Function prototypes */
+static int ipmi_delloem_lcd_main(struct ipmi_intf *intf, int argc,
+		char **argv);
+int ipmi_lcd_get_platform_model_name(struct ipmi_intf *intf, char *lcdstring,
+		uint8_t max_length, uint8_t field_type);
+static int ipmi_idracvalidator_command(struct ipmi_intf *intf);
+static int ipmi_lcd_get_configure_command_wh(struct ipmi_intf *intf);
+static int ipmi_lcd_get_configure_command(struct ipmi_intf *intf,
+		uint8_t *command);
+static int ipmi_lcd_set_configure_command(struct ipmi_intf *intf, int command);
+static int ipmi_lcd_set_configure_command_wh(struct ipmi_intf *intf, uint32_t  mode,
+		uint16_t lcdquallifier,uint8_t errordisp);
+static int ipmi_lcd_get_single_line_text(struct ipmi_intf *intf,
+		char *lcdstring, uint8_t max_length);
+static int ipmi_lcd_get_info_wh(struct ipmi_intf *intf);
+static int ipmi_lcd_get_info(struct ipmi_intf *intf);
+static int ipmi_lcd_get_status_val(struct ipmi_intf *intf,
+		LCD_STATUS *lcdstatus);
+static int IsLCDSupported();
+static void CheckLCDSupport(struct ipmi_intf *intf);
+static void ipmi_lcd_status_print(LCD_STATUS lcdstatus);
+static int ipmi_lcd_get_status(struct ipmi_intf *intf);
+static int ipmi_lcd_set_kvm(struct ipmi_intf *intf, char status);
+static int ipmi_lcd_set_lock(struct ipmi_intf *intf,  char lock);
+static int ipmi_lcd_set_single_line_text(struct ipmi_intf *intf, char *text);
+static int ipmi_lcd_set_text(struct ipmi_intf *intf, char *text,
+		int line_number);
+static int ipmi_lcd_configure_wh(struct ipmi_intf *intf, uint32_t mode,
+		uint16_t lcdquallifier, uint8_t errordisp, int8_t line_number, char *text);
+static int ipmi_lcd_configure(struct ipmi_intf *intf, int command,
+		int8_t line_number, char *text);
+static void ipmi_lcd_usage(void);
+/* MAC Function prototypes */
+static int ipmi_delloem_mac_main(struct ipmi_intf *intf, int argc, char **argv);
+static void InitEmbeddedNICMacAddressValues();
+static int ipmi_macinfo_drac_idrac_virtual_mac(struct ipmi_intf *intf,
+		uint8_t NicNum);
+static int ipmi_macinfo_drac_idrac_mac(struct ipmi_intf *intf,uint8_t NicNum);
+static int ipmi_macinfo_10g(struct ipmi_intf *intf, uint8_t NicNum);
+static int ipmi_macinfo_11g(struct ipmi_intf *intf, uint8_t NicNum);
+static int ipmi_macinfo(struct ipmi_intf *intf, uint8_t NicNum);
+static void ipmi_mac_usage(void);
+/* LAN Function prototypes */
+static int ipmi_delloem_lan_main(struct ipmi_intf *intf, int argc, char **argv);
+static int IsLANSupported();
+static int get_nic_selection_mode(int current_arg, char **argv);
+static int ipmi_lan_set_nic_selection(struct ipmi_intf *intf,
+		uint8_t nic_selection);
+static int ipmi_lan_get_nic_selection(struct ipmi_intf *intf);
+static int ipmi_lan_get_active_nic(struct ipmi_intf *intf);
+static void ipmi_lan_usage(void);
+static int ipmi_lan_set_nic_selection_12g(struct ipmi_intf *intf,
+		uint8_t *nic_selection);
+/* Power monitor Function prototypes */
+static int ipmi_delloem_powermonitor_main(struct ipmi_intf *intf, int argc,
+		char **argv);
+static void ipmi_time_to_str(time_t rawTime, char *strTime);
+static int ipmi_get_sensor_reading(struct ipmi_intf *intf,
+		unsigned char sensorNumber, SensorReadingType *pSensorReadingData);
+static int ipmi_get_power_capstatus_command(struct ipmi_intf *intf);
+static int ipmi_set_power_capstatus_command(struct ipmi_intf *intf,
+		uint8_t val);
+static int ipmi_powermgmt(struct ipmi_intf *intf);
+static int ipmi_powermgmt_clear(struct ipmi_intf *intf, uint8_t clearValue);
+static uint64_t watt_to_btuphr_conversion(uint32_t powerinwatt);
+static uint32_t btuphr_to_watt_conversion(uint64_t powerinbtuphr);
+static int ipmi_get_power_headroom_command(struct ipmi_intf *intf, uint8_t unit);
+static int ipmi_get_power_consumption_data(struct ipmi_intf *intf, uint8_t unit);
+static int ipmi_get_instan_power_consmpt_data(struct ipmi_intf *intf,
+		IPMI_INST_POWER_CONSUMPTION_DATA *instpowerconsumptiondata);
+static void ipmi_print_get_instan_power_Amps_data(
+		IPMI_INST_POWER_CONSUMPTION_DATA instpowerconsumptiondata);
+static int ipmi_print_get_power_consmpt_data(struct ipmi_intf *intf,
+		uint8_t  unit);
+static int ipmi_get_avgpower_consmpt_history(struct ipmi_intf *intf,
+		IPMI_AVGPOWER_CONSUMP_HISTORY *pavgpower);
+static int ipmi_get_peakpower_consmpt_history(struct ipmi_intf *intf,
+		IPMI_POWER_CONSUMP_HISTORY *pstPeakpower);
+static int ipmi_get_minpower_consmpt_history(struct ipmi_intf *intf,
+		IPMI_POWER_CONSUMP_HISTORY *pstMinpower);
+static int ipmi_print_power_consmpt_history(struct ipmi_intf *intf, int unit);
+static int ipmi_get_power_cap(struct ipmi_intf *intf,
+		IPMI_POWER_CAP *ipmipowercap);
+static int ipmi_print_power_cap(struct ipmi_intf *intf, uint8_t unit);
+static int ipmi_set_power_cap(struct ipmi_intf *intf, int unit, int val);
+static void ipmi_powermonitor_usage(void);
+/* vFlash Function prototypes */
+static int ipmi_delloem_vFlash_main(struct ipmi_intf *intf, int argc,
+		char **argv);
+const char *get_vFlash_compcode_str(uint8_t vflashcompcode,
+		const struct vFlashstr *vs);
+static int ipmi_get_sd_card_info(struct ipmi_intf *intf);
+static int ipmi_delloem_vFlash_process(struct ipmi_intf *intf, int current_arg,
+		char **argv);
+static void ipmi_vFlash_usage(void);
+/* LED Function prototypes */
+static int ipmi_getsesmask(int, char **argv);
+static void CheckSetLEDSupport(struct ipmi_intf *intf);
+static int IsSetLEDSupported(void);
+static void ipmi_setled_usage(void);
+static int ipmi_delloem_setled_main(struct ipmi_intf *intf, int argc,
+		char **argv);
+static int ipmi_setled_state(struct ipmi_intf *intf, int bayId, int slotId,
+		int state);
+static int ipmi_getdrivemap(struct ipmi_intf *intf, int b, int d, int f,
+		int *bayId, int *slotId);
+static int
+get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
+		char ** argv, char *nic_set);
+
+/* Function Name:       ipmi_delloem_main
+ *
+ * Description:         This function processes the delloem command
+ * Input:               intf    - ipmi interface
+ *                       argc    - no of arguments
+ *                       argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                                      -1 - failure
+ */
+int
+ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	current_arg = 0;
+	if (argc == 0 || strncmp(argv[0], "help\0", 5) == 0) {
+		usage();
+		return 0;
+	}
+	if (0 ==strncmp(argv[current_arg], "lcd\0", 4)) {
+		rc = ipmi_delloem_lcd_main(intf,argc,argv);
+	} else if (strncmp(argv[current_arg], "mac\0", 4) == 0) {
+		/* mac address*/
+		rc = ipmi_delloem_mac_main(intf,argc,argv);
+	} else if (strncmp(argv[current_arg], "lan\0", 4) == 0) {
+		/* lan address*/
+		rc = ipmi_delloem_lan_main(intf,argc,argv);
+	} else if (strncmp(argv[current_arg], "setled\0", 7) == 0) {
+		/* SetLED support */
+		rc = ipmi_delloem_setled_main(intf,argc,argv);
+	} else if (strncmp(argv[current_arg], "powermonitor\0", 13) == 0) {
+		/*Powermanagement report processing*/
+		rc = ipmi_delloem_powermonitor_main(intf,argc,argv);
+	} else if (strncmp(argv[current_arg], "vFlash\0", 7) == 0) {
+		/* vFlash Support */
+		rc = ipmi_delloem_vFlash_main(intf,argc,argv);
+	} else {
+		usage();
+		return -1;
+	}
+	return rc;
+}
+/*
+ * Function Name:     usage
+ *
+ * Description:       This function prints help message for delloem command
+ * Input:
+ * Output:
+ *
+ * Return:
+ *
+ */
+static void
+usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"usage: delloem <command> [option...]");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"commands:");
+	lprintf(LOG_NOTICE,
+"    lcd");
+	lprintf(LOG_NOTICE,
+"    mac");
+	lprintf(LOG_NOTICE,
+"    lan");
+	lprintf(LOG_NOTICE,
+"    setled");
+	lprintf(LOG_NOTICE,
+"    powermonitor");
+	lprintf(LOG_NOTICE,
+"    vFlash");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"For help on individual commands type:");
+	lprintf(LOG_NOTICE,
+"delloem <command> help");
+}
+/*
+ * Function Name:       ipmi_delloem_lcd_main
+ *
+ * Description:         This function processes the delloem lcd command
+ * Input:               intf    - ipmi interface
+ *                       argc    - no of arguments
+ *                       argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                         -1 - failure
+ *
+ */
+static int
+ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	current_arg++;
+	if (argc < current_arg) {
+		usage();
+		return -1;
+	}
+	/* ipmitool delloem lcd info*/
+	if (argc == 1 || strcmp(argv[current_arg], "help") == 0) {
+		ipmi_lcd_usage();
+		return 0;
+	}
+	CheckLCDSupport(intf);
+	ipmi_idracvalidator_command(intf);
+	if (!IsLCDSupported()) {
+		lprintf(LOG_ERR, "lcd is not supported on this system.");
+		return -1;
+	} else if (strncmp(argv[current_arg], "info\0", 5) == 0) {
+		if (iDRAC_FLAG_ALL) {
+			rc = ipmi_lcd_get_info_wh(intf);
+		} else {
+			rc = ipmi_lcd_get_info(intf);
+		}
+	} else if (strncmp(argv[current_arg], "status\0", 7) == 0) {
+		rc = ipmi_lcd_get_status(intf);
+	} else if (strncmp(argv[current_arg], "set\0", 4) == 0) {
+		/* ipmitool delloem lcd set*/
+		uint8_t line_number = 0;
+		current_arg++;
+		if (argc <= current_arg) {
+			ipmi_lcd_usage();
+			return -1;
+		}
+		if (strncmp(argv[current_arg], "line\0", 5) == 0) {
+			current_arg++;
+			if (argc <= current_arg) {
+				usage();
+				return -1;
+			}
+			if (str2uchar(argv[current_arg], &line_number) != 0) {
+				lprintf(LOG_ERR,
+						"Argument '%s' is either not a number or out of range.",
+						argv[current_arg]);
+				return (-1);
+			}
+			current_arg++;
+			if (argc <= current_arg) {
+				usage();
+				return -1;
+			}
+		}
+		if ((strncmp(argv[current_arg], "mode\0", 5) == 0)
+				&& (iDRAC_FLAG_ALL)) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (argv[current_arg] == NULL) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (strncmp(argv[current_arg], "none\0", 5) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_NONE, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "modelname\0", 10) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_DEFAULT, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "userdefined\0", 12) == 0) {
+				current_arg++;
+				if (argc <= current_arg) {
+					ipmi_lcd_usage();
+					return -1;
+				}
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_USER_DEFINED,
+						0xFF, 0XFF, line_number, argv[current_arg]);
+			} else if (strncmp(argv[current_arg], "ipv4address\0", 12) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_iDRAC_IPV4ADRESS,
+						0xFF, 0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "macaddress\0", 11) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_IDRAC_MAC_ADDRESS,
+							0xFF, 0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "systemname\0", 11) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_OS_SYSTEM_NAME, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "servicetag\0", 11) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_SERVICE_TAG, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "ipv6address\0", 12) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_iDRAC_IPV6ADRESS,
+						0xFF, 0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "ambienttemp\0", 12) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_AMBEINT_TEMP, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "systemwatt\0", 11) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_SYSTEM_WATTS, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "assettag\0", 9) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_ASSET_TAG, 0xFF,
+						0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "help\0", 5) == 0) {
+				ipmi_lcd_usage();
+			} else {
+				lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+						argv[current_arg]);
+				ipmi_lcd_usage();
+			}
+		} else if ((strncmp(argv[current_arg], "lcdqualifier\0", 13) == 0)
+				&& (iDRAC_FLAG_ALL)) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (argv[current_arg] == NULL) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (strncmp(argv[current_arg], "watt\0", 5) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x00, 0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "btuphr\0",7) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x01, 0XFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "celsius\0", 8) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x02, 0xFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "fahrenheit", 11) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x03, 0xFF, 0, NULL);
+			} else if (strncmp(argv[current_arg], "help\0", 5) == 0) {
+				ipmi_lcd_usage();
+			} else {
+				lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+						argv[current_arg]);
+				ipmi_lcd_usage();
+			}
+		} else if ((strncmp(argv[current_arg], "errordisplay\0", 13) == 0)
+				&& (iDRAC_FLAG_ALL)) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (argv[current_arg] == NULL) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (strncmp(argv[current_arg], "sel\0", 4) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0xFF,
+						IPMI_DELL_LCD_ERROR_DISP_SEL, 0, NULL);
+			} else if (strncmp(argv[current_arg], "simple\0", 7) == 0) {
+				rc = ipmi_lcd_configure_wh(intf, 0xFF, 0xFF,
+						IPMI_DELL_LCD_ERROR_DISP_VERBOSE, 0, NULL);
+			} else if (strncmp(argv[current_arg], "help\0", 5) == 0) {
+				ipmi_lcd_usage();
+			} else {
+				lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+						argv[current_arg]);
+				ipmi_lcd_usage();
+			}
+		} else if ((strncmp(argv[current_arg], "none\0", 5) == 0)
+				&& (iDRAC_FLAG==0)) {
+			rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_NONE, 0, NULL);
+		} else if ((strncmp(argv[current_arg], "default\0", 8) == 0)
+				&& (iDRAC_FLAG==0)) {
+			rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_DEFAULT, 0, NULL);
+		} else if ((strncmp(argv[current_arg], "custom\0", 7) == 0)
+				&& (iDRAC_FLAG==0)) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_USER_DEFINED,
+					line_number, argv[current_arg]);
+		} else if (strncmp(argv[current_arg], "vkvm\0", 5) == 0) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (strncmp(argv[current_arg], "active\0", 7) == 0) {
+				rc = ipmi_lcd_set_kvm(intf, 1);
+			} else if (strncmp(argv[current_arg], "inactive\0", 9) == 0) {
+				rc = ipmi_lcd_set_kvm(intf, 0);
+			} else if (strncmp(argv[current_arg], "help\0", 5) == 0) {
+				ipmi_lcd_usage();
+			} else {
+				lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+						argv[current_arg]);
+				ipmi_lcd_usage();
+			}
+		} else if (strncmp(argv[current_arg], "frontpanelaccess\0", 17) == 0) {
+			current_arg++;
+			if (argc <= current_arg) {
+				ipmi_lcd_usage();
+				return -1;
+			}
+			if (strncmp(argv[current_arg], "viewandmodify\0", 14) == 0) {
+				rc = ipmi_lcd_set_lock(intf, 0);
+			} else if (strncmp(argv[current_arg], "viewonly\0", 9)==0) {
+				rc =  ipmi_lcd_set_lock(intf, 1);
+			} else if (strncmp(argv[current_arg], "disabled\0", 9)==0) {
+				rc =  ipmi_lcd_set_lock(intf, 2);
+			} else if (strncmp(argv[current_arg], "help\0", 5) == 0) {
+				ipmi_lcd_usage();
+			} else {
+				lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+						argv[current_arg]);
+				ipmi_lcd_usage();
+			}
+		} else if( (strncmp(argv[current_arg], "help\0", 5) == 0)
+				&& (iDRAC_FLAG==0)) {
+			ipmi_lcd_usage();
+		} else {
+			lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+					argv[current_arg]);
+			ipmi_lcd_usage();
+			return -1;
+		}
+	} else {
+		lprintf(LOG_ERR, "Invalid DellOEM command: %s",
+				argv[current_arg]);
+		ipmi_lcd_usage();
+		return -1;
+	}
+	return rc;
+}
+/* ipmi_lcd_get_platform_model_name - This function retrieves the platform model
+ * name, or any other parameter which stores data in the same format
+ *
+ * @intf:        pointer to interface
+ * @lcdstring:   hostname/platform model string(output)
+ * @max_length:  length of the platform model string
+ * @field_type:  either hostname/platform model
+ *
+ * returns: 0 => success, other value means error
+ */
+int
+ipmi_lcd_get_platform_model_name(struct ipmi_intf * intf, char* lcdstring,
+		uint8_t max_length, uint8_t field_type)
+{
+	int bytes_copied = 0;
+	int ii = 0;
+	int lcdstring_len = 0;
+	int rc = 0;
+	IPMI_DELL_LCD_STRING lcdstringblock;
+
+	for (ii = 0; ii < 4; ii++) {
+		int bytes_to_copy;
+		rc = ipmi_mc_getsysinfo(intf, field_type, ii, 0, sizeof(lcdstringblock),
+				&lcdstringblock);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error getting platform model name");
+			break;
+		} else if (rc > 0) {
+			lprintf(LOG_ERR, "Error getting platform model name: %s",
+					val2str(rc, completion_code_vals));
+			break;
+		}
+		/* first block is different - 14 bytes*/
+		if (ii == 0) {
+			lcdstring_len = lcdstringblock.lcd_string.selector_0_string.length;
+			lcdstring_len = MIN(lcdstring_len,max_length);
+			bytes_to_copy = MIN(lcdstring_len, IPMI_DELL_LCD_STRING1_SIZE);
+			memcpy(lcdstring, lcdstringblock.lcd_string.selector_0_string.data,
+					bytes_to_copy);
+		} else {
+			int string_offset;
+			bytes_to_copy = MIN(lcdstring_len - bytes_copied,
+					IPMI_DELL_LCD_STRINGN_SIZE);
+			if (bytes_to_copy < 1) {
+				break;
+			}
+			string_offset = IPMI_DELL_LCD_STRING1_SIZE + IPMI_DELL_LCD_STRINGN_SIZE
+				* (ii-1);
+			memcpy(lcdstring + string_offset,
+					lcdstringblock.lcd_string.selector_n_data, bytes_to_copy);
+		}
+		bytes_copied += bytes_to_copy;
+		if (bytes_copied >= lcdstring_len) {
+			break;
+		}
+	}
+	return rc;
+}
+/*
+ * Function Name:    ipmi_idracvalidator_command
+ *
+ * Description:      This function returns the iDRAC6 type
+ * Input:            intf            - ipmi interface
+ * Output:
+ *
+ * Return:           iDRAC6 type     1 - whoville
+ *                                   0 - others
+ */
+static int
+ipmi_idracvalidator_command(struct ipmi_intf * intf)
+{
+	int rc;
+	uint8_t data[11];
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_IDRAC_VALIDATOR, 2, 0, sizeof(data),
+			data);
+	if (rc < 0) {
+		/*lprintf(LOG_ERR, " Error getting IMC type"); */
+		return -1;
+	} else if (rc > 0) {
+		/*lprintf(LOG_ERR, " Error getting IMC type: %s",
+		val2str(rsp->ccode, completion_code_vals));  */
+		return -1;
+	}
+	/*
+	 * Set the new flags to 0
+	 */
+	iDRAC_FLAG_ALL = 0;
+	iDRAC_FLAG_12_13 = 0;
+	/* Support the 11G Monolithic, modular, Maisy and Coaster */
+	if ((IMC_IDRAC_11G_MONOLITHIC == data[10])
+			|| (IMC_IDRAC_11G_MODULAR == data[10])
+			|| (IMC_MASER_LITE_BMC == data[10])
+			|| (IMC_MASER_LITE_NU == data[10])) {
+		iDRAC_FLAG=IDRAC_11G;
+		iDRAC_FLAG_ALL = 1;
+	} else if((IMC_IDRAC_12G_MONOLITHIC == data[10])
+			|| (IMC_IDRAC_12G_MODULAR == data[10])) {
+		iDRAC_FLAG = IDRAC_12G;
+		iDRAC_FLAG_ALL = 1;
+		iDRAC_FLAG_12_13 = 1;
+	} else if ((IMC_IDRAC_13G_MONOLITHIC == data[10])
+			|| (IMC_IDRAC_13G_MODULAR == data[10])
+			|| (IMC_IDRAC_13G_DCS == data[10])) {
+		iDRAC_FLAG=IDRAC_13G;
+		iDRAC_FLAG_ALL = 1;
+		iDRAC_FLAG_12_13 = 1;
+	} else {
+		iDRAC_FLAG = 0;
+		iDRAC_FLAG_ALL = 0;
+		iDRAC_FLAG_12_13 = 0;
+	}
+	IMC_Type = data[10];
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_configure_command_wh
+ *
+ * Description:      This function returns current lcd configuration for Dell OEM LCD command
+ * Input:            intf            - ipmi interface
+ * Global:           lcd_mode - lcd mode setting
+ * Output:
+ *
+ * Return:           returns the current lcd configuration
+ *                   0 = User defined
+ *                   1 = Default
+ *                   2 = None
+ */
+static int
+ipmi_lcd_get_configure_command_wh(struct ipmi_intf * intf)
+{
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0,
+			sizeof(lcd_mode), &lcd_mode);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting LCD configuration");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)){
+		lprintf(LOG_ERR, "Error getting LCD configuration: "
+				"Command not supported on this system.");
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error getting LCD configuration: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_configure_command
+ *
+ * Description:   This function returns current lcd configuration for Dell OEM
+ * LCD command
+ * Input:         intf            - ipmi interface
+ * Output:        command         - user defined / default / none / ipv4 / mac address /
+ *                 system name / service tag / ipv6 / temp / system watt / asset tag
+ *
+ * Return:
+ */
+static int
+ipmi_lcd_get_configure_command(struct ipmi_intf * intf, uint8_t *command)
+{
+	uint8_t data[4];
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_CONFIG_SELECTOR, 0, 0,
+			sizeof(data), data);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting LCD configuration");
+		return -1;
+	} else if ((rc == 0xc1)||(rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting LCD configuration: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error getting LCD configuration: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	/* rsp->data[0] is the rev */
+	*command = data[1];
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_set_configure_command
+ *
+ * Description:      This function updates current lcd configuration
+ * Input:            intf            - ipmi interface
+ *                   command         - user defined / default / none / ipv4 / mac address /
+ *                        system name / service tag / ipv6 / temp / system watt / asset tag
+ * Output:
+ * Return:
+ */
+static int
+ipmi_lcd_set_configure_command(struct ipmi_intf * intf, int command)
+{
+	#define LSCC_DATA_LEN 2
+	uint8_t data[2];
+	int rc;
+	data[0] = IPMI_DELL_LCD_CONFIG_SELECTOR;
+	data[1] = command;                      /* command - custom, default, none */
+	rc = ipmi_mc_setsysinfo(intf, 2, data);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error setting LCD configuration");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error setting LCD configuration: "
+				"Command not supported on this system.");
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error setting LCD configuration: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_set_configure_command
+ *
+ * Description:      This function updates current lcd configuration
+ * Input:            intf            - ipmi interface
+ *                   mode            - user defined / default / none
+ *                   lcdquallifier   - lcd quallifier id
+ *                   errordisp       - error number
+ * Output:
+ * Return:
+ */
+static int
+ipmi_lcd_set_configure_command_wh(struct ipmi_intf * intf, uint32_t  mode,
+		uint16_t lcdquallifier, uint8_t errordisp)
+{
+	#define LSCC_DATA_LEN 2
+	uint8_t data[13];
+	int rc;
+	ipmi_lcd_get_configure_command_wh(intf);
+	data[0] = IPMI_DELL_LCD_CONFIG_SELECTOR;
+	if (mode != 0xFF) {
+		data[1] = mode & 0xFF; /* command - custom, default, none*/
+		data[2] = (mode & 0xFF00) >> 8;
+		data[3] = (mode & 0xFF0000) >> 16;
+		data[4] = (mode & 0xFF000000) >> 24;
+	} else {
+		data[1] = (lcd_mode.lcdmode) & 0xFF; /* command - custom, default, none*/
+		data[2] = ((lcd_mode.lcdmode) & 0xFF00) >> 8;
+		data[3] = ((lcd_mode.lcdmode) & 0xFF0000) >> 16;
+		data[4] = ((lcd_mode.lcdmode) & 0xFF000000) >> 24;
+	}
+	if (lcdquallifier != 0xFF) {
+		if(lcdquallifier == 0x01) {
+			data[5] = (lcd_mode.lcdquallifier) | 0x01; /* command - custom, default, none*/
+		} else  if (lcdquallifier == 0x00) {
+			data[5] = (lcd_mode.lcdquallifier) & 0xFE; /* command - custom, default, none*/
+		} else if (lcdquallifier == 0x03) {
+			data[5] = (lcd_mode.lcdquallifier) | 0x02; /* command - custom, default, none*/
+		} else if (lcdquallifier == 0x02) {
+			data[5] = (lcd_mode.lcdquallifier) & 0xFD;
+		}
+	} else {
+		data[5] = lcd_mode.lcdquallifier;
+	}
+	if (errordisp != 0xFF) {
+		data[11] = errordisp;
+	} else {
+		data[11] = lcd_mode.error_display;
+	}
+	rc = ipmi_mc_setsysinfo(intf, 13, data);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error setting LCD configuration");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error setting LCD configuration: "
+				"Command not supported on this system.");
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error setting LCD configuration: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_single_line_text
+ *
+ * Description:    This function updates current lcd configuration
+ * Input:          intf            - ipmi interface
+ *                 lcdstring       - new string to be updated
+ *                 max_length      - length of the string
+ * Output:
+ * Return:
+ */
+static int
+ipmi_lcd_get_single_line_text(struct ipmi_intf * intf, char* lcdstring,
+		uint8_t max_length)
+{
+	IPMI_DELL_LCD_STRING lcdstringblock;
+	int lcdstring_len = 0;
+	int bytes_copied = 0;
+	int ii, rc;
+	for (ii = 0; ii < 4; ii++) {
+		int bytes_to_copy;
+		rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_STRING_SELECTOR, ii, 0,
+				sizeof(lcdstringblock), &lcdstringblock);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error getting text data");
+			return -1;
+		} else if (rc > 0) {
+			lprintf(LOG_ERR, "Error getting text data: %s",
+					val2str(rc, completion_code_vals));
+			return -1;
+		}
+		/* first block is different - 14 bytes*/
+		if (0 == ii) {
+			lcdstring_len = lcdstringblock.lcd_string.selector_0_string.length;
+			if (lcdstring_len < 1 || lcdstring_len > max_length) {
+				break;
+			}
+			bytes_to_copy = MIN(lcdstring_len, IPMI_DELL_LCD_STRING1_SIZE);
+			memcpy(lcdstring, lcdstringblock.lcd_string.selector_0_string.data,
+					bytes_to_copy);
+		} else {
+			int string_offset;
+			bytes_to_copy = MIN(lcdstring_len - bytes_copied,
+					IPMI_DELL_LCD_STRINGN_SIZE);
+			if (bytes_to_copy < 1) {
+				break;
+			}
+			string_offset = IPMI_DELL_LCD_STRING1_SIZE + IPMI_DELL_LCD_STRINGN_SIZE
+				* (ii-1);
+			memcpy(lcdstring+string_offset,
+					lcdstringblock.lcd_string.selector_n_data, bytes_to_copy);
+		}
+		bytes_copied += bytes_to_copy;
+		if (bytes_copied >= lcdstring_len) {
+			break;
+		}
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_info_wh
+ *
+ * Description:     This function prints current lcd configuration for whoville platform
+ * Input:           intf            - ipmi interface
+ * Output:
+ * Return:
+ */
+static int
+ipmi_lcd_get_info_wh(struct ipmi_intf * intf)
+{
+	IPMI_DELL_LCD_CAPS lcd_caps;
+	char lcdstring[IPMI_DELL_LCD_STRING_LENGTH_MAX+1] = {0};
+	int rc;
+	printf("LCD info\n");
+	if (ipmi_lcd_get_configure_command_wh(intf) != 0) {
+		return -1;
+	}
+	if (lcd_mode.lcdmode== IPMI_DELL_LCD_CONFIG_DEFAULT) {
+		char text[IPMI_DELL_LCD_STRING_LENGTH_MAX+1] = {0};
+		if (ipmi_lcd_get_platform_model_name(intf, text,
+					IPMI_DELL_LCD_STRING_LENGTH_MAX,
+					IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR) != 0) {
+			return (-1);
+		}
+		printf("    Setting:Model name\n");
+		printf("    Line 1:  %s\n", text);
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_CONFIG_NONE) {
+		printf("    Setting:   none\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_CONFIG_USER_DEFINED) {
+		printf("    Setting: User defined\n");
+		rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0,
+				sizeof(lcd_caps), &lcd_caps);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities.");
+			return -1;
+		} else if ((rc == 0xc1) || (rc == 0xcb)) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities: "
+					"Command not supported on this system.");
+		} else if (rc > 0) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities: %s",
+					val2str(rc, completion_code_vals));
+			return -1;
+		}
+		if (lcd_caps.number_lines > 0) {
+			memset(lcdstring, 0, IPMI_DELL_LCD_STRING_LENGTH_MAX + 1);
+			rc = ipmi_lcd_get_single_line_text(intf, lcdstring,
+					lcd_caps.max_chars[0]);
+			printf("    Text:    %s\n", lcdstring);
+		} else {
+			printf("    No lines to show\n");
+		}
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_iDRAC_IPV4ADRESS) {
+		printf("    Setting:   IPV4 Address\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_IDRAC_MAC_ADDRESS) {
+		printf("    Setting:   MAC Address\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_OS_SYSTEM_NAME) {
+		printf("    Setting:   OS System Name\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_SERVICE_TAG) {
+		printf("    Setting:   System Tag\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_iDRAC_IPV6ADRESS) {
+		printf("    Setting:  IPV6 Address\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_ASSET_TAG) {
+		printf("    Setting:  Asset Tag\n");
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_AMBEINT_TEMP) {
+		printf("    Setting:  Ambient Temp\n");
+		if (lcd_mode.lcdquallifier & 0x02) {
+			printf("    Unit:  F\n");
+		} else {
+			printf("    Unit:  C\n");
+		}
+	} else if (lcd_mode.lcdmode == IPMI_DELL_LCD_SYSTEM_WATTS) {
+		printf("    Setting:  System Watts\n");
+		if (lcd_mode.lcdquallifier & 0x01) {
+			printf("    Unit:  BTU/hr\n");
+		} else {
+			printf("    Unit:  Watt\n");
+		}
+	}
+	if (lcd_mode.error_display == IPMI_DELL_LCD_ERROR_DISP_SEL) {
+		printf("    Error Display:  SEL\n");
+	} else if (lcd_mode.error_display == IPMI_DELL_LCD_ERROR_DISP_VERBOSE) {
+		printf("    Error Display:  Simple\n");
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_info
+ *
+ * Description:      This function prints current lcd configuration for platform other than whoville
+ * Input:            intf            - ipmi interface
+ * Output:
+ * Return:
+ */
+static int
+ipmi_lcd_get_info(struct ipmi_intf * intf)
+{
+	IPMI_DELL_LCD_CAPS lcd_caps;
+	uint8_t command = 0;
+	char lcdstring[IPMI_DELL_LCD_STRING_LENGTH_MAX+1] = {0};
+	int rc;
+
+	printf("LCD info\n");
+
+	if (ipmi_lcd_get_configure_command(intf, &command) != 0) {
+		return -1;
+	}
+	if (command == IPMI_DELL_LCD_CONFIG_DEFAULT) {
+		memset(lcdstring,0,IPMI_DELL_LCD_STRING_LENGTH_MAX+1);
+		if (ipmi_lcd_get_platform_model_name(intf, lcdstring,
+					IPMI_DELL_LCD_STRING_LENGTH_MAX,
+					IPMI_DELL_PLATFORM_MODEL_NAME_SELECTOR) != 0) {
+			return (-1);
+		}
+		printf("    Setting: default\n");
+		printf("    Line 1:  %s\n", lcdstring);
+	} else if (command == IPMI_DELL_LCD_CONFIG_NONE) {
+		printf("    Setting:   none\n");
+	} else if (command == IPMI_DELL_LCD_CONFIG_USER_DEFINED) {
+		printf("    Setting: custom\n");
+		rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0,
+				sizeof(lcd_caps), &lcd_caps);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities.");
+			return -1;
+		} else if ((rc == 0xc1) || (rc == 0xcb)) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities: "
+					"Command not supported on this system.");
+		} else if (rc > 0) {
+			lprintf(LOG_ERR, "Error getting LCD capabilities: %s",
+					val2str(rc, completion_code_vals));
+			return -1;
+		}
+		if (lcd_caps.number_lines > 0) {
+			memset(lcdstring, 0, IPMI_DELL_LCD_STRING_LENGTH_MAX + 1);
+			rc = ipmi_lcd_get_single_line_text(intf, lcdstring,
+					lcd_caps.max_chars[0]);
+			printf("    Text:    %s\n", lcdstring);
+		} else {
+			printf("    No lines to show\n");
+		}
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_lcd_get_status_val
+ *
+ * Description:      This function gets current lcd configuration
+ * Input:            intf            - ipmi interface
+ * Output:           lcdstatus       - KVM Status & Lock Status
+ * Return:
+ */
+static int
+ipmi_lcd_get_status_val(struct ipmi_intf * intf, LCD_STATUS* lcdstatus)
+{
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0,
+			sizeof(*lcdstatus), lcdstatus);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting LCD Status");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting LCD status: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error getting LCD Status: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    IsLCDSupported
+ *
+ * Description:   This function returns whether lcd supported or not
+ * Input:
+ * Output:
+ * Return:
+ */
+static int
+IsLCDSupported()
+{
+	return LcdSupported;
+}
+/*
+ * Function Name:         CheckLCDSupport
+ *
+ * Description:  This function checks whether lcd supported or not
+ * Input:        intf            - ipmi interface
+ * Output:
+ * Return:
+ */
+static void
+CheckLCDSupport(struct ipmi_intf * intf)
+{
+	int rc;
+	LcdSupported = 0;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_STATUS_SELECTOR, 0, 0, 0, NULL);
+	if (rc == 0) {
+		LcdSupported = 1;
+	}
+}
+/*
+ * Function Name:     ipmi_lcd_status_print
+ *
+ * Description:    This function prints current lcd configuration KVM Status & Lock Status
+ * Input:          lcdstatus - KVM Status & Lock Status
+ * Output:
+ * Return:
+ */
+static void
+ipmi_lcd_status_print(LCD_STATUS lcdstatus)
+{
+	switch (lcdstatus.vKVM_status) {
+		case 0x00:
+			printf("LCD KVM Status :Inactive\n");
+			break;
+		case 0x01:
+			printf("LCD KVM Status :Active\n");
+			break;
+		default:
+			printf("LCD KVM Status :Invalid Status\n");
+			break;
+	}
+	switch (lcdstatus.lock_status) {
+		case 0x00:
+			printf("LCD lock Status :View and modify\n");
+			break;
+		case 0x01:
+			printf("LCD lock Status :View only\n");
+			break;
+		case 0x02:
+			printf("LCD lock Status :disabled\n");
+			break;
+		default:
+			printf("LCD lock Status :Invalid\n");
+			break;
+	}
+}
+/*
+ * Function Name:     ipmi_lcd_get_status
+ *
+ * Description:      This function gets current lcd KVM active status & lcd access mode
+ * Input:            intf            - ipmi interface
+ * Output:
+ * Return:           -1 on error
+ *                   0 if successful
+ */
+static int
+ipmi_lcd_get_status(struct ipmi_intf * intf)
+{
+	int rc=0;
+	LCD_STATUS  lcdstatus;
+	rc =ipmi_lcd_get_status_val( intf, &lcdstatus);
+	if (rc < 0) {
+		return -1;
+	}
+	ipmi_lcd_status_print(lcdstatus);
+	return rc;
+}
+/*
+ * Function Name:     ipmi_lcd_set_kvm
+ *
+ * Description:       This function sets lcd KVM active status
+ * Input:             intf            - ipmi interface
+ *                    status  - Inactive / Active
+ * Output:
+ * Return:            -1 on error
+ *                    0 if successful
+ */
+static int
+ipmi_lcd_set_kvm(struct ipmi_intf * intf, char status)
+{
+	#define LSCC_DATA_LEN 2
+	LCD_STATUS lcdstatus;
+	int rc=0;
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[5];
+	rc = ipmi_lcd_get_status_val(intf,&lcdstatus);
+	if (rc < 0) {
+		return -1;
+	}
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_SET_SYS_INFO;
+	req.msg.data_len = 5;
+	req.msg.data = data;
+	data[0] = IPMI_DELL_LCD_STATUS_SELECTOR;
+	data[1] = status; /* active- incative*/
+	data[2] = lcdstatus.lock_status; /* full-veiw-locked */
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting LCD status");
+		rc= -1;
+	} else if ((rsp->ccode == 0xc1) || (rsp->ccode == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting LCD status: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error setting LCD status: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		rc= -1;
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_set_lock
+ *
+ * Description:     This function sets lcd access mode
+ * Input:           intf            - ipmi interface
+ *                  lock    - View and modify / View only / Diabled
+ * Output:
+ * Return:          -1 on error
+ *                  0 if successful
+ */
+static int
+ipmi_lcd_set_lock(struct ipmi_intf * intf,  char lock)
+{
+	#define LSCC_DATA_LEN 2
+	LCD_STATUS lcdstatus;
+	int rc =0;
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[5];
+	rc = ipmi_lcd_get_status_val(intf,&lcdstatus);
+	if (rc < 0) {
+		return -1;
+	}
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_SET_SYS_INFO;
+	req.msg.data_len = 5;
+	req.msg.data = data;
+	data[0] = IPMI_DELL_LCD_STATUS_SELECTOR;
+	data[1] = lcdstatus.vKVM_status; /* active- incative */
+	data[2] = lock; /* full- veiw-locked */
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting LCD status");
+		rc = -1;
+	} else if ((rsp->ccode == 0xc1) || (rsp->ccode == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting LCD status: "
+				"Command not supported on this system.");
+		rc = -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error setting LCD status: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		rc= -1;
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_set_single_line_text
+ *
+ * Description:    This function sets lcd line text
+ * Input:          intf            - ipmi interface
+ *                 text    - lcd string
+ * Output:
+ * Return:         -1 on error
+ *                 0 if successful
+ */
+static int
+ipmi_lcd_set_single_line_text(struct ipmi_intf * intf, char * text)
+{
+	uint8_t data[18];
+	int bytes_to_store = strlen(text);
+	int bytes_stored = 0;
+	int ii;
+	int rc = 0;
+	if (bytes_to_store > IPMI_DELL_LCD_STRING_LENGTH_MAX) {
+		lprintf(LOG_ERR, "Out of range Max limit is 62 characters");
+		return (-1);
+	} else {
+		bytes_to_store = MIN(bytes_to_store, IPMI_DELL_LCD_STRING_LENGTH_MAX);
+		for (ii = 0; ii < 4; ii++) {
+			/*first block, 2 bytes parms and 14 bytes data*/
+			if (0 == ii) {
+				int size_of_copy = MIN((bytes_to_store - bytes_stored),
+						IPMI_DELL_LCD_STRING1_SIZE);
+				if (size_of_copy < 0) {
+					/* allow 0 string length*/
+					break;
+				}
+				data[0] = IPMI_DELL_LCD_STRING_SELECTOR;
+				data[1] = ii; /* block number to use (0)*/
+				data[2] = 0; /*string encoding*/
+				data[3] = bytes_to_store; /* total string length*/
+				memcpy(data + 4, text+bytes_stored, size_of_copy);
+				bytes_stored += size_of_copy;
+			} else {
+				int size_of_copy = MIN((bytes_to_store - bytes_stored),
+						IPMI_DELL_LCD_STRINGN_SIZE);
+				if (size_of_copy <= 0) {
+					break;
+				}
+				data[0] = IPMI_DELL_LCD_STRING_SELECTOR;
+				data[1] = ii; /* block number to use (1,2,3)*/
+				memcpy(data + 2, text+bytes_stored, size_of_copy);
+				bytes_stored += size_of_copy;
+			}
+			rc = ipmi_mc_setsysinfo(intf, 18, data);
+			if (rc < 0) {
+				lprintf(LOG_ERR, "Error setting text data");
+				rc = -1;
+			} else if (rc > 0) {
+				lprintf(LOG_ERR, "Error setting text data: %s",
+						val2str(rc, completion_code_vals));
+				rc = -1;
+			}
+		}
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_set_text
+ *
+ * Description:     This function sets lcd line text
+ * Input:           intf            - ipmi interface
+ *                  text    - lcd string
+ *                  line_number- line number
+ * Output:
+ * Return:          -1 on error
+ *                  0 if successful
+ */
+static int
+ipmi_lcd_set_text(struct ipmi_intf * intf, char * text, int line_number)
+{
+	int rc = 0;
+	IPMI_DELL_LCD_CAPS lcd_caps;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_LCD_GET_CAPS_SELECTOR, 0, 0,
+			sizeof(lcd_caps), &lcd_caps);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting LCD capabilities");
+		return -1;
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error getting LCD capabilities: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (lcd_caps.number_lines > 0) {
+		rc = ipmi_lcd_set_single_line_text(intf, text);
+	} else {
+		lprintf(LOG_ERR, "LCD does not have any lines that can be set");
+		rc = -1;
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_configure_wh
+ *
+ * Description:     This function updates the current lcd configuration
+ * Input:           intf            - ipmi interface
+ *                  lcdquallifier- lcd quallifier
+ *                  errordisp       - error number
+ *                  line_number-line number
+ *                  text            - lcd string
+ * Output:
+ * Return:          -1 on error
+ *                  0 if successful
+ */
+static int
+ipmi_lcd_configure_wh(struct ipmi_intf * intf, uint32_t  mode,
+		uint16_t lcdquallifier, uint8_t errordisp, int8_t line_number, char * text)
+{
+	int rc = 0;
+	if (IPMI_DELL_LCD_CONFIG_USER_DEFINED == mode) {
+		/* Any error was reported earlier. */
+		rc = ipmi_lcd_set_text(intf, text, line_number);
+	}
+	if (rc == 0) {
+		rc = ipmi_lcd_set_configure_command_wh(intf, mode ,lcdquallifier,errordisp);
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_configure
+ *
+ * Description:     This function updates the current lcd configuration
+ * Input:           intf            - ipmi interface
+ *                  command- lcd command
+ *                  line_number-line number
+ *                  text            - lcd string
+ * Output:
+ * Return:          -1 on error
+ *                  0 if successful
+ */
+static int
+ipmi_lcd_configure(struct ipmi_intf * intf, int command,
+		int8_t line_number, char * text)
+{
+	int rc = 0;
+	if (IPMI_DELL_LCD_CONFIG_USER_DEFINED == command) {
+		rc = ipmi_lcd_set_text(intf, text, line_number);
+	}
+	if (rc == 0) {
+		rc = ipmi_lcd_set_configure_command(intf, command);
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_lcd_usage
+ *
+ * Description:   This function prints help message for lcd command
+ * Input:
+ * Output:
+ *
+ * Return:
+ */
+static void
+ipmi_lcd_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"Generic DELL HW:");
+	lprintf(LOG_NOTICE,
+"   lcd set {none}|{default}|{custom <text>}");
+	lprintf(LOG_NOTICE,
+"      Set LCD text displayed during non-fault conditions");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"iDRAC 11g or iDRAC 12g or  iDRAC 13g :");
+	lprintf(LOG_NOTICE,
+"   lcd set {mode}|{lcdqualifier}|{errordisplay}");
+	lprintf(LOG_NOTICE,
+"      Allows you to set the LCD mode and user-defined string.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd set mode {none}|{modelname}|{ipv4address}|{macaddress}|");
+	lprintf(LOG_NOTICE,
+"   {systemname}|{servicetag}|{ipv6address}|{ambienttemp}");
+	lprintf(LOG_NOTICE,
+"   {systemwatt }|{assettag}|{userdefined}<text>");
+	lprintf(LOG_NOTICE,
+"	   Allows you to set the LCD display mode to any of the preceding");
+	lprintf(LOG_NOTICE,
+"      parameters");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd set lcdqualifier {watt}|{btuphr}|{celsius}|{fahrenheit}");
+	lprintf(LOG_NOTICE,
+"      Allows you to set the unit for the system ambient temperature mode.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd set errordisplay {sel}|{simple}");
+	lprintf(LOG_NOTICE,
+"      Allows you to set the error display.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd info");
+	lprintf(LOG_NOTICE,
+"      Show LCD text that is displayed during non-fault conditions");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd set vkvm{active}|{inactive}");
+	lprintf(LOG_NOTICE,
+"      Set vKVM active and inactive, message will be displayed on lcd");
+	lprintf(LOG_NOTICE,
+"      when vKVM is active and vKVM session is in progress");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd set frontpanelaccess {viewandmodify}|{viewonly}|{disabled}");
+	lprintf(LOG_NOTICE,
+"      Set LCD mode to view and modify, view only or disabled ");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lcd status");
+	lprintf(LOG_NOTICE,
+"      Show LCD Status for vKVM display<active|inactive>");
+	lprintf(LOG_NOTICE,
+"      and Front Panel access mode {viewandmodify}|{viewonly}|{disabled}");
+	lprintf(LOG_NOTICE,
+"");
+}
+/*
+ * Function Name:       ipmi_delloem_mac_main
+ *
+ * Description:         This function processes the delloem mac command
+ * Input:               intf    - ipmi interface
+ *                       argc    - no of arguments
+ *                       argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                         -1 - failure
+ */
+static int
+ipmi_delloem_mac_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	int currIdInt = -1;
+	current_arg++;
+	if (argc > 1 && strcmp(argv[current_arg], "help") == 0) {
+		ipmi_mac_usage();
+		return 0;
+	}
+	ipmi_idracvalidator_command(intf);
+	if (argc == 1) {
+		rc = ipmi_macinfo(intf, 0xff);
+	} else if (strncmp(argv[current_arg], "list\0", 5) == 0) {
+		rc = ipmi_macinfo(intf, 0xff);
+	} else if (strncmp(argv[current_arg], "get\0", 4) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_mac_usage();
+			return -1;
+		}
+		if (str2int(argv[current_arg],&currIdInt) != 0) {
+			lprintf(LOG_ERR,
+					"Invalid NIC number. The NIC number should be between 0-8");
+			return -1;
+		}
+		if ((currIdInt > 8) || (currIdInt < 0)) {
+			lprintf(LOG_ERR,
+					"Invalid NIC number. The NIC number should be between 0-8");
+			return -1;
+		}
+		rc = ipmi_macinfo(intf, currIdInt);
+	} else {
+		ipmi_mac_usage();
+	}
+	return rc;
+}
+
+EmbeddedNICMacAddressType EmbeddedNICMacAddress;
+
+EmbeddedNICMacAddressType_10G EmbeddedNICMacAddress_10G;
+
+static void
+InitEmbeddedNICMacAddressValues()
+{
+	uint8_t i;
+	uint8_t j;
+	for (i = 0; i < MAX_LOM; i++) {
+		EmbeddedNICMacAddress.LOMMacAddress[i].BladSlotNumber = 0;
+		EmbeddedNICMacAddress.LOMMacAddress[i].MacType = LOM_MACTYPE_RESERVED;
+		EmbeddedNICMacAddress.LOMMacAddress[i].EthernetStatus =
+			LOM_ETHERNET_RESERVED;
+		EmbeddedNICMacAddress.LOMMacAddress[i].NICNumber = 0;
+		EmbeddedNICMacAddress.LOMMacAddress[i].Reserved = 0;
+		for (j = 0; j < MACADDRESSLENGH; j++) {
+			EmbeddedNICMacAddress.LOMMacAddress[i].MacAddressByte[j] = 0;
+			EmbeddedNICMacAddress_10G.MacAddress[i].MacAddressByte[j] = 0;
+		}
+	}
+}
+
+uint8_t UseVirtualMacAddress = 0;
+static int
+ipmi_macinfo_drac_idrac_virtual_mac(struct ipmi_intf* intf,uint8_t NicNum)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[30];
+	uint8_t VirtualMacAddress [MACADDRESSLENGH];
+	uint8_t input_length=0;
+	uint8_t j;
+	uint8_t i;
+	if (NicNum != 0xff && NicNum != IDRAC_NIC_NUMBER) {
+		return 0;
+	}
+	UseVirtualMacAddress = 0;
+	input_length = 0;
+	msg_data[input_length++] = 1; /*Get*/
+
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_IDRAC_VIRTUAL_MAC;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		return -1;
+	}
+	if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)
+			|| (IMC_IDRAC_13G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) {
+		/* Get the Chasiss Assigned MAC Addresss for 12g Only */
+		memcpy(VirtualMacAddress, ((rsp->data) + 1), MACADDRESSLENGH);
+		for (i = 0; i < MACADDRESSLENGH; i++) {
+			if (VirtualMacAddress[i] != 0) {
+				UseVirtualMacAddress = 1;
+			}
+		}
+		/* Get the Server Assigned MAC Addresss for 12g Only */
+		if (!UseVirtualMacAddress) {
+			memcpy(VirtualMacAddress, ((rsp->data) + 1 + MACADDRESSLENGH),
+					MACADDRESSLENGH);
+			for (i = 0; i < MACADDRESSLENGH; i++) {
+				if (VirtualMacAddress[i] != 0) {
+					UseVirtualMacAddress = 1;
+				}
+			}
+		}
+	} else {
+		memcpy(VirtualMacAddress, ((rsp->data) + VIRTUAL_MAC_OFFSET),
+				MACADDRESSLENGH);
+		for (i = 0; i < MACADDRESSLENGH; i++) {
+			if (VirtualMacAddress[i] != 0) {
+				UseVirtualMacAddress = 1;
+			}
+		}
+	}
+	if (UseVirtualMacAddress == 0) {
+		return -1;
+	}
+	if (IMC_IDRAC_10G == IMC_Type) {
+		printf("\nDRAC MAC Address ");
+	} else if ((IMC_IDRAC_11G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_11G_MONOLITHIC== IMC_Type)) {
+		printf("\niDRAC6 MAC Address ");
+	} else if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) {
+		printf("\niDRAC7 MAC Address ");
+	} else if ((IMC_IDRAC_13G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) {
+			printf ("\niDRAC8 MAC Address ");
+	} else if ((IMC_MASER_LITE_BMC== IMC_Type)
+			|| (IMC_MASER_LITE_NU== IMC_Type)) {
+		printf("\nBMC MAC Address ");
+	} else {
+		printf("\niDRAC6 MAC Address ");
+	}
+
+	printf("%s\n", mac2str(VirtualMacAddress));
+	return 0;
+}
+/*
+ * Function Name:    ipmi_macinfo_drac_idrac_mac
+ *
+ * Description:      This function retrieves the mac address of DRAC or iDRAC
+ * Input:            NicNum
+ * Output:
+ * Return:
+ */
+static int
+ipmi_macinfo_drac_idrac_mac(struct ipmi_intf* intf,uint8_t NicNum)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[30];
+	uint8_t input_length=0;
+	uint8_t iDRAC6MacAddressByte[MACADDRESSLENGH];
+	uint8_t j;
+	ipmi_macinfo_drac_idrac_virtual_mac(intf,NicNum);
+	if ((NicNum != 0xff && NicNum != IDRAC_NIC_NUMBER)
+			|| UseVirtualMacAddress != 0) {
+		return 0;
+	}
+	input_length = 0;
+	msg_data[input_length++] = LAN_CHANNEL_NUMBER;
+	msg_data[input_length++] = MAC_ADDR_PARAM;
+	msg_data[input_length++] = 0x00;
+	msg_data[input_length++] = 0x00;
+
+	req.msg.netfn = TRANSPORT_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_LAN_PARAM_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting MAC Address");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting MAC Address (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	memcpy(iDRAC6MacAddressByte, ((rsp->data) + PARAM_REV_OFFSET),
+			MACADDRESSLENGH);
+
+	if (IMC_IDRAC_10G == IMC_Type) {
+		printf("\nDRAC MAC Address ");
+	} else if ((IMC_IDRAC_11G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_11G_MONOLITHIC== IMC_Type)) {
+		printf("\niDRAC6 MAC Address ");
+	} else if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) {
+		printf("\niDRAC7 MAC Address ");
+	} else if ((IMC_IDRAC_13G_MODULAR == IMC_Type)
+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) {
+			printf ("\niDRAC8 MAC Address ");
+	} else if ((IMC_MASER_LITE_BMC== IMC_Type)
+			|| (IMC_MASER_LITE_NU== IMC_Type)) {
+		printf("\n\rBMC MAC Address ");
+	} else {
+		printf("\niDRAC6 MAC Address ");
+	}
+
+	printf("%s\n", mac2str(iDRAC6MacAddressByte));
+	return 0;
+}
+/*
+ * Function Name:    ipmi_macinfo_10g
+ *
+ * Description:      This function retrieves the mac address of LOMs
+ * Input:            intf      - ipmi interface
+ *                   NicNum    - NIC number
+ * Output:
+ * Return:
+ */
+static int
+ipmi_macinfo_10g(struct ipmi_intf* intf, uint8_t NicNum)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[30];
+	uint8_t input_length=0;
+	uint8_t j;
+	uint8_t i;
+	uint8_t Total_No_NICs = 0;
+	InitEmbeddedNICMacAddressValues();
+	memset(msg_data, 0, sizeof(msg_data));
+	input_length = 0;
+	msg_data[input_length++] = 0x00; /* Get Parameter Command */
+	msg_data[input_length++] = EMB_NIC_MAC_ADDRESS_9G_10G; /* OEM Param */
+	msg_data[input_length++] = 0x00;
+	msg_data[input_length++] = 0x00;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_GET_SYS_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting MAC Address");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting MAC Address (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	Total_No_NICs = (uint8_t)rsp->data[0 + PARAM_REV_OFFSET]; /* Byte 1: Total Number of Embedded NICs */
+	if (IDRAC_NIC_NUMBER != NicNum) {
+		if (0xff == NicNum) {
+			printf("\nSystem LOMs");
+		}
+		printf("\nNIC Number\tMAC Address\n");
+		memcpy(&EmbeddedNICMacAddress_10G,
+				((rsp->data) + PARAM_REV_OFFSET+TOTAL_N0_NICS_INDEX),
+				Total_No_NICs* MACADDRESSLENGH);
+		/*Read the LOM type and Mac Addresses */
+		for (i = 0; i < Total_No_NICs; i++) {
+			if ((0xff == NicNum) || (i == NicNum)) {
+				printf("\n%d",i);
+				printf("\t\t%s",
+					mac2str(EmbeddedNICMacAddress_10G.MacAddress[i].MacAddressByte));
+			}
+		}
+		printf("\n");
+	}
+	ipmi_macinfo_drac_idrac_mac(intf,NicNum);
+	return 0;
+}
+/*
+ * Function Name:      ipmi_macinfo_11g
+ *
+ * Description:        This function retrieves the mac address of LOMs
+ * Input:              intf - ipmi interface
+ * Output:
+ * Return:
+ */
+static int
+ipmi_macinfo_11g(struct ipmi_intf* intf, uint8_t NicNum)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t input_length = 0;
+	uint8_t i;
+	uint8_t j;
+	uint8_t len;
+	uint8_t loop_count;
+	uint8_t maxlen;
+	uint8_t msg_data[30];
+	uint8_t offset;
+	offset = 0;
+	len = 8; /*eigher 8 or 16 */
+	maxlen = 64;
+	loop_count = maxlen / len;
+	InitEmbeddedNICMacAddressValues();
+	memset(msg_data, 0, sizeof(msg_data));
+	input_length = 0;
+	msg_data[input_length++] = 0x00; /* Get Parameter Command */
+	msg_data[input_length++] = EMB_NIC_MAC_ADDRESS_11G; /* OEM Param */
+	msg_data[input_length++] = 0x00;
+	msg_data[input_length++] = 0x00;
+	msg_data[input_length++] = 0x00;
+	msg_data[input_length++] = 0x00;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_GET_SYS_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting MAC Address");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting MAC Address (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	len = 8; /*eigher 8 or 16 */
+	maxlen = (uint8_t)rsp->data[0 + PARAM_REV_OFFSET];
+	loop_count = maxlen / len;
+	if (IDRAC_NIC_NUMBER != NicNum) {
+		if (0xff == NicNum) {
+			printf("\nSystem LOMs");
+		}
+		printf("\nNIC Number\tMAC Address\t\tStatus\n");
+		/*Read the LOM type and Mac Addresses */
+		offset=0;
+		for (i = 0; i < loop_count; i++, offset = offset + len) {
+			input_length = 4;
+			msg_data[input_length++] = offset;
+			msg_data[input_length++] = len;
+
+			req.msg.netfn = IPMI_NETFN_APP;
+			req.msg.lun = 0;
+			req.msg.cmd = IPMI_GET_SYS_INFO;
+			req.msg.data = msg_data;
+			req.msg.data_len = input_length;
+
+			rsp = intf->sendrecv(intf, &req);
+			if (rsp == NULL) {
+				lprintf(LOG_ERR, "Error in getting MAC Address");
+				return -1;
+			}
+			if (rsp->ccode > 0) {
+				lprintf(LOG_ERR, "Error in getting MAC Address (%s)",
+						val2str(rsp->ccode, completion_code_vals));
+				return -1;
+			}
+			memcpy(&(EmbeddedNICMacAddress.LOMMacAddress[i]),
+					((rsp->data)+PARAM_REV_OFFSET), len);
+			if (LOM_MACTYPE_ETHERNET == EmbeddedNICMacAddress.LOMMacAddress[i].MacType) {
+				if ((0xff==NicNum)
+						|| (NicNum == EmbeddedNICMacAddress.LOMMacAddress[i].NICNumber)) {
+					printf("\n%d",EmbeddedNICMacAddress.LOMMacAddress[i].NICNumber);
+					printf("\t\t%s", mac2str(EmbeddedNICMacAddress.LOMMacAddress[i].MacAddressByte));
+
+					if (LOM_ETHERNET_ENABLED
+							== EmbeddedNICMacAddress.LOMMacAddress[i].EthernetStatus) {
+						printf("\tEnabled");
+					} else {
+						printf("\tDisabled");
+					}
+				}
+			}
+		}
+		printf("\n");
+	}
+	ipmi_macinfo_drac_idrac_mac(intf,NicNum);
+	return 0;
+}
+/*
+ * Function Name:      ipmi_macinfo
+ *
+ * Description:     This function retrieves the mac address of LOMs
+ * Input:           intf   - ipmi interface
+ * Output:
+ * Return:
+ */
+static int
+ipmi_macinfo(struct ipmi_intf* intf, uint8_t NicNum)
+{
+	if (IMC_IDRAC_10G == IMC_Type) {
+		return ipmi_macinfo_10g(intf,NicNum);
+	} else if ((IMC_IDRAC_11G_MODULAR == IMC_Type
+				|| IMC_IDRAC_11G_MONOLITHIC == IMC_Type)
+			|| (IMC_IDRAC_12G_MODULAR == IMC_Type
+				|| IMC_IDRAC_12G_MONOLITHIC == IMC_Type)
+			|| (IMC_IDRAC_13G_MODULAR == IMC_Type
+				|| IMC_IDRAC_13G_MONOLITHIC == IMC_Type)
+			|| (IMC_MASER_LITE_NU == IMC_Type || IMC_MASER_LITE_BMC== IMC_Type)) {
+		return ipmi_macinfo_11g(intf,NicNum);
+	} else {
+		lprintf(LOG_ERR, "Error in getting MAC Address : Not supported platform");
+		return (-1);
+	}
+}
+/*
+ * Function Name:     ipmi_mac_usage
+ *
+ * Description:   This function prints help message for mac command
+ * Input:
+ * Output:
+ *
+ * Return:
+ */
+static void
+ipmi_mac_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   mac list");
+	lprintf(LOG_NOTICE,
+"      Lists the MAC address of LOMs");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   mac get <NIC number>");
+	lprintf(LOG_NOTICE,
+"      Shows the MAC address of specified LOM. 0-7 System LOM, 8- DRAC/iDRAC.");
+	lprintf(LOG_NOTICE,
+"");
+}
+/*
+ * Function Name:       ipmi_delloem_lan_main
+ *
+ * Description:         This function processes the delloem lan command
+ * Input:               intf    - ipmi interface
+ *                      argc    - no of arguments
+ *                      argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                         -1 - failure
+ */
+static int
+ipmi_delloem_lan_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	int nic_selection = 0;
+	char nic_set[2] = {0};
+	current_arg++;
+	if (argv[current_arg] == NULL || strcmp(argv[current_arg], "help") == 0) {
+		ipmi_lan_usage();
+		return 0;
+	}
+	ipmi_idracvalidator_command(intf);
+	if (!IsLANSupported()) {
+		lprintf(LOG_ERR, "lan is not supported on this system.");
+		return -1;
+	} else if (strncmp(argv[current_arg], "set\0", 4) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_lan_usage();
+			return -1;
+		}
+		if (iDRAC_FLAG_12_13)  {
+			nic_selection = get_nic_selection_mode_12g(intf, current_arg, argv,
+					nic_set);
+			if (INVALID == nic_selection) {
+				ipmi_lan_usage();
+				return -1;
+			} else if (INVAILD_FAILOVER_MODE == nic_selection) {
+				lprintf(LOG_ERR, INVAILD_FAILOVER_MODE_STRING);
+				return (-1);
+			} else if (INVAILD_FAILOVER_MODE_SETTINGS == nic_selection) {
+				lprintf(LOG_ERR, INVAILD_FAILOVER_MODE_SET);
+				return (-1);
+			} else if (INVAILD_SHARED_MODE == nic_selection) {
+				lprintf(LOG_ERR, INVAILD_SHARED_MODE_SET_STRING);
+				return (-1);
+			}
+			rc = ipmi_lan_set_nic_selection_12g(intf,nic_set);
+		} else {
+			nic_selection = get_nic_selection_mode(current_arg, argv);
+			if (INVALID == nic_selection) {
+				ipmi_lan_usage();
+				return -1;
+			}
+			if (IMC_IDRAC_11G_MODULAR == IMC_Type) {
+				lprintf(LOG_ERR, INVAILD_SHARED_MODE_SET_STRING);
+				return (-1);
+			}
+			rc = ipmi_lan_set_nic_selection(intf,nic_selection);
+		}
+		return 0;
+	} else if (strncmp(argv[current_arg], "get\0", 4) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			rc = ipmi_lan_get_nic_selection(intf);
+			return rc;
+		} else if (strncmp(argv[current_arg], "active\0", 7) == 0) {
+			rc = ipmi_lan_get_active_nic(intf);
+			return rc;
+		} else {
+			ipmi_lan_usage();
+		}
+	} else {
+		ipmi_lan_usage();
+		return -1;
+	}
+	return rc;
+}
+
+static int
+IsLANSupported()
+{
+	if (IMC_IDRAC_11G_MODULAR == IMC_Type) {
+		return 0;
+	}
+	return 1;
+}
+
+static int
+get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
+		char ** argv, char *nic_set)
+{
+	/* First get the current settings. */
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	int failover = 0;
+	uint8_t input_length = 0;
+	uint8_t msg_data[30];
+
+	input_length = 0;
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_NIC_SELECTION_12G_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting nic selection");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting nic selection (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	nic_set[0] = rsp->data[0];
+	nic_set[1] = rsp->data[1];
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "dedicated\0", 10) == 0) {
+		nic_set[0] = 1;
+		nic_set[1] = 0;
+		return 0;
+	}
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "shared\0", 7) == 0) {
+		/* placeholder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "with\0", 5) == 0) {
+		/* placeholder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "failover\0", 9) == 0) {
+		failover = 1;
+	}
+	if (failover) {
+		current_arg++;
+	}
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "lom1\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (failover) {
+			if (nic_set[0] == 2) {
+				return INVAILD_FAILOVER_MODE;
+			} else if (nic_set[0] == 1) {
+				return INVAILD_FAILOVER_MODE_SETTINGS;
+			}
+			nic_set[1] = 2;
+		} else {
+			nic_set[0] = 2;
+			if (nic_set[1] == 2) {
+				nic_set[1] = 0;
+			}
+		}
+		return 0;
+	} else if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "lom2\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (failover) {
+			if (nic_set[0] == 3) {
+				return INVAILD_FAILOVER_MODE;
+			} else if(nic_set[0] == 1) {
+				return INVAILD_FAILOVER_MODE_SETTINGS;
+			}
+			nic_set[1] = 3;
+		} else {
+			nic_set[0] = 3;
+			if (nic_set[1] == 3) {
+				nic_set[1] = 0;
+			}
+		}
+		return 0;
+	} else if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "lom3\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (failover) {
+			if (nic_set[0] == 4) {
+				return INVAILD_FAILOVER_MODE;
+			} else if(nic_set[0] == 1) {
+				return INVAILD_FAILOVER_MODE_SETTINGS;
+			}
+			nic_set[1] = 4;
+		} else {
+			nic_set[0] = 4;
+			if (nic_set[1] == 4) {
+				nic_set[1] = 0;
+			}
+		}
+		return 0;
+	} else if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "lom4\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (failover) {
+			if (nic_set[0] == 5) {
+				return INVAILD_FAILOVER_MODE;
+			} else if(nic_set[0] == 1) {
+				return INVAILD_FAILOVER_MODE_SETTINGS;
+			}
+			nic_set[1] = 5;
+		} else {
+			nic_set[0] = 5;
+			if (nic_set[1] == 5) {
+				nic_set[1] = 0;
+			}
+		}
+		return 0;
+	} else if (failover && argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "none\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type) ) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (failover) {
+			if (nic_set[0] == 1) {
+				return INVAILD_FAILOVER_MODE_SETTINGS;
+			}
+			nic_set[1] = 0;
+		}
+		return 0;
+	} else if (failover && argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "all\0", 4) == 0) {
+		/* placeholder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (failover && argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "loms\0", 5) == 0) {
+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
+			return INVAILD_SHARED_MODE;
+		}
+		if (nic_set[0] == 1) {
+			return INVAILD_FAILOVER_MODE_SETTINGS;
+		}
+		nic_set[1] = 6;
+		return 0;
+	}
+	return INVALID;
+}
+
+static int
+get_nic_selection_mode(int current_arg, char ** argv)
+{
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "dedicated\0", 10) == 0) {
+		return DEDICATED;
+	}
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "shared\0", 7) == 0) {
+		if (argv[current_arg+1] == NULL) {
+			return SHARED;
+		}
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "with\0", 5) == 0) {
+		/* place holder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "failover\0", 9) == 0) {
+		/* place holder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "lom2\0", 5) == 0) {
+		return SHARED_WITH_FAILOVER_LOM2;
+	} else if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "all\0", 4) == 0) {
+		/* place holder */
+	} else {
+		return INVALID;
+	}
+
+	current_arg++;
+	if (argv[current_arg] != NULL
+			&& strncmp(argv[current_arg], "loms\0", 5) == 0) {
+		return SHARED_WITH_FAILOVER_ALL_LOMS;
+	}
+	return INVALID;
+}
+
+static int
+ipmi_lan_set_nic_selection_12g(struct ipmi_intf * intf, uint8_t * nic_selection)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t input_length = 0;
+	uint8_t msg_data[30];
+
+	input_length = 0;
+	msg_data[input_length++] = nic_selection[0];
+	msg_data[input_length++] = nic_selection[1];
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = SET_NIC_SELECTION_12G_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in setting nic selection");
+		return -1;
+	} else if( (nic_selection[0] == 1)
+			&& (( iDRAC_FLAG_12_13 )
+			&& (rsp->ccode == LICENSE_NOT_SUPPORTED))) {
+		/* Check license only for setting the dedicated nic. */
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in setting nic selection (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	printf("configured successfully");
+	return 0;
+}
+
+static int
+ipmi_lan_set_nic_selection(struct ipmi_intf * intf, uint8_t nic_selection)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t input_length = 0;
+	uint8_t msg_data[30];
+
+	input_length = 0;
+	msg_data[input_length++] = nic_selection;
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = SET_NIC_SELECTION_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in setting nic selection");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in setting nic selection (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	printf("configured successfully");
+	return 0;
+}
+
+static int
+ipmi_lan_get_nic_selection(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t input_length=0;
+	uint8_t msg_data[30];
+	uint8_t nic_selection=-1;
+	uint8_t nic_selection_failover = 0;
+
+	input_length = 0;
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	if( iDRAC_FLAG_12_13 ) {
+		req.msg.cmd = GET_NIC_SELECTION_12G_CMD;
+	} else {
+		req.msg.cmd = GET_NIC_SELECTION_CMD;
+	}
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting nic selection");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting nic selection (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	nic_selection = rsp->data[0];
+	if( iDRAC_FLAG_12_13 ) {
+		nic_selection_failover = rsp->data[1];
+		if ((nic_selection < 6) && (nic_selection > 0)
+				&& (nic_selection_failover < 7)) {
+			if(nic_selection == 1) {
+				printf("%s\n",NIC_Selection_Mode_String_12g[nic_selection-1]);
+			} else if(nic_selection) {
+				printf("Shared LOM   :  %s\n",
+						NIC_Selection_Mode_String_12g[nic_selection-1]);
+				if(nic_selection_failover  == 0) {
+					printf("Failover LOM :  None\n");
+				} else if(nic_selection_failover >= 2 && nic_selection_failover <= 6) {
+					printf("Failover LOM :  %s\n",
+							NIC_Selection_Mode_String_12g[nic_selection_failover + 3]);
+				}
+			}
+		} else {
+			lprintf(LOG_ERR, "Error Outof bond Value received (%d) (%d)",
+					nic_selection,nic_selection_failover);
+			return -1;
+		}
+	} else {
+		printf("%s\n",NIC_Selection_Mode_String[nic_selection]);
+	}
+	return 0;
+}
+
+static int
+ipmi_lan_get_active_nic(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t active_nic=0;
+	uint8_t current_lom =0;
+	uint8_t input_length=0;
+	uint8_t msg_data[30];
+
+	input_length = 0;
+	msg_data[input_length++] = 0; /* Get Status */
+	msg_data[input_length++] = 0; /* Reserved */
+	msg_data[input_length++] = 0; /* Reserved */
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_ACTIVE_NIC_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting Active LOM Status");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting Active LOM Status (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	current_lom = rsp->data[0];
+	input_length = 0;
+	msg_data[input_length++] = 1; /* Get Link status */
+	msg_data[input_length++] = 0; /* Reserved */
+	msg_data[input_length++] = 0; /* Reserved */
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_ACTIVE_NIC_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting Active LOM Status");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting Active LOM Status (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	active_nic = rsp->data[1];
+	if (current_lom < 6 && active_nic) {
+		printf("\n%s\n", AciveLOM_String[current_lom]);
+	} else {
+		printf("\n%s\n", AciveLOM_String[0]);
+	}
+	return 0;
+}
+
+static void
+ipmi_lan_usage(void)
+{
+	/* TODO:
+	 *  - rewrite
+	 *  - review
+	 *  - make it fit into 80 chars per line
+	 *  - this ``shared with Failover None).'' seems like a typo
+	 */
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lan set <Mode>");
+	lprintf(LOG_NOTICE,
+"      sets the NIC Selection Mode :");
+	lprintf(LOG_NOTICE,
+"          on iDRAC12g OR iDRAC13g  :");
+	lprintf(LOG_NOTICE,
+"              dedicated, shared with lom1, shared with lom2,shared with lom3,shared");
+	lprintf(LOG_NOTICE,
+"              with lom4,shared with failover lom1,shared with failover lom2,shared");
+	lprintf(LOG_NOTICE,
+"              with failover lom3,shared with failover lom4,shared with Failover all");
+	lprintf(LOG_NOTICE,
+"              loms, shared with Failover None).");
+	lprintf(LOG_NOTICE,
+"          on other systems :");
+	lprintf(LOG_NOTICE,
+"              dedicated, shared, shared with failover lom2,");
+	lprintf(LOG_NOTICE,
+"              shared with Failover all loms.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lan get ");
+	lprintf(LOG_NOTICE,
+"          on iDRAC12g or iDRAC13g  :");
+	lprintf(LOG_NOTICE,
+"              returns the current NIC Selection Mode (dedicated, shared with lom1, shared");
+	lprintf(LOG_NOTICE,
+"              with lom2, shared with lom3, shared with lom4,shared with failover lom1,");
+	lprintf(LOG_NOTICE,
+"              shared with failover lom2,shared with failover lom3,shared with failover");
+	lprintf(LOG_NOTICE,
+"              lom4,shared with Failover all loms,shared with Failover None).");
+	lprintf(LOG_NOTICE,
+"          on other systems :");
+	lprintf(LOG_NOTICE,
+"              dedicated, shared, shared with failover,");
+	lprintf(LOG_NOTICE,
+"              lom2, shared with Failover all loms.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   lan get active");
+	lprintf(LOG_NOTICE,
+"      returns the current active NIC (dedicated, LOM1, LOM2, LOM3, LOM4).");
+	lprintf(LOG_NOTICE,
+"");
+}
+/*
+ * Function Name:       ipmi_delloem_powermonitor_main
+ *
+ * Description:         This function processes the delloem powermonitor command
+ * Input:               intf    - ipmi interface
+ *                       argc    - no of arguments
+ *                      argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                         -1 - failure
+ */
+static int
+ipmi_delloem_powermonitor_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	current_arg++;
+	if (argc > 1 && strcmp(argv[current_arg], "help") == 0) {
+		ipmi_powermonitor_usage();
+		return 0;
+	}
+	ipmi_idracvalidator_command(intf);
+	if (argc == 1) {
+		rc = ipmi_powermgmt(intf);
+	} else if (strncmp(argv[current_arg], "status\0", 7) == 0) {
+		rc = ipmi_powermgmt(intf);
+	} else if (strncmp(argv[current_arg], "clear\0", 6) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_powermonitor_usage();
+			return -1;
+		} else if (strncmp(argv[current_arg], "peakpower\0", 10) == 0) {
+			rc = ipmi_powermgmt_clear(intf, 1);
+		} else if (strncmp(argv[current_arg], "cumulativepower\0", 16) == 0) {
+			rc = ipmi_powermgmt_clear(intf, 0);
+		} else {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+	} else if (strncmp(argv[current_arg], "powerconsumption\0", 17) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			rc = ipmi_print_get_power_consmpt_data(intf,watt);
+		} else if (strncmp(argv[current_arg], "watt\0", 5) == 0) {
+			rc = ipmi_print_get_power_consmpt_data(intf, watt);
+		} else if (strncmp(argv[current_arg], "btuphr\0", 7) == 0) {
+			rc = ipmi_print_get_power_consmpt_data(intf, btuphr);
+		} else {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+	} else if (strncmp(argv[current_arg], "powerconsumptionhistory\0", 23) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			rc = ipmi_print_power_consmpt_history(intf,watt);
+		} else if (strncmp(argv[current_arg], "watt\0", 5) == 0) {
+			rc = ipmi_print_power_consmpt_history(intf, watt);
+		} else if (strncmp(argv[current_arg], "btuphr\0", 7) == 0) {
+			rc = ipmi_print_power_consmpt_history(intf, btuphr);
+		} else {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+	} else if (strncmp(argv[current_arg], "getpowerbudget\0", 15) == 0) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			rc=ipmi_print_power_cap(intf,watt);
+		} else if (strncmp(argv[current_arg], "watt\0", 5) == 0) {
+			rc = ipmi_print_power_cap(intf, watt);
+		} else if (strncmp(argv[current_arg], "btuphr\0", 7) == 0) {
+			rc = ipmi_print_power_cap(intf, btuphr);
+		} else {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+	} else if (strncmp(argv[current_arg], "setpowerbudget\0", 15) == 0) {
+		int val;
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+		if (strchr(argv[current_arg], '.')) {
+			lprintf(LOG_ERR,
+					"Cap value in Watts, Btu/hr or percent should be whole number");
+			return -1;
+		}
+		if (str2int(argv[current_arg], &val) != 0) {
+			lprintf(LOG_ERR, "Given capacity value '%s' is invalid.",
+					argv[current_arg]);
+			return (-1);
+		}
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_powermonitor_usage();
+		} else if (strncmp(argv[current_arg], "watt\0", 5) == 0) {
+			rc = ipmi_set_power_cap(intf,watt,val);
+		} else if (strncmp(argv[current_arg], "btuphr\0", 7) == 0) {
+			rc = ipmi_set_power_cap(intf, btuphr,val);
+		} else if (strncmp(argv[current_arg], "percent\0", 8) == 0) {
+			rc = ipmi_set_power_cap(intf,percent,val);
+		} else {
+			ipmi_powermonitor_usage();
+			return -1;
+		}
+	} else if (strncmp(argv[current_arg], "enablepowercap\0", 15) == 0) {
+		ipmi_set_power_capstatus_command(intf,1);
+	} else if (strncmp(argv[current_arg], "disablepowercap\0", 16) == 0) {
+		ipmi_set_power_capstatus_command(intf,0);
+	} else {
+		ipmi_powermonitor_usage();
+		return -1;
+	}
+	return rc;
+}
+/*
+ * Function Name:     ipmi_time_to_str
+ *
+ * Description:       This function converts ipmi time format into gmtime format
+ * Input:             rawTime  - ipmi time format
+ * Output:            strTime  - gmtime format
+ *
+ * Return:
+ */
+static void
+ipmi_time_to_str(time_t rawTime, char * strTime)
+{
+	struct tm *tm;
+	char *temp;
+	tm = gmtime(&rawTime);
+	temp = asctime(tm);
+	strcpy(strTime,temp);
+}
+/*
+ * Function Name:      ipmi_get_sensor_reading
+ *
+ * Description:        This function retrieves a raw sensor reading
+ * Input:              sensorOwner       - sensor owner id
+ *                     sensorNumber      - sensor id
+ *                     intf              - ipmi interface
+ * Output:             sensorReadingData - ipmi response structure
+ * Return:             1 on error
+ *                     0 if successful
+ */
+static int
+ipmi_get_sensor_reading(struct ipmi_intf *intf, unsigned char sensorNumber,
+		SensorReadingType* pSensorReadingData)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	int rc = 0;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_SENSOR_READING;
+	req.msg.data = &sensorNumber;
+	req.msg.data_len = 1;
+	if (pSensorReadingData == NULL) {
+		return -1;
+	}
+	memset(pSensorReadingData, 0, sizeof(SensorReadingType));
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return 1;
+	} else if (rsp->ccode > 0) {
+		return 1;
+	}
+	memcpy(pSensorReadingData, rsp->data, sizeof(SensorReadingType));
+	/* if there is an error transmitting ipmi command, return error */
+	if (rsp->ccode != 0) {
+		rc = 1;
+	}
+	/* if sensor messages are disabled, return error*/
+	if ((!(rsp->data[1]& 0xC0)) || ((rsp->data[1] & 0x20))) {
+		rc =1;
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_get_power_capstatus_command
+ *
+ * Description:     This function gets the power cap status
+ * Input:           intf                 - ipmi interface
+ * Global:          PowercapSetable_flag - power cap status
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_get_power_capstatus_command(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[2];
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_DELL_POWER_CAP_STATUS;
+	req.msg.data_len = 2;
+	req.msg.data = data;
+	data[0] = 01;
+	data[1] = 0xFF;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting powercap status");
+		return -1;
+	} else if (( iDRAC_FLAG_12_13 ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1; /* Return Error as unlicensed */
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error getting powercap statusr: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	if (rsp->data[0] & 0x02) {
+		PowercapSetable_flag=1;
+	}
+	if (rsp->data[0] & 0x01) {
+		PowercapstatusFlag=1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_set_power_capstatus_command
+ *
+ * Description:      This function sets the power cap status
+ * Input:            intf     - ipmi interface
+ *                   val      - power cap status
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_set_power_capstatus_command(struct ipmi_intf * intf, uint8_t val)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[2];
+	if (ipmi_get_power_capstatus_command(intf) < 0) {
+		return -1;
+	}
+	if (PowercapSetable_flag != 1) {
+		lprintf(LOG_ERR, "Can not set powercap on this system");
+		return -1;
+	}
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_DELL_POWER_CAP_STATUS;
+	req.msg.data_len = 2;
+	req.msg.data = data;
+	data[0] = 00;
+	data[1] = val;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting powercap status");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1; /* return unlicensed Error code */
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error setting powercap statusr: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_powermgmt
+ *
+ * Description:      This function print the powermonitor details
+ * Input:            intf     - ipmi interface
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_powermgmt(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+	uint32_t cumStartTimeConv;
+	uint32_t cumReadingConv;
+	uint32_t maxPeakStartTimeConv;
+	uint32_t ampPeakTimeConv;
+	uint16_t ampReadingConv;
+	uint32_t wattPeakTimeConv;
+	uint32_t wattReadingConv;
+	uint32_t bmctimeconv;
+	uint32_t * bmctimeconvval;
+
+	IPMI_POWER_MONITOR * pwrMonitorInfo;
+
+	char cumStartTime[26];
+	char maxPeakStartTime[26];
+	char ampPeakTime[26];
+	char wattPeakTime[26];
+	char bmctime[26];
+
+	int ampReading;
+	int ampReadingRemainder;
+	int remainder;
+	int wattReading;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_CMD_GET_SEL_TIME;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting BMC time info.");
+		return -1;
+	}
+	if (rsp->ccode != 0) {
+		lprintf(LOG_ERR,
+				"Error getting power management information, return code %x",
+				rsp->ccode);
+		return -1;
+	}
+	bmctimeconvval=(uint32_t*)rsp->data;
+# if WORDS_BIGENDIAN
+	bmctimeconv=BSWAP_32(*bmctimeconvval);
+# else
+	bmctimeconv=*bmctimeconvval;
+# endif
+
+	/* get powermanagement info*/
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0x0;
+	req.msg.cmd = GET_PWRMGMT_INFO_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+
+	memset(msg_data, 0, 2);
+	msg_data[0] = 0x07;
+	msg_data[1] = 0x01;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting power management information.");
+		return -1;
+	}
+
+	if ((iDRAC_FLAG_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rsp->ccode == 0xc1)||(rsp->ccode == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting power management information: "
+				"Command not supported on this system.");
+		return -1;
+	}else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR,
+				"Error getting power management information, return code %x",
+				rsp->ccode);
+		return -1;
+	}
+
+	pwrMonitorInfo = (IPMI_POWER_MONITOR*)rsp->data;
+# if WORDS_BIGENDIAN
+	cumStartTimeConv = BSWAP_32(pwrMonitorInfo->cumStartTime);
+	cumReadingConv = BSWAP_32(pwrMonitorInfo->cumReading);
+	maxPeakStartTimeConv = BSWAP_32(pwrMonitorInfo->maxPeakStartTime);
+	ampPeakTimeConv = BSWAP_32(pwrMonitorInfo->ampPeakTime);
+	ampReadingConv = BSWAP_16(pwrMonitorInfo->ampReading);
+	wattPeakTimeConv = BSWAP_32(pwrMonitorInfo->wattPeakTime);
+	wattReadingConv = BSWAP_16(pwrMonitorInfo->wattReading);
+# else
+	cumStartTimeConv = pwrMonitorInfo->cumStartTime;
+	cumReadingConv = pwrMonitorInfo->cumReading;
+	maxPeakStartTimeConv = pwrMonitorInfo->maxPeakStartTime;
+	ampPeakTimeConv = pwrMonitorInfo->ampPeakTime;
+	ampReadingConv = pwrMonitorInfo->ampReading;
+	wattPeakTimeConv = pwrMonitorInfo->wattPeakTime;
+	wattReadingConv = pwrMonitorInfo->wattReading;
+# endif
+
+	ipmi_time_to_str(cumStartTimeConv, cumStartTime);
+	ipmi_time_to_str(maxPeakStartTimeConv, maxPeakStartTime);
+	ipmi_time_to_str(ampPeakTimeConv, ampPeakTime);
+	ipmi_time_to_str(wattPeakTimeConv, wattPeakTime);
+	ipmi_time_to_str(bmctimeconv, bmctime);
+
+	remainder = (cumReadingConv % 1000);
+	cumReadingConv = cumReadingConv / 1000;
+	remainder = (remainder + 50) / 100;
+
+	ampReading = ampReadingConv;
+	ampReadingRemainder = ampReading%10;
+	ampReading = ampReading/10;
+
+	wattReading = wattReadingConv;
+
+	printf("Power Tracking Statistics\n");
+	printf("Statistic      : Cumulative Energy Consumption\n");
+	printf("Start Time     : %s", cumStartTime);
+	printf("Finish Time    : %s", bmctime);
+	printf("Reading        : %d.%d kWh\n\n", cumReadingConv, remainder);
+
+	printf("Statistic      : System Peak Power\n");
+	printf("Start Time     : %s", maxPeakStartTime);
+	printf("Peak Time      : %s", wattPeakTime);
+	printf("Peak Reading   : %d W\n\n", wattReading);
+
+	printf("Statistic      : System Peak Amperage\n");
+	printf("Start Time     : %s", maxPeakStartTime);
+	printf("Peak Time      : %s", ampPeakTime);
+	printf("Peak Reading   : %d.%d A\n", ampReading, ampReadingRemainder);
+	return 0;
+}
+/*
+ * Function Name:    ipmi_powermgmt_clear
+ *
+ * Description:     This function clears peakpower / cumulativepower value
+ * Input:           intf           - ipmi interface
+ *                  clearValue     - peakpower / cumulativepower
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_powermgmt_clear(struct ipmi_intf * intf, uint8_t clearValue)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t clearType = 1;
+	uint8_t msg_data[3];
+	if (clearValue) {
+		clearType = 2;
+	}
+	/* clear powermanagement info*/
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = CLEAR_PWRMGMT_INFO_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+	memset(msg_data, 0, 3);
+	msg_data[0] = 0x07;
+	msg_data[1] = 0x01;
+	msg_data[2] = clearType;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error clearing power values.");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13)
+			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if (rsp->ccode == 0xc1) {
+		lprintf(LOG_ERR,
+				"Error clearing power values, command not supported on this system.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Error clearing power values: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    watt_to_btuphr_conversion
+ *
+ * Description:      This function converts the power value in watt to btuphr
+ * Input:            powerinwatt     - power in watt
+ *
+ * Output:           power in btuphr
+ *
+ * Return:
+ */
+static uint64_t
+watt_to_btuphr_conversion(uint32_t powerinwatt)
+{
+	uint64_t powerinbtuphr;
+	powerinbtuphr=(3.413 * powerinwatt);
+	return(powerinbtuphr);
+}
+/*
+ * Function Name:    btuphr_to_watt_conversion
+ *
+ * Description:      This function converts the power value in  btuphr to watt
+ * Input:            powerinbtuphr   - power in btuphr
+ *
+ * Output:           power in watt
+ *
+ * Return:
+ */
+static uint32_t
+btuphr_to_watt_conversion(uint64_t powerinbtuphr)
+{
+	uint32_t powerinwatt;
+	/*returning the floor value*/
+	powerinwatt= (powerinbtuphr / 3.413);
+	return (powerinwatt);
+}
+/*
+ * Function Name:        ipmi_get_power_headroom_command
+ *
+ * Description:          This function prints the Power consumption information
+ * Input:                intf    - ipmi interface
+ *                       unit    - watt / btuphr
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_get_power_headroom_command(struct ipmi_intf * intf,uint8_t unit)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint64_t peakpowerheadroombtuphr;
+	uint64_t instantpowerhearoom;
+
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_PWR_HEADROOM_CMD;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting power headroom status");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13)
+			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rsp->ccode == 0xc1) || (rsp->ccode == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting power headroom status: "
+				"Command not supported on this system ");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error getting power headroom status: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		/* need to look into */
+		printf("power headroom  Data               : %x %x %x %x ", rsp->data[0],
+				rsp->data[1], rsp->data[2], rsp->data[3]);
+	}
+	powerheadroom= *(( POWER_HEADROOM *)rsp->data);
+# if WORDS_BIGENDIAN
+	powerheadroom.instheadroom = BSWAP_16(powerheadroom.instheadroom);
+	powerheadroom.peakheadroom = BSWAP_16(powerheadroom.peakheadroom);
+# endif
+	printf("Headroom\n");
+	printf("Statistic                     Reading\n");
+	if (unit == btuphr) {
+		peakpowerheadroombtuphr = watt_to_btuphr_conversion(powerheadroom.peakheadroom);
+		instantpowerhearoom = watt_to_btuphr_conversion(powerheadroom.instheadroom);
+		printf("System Instantaneous Headroom : %" PRId64 " BTU/hr\n",
+				instantpowerhearoom);
+		printf("System Peak Headroom          : %" PRId64 " BTU/hr\n",
+				peakpowerheadroombtuphr);
+	} else {
+		printf("System Instantaneous Headroom : %d W\n",
+				powerheadroom.instheadroom);
+		printf("System Peak Headroom          : %d W\n",
+				powerheadroom.peakheadroom);
+	}
+	return 0;
+}
+/*
+ * Function Name:       ipmi_get_power_consumption_data
+ *
+ * Description:         This function updates the instant Power consumption information
+ * Input:               intf - ipmi interface
+ * Output:              power consumption current reading
+ *                      Assumption value will be in Watt.
+ *
+ * Return:
+ */
+static int
+ipmi_get_power_consumption_data(struct ipmi_intf * intf,uint8_t unit)
+{
+	SensorReadingType sensorReadingData;
+
+	struct ipmi_rs * rsp=NULL;
+	struct sdr_record_list *sdr;
+	int readingbtuphr = 0;
+	int warning_threshbtuphr = 0;
+	int failure_threshbtuphr = 0;
+	int status = 0;
+	int sensor_number = 0;
+	sdr = ipmi_sdr_find_sdr_byid(intf, "System Level");
+	if (sdr == NULL) {
+		lprintf(LOG_ERR,
+				"Error : Can not access the System Level sensor data");
+		return -1;
+	}
+	sensor_number = sdr->record.common->keys.sensor_num;
+	ipmi_get_sensor_reading(intf,sensor_number,&sensorReadingData);
+	rsp = ipmi_sdr_get_sensor_thresholds(intf,
+			sdr->record.common->keys.sensor_num,
+			sdr->record.common->keys.owner_id,
+			sdr->record.common->keys.lun,
+			sdr->record.common->keys.channel);
+	if (rsp == NULL || rsp->ccode != 0) {
+		lprintf(LOG_ERR,
+				"Error : Can not access the System Level sensor data");
+		return -1;
+	}
+	readingbtuphr = sdr_convert_sensor_reading(sdr->record.full,
+			sensorReadingData.sensorReading);
+	warning_threshbtuphr = sdr_convert_sensor_reading(sdr->record.full,
+			rsp->data[4]);
+	failure_threshbtuphr = sdr_convert_sensor_reading(sdr->record.full,
+			rsp->data[5]);
+
+	printf("System Board System Level\n");
+	if (unit == btuphr) {
+		readingbtuphr = watt_to_btuphr_conversion(readingbtuphr);
+		warning_threshbtuphr = watt_to_btuphr_conversion(warning_threshbtuphr);
+		failure_threshbtuphr = watt_to_btuphr_conversion( failure_threshbtuphr);
+
+		printf("Reading                        : %d BTU/hr\n", readingbtuphr);
+		printf("Warning threshold      : %d BTU/hr\n", warning_threshbtuphr);
+		printf("Failure threshold      : %d BTU/hr\n", failure_threshbtuphr);
+	} else {
+		printf("Reading                        : %d W \n",readingbtuphr);
+		printf("Warning threshold      : %d W \n",(warning_threshbtuphr));
+		printf("Failure threshold      : %d W \n",(failure_threshbtuphr));
+	}
+	return status;
+}
+/*
+ * Function Name:      ipmi_get_instan_power_consmpt_data
+ *
+ * Description:        This function updates the instant Power consumption information
+ * Input:              intf - ipmi interface
+ * Output:             instpowerconsumptiondata - instant Power consumption information
+ *
+ * Return:
+ */
+static int
+ipmi_get_instan_power_consmpt_data(struct ipmi_intf * intf,
+		IPMI_INST_POWER_CONSUMPTION_DATA * instpowerconsumptiondata)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req={0};
+	uint8_t msg_data[2];
+	/*get instantaneous power consumption command*/
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = GET_PWR_CONSUMPTION_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+	memset(msg_data, 0, 2);
+	msg_data[0] = 0x0A;
+	msg_data[1] = 0x00;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting instantaneous power consumption data .");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13)
+			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rsp->ccode == 0xc1) || (rsp->ccode == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting instantaneous power consumption data: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Error getting instantaneous power consumption data: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	*instpowerconsumptiondata = *((IPMI_INST_POWER_CONSUMPTION_DATA *)(rsp->data));
+#if WORDS_BIGENDIAN
+	instpowerconsumptiondata->instanpowerconsumption = BSWAP_16(instpowerconsumptiondata->instanpowerconsumption);
+	instpowerconsumptiondata->instanApms = BSWAP_16(instpowerconsumptiondata->instanApms);
+	instpowerconsumptiondata->resv1 = BSWAP_16(instpowerconsumptiondata->resv1);
+#endif
+	return 0;
+}
+/*
+ * Function Name:      ipmi_print_get_instan_power_Amps_data
+ *
+ * Description:        This function prints the instant Power consumption information
+ * Input:              instpowerconsumptiondata - instant Power consumption information
+ * Output:
+ *
+ * Return:
+ */
+static void
+ipmi_print_get_instan_power_Amps_data(IPMI_INST_POWER_CONSUMPTION_DATA instpowerconsumptiondata)
+{
+	uint16_t intampsval=0;
+	uint16_t decimalampsval=0;
+	if (instpowerconsumptiondata.instanApms > 0) {
+		decimalampsval = (instpowerconsumptiondata.instanApms % 10);
+		intampsval = instpowerconsumptiondata.instanApms / 10;
+	}
+	printf("\nAmperage value: %d.%d A \n", intampsval, decimalampsval);
+}
+/*
+ * Function Name:     ipmi_print_get_power_consmpt_data
+ *
+ * Description:       This function prints the Power consumption information
+ * Input:             intf            - ipmi interface
+ *                    unit            - watt / btuphr
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_print_get_power_consmpt_data(struct ipmi_intf * intf, uint8_t unit)
+{
+	int rc = 0;
+	IPMI_INST_POWER_CONSUMPTION_DATA instpowerconsumptiondata = {0,0,0,0};
+	printf("\nPower consumption information\n");
+	rc = ipmi_get_power_consumption_data(intf, unit);
+	if (rc == (-1)) {
+		return rc;
+	}
+	rc = ipmi_get_instan_power_consmpt_data(intf, &instpowerconsumptiondata);
+	if (rc == (-1)) {
+		return rc;
+	}
+	ipmi_print_get_instan_power_Amps_data(instpowerconsumptiondata);
+	rc = ipmi_get_power_headroom_command(intf, unit);
+	if (rc == (-1)) {
+		return rc;
+	}
+	return rc;
+}
+/*
+ * Function Name:   ipmi_get_avgpower_consmpt_history
+ *
+ * Description:     This function updates the average power consumption information
+ * Input:           intf            - ipmi interface
+ * Output:          pavgpower- average power consumption information
+ *
+ * Return:
+ */
+static int
+ipmi_get_avgpower_consmpt_history(struct ipmi_intf * intf,
+		IPMI_AVGPOWER_CONSUMP_HISTORY * pavgpower)
+{
+	int rc;
+	uint8_t *rdata;
+	rc = ipmi_mc_getsysinfo(intf, 0xeb, 0, 0, sizeof(*pavgpower), pavgpower);
+	if (rc < 0) {
+		lprintf(LOG_ERR,
+				"Error getting average power consumption history data.");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) &&  (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting average power consumption history data: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc != 0) {
+		lprintf(LOG_ERR,
+				"Error getting average power consumption history data: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		rdata = (void *)pavgpower;
+		printf("Average power consumption history data"
+				"       :%x %x %x %x %x %x %x %x\n\n",
+				rdata[0], rdata[1], rdata[2], rdata[3],
+				rdata[4], rdata[5], rdata[6], rdata[7]);
+	}
+# if WORDS_BIGENDIAN
+	pavgpower->lastminutepower = BSWAP_16(pavgpower->lastminutepower);
+	pavgpower->lasthourpower = BSWAP_16(pavgpower->lasthourpower);
+	pavgpower->lastdaypower = BSWAP_16(pavgpower->lastdaypower);
+	pavgpower->lastweakpower = BSWAP_16(pavgpower->lastweakpower);
+# endif
+	return 0;
+}
+/*
+ * Function Name:    ipmi_get_peakpower_consmpt_history
+ *
+ * Description:      This function updates the peak power consumption information
+ * Input:            intf            - ipmi interface
+ * Output:           pavgpower- peak power consumption information
+ *
+ * Return:
+ */
+static int
+ipmi_get_peakpower_consmpt_history(struct ipmi_intf * intf,
+		IPMI_POWER_CONSUMP_HISTORY * pstPeakpower)
+{
+	uint8_t *rdata;
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, 0xec, 0, 0, sizeof(*pstPeakpower),
+			pstPeakpower);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting  peak power consumption history data.");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting peak power consumption history data: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc != 0) {
+		lprintf(LOG_ERR, "Error getting peak power consumption history data: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		rdata = (void *)pstPeakpower;
+		printf("Peak power consmhistory  Data               : "
+				"%x %x %x %x %x %x %x %x %x %x\n   "
+				"%x %x %x %x %x %x %x %x %x %x %x %x %x %x\n\n",
+				rdata[0], rdata[1], rdata[2], rdata[3],
+				rdata[4], rdata[5], rdata[6], rdata[7],
+				rdata[8], rdata[9], rdata[10], rdata[11],
+				rdata[12], rdata[13], rdata[14], rdata[15],
+				rdata[16], rdata[17], rdata[18], rdata[19],
+				rdata[20], rdata[21], rdata[22], rdata[23]);
+	}
+# if WORDS_BIGENDIAN
+	pstPeakpower->lastminutepower = BSWAP_16(pstPeakpower->lastminutepower);
+	pstPeakpower->lasthourpower = BSWAP_16(pstPeakpower->lasthourpower);
+	pstPeakpower->lastdaypower = BSWAP_16(pstPeakpower->lastdaypower);
+	pstPeakpower->lastweakpower = BSWAP_16(pstPeakpower->lastweakpower);
+	pstPeakpower->lastminutepowertime = BSWAP_32(pstPeakpower->lastminutepowertime);
+	pstPeakpower->lasthourpowertime = BSWAP_32(pstPeakpower->lasthourpowertime);
+	pstPeakpower->lastdaypowertime = BSWAP_32(pstPeakpower->lastdaypowertime);
+	pstPeakpower->lastweekpowertime = BSWAP_32(pstPeakpower->lastweekpowertime);
+#endif
+	return 0;
+}
+/*
+ * Function Name:    ipmi_get_minpower_consmpt_history
+ *
+ * Description:      This function updates the peak power consumption information
+ * Input:            intf            - ipmi interface
+ * Output:           pavgpower- peak power consumption information
+ *
+ * Return:
+ */
+static int
+ipmi_get_minpower_consmpt_history(struct ipmi_intf * intf,
+		IPMI_POWER_CONSUMP_HISTORY * pstMinpower)
+{
+	uint8_t *rdata;
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, 0xed, 0, 0, sizeof(*pstMinpower),
+			pstMinpower);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting  peak power consumption history data .");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) &&  (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting peak power consumption history data: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc != 0) {
+		lprintf(LOG_ERR, "Error getting peak power consumption history data: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		rdata = (void *)pstMinpower;
+		printf("Peak power consmhistory  Data               : "
+				"%x %x %x %x %x %x %x %x %x %x\n   "
+				"%x %x %x %x %x %x %x %x %x %x %x %x %x\n\n",
+				rdata[0], rdata[1], rdata[2], rdata[3],
+				rdata[4], rdata[5], rdata[6], rdata[7],
+				rdata[8], rdata[9], rdata[10], rdata[11],
+				rdata[12], rdata[13], rdata[14], rdata[15],
+				rdata[16], rdata[17], rdata[18], rdata[19],
+				rdata[20], rdata[21], rdata[22], rdata[23]);
+	}
+# if WORDS_BIGENDIAN
+	pstMinpower->lastminutepower = BSWAP_16(pstMinpower->lastminutepower);
+	pstMinpower->lasthourpower = BSWAP_16(pstMinpower->lasthourpower);
+	pstMinpower->lastdaypower = BSWAP_16(pstMinpower->lastdaypower);
+	pstMinpower->lastweakpower = BSWAP_16(pstMinpower->lastweakpower);
+	pstMinpower->lastminutepowertime = BSWAP_32(pstMinpower->lastminutepowertime);
+	pstMinpower->lasthourpowertime = BSWAP_32(pstMinpower->lasthourpowertime);
+	pstMinpower->lastdaypowertime = BSWAP_32(pstMinpower->lastdaypowertime);
+	pstMinpower->lastweekpowertime = BSWAP_32(pstMinpower->lastweekpowertime);
+# endif
+	return 0;
+}
+/*
+ * Function Name:    ipmi_print_power_consmpt_history
+ *
+ * Description:      This function print the average and peak power consumption information
+ * Input:            intf      - ipmi interface
+ *                   unit      - watt / btuphr
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_print_power_consmpt_history(struct ipmi_intf * intf, int unit)
+{
+	char timestr[30];
+	uint32_t lastminutepeakpower;
+	uint32_t lasthourpeakpower;
+	uint32_t lastdaypeakpower;
+	uint32_t lastweekpeakpower;
+	uint64_t tempbtuphrconv;
+	int rc = 0;
+
+	IPMI_AVGPOWER_CONSUMP_HISTORY avgpower;
+	IPMI_POWER_CONSUMP_HISTORY stMinpower;
+	IPMI_POWER_CONSUMP_HISTORY stPeakpower;
+
+	rc = ipmi_get_avgpower_consmpt_history(intf, &avgpower);
+	if (rc == (-1)) {
+		return rc;
+	}
+
+	rc = ipmi_get_peakpower_consmpt_history(intf, &stPeakpower);
+	if (rc == (-1)) {
+		return rc;
+	}
+
+	rc = ipmi_get_minpower_consmpt_history(intf, &stMinpower);
+	if (rc == (-1)) {
+		return rc;
+	}
+	if (rc != 0) {
+		return rc;
+	}
+	printf("Power Consumption History\n\n");
+	/* The fields are alligned manually changing the spaces will alter
+	 * the alignment*/
+	printf("Statistic                   Last Minute     Last Hour     "
+			"Last Day     Last Week\n\n");
+	if (unit == btuphr) {
+		printf("Average Power Consumption  ");
+		tempbtuphrconv = watt_to_btuphr_conversion(avgpower.lastminutepower);
+		printf("%4" PRId64 " BTU/hr     ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(avgpower.lasthourpower);
+		printf("%4" PRId64 " BTU/hr   ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(avgpower.lastdaypower);
+		printf("%4" PRId64 " BTU/hr  ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(avgpower.lastweakpower);
+		printf("%4" PRId64 " BTU/hr\n", tempbtuphrconv);
+
+		printf("Max Power Consumption      ");
+		tempbtuphrconv = watt_to_btuphr_conversion(stPeakpower.lastminutepower);
+		printf("%4" PRId64 " BTU/hr     ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stPeakpower.lasthourpower);
+		printf("%4" PRId64 " BTU/hr   ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stPeakpower.lastdaypower);
+		printf("%4" PRId64 " BTU/hr  ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stPeakpower.lastweakpower);
+		printf("%4" PRId64 " BTU/hr\n", tempbtuphrconv);
+
+		printf("Min Power Consumption      ");
+		tempbtuphrconv = watt_to_btuphr_conversion(stMinpower.lastminutepower);
+		printf("%4" PRId64 " BTU/hr     ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stMinpower.lasthourpower);
+		printf("%4" PRId64 " BTU/hr   ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stMinpower.lastdaypower);
+		printf("%4" PRId64 " BTU/hr  ", tempbtuphrconv);
+		tempbtuphrconv = watt_to_btuphr_conversion(stMinpower.lastweakpower);
+		printf("%4" PRId64 " BTU/hr\n\n", tempbtuphrconv);
+	} else {
+		printf("Average Power Consumption  ");
+		tempbtuphrconv = (avgpower.lastminutepower);
+		printf("%4" PRId64 " W          ", tempbtuphrconv);
+		tempbtuphrconv = (avgpower.lasthourpower);
+		printf("%4" PRId64 " W        ", tempbtuphrconv);
+		tempbtuphrconv = (avgpower.lastdaypower);
+		printf("%4" PRId64 " W       ", tempbtuphrconv);
+		tempbtuphrconv=(avgpower.lastweakpower);
+		printf("%4" PRId64 " W   \n", tempbtuphrconv);
+
+		printf("Max Power Consumption      ");
+		tempbtuphrconv = (stPeakpower.lastminutepower);
+		printf("%4" PRId64 " W          ", tempbtuphrconv);
+		tempbtuphrconv = (stPeakpower.lasthourpower);
+		printf("%4" PRId64 " W        ", tempbtuphrconv);
+		tempbtuphrconv = (stPeakpower.lastdaypower);
+		printf("%4" PRId64 " W       ", tempbtuphrconv);
+		tempbtuphrconv = (stPeakpower.lastweakpower);
+		printf("%4" PRId64 " W   \n", tempbtuphrconv);
+
+		printf("Min Power Consumption      ");
+		tempbtuphrconv = (stMinpower.lastminutepower);
+		printf("%4" PRId64 " W          ", tempbtuphrconv);
+		tempbtuphrconv = (stMinpower.lasthourpower);
+		printf("%4" PRId64 " W        ", tempbtuphrconv);
+		tempbtuphrconv = (stMinpower.lastdaypower);
+		printf("%4" PRId64 " W       ", tempbtuphrconv);
+		tempbtuphrconv = (stMinpower.lastweakpower);
+		printf("%4" PRId64 " W   \n\n", tempbtuphrconv);
+	}
+
+	lastminutepeakpower = stPeakpower.lastminutepowertime;
+	lasthourpeakpower = stPeakpower.lasthourpowertime;
+	lastdaypeakpower = stPeakpower.lastdaypowertime;
+	lastweekpeakpower = stPeakpower.lastweekpowertime;
+
+	printf("Max Power Time\n");
+	ipmi_time_to_str(lastminutepeakpower, timestr);
+	printf("Last Minute     : %s",timestr);
+	ipmi_time_to_str(lasthourpeakpower, timestr);
+	printf("Last Hour       : %s",timestr);
+	ipmi_time_to_str(lastdaypeakpower, timestr);
+	printf("Last Day        : %s",timestr);
+	ipmi_time_to_str(lastweekpeakpower, timestr);
+	printf("Last Week       : %s",timestr);
+
+	lastminutepeakpower=stMinpower.lastminutepowertime;
+	lasthourpeakpower=stMinpower.lasthourpowertime;
+	lastdaypeakpower=stMinpower.lastdaypowertime;
+	lastweekpeakpower=stMinpower.lastweekpowertime;
+
+	printf("Min Power Time\n");
+	ipmi_time_to_str(lastminutepeakpower, timestr);
+	printf("Last Minute     : %s", timestr);
+	ipmi_time_to_str(lasthourpeakpower, timestr);
+	printf("Last Hour       : %s", timestr);
+	ipmi_time_to_str(lastdaypeakpower, timestr);
+	printf("Last Day        : %s", timestr);
+	ipmi_time_to_str(lastweekpeakpower, timestr);
+	printf("Last Week       : %s", timestr);
+	return rc;
+}
+/*
+ * Function Name:    ipmi_get_power_cap
+ *
+ * Description:      This function updates the power cap information
+ * Input:            intf         - ipmi interface
+ * Output:           ipmipowercap - power cap information
+ *
+ * Return:
+ */
+static int
+ipmi_get_power_cap(struct ipmi_intf * intf, IPMI_POWER_CAP * ipmipowercap)
+{
+	uint8_t *rdata;
+	int rc;
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_POWER_CAP, 0, 0,
+			sizeof(*ipmipowercap), ipmipowercap);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting power cap.");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if ((rc == 0xc1) || (rc == 0xcb)) {
+		lprintf(LOG_ERR, "Error getting power cap: "
+				"Command not supported on this system.");
+		return -1;
+	} else if (rc != 0) {
+		lprintf(LOG_ERR, "Error getting power cap: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		rdata = (void*)ipmipowercap;
+		printf("power cap  Data               :%x %x %x %x %x %x %x %x %x %x ",
+				rdata[1], rdata[2], rdata[3],
+				rdata[4], rdata[5], rdata[6], rdata[7],
+				rdata[8], rdata[9], rdata[10],rdata[11]);
+	}
+# if WORDS_BIGENDIAN
+	ipmipowercap->PowerCap = BSWAP_16(ipmipowercap->PowerCap);
+	ipmipowercap->MaximumPowerConsmp = BSWAP_16(ipmipowercap->MaximumPowerConsmp);
+	ipmipowercap->MinimumPowerConsmp = BSWAP_16(ipmipowercap->MinimumPowerConsmp);
+	ipmipowercap->totalnumpowersupp = BSWAP_16(ipmipowercap->totalnumpowersupp);
+	ipmipowercap->AvailablePower = BSWAP_16(ipmipowercap->AvailablePower);
+	ipmipowercap->SystemThrottling = BSWAP_16(ipmipowercap->SystemThrottling);
+	ipmipowercap->Resv = BSWAP_16(ipmipowercap->Resv);
+# endif
+	return 0;
+}
+/*
+ * Function Name:    ipmi_print_power_cap
+ *
+ * Description:      This function print the power cap information
+ * Input:            intf            - ipmi interface
+ *                   unit            - watt / btuphr
+ * Output:
+ * Return:
+ */
+static int
+ipmi_print_power_cap(struct ipmi_intf * intf,uint8_t unit)
+{
+	uint64_t tempbtuphrconv;
+	int rc;
+	IPMI_POWER_CAP ipmipowercap;
+	memset(&ipmipowercap, 0, sizeof(ipmipowercap));
+	rc = ipmi_get_power_cap(intf, &ipmipowercap);
+	if (rc == 0) {
+		if (unit == btuphr) {
+			tempbtuphrconv = watt_to_btuphr_conversion(ipmipowercap.MaximumPowerConsmp);
+			printf("Maximum power: %" PRId64 "  BTU/hr\n", tempbtuphrconv);
+			tempbtuphrconv = watt_to_btuphr_conversion(ipmipowercap.MinimumPowerConsmp);
+			printf("Minimum power: %" PRId64 "  BTU/hr\n", tempbtuphrconv);
+			tempbtuphrconv = watt_to_btuphr_conversion(ipmipowercap.PowerCap);
+			printf("Power cap    : %" PRId64 "  BTU/hr\n", tempbtuphrconv);
+		} else {
+			printf("Maximum power: %d Watt\n", ipmipowercap.MaximumPowerConsmp);
+			printf("Minimum power: %d Watt\n", ipmipowercap.MinimumPowerConsmp);
+			printf("Power cap    : %d Watt\n", ipmipowercap.PowerCap);
+		}
+	}
+	return rc;
+}
+/*
+ * Function Name:     ipmi_set_power_cap
+ *
+ * Description:       This function updates the power cap information
+ * Input:             intf            - ipmi interface
+ *                    unit            - watt / btuphr
+ *                    val             - new power cap value
+ * Output:
+ * Return:
+ */
+static int
+ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val)
+{
+	int rc;
+	uint8_t data[13], *rdata;
+	uint16_t powercapval;
+	uint64_t maxpowerbtuphr;
+	uint64_t minpowerbtuphr;
+	IPMI_POWER_CAP ipmipowercap;
+
+	if (ipmi_get_power_capstatus_command(intf) < 0) {
+		return -1; /* Adding the failed condition check */
+	}
+	if (PowercapSetable_flag != 1) {
+		lprintf(LOG_ERR, "Can not set powercap on this system");
+		return -1;
+	} else if (PowercapstatusFlag != 1) {
+		lprintf(LOG_ERR, "Power cap set feature is not enabled");
+		return -1;
+	}
+	rc = ipmi_mc_getsysinfo(intf, IPMI_DELL_POWER_CAP, 0, 0,
+			sizeof(ipmipowercap), &ipmipowercap);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error getting power cap.");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if (rc == 0xc1) {
+		lprintf(LOG_ERR, "Error getting power cap, command not supported on "
+				"this system.");
+		return -1;
+	} else if (rc != 0) {
+		lprintf(LOG_ERR, "Error getting power cap: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		rdata = (void *)&ipmipowercap;
+		printf("power cap  Data               :%x %x %x %x %x %x %x %x %x %x %x ",
+				rdata[1], rdata[2], rdata[3],
+				rdata[4], rdata[5], rdata[6], rdata[7],
+				rdata[8], rdata[9], rdata[10],rdata[11]);
+	}
+# if WORDS_BIGENDIAN
+	ipmipowercap.PowerCap = BSWAP_16(ipmipowercap.PowerCap);
+	ipmipowercap.MaximumPowerConsmp = BSWAP_16(ipmipowercap.MaximumPowerConsmp);
+	ipmipowercap.MinimumPowerConsmp = BSWAP_16(ipmipowercap.MinimumPowerConsmp);
+	ipmipowercap.AvailablePower = BSWAP_16(ipmipowercap.AvailablePower);
+	ipmipowercap.totalnumpowersupp = BSWAP_16(ipmipowercap.totalnumpowersupp);
+# endif
+	memset(data, 0, 13);
+	data[0] = IPMI_DELL_POWER_CAP;
+	powercapval = val;
+	data[1] = (powercapval & 0XFF);
+	data[2] = ((powercapval & 0XFF00) >> 8);
+	data[3] = unit;
+	data[4] = ((ipmipowercap.MaximumPowerConsmp & 0xFF));
+	data[5] = ((ipmipowercap.MaximumPowerConsmp & 0xFF00) >> 8);
+	data[6] = ((ipmipowercap.MinimumPowerConsmp & 0xFF));
+	data[7] = ((ipmipowercap.MinimumPowerConsmp & 0xFF00) >> 8);
+	data[8] = (ipmipowercap.totalnumpowersupp);
+	data[9] = ((ipmipowercap.AvailablePower & 0xFF));
+	data[10] = ((ipmipowercap.AvailablePower & 0xFF00) >> 8);
+	data[11] = (ipmipowercap.SystemThrottling);
+	data[12] = 0x00;
+
+	if (unit == btuphr) {
+		val = btuphr_to_watt_conversion(val);
+	} else if (unit == percent) {
+		if ((val < 0) || (val > 100)) {
+			lprintf(LOG_ERR, "Cap value is out of boundary conditon it "
+					"should be between 0  - 100");
+			return -1;
+		}
+		val = ((val*(ipmipowercap.MaximumPowerConsmp
+						- ipmipowercap.MinimumPowerConsmp)) / 100)
+						+ ipmipowercap.MinimumPowerConsmp;
+		lprintf(LOG_ERR, "Cap value in percentage is  %d ", val);
+		data[1] = (val & 0XFF);
+		data[2] = ((val & 0XFF00) >> 8);
+		data[3] = watt;
+	}
+	if (((val < ipmipowercap.MinimumPowerConsmp)
+				|| (val > ipmipowercap.MaximumPowerConsmp)) && (unit == watt)) {
+		lprintf(LOG_ERR,
+				"Cap value is out of boundary conditon it should be between %d  - %d",
+				ipmipowercap.MinimumPowerConsmp, ipmipowercap.MaximumPowerConsmp);
+		return -1;
+	} else if (((val < ipmipowercap.MinimumPowerConsmp)
+				|| (val > ipmipowercap.MaximumPowerConsmp)) && (unit == btuphr)) {
+		minpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MinimumPowerConsmp);
+		maxpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MaximumPowerConsmp);
+		lprintf(LOG_ERR,
+				"Cap value is out of boundary conditon it should be between %d",
+				minpowerbtuphr);
+		lprintf(LOG_ERR, " -%d", maxpowerbtuphr);
+		return -1;
+	}
+	rc = ipmi_mc_setsysinfo(intf, 13, data);
+	if (rc < 0) {
+		lprintf(LOG_ERR, "Error setting power cap");
+		return -1;
+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if (rc > 0) {
+		lprintf(LOG_ERR, "Error setting power cap: %s",
+				val2str(rc, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 1) {
+		printf("CC for setpowercap :%d ", rc);
+	}
+	return 0;
+}
+/*
+ * Function Name:   ipmi_powermonitor_usage
+ *
+ * Description:     This function prints help message for powermonitor command
+ * Input:
+ * Output:
+ *
+ * Return:
+ */
+static void
+ipmi_powermonitor_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor");
+	lprintf(LOG_NOTICE,
+"      Shows power tracking statistics ");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor clear cumulativepower");
+	lprintf(LOG_NOTICE,
+"      Reset cumulative power reading");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor clear peakpower");
+	lprintf(LOG_NOTICE,
+"      Reset peak power reading");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor powerconsumption");
+	lprintf(LOG_NOTICE,
+"      Displays power consumption in <watt|btuphr>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor powerconsumptionhistory <watt|btuphr>");
+	lprintf(LOG_NOTICE,
+"      Displays power consumption history ");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor getpowerbudget");
+	lprintf(LOG_NOTICE,
+"      Displays power cap in <watt|btuphr>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor setpowerbudget <val><watt|btuphr|percent>");
+	lprintf(LOG_NOTICE,
+"      Allows user to set the  power cap in <watt|BTU/hr|percentage>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor enablepowercap ");
+	lprintf(LOG_NOTICE,
+"      To enable set power cap");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   powermonitor disablepowercap ");
+	lprintf(LOG_NOTICE,
+"      To disable set power cap");
+	lprintf(LOG_NOTICE,
+"");
+}
+/*
+ * Function Name:	   ipmi_delloem_vFlash_main
+ *
+ * Description:		   This function processes the delloem vFlash command
+ * Input:			   intf    - ipmi interface
+ *					   argc    - no of arguments
+ *					   argv    - argument string array
+ * Output:
+ *
+ * Return:			   return code	   0 - success
+ *						  -1 - failure
+ */
+static int
+ipmi_delloem_vFlash_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	current_arg++;
+	rc = ipmi_delloem_vFlash_process(intf, current_arg, argv);
+	return rc;
+}
+/*
+ * Function Name: 	get_vFlash_compcode_str
+ *
+ * Description: 	This function maps the vFlash completion code
+ * 		to a string
+ * Input : vFlash completion code and static array of codes vs strings
+ * Output: -
+ * Return: returns the mapped string
+ */
+const char *
+get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs)
+{
+	static char un_str[32];
+	int i;
+	for (i = 0; vs[i].str != NULL; i++) {
+		if (vs[i].val == vflashcompcode)
+			return vs[i].str;
+	}
+	memset(un_str, 0, 32);
+	snprintf(un_str, 32, "Unknown (0x%02X)", vflashcompcode);
+	return un_str;
+}
+/*
+ * Function Name: 	ipmi_get_sd_card_info
+ *
+ * Description: This function prints the vFlash Extended SD card info
+ * Input : ipmi interface
+ * Output: prints the sd card extended info
+ * Return: 0 - success -1 - failure
+ */
+static int
+ipmi_get_sd_card_info(struct ipmi_intf * intf) {
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+	uint8_t input_length=0;
+	uint8_t cardstatus=0x00;
+	IPMI_DELL_SDCARD_INFO * sdcardinfoblock;
+
+	input_length = 2;
+	msg_data[0] = msg_data[1] = 0x00;
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_GET_EXT_SD_CARD_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = input_length;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in getting SD Card Extended Information");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in getting SD Card Extended Information (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	sdcardinfoblock = (IPMI_DELL_SDCARD_INFO *) (void *) rsp->data;
+
+	if ((iDRAC_FLAG_12_13)
+			&& (sdcardinfoblock->vflashcompcode == VFL_NOT_LICENSED)) {
+		lprintf(LOG_ERR,
+				"FM001 : A required license is missing or expired");
+		return -1;
+	} else if (sdcardinfoblock->vflashcompcode != 0x00) {
+		lprintf(LOG_ERR, "Error in getting SD Card Extended Information (%s)",
+				get_vFlash_compcode_str(sdcardinfoblock->vflashcompcode,
+					vFlash_completion_code_vals));
+		return -1;
+	}
+
+	if (!(sdcardinfoblock->sdcardstatus & 0x04)) {
+		lprintf(LOG_ERR,
+				"vFlash SD card is unavailable, please insert the card of");
+		lprintf(LOG_ERR,
+				"size 256MB or greater");
+		return (-1);
+	}
+
+	printf("vFlash SD Card Properties\n");
+	printf("SD Card size       : %8dMB\n", sdcardinfoblock->sdcardsize);
+	printf("Available size     : %8dMB\n", sdcardinfoblock->sdcardavailsize);
+	printf("Initialized        : %10s\n",
+			(sdcardinfoblock->sdcardstatus & 0x80) ? "Yes" : "No");
+	printf("Licensed           : %10s\n",
+			(sdcardinfoblock->sdcardstatus & 0x40) ? "Yes" : "No");
+	printf("Attached           : %10s\n",
+			(sdcardinfoblock->sdcardstatus & 0x20) ? "Yes" : "No");
+	printf("Enabled            : %10s\n",
+			(sdcardinfoblock->sdcardstatus & 0x10) ? "Yes" : "No");
+	printf("Write Protected    : %10s\n",
+			(sdcardinfoblock->sdcardstatus & 0x08) ? "Yes" : "No");
+	cardstatus = sdcardinfoblock->sdcardstatus & 0x03;
+	printf("Health             : %10s\n",
+			((0x00 == cardstatus) ? "OK" : (
+				(cardstatus == 0x03) ? "Undefined" : (
+					(cardstatus == 0x02) ? "Critical" : "Warning"))));
+	printf("Bootable partition : %10d\n", sdcardinfoblock->bootpartion);
+	return 0;
+}
+/*
+ * Function Name: 	ipmi_delloem_vFlash_process
+ *
+ * Description: 	This function processes the args for vFlash subcmd
+ * Input : intf - ipmi interface, arg index, argv array
+ * Output: prints help or error with help
+ * Return: 0 - Success -1 - failure
+ */
+static int
+ipmi_delloem_vFlash_process(struct ipmi_intf * intf, int current_arg, char ** argv)
+{
+	int rc;
+	if (strncmp(intf->name,"wmi\0",4) && strncmp(intf->name, "open\0",5)) {
+		lprintf(LOG_ERR,
+				"vFlash support is enabled only for wmi and open interface.");
+		lprintf(LOG_ERR, "Its not enabled for lan and lanplus interface.");
+		return -1;
+	}
+
+	if (argv[current_arg] == NULL || strcmp(argv[current_arg], "help") == 0) {
+		ipmi_vFlash_usage();
+		return 0;
+	}
+	ipmi_idracvalidator_command(intf);
+	if (!strncmp(argv[current_arg], "info\0", 5)) {
+		current_arg++;
+		if (argv[current_arg] == NULL) {
+			ipmi_vFlash_usage();
+			return -1;
+		} else if (strncmp(argv[current_arg], "Card\0", 5) == 0) {
+			current_arg++;
+			if (argv[current_arg] != NULL) {
+				ipmi_vFlash_usage();
+				return -1;
+			}
+			rc = ipmi_get_sd_card_info(intf);
+			return rc;
+		} else {
+			/* TBD: many sub commands are present */
+			ipmi_vFlash_usage();
+			return -1;
+		}
+	} else {
+		/* TBD other vFlash subcommands */
+		ipmi_vFlash_usage();
+		return -1;
+	}
+}
+/*
+ * Function Name: 	ipmi_vFlash_usage
+ *
+ * Description: 	This function displays the usage for using vFlash
+ * Input : void
+ * Output: prints help
+ * Return: void
+ */
+static void
+ipmi_vFlash_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   vFlash info Card");
+	lprintf(LOG_NOTICE,
+"      Shows Extended SD Card information");
+	lprintf(LOG_NOTICE,
+"");
+}
+/*
+ * Function Name: ipmi_setled_usage
+ *
+ * Description:  This function prints help message for setled command
+ * Input:
+ * Output:
+ *
+ * Return:
+ */
+static void
+ipmi_setled_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"   setled <b:d.f> <state..>");
+	lprintf(LOG_NOTICE,
+"      Set backplane LED state");
+	lprintf(LOG_NOTICE,
+"      b:d.f = PCI Bus:Device.Function of drive (lspci format)");
+	lprintf(LOG_NOTICE,
+"      state = present|online|hotspare|identify|rebuilding|");
+	lprintf(LOG_NOTICE,
+"              fault|predict|critical|failed");
+	lprintf(LOG_NOTICE,
+"");
+}
+
+static int
+IsSetLEDSupported(void)
+{
+	return SetLEDSupported;
+}
+
+static void
+CheckSetLEDSupport(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[10];
+
+	SetLEDSupported = 0;
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = 0xD5; /* Storage */
+	req.msg.data_len = 10;
+	req.msg.data = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = 0x01; /* get */
+	data[1] = 0x00; /* subcmd:get firmware version */
+	data[2] = 0x08; /* length lsb */
+	data[3] = 0x00; /* length msb */
+	data[4] = 0x00; /* offset lsb */
+	data[5] = 0x00; /* offset msb */
+	data[6] = 0x00; /* bay id */
+	data[7] = 0x00;
+	data[8] = 0x00;
+	data[9] = 0x00;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL || rsp->ccode != 0) {
+		return;
+	}
+	SetLEDSupported = 1;
+}
+/*
+ * Function Name:    ipmi_getdrivemap
+ *
+ * Description:      This function returns mapping of BDF to Bay:Slot
+ * Input:            intf         - ipmi interface
+ *		    bdf	 	 - PCI Address of drive
+ *		    *bay	 - Returns bay ID
+ *		    *slot	 - Returns slot ID
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_getdrivemap(struct ipmi_intf * intf, int b, int d, int f, int *bay,
+		int *slot)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[8];
+	/* Get mapping of BDF to bay:slot */
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = 0xD5;
+	req.msg.data_len = 8;
+	req.msg.data = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = 0x01; /* get */
+	data[1] = 0x07; /* storage map */
+	data[2] = 0x06; /* length lsb */
+	data[3] = 0x00; /* length msb */
+	data[4] = 0x00; /* offset lsb */
+	data[5] = 0x00; /* offset msb */
+	data[6] = b; /* bus */
+	data[7] = (d << 3) + f; /* devfn */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error issuing getdrivemap command.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Error issuing getdrivemap command: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	*bay = rsp->data[7];
+	*slot = rsp->data[8];
+	if (*bay == 0xFF || *slot == 0xFF) {
+		lprintf(LOG_ERR, "Error could not get drive bay:slot mapping");
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_setled_state
+ *
+ * Description:      This function updates the LED on the backplane
+ * Input:            intf         - ipmi interface
+ *		    bdf	 	 - PCI Address of drive
+ *		    state	 - SES Flags state of drive
+ * Output:
+ *
+ * Return:
+ */
+static int
+ipmi_setled_state(struct ipmi_intf * intf, int bayId, int slotId, int state)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req = {0};
+	uint8_t data[20];
+	/* Issue Drive Status Update to bay:slot */
+	req.msg.netfn = DELL_OEM_NETFN;
+	req.msg.lun = 0;
+	req.msg.cmd = 0xD5;
+	req.msg.data_len = 20;
+	req.msg.data = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = 0x00; /* set */
+	data[1] = 0x04; /* set drive status */
+	data[2] = 0x0e; /* length lsb */
+	data[3] = 0x00; /* length msb */
+	data[4] = 0x00; /* offset lsb */
+	data[5] = 0x00; /* offset msb */
+	data[6] = 0x0e; /* length lsb */
+	data[7] = 0x00; /* length msb */
+	data[8] = bayId; /* bayid */
+	data[9] = slotId; /* slotid */
+	data[10] = state & 0xff; /* state LSB */
+	data[11] = state >> 8; /* state MSB; */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error issuing setled command.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Error issuing setled command: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	return 0;
+}
+/*
+ * Function Name:    ipmi_getsesmask
+ *
+ * Description:      This function calculates bits in SES drive update
+ * Return:           Mask set with bits for SES backplane update
+ */
+static int
+ipmi_getsesmask(int argc, char **argv)
+{
+	int mask = 0;
+	while (current_arg < argc) {
+		if (!strcmp(argv[current_arg], "present"))
+			mask |= (1L << 0);
+		if (!strcmp(argv[current_arg], "online"))
+			mask |= (1L << 1);
+		if (!strcmp(argv[current_arg], "hotspare"))
+			mask |= (1L << 2);
+		if (!strcmp(argv[current_arg], "identify"))
+			mask |= (1L << 3);
+		if (!strcmp(argv[current_arg], "rebuilding"))
+			mask |= (1L << 4);
+		if (!strcmp(argv[current_arg], "fault"))
+			mask |= (1L << 5);
+		if (!strcmp(argv[current_arg], "predict"))
+			mask |= (1L << 6);
+		if (!strcmp(argv[current_arg], "critical"))
+			mask |= (1L << 9);
+		if (!strcmp(argv[current_arg], "failed"))
+			mask |= (1L << 10);
+		current_arg++;
+	}
+	return mask;
+}
+/*
+ * Function Name:       ipmi_delloem_setled_main
+ *
+ * Description:         This function processes the delloem setled command
+ * Input:               intf    - ipmi interface
+ *                       argc    - no of arguments
+ *                       argv    - argument string array
+ * Output:
+ *
+ * Return:              return code     0 - success
+ *                         -1 - failure
+ */
+static int
+ipmi_delloem_setled_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int b,d,f, mask;
+	int bayId, slotId;
+	bayId = 0xFF;
+	slotId = 0xFF;
+	current_arg++;
+	if (argc < current_arg) {
+		usage();
+		return -1;
+	}
+	/* ipmitool delloem setled info*/
+	if (argc == 1 || strcmp(argv[current_arg], "help") == 0) {
+		ipmi_setled_usage();
+		return 0;
+	}
+	CheckSetLEDSupport(intf);
+	if (!IsSetLEDSupported()) {
+		lprintf(LOG_ERR, "'setled' is not supported on this system.");
+		return -1;
+	} else if (sscanf(argv[current_arg], "%*x:%x:%x.%x", &b,&d,&f) == 3) {
+		/* We have bus/dev/function of drive */
+		current_arg++;
+		ipmi_getdrivemap (intf, b, d, f, &bayId, &slotId);
+	} else if (sscanf(argv[current_arg], "%x:%x.%x", &b,&d,&f) == 3) {
+		/* We have bus/dev/function of drive */
+		current_arg++;
+	} else {
+		ipmi_setled_usage();
+		return -1;
+	}
+	/* Get mask of SES flags */
+	mask = ipmi_getsesmask(argc, argv);
+	/* Get drive mapping */
+	if (ipmi_getdrivemap (intf, b, d, f, &bayId, &slotId)) {
+		return -1;
+	}
+	/* Set drive LEDs */
+	return ipmi_setled_state (intf, bayId, slotId, mask);
+}
diff --git a/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c
new file mode 100644
index 0000000..7a6c63d
--- /dev/null
+++ b/lib/ipmi_ekanalyzer.c
@@ -0,0 +1,4195 @@
+/*
+ * Copyright (c) 2007 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <ipmitool/ipmi_ekanalyzer.h>
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_strings.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#define NO_MORE_INFO_FIELD         0xc1
+#define TYPE_CODE 0xc0 /*Language code*/
+
+/*
+ * CONSTANT
+ */
+const int ERROR_STATUS  = -1;
+const int OK_STATUS     = 0;
+
+const char * STAR_LINE_LIMITER =
+            "*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*";
+const char * EQUAL_LINE_LIMITER =
+            "=================================================================";
+const int SIZE_OF_FILE_TYPE          = 3;
+const unsigned char AMC_MODULE       = 0x80;
+const int PICMG_ID_OFFSET            = 3;
+const unsigned int COMPARE_CANDIDATE = 2;
+/* In AMC.0 or PICMG 3.0 specification offset start from 0 with 3 bytes of
+ * Mfg.ID, 1 byte of Picmg record Id, and
+ * 1 byte of format version, so the data offset start from 5
+ */
+const int START_DATA_OFFSET         = 5;
+const int LOWER_OEM_TYPE            = 0xf0;
+const int UPPER_OEM_TYPE            = 0xfe;
+const unsigned char DISABLE_PORT    = 0x1f;
+
+const struct valstr ipmi_ekanalyzer_module_type[] = {
+   { ON_CARRIER_FRU_FILE,     "On-Carrier Device" },
+   { A1_AMC_FRU_FILE,         "AMC slot A1" },
+   { A2_AMC_FRU_FILE,         "AMC slot A2" },
+   { A3_AMC_FRU_FILE,         "AMC slot A3" },
+   { A4_AMC_FRU_FILE,         "AMC slot A4" },
+   { B1_AMC_FRU_FILE,         "AMC slot B1" },
+   { B2_AMC_FRU_FILE,         "AMC slot B2" },
+   { B3_AMC_FRU_FILE,         "AMC slot B3" },
+   { B4_AMC_FRU_FILE,         "AMC slot B4" },
+   { RTM_FRU_FILE,            "RTM" }, /*This is OEM specific module*/
+   { CONFIG_FILE,             "Configuration file" },
+   { SHELF_MANAGER_FRU_FILE,  "Shelf Manager" },
+   { 0xffff ,                 NULL },
+};
+
+const struct valstr ipmi_ekanalyzer_IPMBL_addr[] = {
+   { 0x72,         "AMC slot A1" },
+   { 0x74,         "AMC slot A2" },
+   { 0x76,         "AMC slot A3" },
+   { 0x78,         "AMC slot A4" },
+   { 0x7a,         "AMC slot B1" },
+   { 0x7c,         "AMC slot B2" },
+   { 0x7e,         "AMC slot B3" },
+   { 0x80,         "AMC slot B4" },
+   { 0x90,         "RTM"}, /*This is OEM specific module*/
+   { 0xffff ,      NULL },
+};
+
+const struct valstr ipmi_ekanalyzer_link_type[] = {
+   { 0x00,         "Reserved" },
+   { 0x01,         "Reserved" },
+   { 0x02,         "AMC.1 PCI Express" },
+   { 0x03,         "AMC.1 PCI Express Advanced Switching" },
+   { 0x04,         "AMC.1 PCI Express Advanced Switching" },
+   { 0x05,         "AMC.2 Ethernet" },
+   { 0x06,         "AMC.4 Serial RapidIO" },
+   { 0x07,         "AMC.3 Storage" },
+   /*This is OEM specific module*/
+   { 0xf0,         "OEM Type 0"},
+   { 0xf1,         "OEM Type 1"},
+   { 0xf2,         "OEM Type 2"},
+   { 0xf3,         "OEM Type 3"},
+   { 0xf4,         "OEM Type 4"},
+   { 0xf5,         "OEM Type 5"},
+   { 0xf6,         "OEM Type 6"},
+   { 0xf7,         "OEM Type 7"},
+   { 0xf8,         "OEM Type 8"},
+   { 0xf9,         "OEM Type 9"},
+   { 0xfa,         "OEM Type 10"},
+   { 0xfb,         "OEM Type 11"},
+   { 0xfc,         "OEM Type 12"},
+   { 0xfd,         "OEM Type 13"},
+   { 0xfe,         "OEM Type 14"},
+   { 0xff ,        "Reserved" },
+};
+
+/*Reference: AMC.1 specification*/
+const struct valstr ipmi_ekanalyzer_extension_PCIE[] = {
+   { 0x00,         "Gen 1 capable - non SSC" },
+   { 0x01,         "Gen 1 capable - SSC" },
+   { 0x02,         "Gen 2 capable - non SSC" },
+   { 0x03,         "Gen 3 capable - SSC" },
+   { 0x0f,         "Reserved"},
+};
+/*Reference: AMC.2 specification*/
+const struct valstr ipmi_ekanalyzer_extension_ETHERNET[] = {
+   { 0x00,         "1000BASE-BX (SerDES Gigabit) Ethernet link" },
+   { 0x01,         "10GBASE-BX4 10 Gigabit Ethernet link" },
+};
+/*Reference: AMC.3 specification*/
+const struct valstr ipmi_ekanalyzer_extension_STORAGE[] = {
+   { 0x00,         "Fibre Channel  (FC)" },
+   { 0x01,         "Serial ATA (SATA)" },
+   { 0x02,         "Serial Attached SCSI (SAS/SATA)" },
+};
+
+const struct valstr ipmi_ekanalyzer_asym_PCIE[] = {
+   { 0x00,         "exact match"},
+   { 0x01,         "provides a Primary PCI Express Port" },
+   { 0x02,         "provides a Secondary PCI Express Port" },
+};
+
+const struct valstr ipmi_ekanalyzer_asym_STORAGE[] = {
+   { 0x00,         "FC or SAS interface {exact match}" },
+   { 0x01,         "SATA Server interface" },
+   { 0x02,         "SATA Client interface" },
+   { 0x03,         "Reserved" },
+};
+
+const struct valstr ipmi_ekanalyzer_picmg_record_id[] = {
+   { 0x04,         "Backplane Point to Point Connectivity Record" },
+   { 0x10,         "Address Table Record" },
+   { 0x11,         "Shelf Power Distribution Record" },
+   { 0x12,         "Shelf Activation and Power Management Record" },
+   { 0x13,         "Shelf Manager IP Connection Record" },
+   { 0x14,         "Board Point to Point Connectivity Record" },
+   { 0x15,         "Radial IPMB-0 Link Mapping Record" },
+   { 0x16,         "Module Current Requirements Record" },
+   { 0x17,         "Carrier Activation and Power Management Record" },
+   { 0x18,         "Carrier Point-to-Point Connectivity Record" },
+   { 0x19,         "AdvancedMC Point-to-Point Connectivity Record" },
+   { 0x1a,         "Carrier Information Table" },
+   { 0x1b,         "Shelf Fan Geography Record" },
+   { 0x2c,         "Carrier Clock Point-to-Point Connectivity Record" },
+   { 0x2d,         "Clock Configuration Record" },
+};
+
+extern int verbose;
+
+struct ipmi_ek_multi_header {
+   struct fru_multirec_header header;
+   unsigned char * data;
+   struct ipmi_ek_multi_header * prev;
+   struct ipmi_ek_multi_header * next;
+};
+
+struct ipmi_ek_amc_p2p_connectivity_record{
+   unsigned char guid_count;
+   struct fru_picmgext_guid * oem_guid;
+   unsigned char rsc_id;
+   unsigned char ch_count;
+   struct fru_picmgext_amc_channel_desc_record * ch_desc;
+   unsigned char link_desc_count;
+   struct fru_picmgext_amc_link_desc_record * link_desc;
+   int * matching_result; /*For link descriptor comparision*/
+};
+
+/*****************************************************************************
+* Function prototype
+******************************************************************************/
+/****************************************************************************
+* command Functions
+*****************************************************************************/
+static int ipmi_ekanalyzer_print( int argc, char * opt,
+                        char ** filename, int * file_type );
+
+static tboolean ipmi_ekanalyzer_ekeying_match( int argc, char * opt,
+                        char ** filename, int * file_type );
+
+/****************************************************************************
+* Linked list Functions
+*****************************************************************************/
+static void ipmi_ek_add_record2list( struct ipmi_ek_multi_header ** record,
+      struct ipmi_ek_multi_header ** list_head,
+      struct ipmi_ek_multi_header ** list_last );
+
+static void ipmi_ek_display_record( struct ipmi_ek_multi_header * record,
+      struct ipmi_ek_multi_header * list_head,
+      struct ipmi_ek_multi_header * list_last );
+
+static void ipmi_ek_remove_record_from_list(
+      struct ipmi_ek_multi_header * record,
+      struct ipmi_ek_multi_header ** list_head,
+      struct ipmi_ek_multi_header ** list_last );
+
+static int ipmi_ekanalyzer_fru_file2structure( char * filename,
+      struct ipmi_ek_multi_header ** list_head,
+      struct ipmi_ek_multi_header ** list_record,
+      struct ipmi_ek_multi_header ** list_last );
+
+/****************************************************************************
+* Ekeying match Functions
+*****************************************************************************/
+static int ipmi_ek_matching_process( int * file_type, int index1, int index2,
+      struct ipmi_ek_multi_header ** list_head,
+      struct ipmi_ek_multi_header ** list_last, char * opt,
+      struct ipmi_ek_multi_header * pphysical );
+
+static int ipmi_ek_get_resource_descriptor( int port_count, int index,
+      struct fru_picmgext_carrier_p2p_descriptor * port_desc,
+      struct ipmi_ek_multi_header * record );
+
+static int ipmi_ek_create_amc_p2p_record( struct ipmi_ek_multi_header * record,
+      struct ipmi_ek_amc_p2p_connectivity_record * amc_record );
+
+static int ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
+      struct ipmi_ek_amc_p2p_connectivity_record record1,
+      struct ipmi_ek_amc_p2p_connectivity_record record2,
+      char * opt, int file_type1, int file_type2 );
+
+static tboolean ipmi_ek_compare_channel_descriptor(
+      struct fru_picmgext_amc_channel_desc_record ch_desc1,
+      struct fru_picmgext_amc_channel_desc_record ch_desc2,
+      struct fru_picmgext_carrier_p2p_descriptor * port_desc,
+      int index_port, unsigned char rsc_id );
+
+static int ipmi_ek_compare_link_descriptor(
+      struct ipmi_ek_amc_p2p_connectivity_record record1, int index1,
+      struct ipmi_ek_amc_p2p_connectivity_record record2, int index2 );
+
+static int ipmi_ek_compare_asym( unsigned char asym[COMPARE_CANDIDATE] );
+
+static int ipmi_ek_compare_number_of_enable_port(
+      struct fru_picmgext_amc_link_desc_record link_desc[COMPARE_CANDIDATE] );
+
+static int ipmi_ek_check_physical_connectivity(
+      struct ipmi_ek_amc_p2p_connectivity_record record1, int index1,
+      struct ipmi_ek_amc_p2p_connectivity_record record2, int index2,
+      struct ipmi_ek_multi_header * record,
+      int filetype1, int filetype2, char * option );
+
+/****************************************************************************
+* Display Functions
+*****************************************************************************/
+static int ipmi_ek_display_fru_header( char * filename );
+
+static int ipmi_ek_display_fru_header_detail(char * filename);
+
+static int ipmi_ek_display_chassis_info_area(FILE * input_file, long offset);
+
+static size_t ipmi_ek_display_board_info_area( FILE * input_file,
+      char * board_type, unsigned int * board_length );
+
+static int ipmi_ek_display_product_info_area(FILE * input_file, long offset);
+
+static tboolean ipmi_ek_display_link_descriptor( int file_type,
+      unsigned char rsc_id, char * str,
+      struct fru_picmgext_amc_link_desc_record link_desc );
+
+static void ipmi_ek_display_oem_guid(
+      struct ipmi_ek_amc_p2p_connectivity_record amc_record1 );
+
+static int ipmi_ek_display_carrier_connectivity(
+      struct ipmi_ek_multi_header * record );
+
+static int ipmi_ek_display_power( int argc, char * opt,
+      char ** filename, int * file_type );
+
+static void ipmi_ek_display_current_descriptor(
+      struct fru_picmgext_carrier_activation_record car,
+      struct fru_picmgext_activation_record * cur_desc, char * filename );
+
+static void ipmi_ek_display_backplane_p2p_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_address_table_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_shelf_power_distribution_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_shelf_activation_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_shelf_ip_connection_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_shelf_fan_geography_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_board_p2p_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_radial_ipmb0_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_amc_current_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_amc_activation_record (
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_amc_p2p_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_amc_carrier_info_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_clock_carrier_p2p_record(
+      struct ipmi_ek_multi_header * record );
+
+static void ipmi_ek_display_clock_config_record(
+      struct ipmi_ek_multi_header * record );
+
+/**************************************************************************
+*
+* Function name: ipmi_ekanalyzer_usage
+*
+* Description  : Print the usage (help menu) of ekeying analyzer tool
+*
+* Restriction  : None
+*
+* Input        : None
+*
+* Output       : None
+*
+* Global       : None
+*
+* Return       :   None
+*
+***************************************************************************/
+static void
+ipmi_ekanalyzer_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"Ekeying analyzer tool version 1.00");
+	lprintf(LOG_NOTICE,
+"ekanalyzer Commands:");
+	lprintf(LOG_NOTICE,
+"      print    [carrier | power | all] <oc=filename1> <b1=filename2>...");
+	lprintf(LOG_NOTICE,
+"      frushow  <b2=filename>");
+	lprintf(LOG_NOTICE,
+"      summary  [match | unmatch | all] <oc=filename1> <b1=filename2>...");
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_get_file_type
+*
+* Description: this function takes an argument, then xtract the file type and
+*              convert into module type (on carrier, AMC,...) value.
+*
+*
+* Restriction: None
+*
+* Input:       argument: strings contain the type and the name of the file
+*                        together
+*
+* Output:      None
+*
+* Global:      None
+*
+* Return:      Return value of module type: On carrier FRU file, A1 FRUM file...
+*           if the file type is invalid, it return -1. See structure
+*           ipmi_ekanalyzer_module_type for a list of valid type.
+***************************************************************************/
+static int
+ipmi_ek_get_file_type(char *argument)
+{
+	int filetype = ERROR_STATUS;
+	if (strlen(argument) <= MIN_ARGUMENT) {
+		return filetype;
+	}
+	if (strncmp(argument, "oc=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = ON_CARRIER_FRU_FILE;
+	} else if (strncmp(argument, "a1=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = A1_AMC_FRU_FILE;
+	} else if (strncmp(argument, "a2=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = A2_AMC_FRU_FILE;
+	} else if (strncmp(argument, "a3=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = A3_AMC_FRU_FILE;
+	} else if (strncmp(argument, "a4=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = A4_AMC_FRU_FILE;
+	} else if (strncmp(argument, "b1=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = B1_AMC_FRU_FILE;
+	} else if (strncmp(argument, "b2=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = B2_AMC_FRU_FILE;
+	} else if (strncmp(argument, "b3=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = B3_AMC_FRU_FILE;
+	} else if (strncmp(argument, "b4=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = B4_AMC_FRU_FILE;
+	} else if (strncmp(argument, "rt=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = RTM_FRU_FILE;
+	} else if (strncmp(argument, "rc=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = CONFIG_FILE;
+	} else if (strncmp(argument, "sm=", SIZE_OF_FILE_TYPE) == 0) {
+		filetype = SHELF_MANAGER_FRU_FILE;
+	} else {
+		filetype = ERROR_STATUS;
+	}
+	return filetype;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ekanalyzer_main
+*
+* Description: Main program of ekeying analyzer. It calls the appropriate
+*           function according to the command received.
+*
+* Restriction: None
+*
+* Input: ipmi_intf * intf: ?
+*        int argc : number of argument received
+*        int ** argv: argument strings
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   OK_STATUS as succes or ERROR_STATUS as error
+*
+***************************************************************************/
+int
+ipmi_ekanalyzer_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = ERROR_STATUS;
+	int file_type[MAX_FILE_NUMBER];
+	char *filename[MAX_FILE_NUMBER];
+	unsigned int argument_offset = 0;
+	unsigned int type_offset = 0;
+	/* list des multi record */
+	struct ipmi_ek_multi_header *list_head = NULL;
+	struct ipmi_ek_multi_header *list_record = NULL;
+	struct ipmi_ek_multi_header *list_last = NULL;
+
+	if (argc == 0) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_ekanalyzer_usage();
+		return (-1);
+	} else if ((argc - 1) > MAX_FILE_NUMBER) {
+		lprintf(LOG_ERR, "Too too many parameters given.");
+		return (-1);
+	}
+
+	if (strcmp(argv[argument_offset], "help") == 0) {
+		ipmi_ekanalyzer_usage();
+		return 0;
+	} else if ((strcmp(argv[argument_offset], "frushow") == 0)
+			&& (argc > (MIN_ARGUMENT-1))) {
+		for (type_offset = 0; type_offset < (argc-1); type_offset++ ) {
+			argument_offset++;
+			file_type[type_offset] = ipmi_ek_get_file_type(argv[argument_offset]);
+			if (file_type[type_offset] == ERROR_STATUS
+					|| file_type[type_offset] == CONFIG_FILE) {
+				lprintf(LOG_ERR, "Invalid file type!");
+				lprintf(LOG_ERR, "   ekanalyzer frushow <xx=frufile> ...");
+				return (-1);
+			}
+			/* because of strlen doesn't count '\0',
+			 * we need to add 1 byte for this character
+			 * to filename size
+			 */
+			filename[type_offset] = malloc(strlen(argv[argument_offset])
+					+ 1 - SIZE_OF_FILE_TYPE);
+			if (filename[type_offset] == NULL) {
+				lprintf(LOG_ERR, "malloc failure");
+				return (-1);
+			}
+			strcpy(filename[type_offset],
+					&argv[argument_offset][SIZE_OF_FILE_TYPE]);
+			printf("Start converting file '%s'...\n",
+					filename[type_offset]);
+			/* Display FRU header offset */
+			rc = ipmi_ek_display_fru_header (filename[type_offset]);
+			if (rc != ERROR_STATUS) {
+				/* Display FRU header info in detail record */
+				rc = ipmi_ek_display_fru_header_detail(filename[type_offset]);
+				/* Convert from binary data into multi record structure */
+				rc = ipmi_ekanalyzer_fru_file2structure (filename[type_offset],
+						&list_head, &list_record, &list_last );
+				ipmi_ek_display_record(list_record, list_head, list_last);
+				/* Remove record of list */
+				while (list_head != NULL) {
+					ipmi_ek_remove_record_from_list(list_head,
+							&list_head,&list_last );
+					if (verbose > 1) {
+						printf("record has been removed!\n");
+					}
+				}
+			}
+			free(filename[type_offset]);
+			filename[type_offset] = NULL;
+		}
+	} else if ((strcmp(argv[argument_offset], "print") == 0)
+			|| (strcmp(argv[argument_offset], "summary") == 0)) {
+		/* Display help text for corresponding command
+		 * if not enough parameters were given.
+		 */
+		char * option;
+		/* index=1 indicates start position of first file
+		 * name in command line
+		 */
+		int index = 1;
+		int filename_size=0;
+		if (argc < MIN_ARGUMENT) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			if (strcmp(argv[argument_offset], "print") == 0) {
+				lprintf(LOG_ERR,
+						"   ekanalyzer print [carrier/power/all]"
+						" <xx=frufile> <xx=frufile> [xx=frufile]");
+			} else {
+				lprintf(LOG_ERR,
+						"   ekanalyzer summary [match/ unmatch/ all]"
+						" <xx=frufile> <xx=frufile> [xx=frufile]");
+			}
+			return ERROR_STATUS;
+		}
+		argument_offset++;
+		if ((strcmp(argv[argument_offset], "carrier") == 0)
+				|| (strcmp(argv[argument_offset], "power") == 0)
+				|| (strcmp(argv[argument_offset], "all") == 0)) {
+			option = argv[argument_offset];
+			index ++;
+			argc--;
+		} else if ((strcmp(argv[argument_offset], "match") == 0)
+				|| ( strcmp(argv[argument_offset], "unmatch") == 0)) {
+			option = argv[argument_offset];
+			index ++;
+			argc--;
+		} else if ( strncmp(&argv[argument_offset][2], "=", 1) == 0) {
+			/* since the command line must receive xx=filename,
+			 * so the position of "=" sign is 2
+			 */
+			option = "default";
+			/* Since there is no option from user, the first argument
+			 * becomes first file type
+			 */
+			index = 1; /* index of argument */
+		} else {
+			option = "invalid";
+			printf("Invalid option '%s'\n", argv[argument_offset]);
+			argument_offset--;
+			if (strcmp(argv[0], "print") == 0) {
+				lprintf (LOG_ERR,
+						"   ekanalyzer print [carrier/power/all]"
+						" <xx=frufile> <xx=frufile> [xx=frufile]");
+			} else {
+				lprintf (LOG_ERR,
+						"   ekanalyzer summary [match/ unmatch/ all]"
+						" <xx=frufile> <xx=frufile> [xx=frufile]");
+			}
+			rc = ERROR_STATUS;
+		}
+		if (strcmp(option, "invalid") != 0) {
+			int i=0;
+			for (i = 0; i < (argc-1); i++) {
+				file_type[i] = ipmi_ek_get_file_type (argv[index]);
+				if (file_type[i] == ERROR_STATUS) {
+					/* display the first 2 charactors (file type) of argument */
+					lprintf(LOG_ERR, "Invalid file type: %c%c\n",
+							argv[index][0],
+							argv[index][1]);
+					ipmi_ekanalyzer_usage();
+					rc = ERROR_STATUS;
+					break;
+				}
+				/* size is equal to string size minus 3 bytes of file type plus
+				 * 1 byte of '\0' since the strlen doesn't count the '\0'
+				 */
+				filename_size = strlen(argv[index]) - SIZE_OF_FILE_TYPE + 1;
+				if (filename_size > 0) {
+					filename[i] = malloc( filename_size );
+					if (filename[i] != NULL) {
+						strcpy(filename[i], &argv[index][SIZE_OF_FILE_TYPE]);
+					} else {
+						lprintf(LOG_ERR, "ipmitool: malloc failure");
+						rc = ERROR_STATUS;
+						break;
+					}
+				}
+				rc = OK_STATUS;
+				index++;
+			}
+			if (rc != ERROR_STATUS) {
+				if (verbose > 0) {
+					for (i = 0; i < (argc-1); i++) {
+						printf ("Type: %s,   ",
+								val2str(file_type[i],
+									ipmi_ekanalyzer_module_type));
+						printf("file name: %s\n", filename[i]);
+					}
+				}
+				if (strcmp(argv[0], "print") == 0) {
+					rc = ipmi_ekanalyzer_print((argc-1),
+							option, filename, file_type);
+				} else {
+					rc = ipmi_ekanalyzer_ekeying_match((argc-1),
+							option, filename, file_type);
+				}
+				for (i = 0; i < (argc-1); i++) {
+					if (filename[i] != NULL) {
+						free(filename[i]);
+						filename[i] = NULL;
+					}
+				}
+			} /* End of ERROR_STATUS */
+		} /* End of comparison of invalid option */
+	} else {
+		lprintf(LOG_ERR, "Invalid ekanalyzer command: %s", argv[0]);
+		ipmi_ekanalyzer_usage();
+		rc = ERROR_STATUS;
+	}
+	return rc;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ekanalyzer_print
+*
+* Description: this function will display the topology, power or both
+*            information together according to the option that it received.
+*
+* Restriction: None
+*
+* Input: int argc: number of the argument received
+*       char* opt: option string that will tell what to display
+*       char** filename: strings that contained filename of FRU data binary file
+*       int* file_type: a pointer that contain file type (on carrier file,
+*                       a1 file, b1 file...). See structure
+*                       ipmi_ekanalyzer_module_type for a list of valid type
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 as success and -1 as error.
+*
+***************************************************************************/
+static int
+ipmi_ekanalyzer_print(int argc, char *opt, char **filename, int *file_type)
+{
+	int return_value = OK_STATUS;
+	/* Display carrier topology */
+	if ((strcmp(opt, "carrier") == 0) || (strcmp(opt, "default") == 0)) {
+		tboolean found_flag = FALSE;
+		int index = 0;
+		int index_name[argc];
+		int list = 0;
+		/* list of multi record */
+		struct ipmi_ek_multi_header *list_head[argc];
+		struct ipmi_ek_multi_header *list_record[argc];
+		struct ipmi_ek_multi_header *list_last[argc];
+
+		for (list=0; list < argc; list++) {
+			list_head[list] = NULL;
+			list_record[list] = NULL;
+			list_last[list] = NULL;
+		}
+		/* reset list count */
+		list = 0;
+		for (index = 0; index < argc; index++) {
+			if (file_type[index] != ON_CARRIER_FRU_FILE) {
+				continue;
+			}
+			index_name[list] = index;
+			return_value = ipmi_ekanalyzer_fru_file2structure(filename[index],
+					&list_head[list],
+					&list_record[list],
+					&list_last[list]);
+			list++;
+			found_flag = TRUE;
+		}
+		if (!found_flag) {
+			printf("No carrier file has been found\n");
+			return_value = ERROR_STATUS;
+		} else {
+			int i = 0;
+			for (i = 0; i < argc; i++) {
+				/* this is a flag to advoid displaying
+				 * the same data multiple time
+				 */
+				tboolean first_data = TRUE;
+				for (list_record[i] = list_head[i];
+						list_record[i] != NULL;
+						list_record[i] = list_record[i]->next) {
+					if (list_record[i]->data[PICMG_ID_OFFSET] == FRU_AMC_CARRIER_P2P) {
+						if (first_data) {
+							printf("%s\n", STAR_LINE_LIMITER);
+							printf("From Carrier file: %s\n", filename[index_name[i]]);
+							first_data = FALSE;
+						}
+						return_value = ipmi_ek_display_carrier_connectivity(list_record[i]);
+					} else if (list_record[i]->data[PICMG_ID_OFFSET] == FRU_AMC_CARRIER_INFO) {
+						/*See AMC.0 specification Table3-3 for mor detail*/
+						#define COUNT_OFFSET 6
+						if (first_data) {
+							printf("From Carrier file: %s\n", filename[index_name[i]]);
+							first_data = FALSE;
+						}
+						printf("   Number of AMC bays supported by Carrier: %d\n",
+								list_record[i]->data[COUNT_OFFSET]);
+					}
+				}
+			}
+			/*Destroy the list of record*/
+			for (i = 0; i < argc; i++) {
+				while (list_head[i] != NULL) {
+					ipmi_ek_remove_record_from_list(list_head[i],
+							&list_head[i], &list_last[i]);
+				}
+				/* display deleted result when we
+				 * reach the last record
+				 */
+				if ((i == (list-1)) && verbose) {
+					printf("Record list has been removed successfully\n");
+				}
+			}
+		}
+	} else if (strcmp(opt, "power") == 0) {
+		printf("Print power information\n");
+		return_value = ipmi_ek_display_power(argc, opt, filename, file_type);
+	} else if (strcmp(opt, "all") == 0) {
+		printf("Print all information\n");
+		return_value = ipmi_ek_display_power(argc, opt, filename, file_type);
+	} else {
+		lprintf(LOG_ERR, "Invalid option %s", opt);
+		return_value = ERROR_STATUS;
+	}
+	return return_value;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_carrier_connectivity
+*
+* Description: Display the topology between a Carrier and all AMC modules by
+*           using carrier p2p connectivity record
+*
+* Restriction: Ref: AMC.0 Specification: Table 3-13 and Table 3-14
+*
+* Input: struct ipmi_ek_multi_header* record: a pointer to the carrier p2p
+*                              connectivity record.
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 on success and -1 if the record doesn't exist.
+*
+***************************************************************************/
+static int
+ipmi_ek_display_carrier_connectivity(struct ipmi_ek_multi_header *record)
+{
+	int offset = START_DATA_OFFSET;
+	struct fru_picmgext_carrier_p2p_record rsc_desc;
+	struct fru_picmgext_carrier_p2p_descriptor *port_desc;
+	if (record == NULL) {
+		lprintf(LOG_ERR, "P2P connectivity record is invalid\n");
+		return ERROR_STATUS;
+	}
+	if (verbose > 1) {
+		int k = 0;
+		printf("Binary data of Carrier p2p connectivity"\
+				" record starting from mfg id\n");
+		for (k = 0; k < (record->header.len); k++) {
+			printf("%02x   ", record->data[k]);
+		}
+		printf("\n");
+	}
+	while (offset <= (record->header.len - START_DATA_OFFSET)) {
+		rsc_desc.resource_id = record->data[offset++];
+		rsc_desc.p2p_count = record->data[offset++];
+		if (verbose > 0) {
+			printf("resource id= %02x  port count= %d\n",
+					rsc_desc.resource_id, rsc_desc.p2p_count);
+		}
+		/* check if it is an AMC Module */
+		if ((rsc_desc.resource_id & AMC_MODULE) == AMC_MODULE) {
+			/* check if it is an RTM module */
+			if (rsc_desc.resource_id == AMC_MODULE) {
+				printf("   %s topology:\n",
+						val2str(RTM_IPMB_L,
+							ipmi_ekanalyzer_IPMBL_addr));
+			} else {
+				/* The last four bits of resource ID
+				 * represent site number (mask = 0x0f)
+				 */
+				printf("   %s topology:\n",
+						val2str((rsc_desc.resource_id & 0x0f),
+							ipmi_ekanalyzer_module_type));
+			}
+		} else {
+			printf("   On Carrier Device ID %d topology: \n",
+					(rsc_desc.resource_id & 0x0f));
+		}
+		while (rsc_desc.p2p_count > 0) {
+			unsigned char data[3];
+# ifndef WORDS_BIGENDIAN
+			data[0] = record->data[offset + 0];
+			data[1] = record->data[offset + 1];
+			data[2] = record->data[offset + 2];
+# else
+			data[0] = record->data[offset + 2];
+			data[1] = record->data[offset + 1];
+			data[2] = record->data[offset + 0];
+# endif
+			port_desc = (struct fru_picmgext_carrier_p2p_descriptor*)data;
+			offset += sizeof(struct fru_picmgext_carrier_p2p_descriptor);
+			if ((port_desc->remote_resource_id & AMC_MODULE) == AMC_MODULE) {
+				printf("\tPort %d =====> %s, Port %d\n",
+						port_desc->local_port,
+						val2str((port_desc->remote_resource_id & 0x0f),
+							ipmi_ekanalyzer_module_type),
+						port_desc->remote_port);
+			} else {
+				printf("\tPort %d =====> On Carrier Device ID %d, Port %d\n",
+						port_desc->local_port,
+						(port_desc->remote_resource_id & 0x0f),
+						port_desc->remote_port);
+			}
+			rsc_desc.p2p_count--;
+		}
+	}
+	return OK_STATUS;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_power
+*
+* Description: Display the power management of the Carrier and AMC module by
+*           using current management record. If the display option equal to all,
+*           it will display power and carrier topology together.
+*
+* Restriction: Reference: AMC.0 Specification, Table 3-11
+*
+* Input: int argc: number of the argument received
+*       char* opt: option string that will tell what to display
+*       char** filename: strings that contained filename of FRU data binary file
+*       int* file_type: a pointer that contain file type (on carrier file,
+*                       a1 file, b1 file...)
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 on success and -1 if the record doesn't exist.
+*
+***************************************************************************/
+static int
+ipmi_ek_display_power( int argc, char * opt, char ** filename, int * file_type )
+{
+   int num_file=0;
+   int return_value = ERROR_STATUS;
+   int index = 0;
+
+   /*list des multi record*/
+   struct ipmi_ek_multi_header * list_head[argc];
+   struct ipmi_ek_multi_header * list_record[argc];
+   struct ipmi_ek_multi_header * list_last[argc];
+
+   for ( num_file = 0; num_file < argc; num_file++ ){
+      list_head[num_file] = NULL;
+      list_record[num_file] = NULL;
+      list_last[num_file] = NULL;
+   }
+
+   for ( num_file = 0; num_file < argc; num_file++ ){
+      tboolean is_first_data = TRUE;
+      if ( file_type[num_file] == CONFIG_FILE ){
+         num_file++;
+      }
+
+      if ( is_first_data ){
+         printf("%s\n", STAR_LINE_LIMITER);
+         printf("\nFrom %s file '%s'\n",
+                  val2str( file_type[num_file], ipmi_ekanalyzer_module_type),
+                  filename[num_file]);
+         is_first_data = FALSE;
+      }
+
+      return_value = ipmi_ekanalyzer_fru_file2structure( filename[num_file],
+        &list_head[num_file], &list_record[num_file], &list_last[num_file]);
+
+      if ( list_head[num_file] != NULL ){
+         for (    list_record[num_file] = list_head[num_file];
+                  list_record[num_file] != NULL;
+                  list_record[num_file] = list_record[num_file]->next
+            ){
+            if ( ( strcmp(opt, "all") == 0 )
+                  && ( file_type[num_file] == ON_CARRIER_FRU_FILE )
+               ){
+                  if ( list_record[num_file]->data[PICMG_ID_OFFSET]
+                           ==
+                        FRU_AMC_CARRIER_P2P
+                     ){
+                        return_value = ipmi_ek_display_carrier_connectivity(
+                                                list_record[num_file] );
+               }
+               else if ( list_record[num_file]->data[PICMG_ID_OFFSET]
+                           ==
+                         FRU_AMC_CARRIER_INFO
+                       ){
+                  /*Ref: See AMC.0 Specification Table 3-3: Carrier Information
+                  * Table about offset value
+                  */
+                  printf( "   Number of AMC bays supported by Carrier: %d\n",
+                          list_record[num_file]->data[START_DATA_OFFSET+1] );
+               }
+            }
+            /*Ref: AMC.0 Specification: Table 3-11
+            * Carrier Activation and Current Management Record
+            */
+            if ( list_record[num_file]->data[PICMG_ID_OFFSET]
+                  ==
+                 FRU_AMC_ACTIVATION
+               ){
+               int index_data = START_DATA_OFFSET;
+               struct fru_picmgext_carrier_activation_record car;
+               struct fru_picmgext_activation_record * cur_desc;
+
+               memcpy ( &car, &list_record[num_file]->data[index_data],
+                     sizeof (struct fru_picmgext_carrier_activation_record) );
+               index_data +=
+                     sizeof (struct fru_picmgext_carrier_activation_record);
+               cur_desc = malloc (car.module_activation_record_count * \
+                     sizeof (struct fru_picmgext_activation_record) );
+               for(index=0; index<car.module_activation_record_count; index++){
+                  memcpy( &cur_desc[index],
+                           &list_record[num_file]->data[index_data],
+                           sizeof (struct fru_picmgext_activation_record) );
+
+                  index_data += sizeof (struct fru_picmgext_activation_record);
+               }
+               /*Display the current*/
+               ipmi_ek_display_current_descriptor( car,
+                                    cur_desc, filename[num_file] );
+               free(cur_desc);
+               cur_desc = NULL;
+            }
+            /*Ref: AMC.0 specification, Table 3-10: Module Current Requirement*/
+            else if ( list_record[num_file]->data[PICMG_ID_OFFSET]
+                       == FRU_AMC_CURRENT
+                    ){
+               float power_in_watt = 0;
+               float current_in_amp = 0;
+
+               printf("   %s power required (Current Draw): ",
+                  val2str ( file_type[num_file], ipmi_ekanalyzer_module_type) );
+               current_in_amp =
+                        list_record[num_file]->data[START_DATA_OFFSET]*0.1;
+               power_in_watt = current_in_amp * AMC_VOLTAGE;
+               printf("%.2f Watts (%.2f Amps)\n",power_in_watt, current_in_amp);
+            }
+         }
+         return_value = OK_STATUS;
+         /*Destroy the list of record*/
+         for ( index = 0; index < argc; index++ ){
+            while ( list_head[index] != NULL ){
+               ipmi_ek_remove_record_from_list ( list_head[index],
+                        &list_head[index],&list_last[index] );
+            }
+            if ( verbose > 1 )
+               printf("Record list has been removed successfully\n");
+         }
+      }
+   }
+   printf("%s\n", STAR_LINE_LIMITER);
+   return return_value;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_current_descriptor
+*
+* Description: Display the current descriptor under format xx Watts (xx Amps)
+*
+* Restriction: None
+*
+* Input: struct fru_picmgext_carrier_activation_record car: contain binary data
+*                  of carrier activation record
+*        struct fru_picmgext_activation_record * cur_desc: contain current
+*                  descriptor
+*        char* filename: strings that contained filename of FRU data binary file
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_current_descriptor(
+		struct fru_picmgext_carrier_activation_record car,
+		struct fru_picmgext_activation_record *cur_desc,
+		char *filename)
+{
+	int index = 0;
+	float power_in_watt = 0.0;
+	float current_in_amp = 0.0;
+	for (index = 0; index < car.module_activation_record_count; index++) {
+		/* See AMC.0 specification, Table 3-12 for
+		 * detail about calculation
+		 */
+		current_in_amp = (float)cur_desc[index].max_module_curr * 0.1;
+		power_in_watt = (float)current_in_amp * AMC_VOLTAGE;
+		printf("   Carrier AMC power available on %s:\n",
+				val2str( cur_desc[index].ibmb_addr,
+					ipmi_ekanalyzer_IPMBL_addr));
+		printf("\t- Local IPMB Address    \t: %02x\n",
+				cur_desc[index].ibmb_addr);
+		printf("\t- Maximum module Current\t: %.2f Watts (%.2f Amps)\n",
+				power_in_watt, current_in_amp);
+	}
+	/* Display total power on Carrier */
+	current_in_amp =  (float)car.max_internal_curr * 0.1;
+	power_in_watt = (float)current_in_amp * AMC_VOLTAGE;
+	printf("   Carrier AMC total power available for all bays from file '%s':",
+			filename);
+	printf(" %.2f Watts (%.2f Amps)\n", power_in_watt, current_in_amp);
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ekanalyzer_ekeying_match
+*
+* Description: Check for possible Ekeying match between two FRU files
+*
+* Restriction: None
+*
+* Input: argc: number of the argument received
+*        opt: string that contains display option received from user.
+*        filename: strings that contained filename of FRU data binary file
+*        file_type: a pointer that contain file type (on carrier file,
+*                       a1 file, b1 file...)
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return TRUE on success and FALSE if the record doesn't exist.
+*
+***************************************************************************/
+static tboolean
+ipmi_ekanalyzer_ekeying_match( int argc, char * opt,
+         char ** filename, int * file_type )
+{
+   tboolean return_value = FALSE;
+
+   if ( (strcmp(opt, "carrier") == 0 ) || (strcmp(opt, "power") == 0) ){
+      lprintf(LOG_ERR, "   ekanalyzer summary [match/ unmatch/ all]"\
+                   " <xx=frufile> <xx=frufile> [xx=frufile]");
+      return_value = ERROR_STATUS;
+   }
+   else{
+      int num_file=0;
+      tboolean amc_file = FALSE; /*used to indicate the present of AMC file*/
+      tboolean oc_file = FALSE; /*used to indicate the present of Carrier file*/
+
+      /*Check for possible ekeying match between files*/
+      for ( num_file=0; num_file < argc; num_file++ ){
+         if ( ( file_type[num_file] == ON_CARRIER_FRU_FILE )
+              || ( file_type[num_file] == CONFIG_FILE )
+              || ( file_type[num_file] == SHELF_MANAGER_FRU_FILE )
+            ){
+            amc_file = FALSE;
+         }
+         else {   /*there is an amc file*/
+            amc_file = TRUE;
+            break;
+         }
+      }
+      if ( amc_file == FALSE ){
+         printf("\nNo AMC FRU file is provided --->" \
+                       " No possible ekeying match!\n");
+         return_value = ERROR_STATUS;
+      }
+      else{
+         /*If no carrier file is provided, return error*/
+         for ( num_file=0; num_file < argc; num_file++ ){
+            if ( (file_type[num_file] == ON_CARRIER_FRU_FILE )
+                 || ( file_type[num_file] == CONFIG_FILE )
+                 || ( file_type[num_file] == SHELF_MANAGER_FRU_FILE )
+               ){
+               oc_file = TRUE;
+               break;
+            }
+         }
+         if ( !oc_file ){
+            printf("\nNo Carrier FRU file is provided" \
+                        " ---> No possible ekeying match!\n");
+            return_value = ERROR_STATUS;
+         }
+         else{
+            /*list des multi record*/
+            struct ipmi_ek_multi_header * list_head[argc];
+            struct ipmi_ek_multi_header * list_record[argc];
+            struct ipmi_ek_multi_header * list_last[argc];
+            struct ipmi_ek_multi_header * pcarrier_p2p;
+            int list = 0;
+            int match_pair = 0;
+
+            /*Create an empty list*/
+            for ( list=0; list<argc; list++ ){
+               list_head[list] = NULL;
+               list_record[list] = NULL;
+               list_last[list] = NULL;
+            }
+            list=0;
+
+            for ( num_file=0; num_file < argc; num_file++ ){
+               if (file_type[num_file] != CONFIG_FILE){
+                  return_value = ipmi_ekanalyzer_fru_file2structure(
+                                filename[num_file], &list_head[num_file],
+                                &list_record[num_file], &list_last[num_file]);
+               }
+            }
+            /*Get Carrier p2p connectivity record for physical check*/
+            for (num_file=0; num_file < argc; num_file++){
+               if (file_type[num_file] == ON_CARRIER_FRU_FILE ){
+                  for ( pcarrier_p2p=list_head[num_file];
+                        pcarrier_p2p != NULL ;
+                        pcarrier_p2p = pcarrier_p2p->next
+                     ){
+                     if ( pcarrier_p2p->data[PICMG_ID_OFFSET]
+                           == FRU_AMC_CARRIER_P2P
+                        ){
+                        break;
+                     }
+                  }
+                  break;
+               }
+            }
+            /*Determine the match making pair*/
+            while ( match_pair < argc ){
+               for ( num_file = (match_pair+1); num_file<argc; num_file++ ){
+                  if ( ( file_type[match_pair] != CONFIG_FILE )
+                        && ( file_type[num_file] != CONFIG_FILE )
+                     ){
+                     if ( ( file_type[match_pair] != ON_CARRIER_FRU_FILE )
+                           || ( file_type[num_file] != ON_CARRIER_FRU_FILE )
+                        ){
+                        printf("%s vs %s\n",
+                                 val2str(file_type[match_pair],
+                                                ipmi_ekanalyzer_module_type),
+                                 val2str(file_type[num_file],
+                                                ipmi_ekanalyzer_module_type));
+                        /*Ekeying match between 2 files*/
+                        if (verbose>0){
+                           printf("Start matching process\n");
+                        }
+                        return_value = ipmi_ek_matching_process( file_type,
+                                             match_pair, num_file, list_head,
+                                             list_last, opt, pcarrier_p2p);
+                     }
+                  }
+               }
+               match_pair ++;
+            }
+            for( num_file=0; num_file < argc; num_file++ ){
+               if (list_head[num_file] != NULL ){
+                  ipmi_ek_remove_record_from_list( list_head[num_file],
+                           &list_record[num_file], &list_last[num_file]);
+               }
+               if ( ( num_file == argc-1 ) && verbose )
+                  printf("Record list has been removed successfully\n");
+            }
+            return_value = OK_STATUS;
+         }
+      }
+   }
+   return return_value;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_matching_process
+*
+* Description: This function process the OEM check, Physical Connectivity check,
+*              and Link Descriptor comparison to do Ekeying match
+*
+* Restriction: None
+*
+* Input: file_type: a pointer that contain file type (on carrier file,
+*                       a1 file, b1 file...)
+*        index1: position of the first record in the list of the record
+*        index2: position of the second record in the list of the record
+*        ipmi_ek_multi_header ** list_head: pointer to the header of a
+*                 linked list that contain FRU multi record
+*        ipmi_ek_multi_header ** list_last: pointer to the tale of a
+*                 linked list that contain FRU multi record
+*        opt: string that contain display option such as "match", "unmatch", or
+*               "all".
+*        pphysical: a pointer that contain a carrier p2p connectivity record
+*                   to perform physical check
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return OK_STATUS on success and ERROR_STATUS if the record doesn't
+*           exist.
+*
+***************************************************************************/
+static int ipmi_ek_matching_process( int * file_type, int index1, int index2,
+      struct ipmi_ek_multi_header ** list_head,
+      struct ipmi_ek_multi_header ** list_last, char * opt,
+      struct ipmi_ek_multi_header * pphysical )
+{
+   int result = ERROR_STATUS;
+   struct ipmi_ek_multi_header * record;
+   int num_amc_record1 = 0;/*Number of AMC records in the first module*/
+   int num_amc_record2 = 0;/*Number of AMC records in the second module*/
+
+   /* Comparison between an On-Carrier and an AMC*/
+   if ( file_type[index2] == ON_CARRIER_FRU_FILE ){
+      int index_temp = 0;
+      index_temp = index1;
+      index1 = index2; /*index1 indicate on carrier*/
+      index2 = index_temp; /*index2 indcate an AMC*/
+   }
+   /*Calculate record size for Carrier file*/
+   for ( record=list_head[index1]; record != NULL;record = record->next ){
+      if ( record->data[PICMG_ID_OFFSET] == FRU_AMC_P2P ){
+         num_amc_record2++;
+      }
+   }
+   /*Calculate record size for amc file*/
+   for ( record=list_head[index2]; record != NULL;record = record->next){
+      if ( record->data[PICMG_ID_OFFSET] == FRU_AMC_P2P ){
+         num_amc_record1++;
+      }
+   }
+   if ( (num_amc_record1 > 0) && (num_amc_record2 > 0) ){
+      int index_record1 = 0;
+      int index_record2 = 0;
+      /* Multi records of AMC module */
+      struct ipmi_ek_amc_p2p_connectivity_record * amc_record1 = NULL;
+      /* Multi records of Carrier or an AMC module */
+      struct ipmi_ek_amc_p2p_connectivity_record * amc_record2 = NULL;
+
+      amc_record1 = malloc ( num_amc_record1 * \
+                           sizeof(struct ipmi_ek_amc_p2p_connectivity_record));
+      amc_record2 = malloc ( num_amc_record2 * \
+                           sizeof(struct ipmi_ek_amc_p2p_connectivity_record));
+
+      for (record=list_head[index2]; record != NULL;record = record->next){
+         if ( record->data[PICMG_ID_OFFSET] == FRU_AMC_P2P ){
+            result = ipmi_ek_create_amc_p2p_record( record,
+                                       &amc_record1[index_record1] );
+            if (result != ERROR_STATUS){
+               struct ipmi_ek_multi_header * current_record = NULL;
+
+               for ( current_record=list_head[index1];
+                     current_record != NULL ;
+                     current_record = current_record->next
+                  ){
+                  if ( current_record->data[PICMG_ID_OFFSET] == FRU_AMC_P2P ){
+                     result = ipmi_ek_create_amc_p2p_record( current_record,
+                                       &amc_record2[index_record2] );
+                     if ( result != ERROR_STATUS ){
+                        if ( result == OK_STATUS ){
+                           /*Compare Link descriptor*/
+                           result = ipmi_ek_compare_link ( pphysical,
+                                    amc_record1[index_record1],
+                                    amc_record2[index_record2],
+                                    opt, file_type[index1], file_type[index2]);
+                        }
+                        index_record2++;
+                     }
+                  } /*end of FRU_AMC_P2P */
+               } /* end of for loop */
+               index_record1++;
+            }
+         }
+      }
+      free(amc_record1) ;
+      amc_record1 = NULL;
+      free(amc_record2) ;
+      amc_record2 = NULL;
+   }
+   else{
+      printf("No amc record is found!\n");
+   }
+
+   return result;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_check_physical_connectivity
+*
+* Description: This function check for point to point connectivity between
+*               two modules by comparing each enable port in link descriptor
+*               with local and remote ports of port descriptor in
+*               carrier point-to-point connectivity record according to the
+*               corresponding file type ( a1, b1, b2...).
+*
+* Restriction: In order to perform physical check connectivity, it needs to
+*               compare between 2 AMC Modules, so the use of index ( 1 and 2 )
+*               can facilitate the comparison in this case.
+*
+* Input: record1: is an AMC p2p record for an AMC module
+*        record2 is an AMC p2p record for an On-Carrier record or an AMC module
+*        char* opt: option string that will tell if a matching result, unmatched
+*                 result or all the results will be displayed.
+*        file_type1: indicates type of the first module
+*        file_type2: indicates type of the second module
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return OK_STATUS if both link are matched, otherwise
+*            return ERROR_STATUS
+*
+***************************************************************************/
+static int
+ipmi_ek_check_physical_connectivity(
+      struct ipmi_ek_amc_p2p_connectivity_record record1, int index1,
+      struct ipmi_ek_amc_p2p_connectivity_record record2, int index2,
+      struct ipmi_ek_multi_header * record,
+      int filetype1, int filetype2, char * option )
+{
+   int return_status = OK_STATUS;
+
+   if ( record == NULL ){
+      printf("NO Carrier p2p connectivity !\n");
+      return_status = ERROR_STATUS;
+   }
+   else{
+      #define INVALID_AMC_SITE_NUMBER      -1
+      int index = START_DATA_OFFSET;
+      int amc_site = INVALID_AMC_SITE_NUMBER;
+      struct fru_picmgext_carrier_p2p_record rsc_desc;
+      struct fru_picmgext_carrier_p2p_descriptor * port_desc = NULL;
+
+      /* Get the physical connectivity record */
+      while ( index < record->header.len ) {
+         rsc_desc.resource_id = record->data[index++];
+         rsc_desc.p2p_count = record->data[index++];
+         /* carrier p2p record starts with on-carrier device */
+         if ( (rsc_desc.resource_id == record1.rsc_id)
+               ||
+              (rsc_desc.resource_id == record2.rsc_id)
+            ){
+            if (rsc_desc.p2p_count <= 0){
+               printf("No p2p count\n");
+               return_status = ERROR_STATUS;
+            }
+            else{
+               port_desc = malloc ( rsc_desc.p2p_count *
+                           sizeof(struct fru_picmgext_carrier_p2p_descriptor) );
+               index = ipmi_ek_get_resource_descriptor( rsc_desc.p2p_count,
+                           index, port_desc, record );
+               amc_site = INVALID_AMC_SITE_NUMBER;
+               break;
+            }
+         }
+         else{ /* carrier p2p record starts with AMC module */
+            if (rsc_desc.resource_id == AMC_MODULE){
+               if (filetype1 != ON_CARRIER_FRU_FILE){
+                  amc_site = filetype1;
+               }
+               else{
+                  amc_site = filetype2;
+               }
+            }
+            else{
+               amc_site = rsc_desc.resource_id & 0x0f;
+            }
+            if ( amc_site > 0 ){
+               if ( (amc_site == filetype1) || (amc_site == filetype2) ){
+                  port_desc = malloc ( rsc_desc.p2p_count *
+                           sizeof(struct fru_picmgext_carrier_p2p_descriptor) );
+                  index = ipmi_ek_get_resource_descriptor( rsc_desc.p2p_count,
+                                    index, port_desc, record );
+                  break;
+               }
+            }
+            else{
+               return_status = ERROR_STATUS;
+            }
+         }
+         /*If the record doesn't contain the same AMC site number in command
+         * line, go to the next record
+         */
+         index += ( sizeof(struct fru_picmgext_carrier_p2p_descriptor) *
+                     rsc_desc.p2p_count );
+      }
+
+      if ( (port_desc != NULL) && (return_status != ERROR_STATUS) ){
+         int j=0;
+
+         for ( j = 0; j < rsc_desc.p2p_count; j++ ){
+            /* Compare only enable channel descriptor */
+            if ( record1.ch_desc[index1].lane0port != DISABLE_PORT ){
+               /* matching result from channel descriptor comparison */
+               tboolean match_lane = FALSE;
+
+               match_lane = ipmi_ek_compare_channel_descriptor (
+                              record1.ch_desc[index1], record2.ch_desc[index2],
+                              port_desc, j, rsc_desc.resource_id );
+
+               if ( match_lane ){
+                  if ( filetype1 != ON_CARRIER_FRU_FILE ){
+                     if ( (
+                           (filetype1 == (rsc_desc.resource_id & 0x0f))
+                              &&
+                           (filetype2 ==(port_desc[j].remote_resource_id &0x0f))
+                          )
+                          ||
+                          (
+                           (filetype2 == (rsc_desc.resource_id & 0x0f))
+                              &&
+                           (filetype1 ==(port_desc[j].remote_resource_id &0x0f))
+                          )
+                        ){
+                        if ( ! (strcmp(option, "unmatch") == 0) ){
+                           printf("%s port %d ==> %s port %d\n",
+                              val2str(filetype2, ipmi_ekanalyzer_module_type),
+                              record1.ch_desc[index1].lane0port,
+                              val2str(filetype1, ipmi_ekanalyzer_module_type),
+                              record2.ch_desc[index2].lane0port);
+                        }
+                        return_status = OK_STATUS;
+
+                        break;
+                     }
+                     else{
+                        if (verbose == LOG_DEBUG){
+                           printf("No point 2 point connectivity\n");
+                        }
+                        return_status = ERROR_STATUS;
+                     }
+                  }
+                  else{
+                     if ( (record2.rsc_id == (rsc_desc.resource_id) )
+                           &&
+                         (filetype2 == (port_desc[j].remote_resource_id & 0x0f))
+                        ){
+                        if ( ! (strcmp(option, "unmatch") == 0) ){
+                           printf("%s port %d ==> %s port %d\n",
+                              val2str(filetype2, ipmi_ekanalyzer_module_type),
+                              record1.ch_desc[index1].lane0port,
+                              val2str(filetype1, ipmi_ekanalyzer_module_type),
+                              record2.ch_desc[index2].lane0port);
+                        }
+                        return_status = OK_STATUS;
+                        break;
+                     }
+                     else if ( (filetype2 == (rsc_desc.resource_id & 0x0f) )
+                              &&
+                           (record2.rsc_id == (port_desc[j].remote_resource_id))
+                        ){
+                        if ( ! (strcmp(option, "unmatch") == 0) ){
+                           printf("%s port %d ==> %s %x port %d\n",
+                              val2str(filetype2, ipmi_ekanalyzer_module_type),
+                              record1.ch_desc[index1].lane0port,
+                              val2str(filetype1, ipmi_ekanalyzer_module_type),
+                              record2.rsc_id,record2.ch_desc[index2].lane0port);
+                        }
+                        return_status = OK_STATUS;
+                        break;
+                     }
+                     else{
+                        if (verbose == LOG_DEBUG){
+                           printf("No point 2 point connectivity\n");
+                        }
+                        return_status = ERROR_STATUS;
+                     }
+                  }
+               }
+               else{
+                  if (verbose == LOG_DEBUG){
+                           printf("No point 2 point connectivity\n");
+                  }
+                  return_status = ERROR_STATUS;
+               }
+            }
+            else{ /*If the link is disable, the result is always true*/
+               return_status = OK_STATUS;
+            }
+         }
+      }
+      else{
+         if (verbose == LOG_WARN){
+            printf("Invalid Carrier p2p connectivity record\n");
+         }
+         return_status = ERROR_STATUS;
+      }
+      if (port_desc != NULL){
+         free(port_desc);
+         port_desc = NULL;
+      }
+   }
+   return return_status;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_compare_link
+*
+* Description: This function compares link grouping id of each
+*               amc p2p connectiviy record
+*
+* Restriction: None
+*
+* Input: record1: is an AMC p2p record for an AMC module
+*        record2 is an AMC p2p record for an On-Carrier record or an AMC module
+*        char* opt: option string that will tell if a matching result, unmatched
+*                 result or all the results will be displayed.
+*        file_type1: indicates type of the first module
+*        file_type2: indicates type of the second module
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 if both link are matched, otherwise return -1
+*
+***************************************************************************/
+static int
+ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
+   struct ipmi_ek_amc_p2p_connectivity_record record1,
+   struct ipmi_ek_amc_p2p_connectivity_record record2, char * opt,
+   int file_type1, int file_type2 )
+{
+   int result = ERROR_STATUS;
+   int index1 = 0; /*index for AMC module*/
+   int index2 = 0; /*index for On-carrier type*/
+
+   record1.matching_result = malloc ( record1.link_desc_count * sizeof(int) );
+   record2.matching_result = malloc ( record2.link_desc_count * sizeof(int) );
+   /*Initialize all the matching_result to false*/
+   for( index2 = 0; index2 < record2.link_desc_count; index2++ ){
+      record2.matching_result[index2] = FALSE;
+   }
+   for( index1 = 0; index1 < record1.link_desc_count; index1++ ){
+      for( index2 = 0; index2 < record2.link_desc_count; index2++ ){
+         if( record1.link_desc[index1].group_id == 0 ){
+            if( record2.link_desc[index2].group_id == 0 ){
+               result = ipmi_ek_compare_link_descriptor(
+                              record1, index1, record2, index2 );
+               if ( result == OK_STATUS ){
+                  /*Calculate the index for Channel descriptor in function of
+                  * link designator channel ID
+                  */
+                  /*first channel_id in the AMC Link descriptor of record1*/
+                  static int flag_first_link1;
+                  int index_ch_desc1; /*index of channel descriptor */
+                  /*first channel_id in the AMC Link descriptor of record2*/
+                  static int flag_first_link2;
+                  int index_ch_desc2; /*index of channel descriptor*/
+
+                  if (index1==0){ /*this indicate the first link is encounter*/
+                     flag_first_link1 = record1.link_desc[index1].channel_id;
+                  }
+                  index_ch_desc1 = record1.link_desc[index1].channel_id -
+                              flag_first_link1;
+                  if (index2==0){
+                     flag_first_link2 = record2.link_desc[index2].channel_id;
+                  }
+                  index_ch_desc2 = record2.link_desc[index2].channel_id -
+                              flag_first_link2;
+                  /*Check for physical connectivity for each link*/
+                  result = ipmi_ek_check_physical_connectivity ( record1,
+                      index_ch_desc1, record2, index_ch_desc2,
+                           physic_record, file_type1, file_type2, opt );
+                  if ( result == OK_STATUS ){
+                     /*Display the result if option = match or all*/
+                     if ( (strcmp( opt, "match" ) == 0)
+                           || (strcmp( opt, "all" ) == 0)
+                           || (strcmp( opt, "default" ) == 0)
+                        ){
+                        tboolean isOEMtype = FALSE;
+                        printf(" Matching Result\n");
+                        isOEMtype = ipmi_ek_display_link_descriptor( file_type1,
+                                          record2.rsc_id,
+                                          "From", record2.link_desc[index2]);
+                        if (isOEMtype){
+                           ipmi_ek_display_oem_guid (record2);
+                        }
+                        isOEMtype = ipmi_ek_display_link_descriptor( file_type2,
+                                          record1.rsc_id,
+                                          "To", record1.link_desc[index1] );
+                        if (isOEMtype){
+                           ipmi_ek_display_oem_guid (record1);
+                        }
+                        printf("  %s\n", STAR_LINE_LIMITER);
+                     }
+                     record2.matching_result[index2] = TRUE;
+                     record1.matching_result[index1] = TRUE;
+                     /*quit the fist loop since the match is found*/
+                     index2 = record2.link_desc_count;
+                  }
+               }
+            }
+         }
+         else { /*Link Grouping ID is non zero, Compare all link descriptor
+                 * that has non-zero link grouping id together
+                 */
+            if (record2.link_desc[index2].group_id != 0 ){
+               result = ipmi_ek_compare_link_descriptor(
+                              record1, index1, record2, index2 );
+               if ( result == OK_STATUS ){
+                  /*Calculate the index for Channel descriptor in function of
+                  * link designator channel ID
+                  */
+                  /*first channel_id in the AMC Link descriptor of record1*/
+                  static int flag_first_link1;
+                  int index_ch_desc1; /*index of channel descriptor */
+                  /*first channel_id in the AMC Link descriptor of record2*/
+                  static int flag_first_link2;
+                  int index_ch_desc2; /*index of channel descriptor*/
+
+                  if (index1==0){ /*this indicate the first link is encounter*/
+                     flag_first_link1 = record1.link_desc[index1].channel_id;
+                  }
+                  index_ch_desc1 = record1.link_desc[index1].channel_id -
+                              flag_first_link1;
+                  if (index2==0){
+                     flag_first_link2 = record2.link_desc[index2].channel_id;
+                  }
+                  index_ch_desc2 = record2.link_desc[index2].channel_id -
+                              flag_first_link2;
+                  /*Check for physical connectivity for each link*/
+                  result = ipmi_ek_check_physical_connectivity (
+                           record1, index_ch_desc1, record2, index_ch_desc2,
+                           physic_record, file_type1, file_type2, opt );
+                  if ( result == OK_STATUS ){
+                     if ( (strcmp( opt, "match" ) == 0)
+                           || (strcmp( opt, "all" ) == 0)
+                           || (strcmp( opt, "default" ) == 0)
+                        ){
+                        tboolean isOEMtype = FALSE;
+                        printf("  Matching Result\n");
+                        isOEMtype = ipmi_ek_display_link_descriptor( file_type1,
+                                       record2.rsc_id,
+                                       "From", record2.link_desc[index2] );
+                        if ( isOEMtype ){
+                           ipmi_ek_display_oem_guid (record2);
+                        }
+                        isOEMtype = ipmi_ek_display_link_descriptor( file_type2,
+                                       record1.rsc_id,
+                                       "To", record1.link_desc[index1] );
+                        if (isOEMtype){
+                           ipmi_ek_display_oem_guid (record1);
+                        }
+                        printf("  %s\n", STAR_LINE_LIMITER);
+                     }
+                     record2.matching_result[index2] = TRUE;
+                     record1.matching_result[index1] = TRUE;
+                     /*leave the fist loop since the match is found*/
+                     index2 = record2.link_desc_count;
+                  }
+               }
+            }
+         }
+      }
+   }
+
+   if ( (strcmp(opt, "unmatch") == 0) || (strcmp(opt, "all") == 0) ){
+      int isOEMtype = FALSE;
+      printf("  Unmatching result\n");
+      for (index1 = 0; index1 < record1.link_desc_count; index1++){
+         isOEMtype = ipmi_ek_display_link_descriptor( file_type2,
+                           record1.rsc_id, "", record1.link_desc[index1] );
+         if ( isOEMtype ){
+            ipmi_ek_display_oem_guid (record1);
+         }
+         printf("   %s\n", STAR_LINE_LIMITER);
+      }
+      for ( index2 = 0; index2 < record2.link_desc_count; index2++){
+         if ( !record2.matching_result[index2] ){
+            isOEMtype = ipmi_ek_display_link_descriptor( file_type1,
+                           record2.rsc_id, "", record2.link_desc[index2] );
+            if ( isOEMtype ){
+               ipmi_ek_display_oem_guid (record2);
+            }
+            printf("   %s\n", STAR_LINE_LIMITER);
+         }
+      }
+   }
+
+   free(record1.matching_result);
+   record1.matching_result = NULL;
+   free(record2.matching_result);
+   record2.matching_result = NULL;
+
+   return result;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_compare_channel_descriptor
+*
+* Description: This function compares 2 channel descriptors of 2 AMC
+*               point-to-point connectivity records with port descriptor of
+*                carrier point-to-point connectivity record. The comparison is
+*                made between each enable port only.
+*
+* Restriction: Reference: AMC.0 specification:
+*                     - Table 3-14 for port descriptor
+*                     - Table 3-17 for channel descriptor
+*
+* Input: ch_desc1: first channel descriptor
+*        ch_desc2: second channel descriptor
+*        port_desc: a pointer that contain a list of port descriptor
+*        index_port: index of the port descriptor
+*         rsc_id: resource id that represents as local resource id in the
+*                  resource descriptor table.
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return TRUE if both channel descriptor are matched,
+*         or FALSE otherwise
+*
+***************************************************************************/
+static tboolean
+ipmi_ek_compare_channel_descriptor(
+      struct fru_picmgext_amc_channel_desc_record ch_desc1,
+      struct fru_picmgext_amc_channel_desc_record ch_desc2,
+      struct fru_picmgext_carrier_p2p_descriptor * port_desc,
+      int index_port, unsigned char rsc_id )
+{
+   tboolean match_lane = FALSE;
+
+   /* carrier p2p record start with AMC_MODULE as local port */
+   if ( (rsc_id & AMC_MODULE) == AMC_MODULE ){
+      if ( (ch_desc1.lane0port == port_desc[index_port].local_port)
+               &&
+           (ch_desc2.lane0port == port_desc[index_port].remote_port)
+         ){
+         /*check if the port is enable*/
+         if (ch_desc1.lane1port != DISABLE_PORT){
+            index_port ++;
+            if ( (ch_desc1.lane1port == port_desc[index_port].local_port)
+                     &&
+                 (ch_desc2.lane1port == port_desc[index_port].remote_port)
+               ){
+               if (ch_desc1.lane2port != DISABLE_PORT){
+                  index_port++;
+                  if ( (ch_desc1.lane2port == port_desc[index_port].local_port)
+                           &&
+                       (ch_desc2.lane2port == port_desc[index_port].remote_port)
+                     ){
+                     if (ch_desc1.lane3port != DISABLE_PORT){
+                        index_port++;
+                        if ( (ch_desc1.lane3port ==
+                                             port_desc[index_port].local_port)
+                                 &&
+                             (ch_desc2.lane3port ==
+                                             port_desc[index_port].remote_port)
+                           ){
+                              match_lane = TRUE;
+                        }
+                     }
+                     else{
+                        match_lane = TRUE;
+                     }
+                  } /* end of if lane2port */
+               }
+               else{
+                  match_lane = TRUE;
+               }
+            } /* end of if lane1port */
+         }
+         else{ /*if the port is disable, the compare result is always true*/
+              match_lane = TRUE;
+         }
+      }/* end of if lane0port */
+   }
+   /* carrier p2p record start with Carrier as local port */
+   else{
+      if ( (ch_desc1.lane0port == port_desc[index_port].remote_port)
+               &&
+           (ch_desc2.lane0port == port_desc[index_port].local_port)
+         ){
+         if (ch_desc1.lane1port != DISABLE_PORT){
+            index_port ++;
+            if ( (ch_desc1.lane1port == port_desc[index_port].remote_port)
+                     &&
+                 (ch_desc2.lane1port == port_desc[index_port].local_port)
+               ){
+               if (ch_desc1.lane2port != DISABLE_PORT){
+                  index_port++;
+                  if ( (ch_desc1.lane2port == port_desc[index_port].remote_port)
+                           &&
+                       (ch_desc2.lane2port == port_desc[index_port].local_port)
+                     ){
+                     if (ch_desc1.lane3port != DISABLE_PORT){
+                        index_port++;
+                        if ( (ch_desc1.lane3port ==
+                                             port_desc[index_port].remote_port)
+                                 &&
+                             (ch_desc2.lane3port ==
+                                             port_desc[index_port].local_port)
+                           ){
+                              match_lane = TRUE;
+                        }
+                     }
+                     else{
+                        match_lane = TRUE;
+                     }
+                  } /* end of if lane2port */
+               }
+               else{
+                  match_lane = TRUE;
+               }
+            } /* end of if lane1port */
+         }
+         else{
+              match_lane = TRUE;
+         }
+      } /* end of if lane0port */
+   }
+
+   return match_lane;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_compare_link_descriptor
+*
+* Description: This function compares 2 link descriptors of 2
+*               amc p2p connectiviy record
+*
+* Restriction: None
+*
+* Input: record1: AMC p2p connectivity record of the 1rst AMC or Carrier Module
+*         index1: index of AMC link descriptor in 1rst record
+*         record2: AMC p2p connectivity record of the 2nd AMC or Carrier Module
+*         index1: index of AMC link descriptor in 2nd record
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return OK_STATUS if both link are matched,
+*            otherwise return ERROR_STATUS
+*
+***************************************************************************/
+static int
+ipmi_ek_compare_link_descriptor(
+		struct ipmi_ek_amc_p2p_connectivity_record record1,
+		int index1,
+		struct ipmi_ek_amc_p2p_connectivity_record record2,
+		int index2)
+{
+	int result = ERROR_STATUS;
+	if (record1.link_desc[index1].type != record2.link_desc[index2].type) {
+		return ERROR_STATUS;
+	}
+	/* if it is an OEM type, we compare the OEM GUID */
+	if ((record1.link_desc[index1].type >= LOWER_OEM_TYPE)
+			&& (record1.link_desc[index1].type <= UPPER_OEM_TYPE)) {
+		if ((record1.guid_count == 0) && (record2.guid_count == 0)) {
+			/*there is no GUID for comparison, so the result is always OK*/
+			result = OK_STATUS;
+		} else {
+			int i = 0;
+			int j = 0;
+			for (i = 0; i < record1.guid_count; i++) {
+				for (j = 0; j < record2.guid_count; j++) {
+					if (memcmp(&record1.oem_guid[i],
+								&record2.oem_guid[j],
+								SIZE_OF_GUID) == 0) {
+						result = OK_STATUS;
+						break;
+					}
+				}
+			}
+		}
+	} else {
+		result = OK_STATUS;
+	}
+	if (result != OK_STATUS) {
+		return result;
+	}
+	if (record1.link_desc[index1].type_ext == record2.link_desc[index2].type_ext) {
+		unsigned char asym[COMPARE_CANDIDATE];
+		int offset = 0;
+		asym[offset++] = record1.link_desc[index1].asym_match;
+		asym[offset] = record2.link_desc[index2].asym_match;
+		result = ipmi_ek_compare_asym (asym);
+		if (result == OK_STATUS){
+			struct fru_picmgext_amc_link_desc_record link[COMPARE_CANDIDATE];
+			int index = 0;
+			link[index++] = record1.link_desc[index1];
+			link[index] = record2.link_desc[index2];
+			result = ipmi_ek_compare_number_of_enable_port(link);
+		} else {
+			result = ERROR_STATUS;
+		}
+	} else {
+		result = ERROR_STATUS;
+	}
+	return result;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_compare_asym
+*
+* Description: This function compares 2 asymetric match of 2
+*               amc link descriptors
+*
+* Restriction: None
+*
+* Input:      asym[COMPARE_CANDIDATE]: Contain 2 asymetric match for comparison
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 if both asym. match are matched, otherwise return -1
+*
+***************************************************************************/
+
+static int
+ipmi_ek_compare_asym(unsigned char asym[COMPARE_CANDIDATE])
+{
+	int return_value = ERROR_STATUS;
+	int first_index = 0;
+	int second_index = 1;
+
+	if ((asym[first_index] == 0) && (asym[second_index] == 0)) {
+		return_value = OK_STATUS;
+	} else if ((asym[first_index] & asym[second_index]) == 0) {
+		return_value = OK_STATUS;
+	} else {
+		return_value = ERROR_STATUS;
+	}
+	return return_value;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_compare_link_descriptor
+*
+* Description: This function compare number of enble port of Link designator
+*
+* Restriction: None
+*
+* Input: link_designator1: first link designator
+*        link_designator2:  second link designator
+*
+* Output: None
+*
+* Global: None
+*
+* Return:   return 0 if both link are matched, otherwise return -1
+*
+***************************************************************************/
+static int
+ipmi_ek_compare_number_of_enable_port(
+		struct fru_picmgext_amc_link_desc_record link_desc[COMPARE_CANDIDATE])
+{
+	int amc_port_count = 0;
+	int carrier_port_count = 0;
+	int return_value = ERROR_STATUS;
+	int index = 0;
+
+	if (link_desc[index].port_flag_0) {
+		/*bit 0 indicates port 0*/
+		amc_port_count++;
+	}
+	if (link_desc[index].port_flag_1) {
+		/*bit 1 indicates port 1*/
+		amc_port_count++;
+	}
+	if (link_desc[index].port_flag_2) {
+		/*bit 2 indicates port 2*/
+		amc_port_count++;
+	}
+	if (link_desc[index++].port_flag_3) {
+		/*bit 3 indicates port 3*/
+		amc_port_count++;
+	}
+
+	/* 2nd link designator */
+	if (link_desc[index].port_flag_0) {
+		/*bit 0 indicates port 0*/
+		carrier_port_count++;
+	}
+	if (link_desc[index].port_flag_1) {
+		/*bit 1 indicates port 1*/
+		carrier_port_count++;
+	}
+	if (link_desc[index].port_flag_2) {
+		/*bit 2 indicates port 2*/
+		carrier_port_count++;
+	}
+	if (link_desc[index].port_flag_3) {
+		/*bit 3 indicates port 3*/
+		carrier_port_count++;
+	}
+
+	if (carrier_port_count == amc_port_count) {
+		return_value = OK_STATUS;
+	} else {
+		return_value = ERROR_STATUS;
+	}
+	return return_value;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_link_descriptor
+*
+* Description: Display the link descriptor of an AMC p2p connectivity record
+*
+* Restriction: See AMC.0 or PICMG 3.0 specification for detail about bit masks
+*
+* Input: file_type: module type.
+*        rsc_id: resource id
+*        char* str: indicates if it is a source (its value= "From") or a
+*                 destination (its value = "To"). ( it is set to "" if it is not
+*                 a source nor destination
+*        link_desc: AMC link descriptor
+*        asym:  asymetric match
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static tboolean
+ipmi_ek_display_link_descriptor(int file_type, unsigned char rsc_id,
+		char *str,
+		struct fru_picmgext_amc_link_desc_record link_desc)
+{
+	tboolean isOEMtype = FALSE;
+	if (file_type == ON_CARRIER_FRU_FILE) {
+		printf("  - %s On-Carrier Device ID %d\n", str,
+				(rsc_id & 0x0f));
+	} else {
+		printf("  - %s %s\n", str, val2str(file_type,
+					ipmi_ekanalyzer_module_type));
+	}
+	printf("    - Channel ID %d || ",  link_desc.channel_id);
+	printf("%s", link_desc.port_flag_0 ? "Lane 0: enable" : "");
+	printf("%s", link_desc.port_flag_1 ? ", Lane 1: enable" : "");
+	printf("%s", link_desc.port_flag_2 ? ", Lane 2: enable" : "");
+	printf("%s", link_desc.port_flag_3 ? ", Lane 3: enable" : "");
+	printf("\n");
+	printf("    - Link Type: %s \n", val2str(link_desc.type,
+				ipmi_ekanalyzer_link_type));
+	switch (link_desc.type) {
+	case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE:
+	case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS1:
+	case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS2:
+		printf("    - Link Type extension: %s\n",
+				val2str(link_desc.type_ext,
+					ipmi_ekanalyzer_extension_PCIE));
+		printf("    - Link Group ID: %d || ", link_desc.group_id);
+		printf("Link Asym. Match: %d - %s\n",
+				link_desc.asym_match, 
+				val2str(link_desc.asym_match,
+					ipmi_ekanalyzer_asym_PCIE));
+		break;
+	case FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET:
+		printf("    - Link Type extension: %s\n",
+				val2str(link_desc.type_ext,
+					ipmi_ekanalyzer_extension_ETHERNET));
+		printf("    - Link Group ID: %d || ", link_desc.group_id);
+		printf("Link Asym. Match: %d - %s\n",
+				link_desc.asym_match, 
+				val2str(link_desc.asym_match,
+					ipmi_ekanalyzer_asym_PCIE));
+		break;
+	case FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE:
+		printf("    - Link Type extension: %s\n",
+				val2str(link_desc.type_ext,
+					ipmi_ekanalyzer_extension_STORAGE));
+		printf("    - Link Group ID: %d || ",
+				link_desc.group_id);
+		printf("Link Asym. Match: %d - %s\n",
+				link_desc.asym_match, 
+				val2str(link_desc.asym_match,
+					ipmi_ekanalyzer_asym_STORAGE));
+		break;
+	default:
+		printf("    - Link Type extension: %i\n",
+				link_desc.type_ext);
+		printf("    - Link Group ID: %d || ",
+				link_desc.group_id);
+		printf("Link Asym. Match: %i\n",
+				link_desc.asym_match);
+		break;
+	}
+	/* return as OEM type if link type indicates OEM */
+	if ((link_desc.type >= LOWER_OEM_TYPE)
+			&& (link_desc.type <= UPPER_OEM_TYPE)) {
+		isOEMtype = TRUE;
+	}
+	return isOEMtype;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_oem_guid
+*
+* Description: Display the oem guid of an AMC p2p connectivity record
+*
+* Restriction: None
+*
+* Input: amc_record: AMC p2p connectivity record
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_oem_guid(struct ipmi_ek_amc_p2p_connectivity_record amc_record)
+{
+	int index_oem = 0;
+	int index = 0;
+	if (amc_record.guid_count == 0) {
+		printf("\tThere is no OEM GUID for this module\n");
+	}
+	for (index_oem = 0; index_oem < amc_record.guid_count; index_oem++) {
+		printf("    - GUID: ");
+		for (index = 0; index < SIZE_OF_GUID; index++) {
+			printf("%02x",
+					amc_record.oem_guid[index_oem].guid[index]);
+			/* For a better look: putting a "-" after displaying
+			 * four bytes of GUID
+			 */
+			if (!(index % 4)){
+				printf("-");
+			}
+		}
+		printf("\n");
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_create_amc_p2p_record
+*
+* Description: this function create an AMC point 2 point connectivity record
+*            that contain link descriptor, channel descriptor, oem guid
+*
+* Restriction: Reference: AMC.0 Specification Table 3-16
+*
+* Input: record: a pointer to FRU multi record
+*
+* Output: amc_record: a pointer to the created AMC p2p record
+*
+* Global: None
+*
+* Return: Return OK_STATUS on success, or ERROR_STATUS if no record has been
+*          created.
+*
+***************************************************************************/
+static int
+ipmi_ek_create_amc_p2p_record(struct ipmi_ek_multi_header *record,
+		struct ipmi_ek_amc_p2p_connectivity_record *amc_record)
+{
+	int index_data = START_DATA_OFFSET;
+	int return_status = OK_STATUS;
+
+	amc_record->guid_count = record->data[index_data++];
+	if (amc_record->guid_count > 0) {
+		int index_oem = 0;
+		amc_record->oem_guid = malloc(amc_record->guid_count * \
+				sizeof(struct fru_picmgext_guid));
+		if (amc_record->oem_guid == NULL) {
+			return ERROR_STATUS;
+		}
+		for (index_oem = 0; index_oem < amc_record->guid_count;
+				index_oem++) {
+			memcpy(&amc_record->oem_guid[index_oem].guid,
+					&record->data[index_data],
+					SIZE_OF_GUID);
+			index_data += (int)SIZE_OF_GUID;
+		}
+		amc_record->rsc_id = record->data[index_data++];
+		amc_record->ch_count = record->data[index_data++];
+		/* Calculate link descriptor count */
+		amc_record->link_desc_count = ((record->header.len) - 8 -
+				(SIZE_OF_GUID*amc_record->guid_count) -
+				(FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE *
+				amc_record->ch_count)) / 5 ;
+	} else {
+		amc_record->rsc_id = record->data[index_data++];
+		amc_record->ch_count = record->data[index_data++];
+		/* Calculate link descriptor count see spec AMC.0 for detail */
+		amc_record->link_desc_count = ((record->header.len) - 8 -
+				(FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE *
+				amc_record->ch_count)) / 5;
+	}
+
+	if (amc_record->ch_count > 0) {
+		int ch_index = 0;
+		amc_record->ch_desc = malloc((amc_record->ch_count) * \
+				sizeof(struct fru_picmgext_amc_channel_desc_record));
+		if (amc_record->ch_desc == NULL) {
+			return ERROR_STATUS;
+		}
+		for (ch_index = 0; ch_index < amc_record->ch_count;
+				ch_index++) {
+			unsigned int data;
+			struct fru_picmgext_amc_channel_desc_record *src, *dst;
+			data = record->data[index_data] | 
+				(record->data[index_data + 1] << 8) |
+				(record->data[index_data + 2] << 16);
+			
+			src = (struct fru_picmgext_amc_channel_desc_record *)&data;
+			dst = (struct fru_picmgext_amc_channel_desc_record *)
+				&amc_record->ch_desc[ch_index];
+
+			dst->lane0port = src->lane0port;
+			dst->lane1port = src->lane1port;
+			dst->lane2port = src->lane2port;
+			dst->lane3port = src->lane3port;
+			index_data += FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE;
+		}
+	}
+	if (amc_record->link_desc_count > 0) {
+		int i=0;
+		amc_record->link_desc = malloc(amc_record->link_desc_count * \
+				sizeof(struct fru_picmgext_amc_link_desc_record));
+		if (amc_record->link_desc == NULL) {
+			return ERROR_STATUS;
+		}
+		for (i = 0; i< amc_record->link_desc_count; i++) {
+			unsigned int data[2];
+			struct fru_picmgext_amc_link_desc_record *src, *dst;
+			data[0] = record->data[index_data] | 
+				(record->data[index_data + 1] << 8) |
+				(record->data[index_data + 2] << 16) |
+				(record->data[index_data + 3] << 24);
+
+			data[1] = record->data[index_data + 4];
+			src = (struct fru_picmgext_amc_link_desc_record*)&data;
+			dst = (struct fru_picmgext_amc_link_desc_record*) 
+				&amc_record->link_desc[i];
+
+			dst->channel_id = src->channel_id;
+			dst->port_flag_0 = src->port_flag_0;
+			dst->port_flag_1 = src->port_flag_1;
+			dst->port_flag_2 = src->port_flag_2;
+			dst->port_flag_3 = src->port_flag_3;
+			dst->type = src->type;
+			dst->type_ext = src->type_ext;
+			dst->group_id = src->group_id;
+			dst->asym_match = src->asym_match;
+			index_data += FRU_PICMGEXT_AMC_LINK_DESC_RECORD_SIZE;
+		}
+	} else {
+		return_status = ERROR_STATUS;
+	}
+	return return_status;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_get_resource_descriptor
+*
+* Description: this function create the resource descriptor of Carrier p2p
+*              connectivity record.
+*
+* Restriction: None
+*
+* Input: port_count: number of port count
+*        index: index to the position of data start offset
+*        record: a pointer to FRU multi record
+*
+* Output: port_desc: a pointer to the created resource descriptor
+*
+* Global: None
+*
+* Return: Return index that indicates the current position of data in record.
+*
+***************************************************************************/
+static int
+ipmi_ek_get_resource_descriptor(int port_count, int index,
+		struct fru_picmgext_carrier_p2p_descriptor *port_desc,
+		struct ipmi_ek_multi_header *record)
+{
+	int num_port = 0;
+	while (num_port < port_count) {
+		memcpy(&port_desc[num_port], &record->data[index],
+				sizeof (struct fru_picmgext_carrier_p2p_descriptor));
+		index += sizeof (struct fru_picmgext_carrier_p2p_descriptor);
+		num_port++;
+	}
+	return index;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_fru_header
+*
+* Description: this function display FRU header offset from a FRU binary file
+*
+* Restriction: Reference: IPMI Platform Management FRU Information Storage
+*                  Definition V1.0, Section 8
+*
+* Input: filename: name of FRU binary file
+*
+* Output: None
+*
+* Global: None
+*
+* Return: Return OK_STATUS on sucess, ERROR_STATUS on error
+*
+***************************************************************************/
+static int
+ipmi_ek_display_fru_header(char *filename)
+{
+	FILE *input_file;
+	struct fru_header header;
+	int ret = 0;
+
+	input_file = fopen(filename, "r");
+	if (input_file == NULL) {
+		lprintf(LOG_ERR, "File '%s' not found.", filename);
+		return (ERROR_STATUS);
+	}
+	ret = fread(&header, sizeof (struct fru_header), 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Failed to read FRU header!");
+		fclose(input_file);
+		return (ERROR_STATUS);
+	}
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	printf("FRU Header Info\n");
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	printf("Format Version          :0x%02x %s\n",
+		(header.version & 0x0f),
+		((header.version & 0x0f) == 1) ? "" : "{unsupported}");
+	printf("Internal Use Offset     :0x%02x\n", header.offset.internal);
+	printf("Chassis Info Offset     :0x%02x\n", header.offset.chassis);
+	printf("Board Info Offset       :0x%02x\n", header.offset.board);
+	printf("Product Info Offset     :0x%02x\n", header.offset.product);
+	printf("MultiRecord Offset      :0x%02x\n", header.offset.multi);
+	printf("Common header Checksum  :0x%02x\n", header.checksum);
+
+	fclose(input_file);
+	return OK_STATUS;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_fru_header_detail
+*
+* Description: this function display detail FRU header information
+*               from a FRU binary file.
+
+*
+* Restriction: Reference: IPMI Platform Management FRU Information Storage
+*                  Definition V1.0, Section 8
+*
+* Input: filename: name of FRU binary file
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static int
+ipmi_ek_display_fru_header_detail(char *filename)
+{
+# define FACTOR_OFFSET 8
+# define SIZE_MFG_DATE 3
+	FILE *input_file;
+	size_t file_offset = 0;
+	struct fru_header header;
+	time_t tval;
+	int ret = 0;
+	unsigned char data = 0;
+	unsigned char lan_code = 0;
+	unsigned char mfg_date[SIZE_MFG_DATE];
+	unsigned int board_length = 0;
+
+	input_file = fopen(filename, "r");
+	if (input_file == NULL) {
+		lprintf(LOG_ERR, "File '%s' not found.", filename);
+		return (-1);
+	}
+	/* The offset in each fru is in multiple of 8 bytes
+	 * See IPMI Platform Management FRU Information Storage Definition
+	 * for detail
+	 */
+	ret = fread(&header, sizeof(struct fru_header), 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Failed to read FRU header!");
+		fclose(input_file);
+		return (-1);
+	}
+	/*** Display FRU Internal Use Info ***/
+	if (header.offset.internal != 0) {
+		unsigned char format_version;
+		unsigned long len = 0;
+
+		printf("%s\n", EQUAL_LINE_LIMITER);
+		printf("FRU Internal Use Info\n");
+		printf("%s\n", EQUAL_LINE_LIMITER);
+
+		ret = fread(&format_version, 1, 1, input_file);
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid format version!");
+			fclose(input_file);
+			return (-1);
+		}
+		printf("Format Version: %d\n", (format_version & 0x0f));
+
+		if (header.offset.chassis > 0) {
+			len = (header.offset.chassis * FACTOR_OFFSET)
+				- (header.offset.internal * FACTOR_OFFSET);
+		} else {
+			len = (header.offset.board * FACTOR_OFFSET)
+				- (header.offset.internal * FACTOR_OFFSET);
+		}
+		printf("Length: %ld\n", len);
+		printf("Data dump:\n");
+		while ((len > 0) && (!feof(input_file))) {
+			unsigned char data;
+			ret = fread(&data, 1, 1, input_file);
+			if ((ret != 1) || ferror(input_file)) {
+				lprintf(LOG_ERR, "Invalid data!");
+				fclose(input_file);
+				return (-1);
+			}
+			printf("0x%02x ", data);
+			len--;
+		}
+		printf("\n");
+	}
+	/*** Chassis Info Area ***/
+	if (header.offset.chassis != 0) {
+		long offset = 0;
+		offset = header.offset.chassis * FACTOR_OFFSET;
+		ret = ipmi_ek_display_chassis_info_area(input_file, offset);
+	}
+	/*** Display FRU Board Info Area ***/
+	while (1) {
+		if (header.offset.board == 0) {
+			break;
+		}
+		ret = fseek(input_file,
+				(header.offset.board * FACTOR_OFFSET),
+				SEEK_SET);
+		if (feof(input_file)) {
+			break;
+		}
+		file_offset = ftell(input_file);
+		printf("%s\n", EQUAL_LINE_LIMITER);
+		printf("FRU Board Info Area\n");
+		printf("%s\n", EQUAL_LINE_LIMITER);
+
+		ret = fread(&data, 1, 1, input_file); /* Format version */
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid FRU Format Version!");
+			fclose(input_file);
+			return (-1);
+		}
+		printf("Format Version: %d\n", (data & 0x0f));
+		if (feof(input_file)) {
+			break;
+		}
+		ret = fread(&data, 1, 1, input_file); /* Board Area Length */
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid Board Area Length!");
+			fclose(input_file);
+			return (-1);
+		}
+		board_length = (data * FACTOR_OFFSET);
+		printf("Area Length: %d\n", board_length);
+		/* Decrease the length of board area by 1 byte of format version
+		 * and 1 byte for area length itself. the rest of this length will
+		 * be used to check for additional custom mfg. byte
+		 */
+		board_length -= 2;
+		if (feof(input_file)) {
+			break;
+		}
+		ret = fread(&lan_code, 1, 1, input_file); /* Language Code */
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid Language Code in input");
+			fclose(input_file);
+			return (-1);
+		}
+		printf("Language Code: %d\n", lan_code);
+		board_length--;
+		/* Board Mfg Date */
+		if (feof(input_file)) {
+			break;
+		}
+
+		ret = fread(mfg_date, SIZE_MFG_DATE, 1, input_file);
+		if (ret != 1) {
+			lprintf(LOG_ERR, "Invalid Board Data.");
+			fclose(input_file);
+			return (-1);
+		}
+		tval = ((mfg_date[2] << 16) + (mfg_date[1] << 8)
+				+ (mfg_date[0]));
+		tval = tval * 60;
+		tval = tval + secs_from_1970_1996;
+		printf("Board Mfg Date: %ld, %s", tval,
+				asctime(localtime(&tval)));
+		board_length -= SIZE_MFG_DATE;
+		/* Board Mfg */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "Board Manufacture Data", &board_length);
+		ret = fseek(input_file, file_offset, SEEK_SET);
+		/* Board Product */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "Board Product Name", &board_length);
+		ret = fseek(input_file, file_offset, SEEK_SET);
+		/* Board Serial */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "Board Serial Number", &board_length);
+		ret = fseek(input_file, file_offset, SEEK_SET);
+		/* Board Part */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "Board Part Number", &board_length);
+		ret = fseek(input_file, file_offset, SEEK_SET);
+		/* FRU file ID */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "FRU File ID", &board_length);
+		ret = fseek(input_file, file_offset, SEEK_SET);
+		/* Additional Custom Mfg. */
+		file_offset = ipmi_ek_display_board_info_area(
+				input_file, "Custom", &board_length);
+		break;
+	}
+	/* Product Info Area */
+	if (header.offset.product && (!feof(input_file))) {
+		long offset = 0;
+		offset = header.offset.product * FACTOR_OFFSET;
+		ret = ipmi_ek_display_product_info_area(input_file,
+				offset);
+	}
+	fclose(input_file);
+	return 0;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_chassis_info_area
+*
+* Description: this function displays detail format of product info area record
+*               into humain readable text format
+*
+* Restriction: Reference: IPMI Platform Management FRU Information Storage
+*                  Definition V1.0, Section 10
+*
+* Input: input_file: pointer to file stream
+*         offset: start offset of chassis info area
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static int
+ipmi_ek_display_chassis_info_area(FILE *input_file, long offset)
+{
+	size_t file_offset;
+	int ret = 0;
+	unsigned char data = 0;
+	unsigned char ch_len = 0;
+	unsigned char ch_type = 0;
+	unsigned int len;
+
+	if (input_file == NULL) {
+		lprintf(LOG_ERR, "No file stream to read.");
+		return (-1);
+	}
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	printf("Chassis Info Area\n");
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	ret = fseek(input_file, offset, SEEK_SET);
+	if (feof(input_file)) {
+		lprintf(LOG_ERR, "Invalid Chassis Info Area!");
+		return (-1);
+	}
+	ret = fread(&data, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Version Number!");
+		return (-1);
+	}
+	printf("Format Version Number: %d\n", (data & 0x0f));
+	ret = fread(&ch_len, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid length!");
+		return (-1);
+	}
+	/* len is in factor of 8 bytes */
+	len = ch_len * 8;
+	printf("Area Length: %d\n", len);
+	len -= 2;
+	if (feof(input_file)) {
+		return (-1);
+	}
+	/* Chassis Type*/
+	ret = fread(&ch_type, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Chassis Type!");
+		return (-1);
+	}
+	printf("Chassis Type: %d\n", ch_type);
+	len--;
+	/* Chassis Part Number*/
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Chassis Part Number", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Chassis Serial */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Chassis Serial Number", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Custom product info area */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Custom", &len);
+	return 0;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_board_info_area
+*
+* Description: this function displays board info area depending on board type
+*               that pass in argument. Board type can be:
+*               Manufacturer, Serial, Product or Part...
+*
+* Restriction: IPMI Platform Management FRU Information Storage
+*                  Definition V1.0, Section 11
+*
+* Input: input_file: pointer to file stream
+*         board_type: a string that contain board type
+*         board_length: length of info area
+*
+* Output: None
+*
+* Global: None
+*
+* Return: the current position of input_file
+*
+***************************************************************************/
+static size_t
+ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
+		unsigned int *board_length)
+{
+	size_t file_offset;
+	int ret = 0;
+	unsigned char len = 0;
+	unsigned int size_board = 0;
+	if (input_file == NULL || board_type == NULL
+			|| board_length == NULL) {
+		return (size_t)(-1);
+	}
+	file_offset = ftell(input_file);
+
+	/* Board length*/
+	ret = fread(&len, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Length!");
+		goto out;
+	}
+	(*board_length)--;
+
+	/* Bit 5:0 of Board Mfg type represent legnth */
+	size_board = (len & 0x3f);
+	if (size_board == 0) {
+		printf("%s: None\n", board_type);
+		goto out;
+	}
+	if (strncmp(board_type, "Custom", 6 ) != 0) {
+		unsigned char *data;
+		unsigned int i = 0;
+		data = malloc(size_board);
+		if (data == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return (size_t)(-1);
+		}
+		ret = fread(data, size_board, 1, input_file);
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid board type size!");
+			free(data);
+			data = NULL;
+			goto out;
+		}
+		printf("%s type: 0x%02x\n", board_type, len);
+		printf("%s: ", board_type);
+		for (i = 0; i < size_board; i++) {
+			if ((len & TYPE_CODE) == TYPE_CODE) {
+				printf("%c", data[i]);
+			} else {
+				/* other than language code (binary, BCD,
+				 * ASCII 6 bit...) is not supported
+				 */
+				printf("%02x", data[i]);
+			}
+		}
+		printf("\n");
+		free(data);
+		data = NULL;
+		(*board_length) -= size_board;
+		goto out;
+	}
+	while (!feof(input_file)) {
+		if (len == NO_MORE_INFO_FIELD) {
+			unsigned char padding;
+			unsigned char checksum = 0;
+			/* take the rest of data in the area minus 1 byte of 
+			 * checksum
+			 */
+			printf("Additional Custom Mfg. length: 0x%02x\n", len);
+			padding = (*board_length) - 1;
+			if ((padding > 0) && (!feof(input_file))) {
+				printf("Unused space: %d (bytes)\n", padding);
+				fseek(input_file, padding, SEEK_CUR);
+			}
+			ret = fread(&checksum, 1, 1, input_file);
+			if ((ret != 1) || ferror(input_file)) {
+				lprintf(LOG_ERR, "Invalid Checksum!");
+				goto out;
+			}
+			printf("Checksum: 0x%02x\n", checksum);
+			goto out;
+		}
+		printf("Additional Custom Mfg. length: 0x%02x\n", len);
+		if ((size_board > 0) && (size_board < (*board_length))) {
+			unsigned char * additional_data = NULL;
+			unsigned int i = 0;
+			additional_data = malloc(size_board);
+			if (additional_data == NULL) {
+				lprintf(LOG_ERR, "ipmitool: malloc failure");
+				return (size_t)(-1);
+			}
+			ret = fread(additional_data, size_board, 1, input_file);
+			if ((ret != 1) || ferror(input_file)) {
+				lprintf(LOG_ERR, "Invalid Additional Data!");
+				if (additional_data != NULL) {
+					free(additional_data);
+					additional_data = NULL;
+				}
+				goto out;
+			}
+			printf("Additional Custom Mfg. Data: %02x",
+					additional_data[0]);
+			for (i = 1; i < size_board; i++) {
+				printf("-%02x", additional_data[i]);
+			}
+			printf("\n");
+			free(additional_data);
+			additional_data = NULL;
+			(*board_length) -= size_board;
+		}
+		else {
+			printf("No Additional Custom Mfg. %d\n", *board_length);
+			goto out;
+		}
+	}
+ 
+out:
+	file_offset = ftell(input_file);
+	return file_offset;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_product_info_area
+*
+* Description: this function displays detail format of product info area record
+*               into humain readable text format
+*
+* Restriction: Reference: IPMI Platform Management FRU Information Storage
+*                  Definition V1.0, Section 12
+*
+* Input: input_file: pointer to file stream
+*         offset: start offset of product info area
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static int
+ipmi_ek_display_product_info_area(FILE *input_file, long offset)
+{
+	size_t file_offset;
+	int ret = 0;
+	unsigned char ch_len = 0;
+	unsigned char data = 0;
+	unsigned int len = 0;
+
+	if (input_file == NULL) {
+		lprintf(LOG_ERR, "No file stream to read.");
+		return (-1);
+	}
+	file_offset = ftell(input_file);
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	printf("Product Info Area\n");
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	ret = fseek(input_file, offset, SEEK_SET);
+	if (feof(input_file)) {
+		lprintf(LOG_ERR, "Invalid Product Info Area!");
+		return (-1);
+	}
+	ret = fread(&data, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Data!");
+		return (-1);
+	}
+	printf("Format Version Number: %d\n", (data & 0x0f));
+	if (feof(input_file)) {
+		return (-1);
+	}
+	/* Have to read this into a char or else
+	 * it ends up byte swapped on big endian machines */
+	ret = fread(&ch_len, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Length!");
+		return (-1);
+	}
+	/* length is in factor of 8 bytes */
+	len = ch_len * 8;
+	printf("Area Length: %d\n", len);
+	len -= 2; /* -1 byte of format version and -1 byte itself */
+
+	ret = fread(&data, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Length!");
+		return (-1);
+	}
+
+	printf("Language Code: %d\n", data);
+	len--;
+	/* Product Mfg */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Product Manufacture Data", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Product Name */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Product Name", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Product Part */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Product Part/Model Number", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Product Version */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Product Version", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Product Serial */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Product Serial Number", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Product Asset Tag */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Asset Tag", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* FRU file ID */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"FRU File ID", &len);
+	ret = fseek(input_file, file_offset, SEEK_SET);
+	/* Custom product info area */
+	file_offset = ipmi_ek_display_board_info_area(input_file,
+			"Custom", &len);
+	return 0;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_record
+*
+* Description: this function displays FRU multi record information.
+*
+* Restriction: None
+*
+* Input: record: a pointer to current record
+*        list_head: a pointer to header of the list
+*        list_last: a pointer to tale of the list
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_record(struct ipmi_ek_multi_header *record,
+		struct ipmi_ek_multi_header *list_head,
+		struct ipmi_ek_multi_header *list_last)
+{
+	if (list_head == NULL) {
+		printf("***empty list***\n");
+		return;
+	}
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	printf("FRU Multi Info area\n");
+	printf("%s\n", EQUAL_LINE_LIMITER);
+	for (record = list_head; record != NULL; record = record->next) {
+		printf("Record Type ID: 0x%02x\n", record->header.type);
+		printf("Record Format version: 0x%02x\n",
+				record->header.format);
+		if (record->header.len <= PICMG_ID_OFFSET) {
+			continue;
+		}
+		/* In picmg3.0 specification, picmg record
+		 * id lower than 4 or greater than 0x2d
+		 * isn't supported
+		 */
+		#define PICMG_ID_LOWER_LIMIT  0x04
+		#define PICMG_ID_UPPER_LIMIT  0x2d
+		unsigned char picmg_id;
+
+		picmg_id = record->data[PICMG_ID_OFFSET];
+		printf("Manufacturer ID: %02x%02x%02x h\n",
+				record->data[2], record->data[1],
+				record->data[0]);
+		if ((picmg_id < PICMG_ID_LOWER_LIMIT)
+				|| (picmg_id > PICMG_ID_UPPER_LIMIT)) {
+			printf("Picmg record ID: Unsupported {0x%02x}\n", picmg_id);
+		} else {
+			printf("Picmg record ID: %s {0x%02x}\n",
+					val2str(picmg_id, ipmi_ekanalyzer_picmg_record_id),
+					picmg_id);
+		}
+		switch (picmg_id) {
+		case FRU_PICMG_BACKPLANE_P2P: /*0x04*/
+			ipmi_ek_display_backplane_p2p_record (record);
+			break;
+		case FRU_PICMG_ADDRESS_TABLE: /*0x10*/
+			ipmi_ek_display_address_table_record (record);
+			break;
+		case FRU_PICMG_SHELF_POWER_DIST: /*0x11*/
+			ipmi_ek_display_shelf_power_distribution_record (record);
+			break;
+		case FRU_PICMG_SHELF_ACTIVATION: /*/0x12*/
+			ipmi_ek_display_shelf_activation_record (record);
+			break;
+		case FRU_PICMG_SHMC_IP_CONN: /*0x13*/
+			ipmi_ek_display_shelf_ip_connection_record (record);
+			break;
+		case FRU_PICMG_BOARD_P2P: /*0x14*/
+			ipmi_ek_display_board_p2p_record (record);
+			break;
+		case FRU_RADIAL_IPMB0_LINK_MAPPING: /*0x15*/
+			ipmi_ek_display_radial_ipmb0_record (record);
+			break;
+		case FRU_AMC_CURRENT: /*0x16*/
+			ipmi_ek_display_amc_current_record (record);
+			break;
+		case FRU_AMC_ACTIVATION: /*0x17*/
+			ipmi_ek_display_amc_activation_record (record);
+			break;
+		case FRU_AMC_CARRIER_P2P: /*0x18*/
+			ipmi_ek_display_carrier_connectivity (record);
+			break;
+		case FRU_AMC_P2P: /*0x19*/
+			ipmi_ek_display_amc_p2p_record (record);
+			break;
+		case FRU_AMC_CARRIER_INFO: /*0x1a*/
+			ipmi_ek_display_amc_carrier_info_record (record);
+			break;
+		case FRU_PICMG_CLK_CARRIER_P2P: /*0x2c*/
+			ipmi_ek_display_clock_carrier_p2p_record (record);
+			break;
+		case FRU_PICMG_CLK_CONFIG: /*0x2d*/
+			ipmi_ek_display_clock_config_record (record);
+			break;
+		default:
+			if (verbose > 0) {
+				int i;
+				printf("%02x %02x %02x %02x %02x ",
+						record->header.type,
+						record->header.format,
+						record->header.len,
+						record->header.record_checksum,
+						record->header.header_checksum);
+				for (i = 0; i < record->header.len; i++) {
+					printf("%02x ", record->data[i]);
+				}
+				printf("\n");
+			}
+			break;
+		}
+		printf("%s\n", STAR_LINE_LIMITER);
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_backplane_p2p_record
+*
+* Description: this function displays backplane p2p record.
+*
+* Restriction: Reference: PICMG 3.0 Specification Table 3-40
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_backplane_p2p_record(struct ipmi_ek_multi_header *record)
+{
+	uint8_t index;
+	int offset = START_DATA_OFFSET;
+	struct fru_picmgext_slot_desc *slot_d =
+		(struct fru_picmgext_slot_desc*)&record->data[offset];
+
+	offset += sizeof(struct fru_picmgext_slot_desc);
+	while (offset <= record->header.len) {
+		printf("   Channel Type: ");
+		switch (slot_d->chan_type) {
+		case 0x00:
+		case 0x07:
+			printf("PICMG 2.9\n");
+			break;
+		case 0x08:
+			printf("Single Port Fabric IF\n");
+			break;
+		case 0x09:
+			printf("Double Port Fabric IF\n");
+			break;
+		case 0x0a:
+			printf("Full Channel Fabric IF\n");
+			break;
+		case 0x0b:
+			printf("Base IF\n");
+			break;
+		case 0x0c:
+			printf("Update Channel IF\n");
+			break;
+		default:
+			printf("Unknown IF\n");
+			break;
+		}
+		printf("   Slot Address:  %02x\n", slot_d->slot_addr);
+		printf("   Channel Count: %i\n", slot_d->chn_count);
+		for (index = 0; index < (slot_d->chn_count); index++) {
+			struct fru_picmgext_chn_desc *d =
+				(struct fru_picmgext_chn_desc *)&record->data[offset];
+			if (verbose) {
+				printf("\t"
+						"Chn: %02x   -->   "
+						"Chn: %02x in "
+						"Slot: %02x\n",
+						d->local_chn,
+						d->remote_chn,
+						d->remote_slot);
+			}
+			offset += sizeof(struct fru_picmgext_chn_desc);
+		}
+		slot_d = (struct fru_picmgext_slot_desc*)&record->data[offset];
+		offset += sizeof(struct fru_picmgext_slot_desc);
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_address_table_record
+*
+* Description: this function displays address table record.
+*
+* Restriction: Reference: PICMG 3.0 Specification Table 3-6
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_address_table_record(struct ipmi_ek_multi_header *record)
+{
+#define SIZE_SHELF_ADDRESS_BYTE 20
+	unsigned char entries = 0;
+	unsigned char i;
+	int offset = START_DATA_OFFSET;
+
+	printf("   Type/Len:    0x%02x\n", record->data[offset++]);
+	printf("   Shelf Addr: ");
+	for (i = 0; i < SIZE_SHELF_ADDRESS_BYTE; i++) {
+		printf("0x%02x ", record->data[offset++]);
+	}
+	printf("\n");
+	entries = record->data[offset++];
+	printf("   Addr Table Entries count: 0x%02x\n", entries);
+	for (i = 0; i < entries; i++) {
+		printf("\tHWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
+				record->data[offset+0],
+				record->data[offset+1],
+				record->data[offset+2]);
+		offset += 3;
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_shelf_power_distribution_record
+*
+* Description: this function displays shelf power distribution record.
+*
+* Restriction: Reference: PICMG 3.0 Specification Table 3-70
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_shelf_power_distribution_record(
+		struct ipmi_ek_multi_header *record)
+{
+	int offset = START_DATA_OFFSET;
+	unsigned char i;
+	unsigned char j;
+	unsigned char feeds = 0;
+
+	feeds = record->data[offset++];
+	printf("   Number of Power Feeds: 0x%02x\n", feeds);
+	for (i = 0; i < feeds; i++) {
+		unsigned char entries;
+		unsigned long max_ext = 0;
+		unsigned long max_int = 0;
+		max_ext = record->data[offset+0]
+			| (record->data[offset+1] << 8);
+		printf("   Max External Available Current: %ld Amps\n",
+				(max_ext * 10));
+		offset += 2;
+		max_int = record->data[offset+0]
+			| (record->data[offset+1] << 8);
+		printf("   Max Internal Current:\t   %ld Amps\n",
+				(max_int * 10));
+		offset += 2;
+		printf("   Min Expected Operating Voltage: %d Volts\n",
+				(record->data[offset++] / 2));
+		entries = record->data[offset++];
+		printf("   Feed to FRU count: 0x%02x\n", entries);
+		for (j = 0; j < entries; j++) {
+			printf("\tHW: 0x%02x", record->data[offset++]);
+			printf("\tFRU ID: 0x%02x\n", record->data[offset++]);
+		}
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_shelf_activation_record
+*
+* Description: this function displays shelf activation record.
+*
+* Restriction: Reference: PICMG 3.0 Specification Table 3-73
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_shelf_activation_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char count = 0;
+	int offset = START_DATA_OFFSET;
+
+	printf("   Allowance for FRU Act Readiness: 0x%02x\n",
+			record->data[offset++]);
+	count = record->data[offset++];
+	printf("   FRU activation and Power Desc Cnt: 0x%02x\n", count);
+	while (count > 0) {
+		printf("   FRU activation and Power descriptor:\n");
+		printf("\tHardware Address:\t\t0x%02x\n",
+				record->data[offset++]);
+		printf("\tFRU Device ID:\t\t\t0x%02x\n",
+				record->data[offset++]);
+		printf("\tMax FRU Power Capability:\t0x%04x Watts\n",
+				(record->data[offset+0]
+				 | (record->data[offset+1]<<8)));
+		offset += 2;
+		printf("\tConfiguration parameter:\t0x%02x\n",
+				record->data[offset++]);
+		count --;
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_shelf_ip_connection_record
+*
+* Description: this function displays shelf ip connection record.
+*
+* Restriction: Fix me: Don't test yet
+*               Reference: PICMG 3.0 Specification Table 3-31
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_shelf_ip_connection_record(struct ipmi_ek_multi_header *record)
+{
+	int ioffset = START_DATA_OFFSET;
+	if (ioffset > record->header.len) {
+		printf("   Shelf Manager IP Address: %d.%d.%d.%d\n",
+				record->data[ioffset+0],
+				record->data[ioffset+1],
+				record->data[ioffset+2],
+				record->data[ioffset+3]);
+		ioffset += 4;
+	}
+	if (ioffset > record->header.len) {
+		printf("   Default Gateway Address: %d.%d.%d.%d\n",
+				record->data[ioffset+0],
+				record->data[ioffset+1],
+				record->data[ioffset+2],
+				record->data[ioffset+3]);
+		ioffset += 4;
+	}
+	if (ioffset > record->header.len) {
+		printf("   Subnet Mask: %d.%d.%d.%d\n", 
+				record->data[ioffset+0],
+				record->data[ioffset+1],
+				record->data[ioffset+2],
+				record->data[ioffset+3]);
+		ioffset += 4;
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_shelf_fan_geography_record
+*
+* Description: this function displays shelf fan geography record.
+*
+* Restriction: Fix me: Don't test yet
+*               Reference: PICMG 3.0 Specification Table 3-75
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_shelf_fan_geography_record(struct ipmi_ek_multi_header *record)
+{
+	int ioffset = START_DATA_OFFSET;
+	unsigned char fan_count = 0;
+
+	fan_count = record->data[ioffset];
+	ioffset++;
+	printf("   Fan-to-FRU Entry Count: 0x%02x\n", fan_count);
+	while ((fan_count > 0) && (ioffset <= record->header.len)) {
+		printf("   Fan-to-FRU Mapping Entry: {%2x%2x%2x%2x}\n",
+				record->data[ioffset],
+				record->data[ioffset+1],
+				record->data[ioffset+2],
+				record->data[ioffset+3]);
+		printf("      Hardware Address:   0x%02x\n",
+				record->data[ioffset++]);
+		printf("      FRU device ID:   0x%02x\n",
+				record->data[ioffset++]);
+		printf("      Site Number:   0x%02x\n",
+				record->data[ioffset++]);
+		printf("      Site Type:   0x%02x\n",
+				record->data[ioffset++]);
+		fan_count --;
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_board_p2p_record
+*
+* Description: this function displays board pont-to-point record.
+*
+* Restriction: Reference: PICMG 3.0 Specification Table 3-44
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_board_p2p_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char guid_count;
+	int offset = START_DATA_OFFSET;
+	int i = 0;
+
+	guid_count = record->data[offset++];
+	printf("   GUID count: %2d\n", guid_count);
+	for (i = 0 ; i < guid_count; i++) {
+		int j;
+		printf("\tGUID: ");
+		for (j = 0; j < sizeof(struct fru_picmgext_guid); j++) {
+			printf("%02x", record->data[offset+j]);
+		}
+		printf("\n");
+		offset += sizeof(struct fru_picmgext_guid);
+	}
+	for (offset = offset;
+			offset < record->header.len;
+			offset += sizeof(struct fru_picmgext_link_desc)) {
+		/* to solve little endian/big endian problem */
+		unsigned long data;
+		struct fru_picmgext_link_desc * d;
+		data = (record->data[offset+0])
+			| (record->data[offset+1] << 8)\
+			| (record->data[offset+2] << 16)\
+			| (record->data[offset+3] << 24);
+		d = (struct fru_picmgext_link_desc *)&data;
+
+		printf("   Link Descriptor\n");
+		printf("\tLink Grouping ID:\t0x%02x\n", d->grouping);
+		printf("\tLink Type Extension:\t0x%02x - ", d->ext);
+		if (d->type == FRU_PICMGEXT_LINK_TYPE_BASE) {
+			switch (d->ext) {
+			case 0:
+				printf("10/100/1000BASE-T Link (four-pair)\n");
+				break;
+			case 1:
+				printf("ShMC Cross-connect (two-pair)\n");
+				break;
+			default:
+				printf("Unknwon\n");
+				break;
+			}
+		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET) {
+			switch (d->ext) {
+			case 0:
+				printf("Fixed 1000Base-BX\n");
+				break;
+			case 1:
+				printf("Fixed 10GBASE-BX4 [XAUI]\n");
+				break;
+			case 2:
+				printf("FC-PI\n");
+				break;
+			default:
+				printf("Unknwon\n");
+				break;
+			}
+		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND) {
+			printf("Unknwon\n");
+		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR) {
+			printf("Unknwon\n");
+		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_PCIE) {
+			printf("Unknwon\n");
+		} else {
+			printf("Unknwon\n");
+		}
+		printf("\tLink Type:\t\t0x%02x - ", d->type);
+		if (d->type == 0 || d->type == 0xff) {
+			printf("Reserved\n");
+		} else if (d->type >= 0x06 && d->type <= 0xef) {
+			printf("Reserved\n");
+		} else if (d->type >= LOWER_OEM_TYPE && d->type <= UPPER_OEM_TYPE) {
+			printf("OEM GUID Definition\n");
+		} else {
+			switch (d->type){
+			case FRU_PICMGEXT_LINK_TYPE_BASE:
+				printf("PICMG 3.0 Base Interface 10/100/1000\n");
+				break;
+			case FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET:
+				printf("PICMG 3.1 Ethernet Fabric Interface\n");
+				break;
+			case FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND:
+				printf("PICMG 3.2 Infiniband Fabric Interface\n");
+				break;
+			case FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR:
+				printf("PICMG 3.3 Star Fabric Interface\n");
+				break;
+			case FRU_PICMGEXT_LINK_TYPE_PCIE:
+				printf("PICMG 3.4 PCI Express Fabric Interface\n");
+				break;
+			default:
+				printf("Invalid\n");
+				break;
+			}
+		}
+		printf("\tLink Designator: \n");
+		printf("\t   Port 0 Flag:   %s\n",
+				(d->desig_port & 0x01) ? "enable" : "disable");
+		printf("\t   Port 1 Flag:   %s\n",
+				(d->desig_port & 0x02) ? "enable" : "disable");
+		printf("\t   Port 2 Flag:   %s\n",
+				(d->desig_port & 0x04) ? "enable" : "disable");
+		printf("\t   Port 3 Flag:   %s\n",
+				(d->desig_port & 0x08) ? "enable" : "disable");
+		printf("\t   Interface:    0x%02x - ", d->desig_if);
+		switch (d->desig_if) {
+		case FRU_PICMGEXT_DESIGN_IF_BASE:
+			printf("Base Interface\n");
+			break;
+		case FRU_PICMGEXT_DESIGN_IF_FABRIC:
+			printf("Fabric Interface\n");
+			break;
+		case FRU_PICMGEXT_DESIGN_IF_UPDATE_CHANNEL:
+			printf("Update Channel\n");
+			break;
+		case FRU_PICMGEXT_DESIGN_IF_RESERVED:
+			printf("Reserved\n");
+			break;
+		default:
+			printf("Invalid");
+			break;
+		}
+		printf("\t   Channel Number:    0x%02x\n",
+				d->desig_channel);
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_radial_ipmb0_record
+*
+* Description: this function displays radial IPMB-0 record.
+*
+* Restriction: Fix me: Don't test yet
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_radial_ipmb0_record(struct ipmi_ek_multi_header *record)
+{
+#define SIZE_OF_CONNECTOR_DEFINER  3; /*bytes*/
+	int offset = START_DATA_OFFSET;
+	/* Ref: PICMG 3.0 Specification Revision 2.0, Table 3-59 */
+	printf("   IPMB-0 Connector Definer: ");
+#ifndef WORDS_BIGENDIAN
+	printf("%02x %02x %02x h\n", record->data[offset],
+			record->data[offset+1], record->data[offset+2]);
+#else
+	printf("%02x %02x %02x h\n", record->data[offset+2],
+			record->data[offset+1], record->data[offset]);
+#endif
+	/* 3 bytes of connector definer was used */
+	offset += SIZE_OF_CONNECTOR_DEFINER;
+	printf("   IPMB-0 Connector version ID: ");
+#ifndef WORDS_BIGENDIAN
+	printf("%02x %02x h\n", record->data[offset],
+			record->data[offset+1]);
+#else
+	printf("%02x %02x h\n", record->data[offset+1],
+			record->data[offset]);
+#endif
+	offset += 2;
+	printf("   IPMB-0 Hub Descriptor Count: 0x%02x",
+			record->data[offset++]);
+	if (record->data[offset] < 1) {
+		return;
+	}
+	for (offset = offset; offset < record->header.len;) {
+		unsigned char entry_count = 0;
+		printf("   IPMB-0 Hub Descriptor\n");
+		printf("\tHardware Address: 0x%02x\n",
+				record->data[offset++]);
+		printf("\tHub Info {0x%02x}: ", record->data[offset]);
+		/* Bit mask specified in Table 3-59
+		 * of PICMG 3.0 Specification
+		 */
+		if ((record->data[offset] & 0x01) == 0x01) {
+			printf("IPMB-A only\n");
+		} else if ((record->data[offset] & 0x02) == 0x02) {
+			printf("IPMB-B only\n");
+		} else if ((record->data[offset] & 0x03) == 0x03) {
+			printf("IPMB-A and IPMB-B\n");
+		} else {
+			printf("Reserved.\n");
+		}
+		offset ++;
+		entry_count = record->data[offset++];
+		printf("\tAddress Entry count: 0x%02x", entry_count);
+		while (entry_count > 0) {
+			printf("\t   Hardware Address: 0x%02x\n",
+					record->data[offset++]);
+			printf("\t   IPMB-0 Link Entry: 0x%02x\n",
+					record->data[offset++]);
+			entry_count --;
+		}
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_amc_current_record
+*
+* Description: this function displays AMC current record.
+*
+* Restriction: None
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_amc_current_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char current;
+	current = record->data[START_DATA_OFFSET];
+	printf("   Current draw: %.1f A @ 12V => %.2f Watt\n",
+			(float)current / 10.0,
+			((float)current / 10.0) * 12.0);
+	printf("\n");
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_amc_activation_record
+*
+* Description: this function displays carrier activation and current management
+*             record.
+*
+* Restriction: Reference: AMC.0 Specification Table 3-11 and Table 3-12
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_amc_activation_record(struct ipmi_ek_multi_header *record)
+{
+	uint16_t max_current;
+	int offset = START_DATA_OFFSET;
+
+	max_current = record->data[offset];
+	max_current |= record->data[++offset] << 8;
+	printf("   Maximum Internal Current(@12V): %.2f A [ %.2f Watt ]\n",
+			(float) max_current / 10,
+			(float) max_current / 10 * 12);
+	printf("   Module Activation Readiness:    %i sec.\n",
+			record->data[++offset]);
+	printf("   Descriptor Count: %i\n", record->data[++offset]);
+	for (++offset; (offset < record->header.len); offset += 3) {
+		struct fru_picmgext_activation_record *a =
+			(struct fru_picmgext_activation_record *)&record->data[offset];
+		printf("\tIPMB-Address:\t\t0x%x\n", a->ibmb_addr);
+		printf("\tMax. Module Current:\t%.2f A\n",
+				(float)a->max_module_curr / 10);
+		printf("\n");
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_amc_p2p_record
+*
+* Description: this function display amc p2p connectivity record in humain
+*              readable text format
+*
+* Restriction: Reference: AMC.0 Specification Table 3-16
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_amc_p2p_record(struct ipmi_ek_multi_header *record)
+{
+	int index_data = START_DATA_OFFSET;
+	int oem_count = 0;
+	int ch_count = 0;
+	int index=0;
+
+	oem_count = record->data[index_data++];
+	printf("OEM GUID count: %02x\n", oem_count);
+	if (oem_count > 0) {
+		while (oem_count > 0) {
+			printf("OEM GUID: ");
+			for (index = 1; index <= SIZE_OF_GUID; index++) {
+				printf("%02x", record->data[index_data++]);
+				/* For a better look, display a "-" character
+				 * after each 5 bytes of OEM GUID
+				 */
+				if (!(index % 5)) {
+					printf("-");
+				}
+			}
+			printf("\n");
+			oem_count--;
+		}
+	}
+	if ((record->data[index_data] & AMC_MODULE) == AMC_MODULE) {
+		printf("AMC module connection\n");
+	} else {
+		printf("On-Carrier Device %02x h\n",
+				(record->data[index_data] & 0x0f));
+	}
+	index_data ++;
+	ch_count = record->data[index_data++];
+	printf("AMC Channel Descriptor count: %02x h\n", ch_count);
+
+	if (ch_count > 0) {
+		for (index = 0; index < ch_count; index++) {
+			unsigned int data;
+			struct fru_picmgext_amc_channel_desc_record *ch_desc;
+			printf("   AMC Channel Descriptor {%02x%02x%02x}\n",
+					record->data[index_data+2],
+					record->data[index_data+1],
+					record->data[index_data]);
+			data = record->data[index_data]
+				| (record->data[index_data + 1] << 8)
+				| (record->data[index_data + 2] << 16);
+			ch_desc = (struct fru_picmgext_amc_channel_desc_record *)&data;
+			printf("      Lane 0 Port: %d\n", ch_desc->lane0port);
+			printf("      Lane 1 Port: %d\n", ch_desc->lane1port);
+			printf("      Lane 2 Port: %d\n", ch_desc->lane2port);
+			printf("      Lane 3 Port: %d\n\n", ch_desc->lane3port);
+			index_data += FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE;
+		}
+	}
+	while (index_data < record->header.len) {
+		/* Warning: This code doesn't work with gcc version
+		 * between 4.0 and 4.3
+		 */
+		unsigned int data[2];
+		struct fru_picmgext_amc_link_desc_record *link_desc;
+		data[0] = record->data[index_data]
+			| (record->data[index_data + 1] << 8)
+			| (record->data[index_data + 2] << 16)
+			| (record->data[index_data + 3] << 24);
+		data[1] = record->data[index_data + 4];
+
+		link_desc = (struct fru_picmgext_amc_link_desc_record *)&data[0];
+		printf("   AMC Link Descriptor:\n");
+		printf("\t- Link Type: %s \n",
+				val2str(link_desc->type, ipmi_ekanalyzer_link_type));
+		switch (link_desc->type) {
+		case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE:
+		case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS1:
+		case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS2:
+			printf("\t- Link Type extension: %s\n",
+					val2str(link_desc->type_ext,
+						ipmi_ekanalyzer_extension_PCIE));
+			printf("\t- Link Group ID: %d\n ",
+					link_desc->group_id);
+			printf("\t- Link Asym. Match: %d - %s\n",
+					link_desc->asym_match, 
+					val2str(link_desc->asym_match,
+						ipmi_ekanalyzer_asym_PCIE));
+			break;
+		case FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET:
+			printf("\t- Link Type extension: %s\n",
+					val2str (link_desc->type_ext,
+						ipmi_ekanalyzer_extension_ETHERNET));
+			printf("\t- Link Group ID: %d \n",
+					link_desc->group_id);
+			printf("\t- Link Asym. Match: %d - %s\n",
+					link_desc->asym_match, 
+					val2str(link_desc->asym_match,
+						ipmi_ekanalyzer_asym_PCIE));
+			break;
+		case FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE:
+			printf("\t- Link Type extension: %s\n",
+					val2str (link_desc->type_ext,
+						ipmi_ekanalyzer_extension_STORAGE));
+			printf("\t- Link Group ID: %d \n",
+					link_desc->group_id);
+			printf("\t- Link Asym. Match: %d - %s\n",
+					link_desc->asym_match, 
+					val2str(link_desc->asym_match,
+						ipmi_ekanalyzer_asym_STORAGE));
+			break;
+		default:
+			printf("\t- Link Type extension: %i (Unknown)\n",
+					link_desc->type_ext);
+			printf("\t- Link Group ID: %d \n",
+					link_desc->group_id);
+			printf("\t- Link Asym. Match: %i\n",
+					link_desc->asym_match);
+			break;
+		}
+		printf("\t- AMC Link Designator:\n");
+		printf("\t    Channel ID: %i\n", link_desc->channel_id);
+		printf("\t\t Lane 0: %s\n",
+				(link_desc->port_flag_0) ? "enable" : "disable");
+		printf("\t\t Lane 1: %s\n",
+				(link_desc->port_flag_1) ? "enable" : "disable");
+		printf("\t\t Lane 2: %s\n",
+				(link_desc->port_flag_2) ? "enable" : "disable");
+		printf("\t\t Lane 3: %s\n",
+				(link_desc->port_flag_3) ? "enable" : "disable");
+		index_data += FRU_PICMGEXT_AMC_LINK_DESC_RECORD_SIZE;
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_amc_carrier_info_record
+*
+* Description: this function displays Carrier information table.
+*
+* Restriction: Reference: AMC.0 Specification Table 3-3
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: START_DATA_OFFSET
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_amc_carrier_info_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char extVersion;
+	unsigned char siteCount;
+	int offset = START_DATA_OFFSET;
+
+	extVersion = record->data[offset++];
+	siteCount  = record->data[offset++];
+	printf("   AMC.0 extension version: R%d.%d\n",
+			(extVersion >> 0) & 0x0F,
+			(extVersion >> 4) & 0x0F);
+	printf("   Carrier Sie Number Count: %d\n", siteCount);
+	while (siteCount > 0) {
+		printf("\tSite ID (%d): %s \n", record->data[offset],
+				val2str(record->data[offset], ipmi_ekanalyzer_module_type));
+		offset++;
+		siteCount--;
+	}
+	printf("\n");
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_clock_carrier_p2p_record
+*
+* Description: this function displays Carrier clock point-to-pont
+*              connectivity record.
+*
+* Restriction: the following code is copy from ipmi_fru.c with modification in
+*               reference to AMC.0 Specification Table 3-29
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_display_clock_carrier_p2p_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char desc_count;
+	int i;
+	int j;
+	int offset = START_DATA_OFFSET;
+
+	desc_count = record->data[offset++];
+	for(i = 0; i < desc_count; i++) {
+		unsigned char resource_id;
+		unsigned char channel_count;
+
+		resource_id = record->data[offset++];
+		channel_count = record->data[offset++];
+
+		printf("   Clock Resource ID: 0x%02x\n", resource_id);
+		printf("   Type: ");
+		if ((resource_id & 0xC0) >> 6 == 0) {
+			printf("On-Carrier-Device\n");
+		} else if ((resource_id & 0xC0) >> 6 == 1) {
+			printf("AMC slot\n");
+		} else if ((resource_id & 0xC0) >> 6 == 2) {
+			printf("Backplane\n");
+		} else{
+			printf("reserved\n");
+		}
+		printf("   Channel Count: 0x%02x\n", channel_count);
+
+		for (j = 0; j < channel_count; j++) {
+			unsigned char loc_channel;
+			unsigned char rem_channel;
+			unsigned char rem_resource;
+
+			loc_channel = record->data[offset++];
+			rem_channel = record->data[offset++];
+			rem_resource = record->data[offset++];
+
+			printf("\tCLK-ID: 0x%02x   --->  ", loc_channel);
+			printf(" remote CLKID: 0x%02x   ", rem_channel);
+			if ((rem_resource & 0xC0) >> 6 == 0) {
+				printf("[ Carrier-Dev");
+			} else if ((rem_resource & 0xC0) >> 6 == 1) {
+				printf("[ AMC slot    ");
+			} else if ((rem_resource & 0xC0) >> 6 == 2) {
+				printf("[ Backplane    ");
+			} else {
+				printf("reserved          ");
+			}
+			printf(" 0x%02x ]\n", rem_resource & 0xF);
+		}
+	}
+	printf("\n");
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_display_clock_config_record
+*
+* Description: this function displays clock configuration record.
+*
+* Restriction: the following codes are copy from ipmi_fru.c with modification
+*               in reference to AMC.0 Specification Table 3-35 and Table 3-36
+*
+* Input: record: a pointer to current record to be displayed
+*
+* Output: None
+*
+* Global: START_DATA_OFFSET
+*
+* Return: None
+*
+***************************************************************************/
+void
+ipmi_ek_display_clock_config_record(struct ipmi_ek_multi_header *record)
+{
+	unsigned char resource_id;
+	unsigned char descr_count;
+	int i;
+	int offset = START_DATA_OFFSET;
+
+	resource_id = record->data[offset++];
+	descr_count = record->data[offset++];
+	printf("   Clock Resource ID: 0x%02x\n", resource_id);
+	printf("   Clock Configuration Descriptor Count: 0x%02x\n", descr_count);
+
+	for (i = 0; i < descr_count; i++) {
+		int j = 0;
+		unsigned char channel_id;
+		unsigned char control;
+		unsigned char indirect_cnt;
+		unsigned char direct_cnt;
+
+		channel_id = record->data[offset++];
+		control = record->data[offset++];
+		printf("\tCLK-ID: 0x%02x  -  ", channel_id);
+		printf("CTRL 0x%02x [ %12s ]\n", control,
+				((control & 0x1) == 0) ? "Carrier IPMC" : "Application");
+
+		indirect_cnt = record->data[offset++];
+		direct_cnt = record->data[offset++];
+		printf("\t   Count: Indirect 0x%02x   / Direct 0x%02x\n",
+				indirect_cnt,
+				direct_cnt);
+
+		/* indirect desc */
+		for (j = 0; j < indirect_cnt; j++) {
+			unsigned char feature;
+			unsigned char dep_chn_id;
+
+			feature = record->data[offset++];
+			dep_chn_id = record->data[offset++];
+			printf("\t\tFeature: 0x%02x [%8s] - ",
+					feature,
+					(feature & 0x1) == 1 ? "Source" : "Receiver");
+			printf(" Dep. CLK-ID: 0x%02x\n", dep_chn_id);
+		}
+		/* direct desc */
+		for (j = 0; j < direct_cnt; j++) {
+			unsigned char feature;
+			unsigned char family;
+			unsigned char accuracy;
+			unsigned long freq;
+			unsigned long min_freq;
+			unsigned long max_freq;
+
+			feature = record->data[offset++];
+			family = record->data[offset++];
+			accuracy = record->data[offset++];
+			freq = (record->data[offset+0] << 0)
+				| (record->data[offset+1] << 8)
+				| (record->data[offset+2] << 16)
+				| (record->data[offset+3] << 24);
+			offset += 4;
+			min_freq = (record->data[offset+0] << 0)
+				| (record->data[offset+1] << 8)
+				| (record->data[offset+2] << 16)
+				| (record->data[offset+3] << 24);
+			offset += 4;
+			max_freq = (record->data[offset+0] << 0)
+				| (record->data[offset+1] << 8)
+				| (record->data[offset+2] << 16)
+				| (record->data[offset+3] << 24);
+			offset += 4;
+
+			printf("\t- Feature: 0x%02x    - PLL: %x / Asym: %s\n",
+					feature,
+					(feature > 1) & 1,
+					(feature & 1) ? "Source" : "Receiver");
+			printf("\tFamily:  0x%02x    - AccLVL: 0x%02x\n",
+					family, accuracy);
+			printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n",
+					freq, min_freq, max_freq);
+		}
+		printf("\n");
+	}
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ekanalyzer_fru_file2structure
+*
+* Description: this function convert a FRU binary file into a linked list of
+*              FRU multi record
+*
+* Restriction: None
+*
+* Input/Ouput: filename1: name of the file that contain FRU binary data
+*        record: a pointer to current record
+*        list_head: a pointer to header of the list
+*        list_last: a pointer to tale of the list
+*
+* Global: None
+*
+* Return: return -1 as Error status, and 0 as Ok status
+*
+***************************************************************************/
+static int
+ipmi_ekanalyzer_fru_file2structure(char *filename,
+		struct ipmi_ek_multi_header **list_head,
+		struct ipmi_ek_multi_header **list_record,
+		struct ipmi_ek_multi_header **list_last)
+{
+	FILE *input_file;
+	unsigned char data;
+	unsigned char last_record = 0;
+	unsigned int multi_offset = 0;
+	int record_count = 0;
+	int ret = 0;
+
+	input_file = fopen(filename, "r");
+	if (input_file == NULL) {
+		lprintf(LOG_ERR, "File: '%s' is not found", filename);
+		return ERROR_STATUS;
+	}
+
+	fseek(input_file, START_DATA_OFFSET, SEEK_SET);
+	data = 0;
+	ret = fread(&data, 1, 1, input_file);
+	if ((ret != 1) || ferror(input_file)) {
+		lprintf(LOG_ERR, "Invalid Offset!");
+		fclose(input_file);
+		return ERROR_STATUS;
+	}
+	if (data == 0) {
+		lprintf(LOG_ERR, "There is no multi record in the file '%s'",
+				filename);
+		fclose(input_file);
+		return ERROR_STATUS;
+	}
+	/* the offset value is in multiple of 8 bytes. */
+	multi_offset = data * 8;
+	lprintf(LOG_DEBUG, "start multi offset = 0x%02x", 
+			multi_offset);
+
+	fseek(input_file, multi_offset, SEEK_SET);
+	while (!feof(input_file)) {
+		*list_record = malloc(sizeof(struct ipmi_ek_multi_header));
+		if (*list_record == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return ERROR_STATUS;
+		}
+		ret = fread(&(*list_record)->header, START_DATA_OFFSET, 1, 
+				input_file);
+		if ((ret != 1) || ferror(input_file)) {
+			free(*list_record);
+			*list_record = NULL;
+			fclose(input_file);
+			lprintf(LOG_ERR, "Invalid Header!");
+			return ERROR_STATUS;
+		}
+		if ((*list_record)->header.len == 0) {
+			record_count++;
+			continue;
+		}
+		(*list_record)->data = malloc((*list_record)->header.len);
+		if ((*list_record)->data == NULL) {
+			lprintf(LOG_ERR, "Failed to allocation memory size %d\n",
+					(*list_record)->header.len);
+			record_count++;
+			continue;
+		}
+
+		ret = fread((*list_record)->data, ((*list_record)->header.len),
+				1, input_file);
+		if ((ret != 1) || ferror(input_file)) {
+			lprintf(LOG_ERR, "Invalid Record Data!");
+			fclose(input_file);
+			return ERROR_STATUS;
+		}
+		if (verbose > 0)
+			printf("Record %d has length = %02x\n", record_count,
+					(*list_record)->header.len);
+		if (verbose > 1) {
+			int i;
+			printf("Type: %02x", (*list_record)->header.type);
+			for (i = 0; i < ((*list_record)->header.len); i++) {
+				if (!(i % 8)) {
+					printf("\n0x%02x: ", i);
+				}
+				printf("%02x ",
+					(*list_record)->data[i]);
+			}
+			printf("\n\n");
+		}
+		ipmi_ek_add_record2list(list_record, list_head, list_last);
+		/* mask the 8th bits to see if it is the last record */
+		last_record = ((*list_record)->header.format) & 0x80;
+		if (last_record) {
+			break;
+		}
+		record_count++;
+	}
+	fclose(input_file);
+	return OK_STATUS;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_add_record2list
+*
+* Description: this function adds a sigle FRU multi record to a linked list of
+*              FRU multi record.
+*
+* Restriction: None
+*
+* Input/Output: record: a pointer to current record
+*        list_head: a pointer to header of the list
+*        list_last: a pointer to tale of the list
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_add_record2list(struct ipmi_ek_multi_header **record,
+		struct ipmi_ek_multi_header **list_head,
+		struct ipmi_ek_multi_header **list_last)
+{
+	if (*list_head == NULL) {
+		*list_head = *record;
+		(*record)->prev = NULL;
+		if (verbose > 2) {
+			printf("Adding first record to list\n");
+		}
+	} else {
+		(*list_last)->next = *record;
+		(*record)->prev = *list_last;
+		if (verbose > 2) {
+			printf("Add 1 record to list\n");
+		}
+	}
+	*list_last = *record;
+	(*record)->next = NULL;
+}
+
+/**************************************************************************
+*
+* Function name: ipmi_ek_remove_record_from_list
+*
+* Description: this function removes a sigle FRU multi record from a linked
+*              list of FRU multi record.
+*
+* Restriction: None
+*
+* Input/Output: record: a pointer to record to be deleted
+*        list_head: a pointer to header of the list
+*        list_last: a pointer to tale of the list
+*
+* Global: None
+*
+* Return: None
+*
+***************************************************************************/
+static void
+ipmi_ek_remove_record_from_list(struct ipmi_ek_multi_header *record,
+		struct ipmi_ek_multi_header **list_head,
+		struct ipmi_ek_multi_header **list_last)
+{
+	if (record->prev == NULL) {
+		*list_head = record->next;
+	} else {
+		record->prev->next = record->next;
+	}
+	if (record->next == NULL) {
+		(*list_last) = record->prev;
+	} else {
+		record->next->prev = record->prev;
+	}
+	free(record);
+	record = NULL;
+}
diff --git a/lib/ipmi_event.c b/lib/ipmi_event.c
new file mode 100644
index 0000000..bc32ae8
--- /dev/null
+++ b/lib/ipmi_event.c
@@ -0,0 +1,645 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _BSD_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <ctype.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_event.h>
+#include <ipmitool/ipmi_sdr.h>
+
+
+static void
+ipmi_event_msg_print(struct ipmi_intf * intf, struct platform_event_msg * pmsg)
+{
+	struct sel_event_record sel_event;
+
+	memset(&sel_event, 0, sizeof(struct sel_event_record));
+
+	sel_event.record_id = 0;
+	sel_event.sel_type.standard_type.gen_id = 2;
+
+	sel_event.sel_type.standard_type.evm_rev        = pmsg->evm_rev;
+	sel_event.sel_type.standard_type.sensor_type    = pmsg->sensor_type;
+	sel_event.sel_type.standard_type.sensor_num     = pmsg->sensor_num;
+	sel_event.sel_type.standard_type.event_type     = pmsg->event_type;
+	sel_event.sel_type.standard_type.event_dir      = pmsg->event_dir;
+	sel_event.sel_type.standard_type.event_data[0]  = pmsg->event_data[0];
+	sel_event.sel_type.standard_type.event_data[1]  = pmsg->event_data[1];
+	sel_event.sel_type.standard_type.event_data[2]  = pmsg->event_data[2];
+
+	if (verbose)
+		ipmi_sel_print_extended_entry_verbose(intf, &sel_event);
+	else
+		ipmi_sel_print_extended_entry(intf, &sel_event);
+}
+
+static int
+ipmi_send_platform_event(struct ipmi_intf * intf, struct platform_event_msg * emsg)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t rqdata[8];
+	uint8_t chmed;
+
+	memset(&req, 0, sizeof(req));
+	memset(rqdata, 0, 8);
+
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = 0x02;
+	req.msg.data = rqdata;
+
+	chmed = ipmi_current_channel_medium(intf);
+	if (chmed == IPMI_CHANNEL_MEDIUM_SYSTEM) {
+		/* system interface, need extra generator ID */
+		req.msg.data_len = 8;
+		rqdata[0] = 0x41;   // As per Fig. 29-2 and Table 5-4
+		memcpy(rqdata+1, emsg, sizeof(struct platform_event_msg));
+	}
+	else {
+		req.msg.data_len = 7;
+		memcpy(rqdata, emsg, sizeof(struct platform_event_msg));
+	}
+
+	ipmi_event_msg_print(intf, emsg);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Platform Event Message command failed");
+		return -1;
+	}
+	else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Platform Event Message command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+#define EVENT_THRESH_STATE_LNC_LO	0
+#define EVENT_THRESH_STATE_LNC_HI	1
+#define EVENT_THRESH_STATE_LCR_LO	2
+#define EVENT_THRESH_STATE_LCR_HI	3
+#define EVENT_THRESH_STATE_LNR_LO	4
+#define EVENT_THRESH_STATE_LNR_HI	5
+#define EVENT_THRESH_STATE_UNC_LO	6
+#define EVENT_THRESH_STATE_UNC_HI	7
+#define EVENT_THRESH_STATE_UCR_LO	8
+#define EVENT_THRESH_STATE_UCR_HI	9
+#define EVENT_THRESH_STATE_UNR_LO	10
+#define EVENT_THRESH_STATE_UNR_HI	11
+
+static const struct valstr ipmi_event_thresh_lo[] = {
+	{ EVENT_THRESH_STATE_LNC_LO, "lnc" },
+	{ EVENT_THRESH_STATE_LCR_LO, "lcr" },
+	{ EVENT_THRESH_STATE_LNR_LO, "lnr" },
+	{ EVENT_THRESH_STATE_UNC_LO, "unc" },
+	{ EVENT_THRESH_STATE_UCR_LO, "ucr" },
+	{ EVENT_THRESH_STATE_UNR_LO, "unr" },
+	{ 0, NULL  },
+};
+static const struct valstr ipmi_event_thresh_hi[] = {
+	{ EVENT_THRESH_STATE_LNC_HI, "lnc" },
+	{ EVENT_THRESH_STATE_LCR_HI, "lcr" },
+	{ EVENT_THRESH_STATE_LNR_HI, "lnr" },
+	{ EVENT_THRESH_STATE_UNC_HI, "unc" },
+	{ EVENT_THRESH_STATE_UCR_HI, "ucr" },
+	{ EVENT_THRESH_STATE_UNR_HI, "unr" },
+	{ 0, NULL  },
+};
+
+static int
+ipmi_send_platform_event_num(struct ipmi_intf * intf, int num)
+{
+	struct platform_event_msg emsg;
+
+	memset(&emsg, 0, sizeof(struct platform_event_msg));
+
+	/* IPMB/LAN/etc */
+	switch (num) {
+	case 1:			/* temperature */
+		printf("Sending SAMPLE event: Temperature - "
+		       "Upper Critical - Going High\n");
+		emsg.evm_rev       = 0x04;
+		emsg.sensor_type   = 0x01;
+		emsg.sensor_num    = 0x30;
+		emsg.event_dir     = EVENT_DIR_ASSERT;
+		emsg.event_type    = 0x01;
+		emsg.event_data[0] = EVENT_THRESH_STATE_UCR_HI;
+		emsg.event_data[1] = 0xff;
+		emsg.event_data[2] = 0xff;
+		break;
+	case 2:			/* voltage error */
+		printf("Sending SAMPLE event: Voltage Threshold - "
+		       "Lower Critical - Going Low\n");
+		emsg.evm_rev       = 0x04;
+		emsg.sensor_type   = 0x02;
+		emsg.sensor_num    = 0x60;
+		emsg.event_dir     = EVENT_DIR_ASSERT;
+		emsg.event_type    = 0x01;
+		emsg.event_data[0] = EVENT_THRESH_STATE_LCR_LO;
+		emsg.event_data[1] = 0xff;
+		emsg.event_data[2] = 0xff;
+		break;
+	case 3:			/* correctable ECC */
+		printf("Sending SAMPLE event: Memory - Correctable ECC\n");
+		emsg.evm_rev       = 0x04;
+		emsg.sensor_type   = 0x0c;
+		emsg.sensor_num    = 0x53;
+		emsg.event_dir     = EVENT_DIR_ASSERT;
+		emsg.event_type    = 0x6f;
+		emsg.event_data[0] = 0x00;
+		emsg.event_data[1] = 0xff;
+		emsg.event_data[2] = 0xff;
+		break;
+	default:
+		lprintf(LOG_ERR, "Invalid event number: %d", num);
+		return -1;
+	}
+
+	return ipmi_send_platform_event(intf, &emsg);
+}
+
+static int
+ipmi_event_find_offset(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type, char *desc)
+{
+	const struct ipmi_event_sensor_types *evt;
+
+	if (desc == NULL || sensor_type == 0  || event_type == 0) {
+		return 0x00;
+	}
+
+	for (evt = ipmi_get_first_event_sensor_type(intf, sensor_type, event_type);
+			evt != NULL; evt = ipmi_get_next_event_sensor_type(evt)) {
+		if (evt->desc != NULL &&
+			strncasecmp(desc, evt->desc, __maxlen(desc, evt->desc)) == 0) {
+			return evt->offset;
+		}
+	}
+
+	lprintf(LOG_WARN, "Unable to find matching event offset for '%s'", desc);
+	return -1;
+}
+
+static void
+print_sensor_states(struct ipmi_intf *intf, uint8_t sensor_type, uint8_t event_type)
+{
+	ipmi_sdr_print_discrete_state_mini(intf,
+			"Sensor States: \n  ", "\n  ", sensor_type,
+			event_type, 0xff, 0xff);
+	printf("\n");
+}
+
+
+static int
+ipmi_event_fromsensor(struct ipmi_intf * intf, char * id, char * state, char * evdir)
+{
+	struct ipmi_rs * rsp;
+	struct sdr_record_list * sdr;
+	struct platform_event_msg emsg;
+	int off;
+	uint8_t target, lun, channel;
+
+	if (id == NULL) {
+		lprintf(LOG_ERR, "No sensor ID supplied");
+		return -1;
+	}
+
+	memset(&emsg, 0, sizeof(struct platform_event_msg));
+	emsg.evm_rev = 0x04;
+
+	if (evdir == NULL)
+		emsg.event_dir = EVENT_DIR_ASSERT;
+	else if (strncasecmp(evdir, "assert", 6) == 0)
+		emsg.event_dir = EVENT_DIR_ASSERT;
+	else if (strncasecmp(evdir, "deassert", 8) == 0)
+		emsg.event_dir = EVENT_DIR_DEASSERT;
+	else {
+		lprintf(LOG_ERR, "Invalid event direction %s.  Must be 'assert' or 'deassert'", evdir);
+		return -1;
+	}
+
+	printf("Finding sensor %s... ", id);
+	sdr = ipmi_sdr_find_sdr_byid(intf, id);
+	if (sdr == NULL) {
+		printf("not found!\n");
+		return -1;
+	}
+	printf("ok\n");
+
+	switch (sdr->type)
+	{
+	case SDR_RECORD_TYPE_FULL_SENSOR:
+	case SDR_RECORD_TYPE_COMPACT_SENSOR:
+
+		emsg.sensor_type   = sdr->record.common->sensor.type;
+		emsg.sensor_num    = sdr->record.common->keys.sensor_num;
+		emsg.event_type    = sdr->record.common->event_type;
+		target    = sdr->record.common->keys.owner_id;
+		lun    = sdr->record.common->keys.lun;
+		channel = sdr->record.common->keys.channel;
+		break;
+	default:
+		lprintf(LOG_ERR, "Unknown sensor type for id '%s'", id);
+		return -1;
+	}
+
+	emsg.event_data[1] = 0xff;
+	emsg.event_data[2] = 0xff;
+
+	switch (emsg.event_type)
+	{
+	/*
+	 * Threshold Class
+	 */
+	case 1:
+	{
+		int dir = 0;
+		int hilo = 0;
+		off = 1;
+
+		if (state == NULL || strncasecmp(state, "list", 4) == 0) {
+			printf("Sensor States:\n");
+			printf("  lnr : Lower Non-Recoverable \n");
+			printf("  lcr : Lower Critical\n");
+			printf("  lnc : Lower Non-Critical\n");
+			printf("  unc : Upper Non-Critical\n");
+			printf("  ucr : Upper Critical\n");
+			printf("  unr : Upper Non-Recoverable\n");
+			return -1;
+		}
+
+		if (0 != strncasecmp(state, "lnr", 3) &&
+		    0 != strncasecmp(state, "lcr", 3) &&
+		    0 != strncasecmp(state, "lnc", 3) &&
+		    0 != strncasecmp(state, "unc", 3) &&
+		    0 != strncasecmp(state, "ucr", 3) &&
+		    0 != strncasecmp(state, "unr", 3))
+		{
+			lprintf(LOG_ERR, "Invalid threshold identifier %s", state);
+			return -1;
+		}
+
+		if (state[0] == 'u')
+			hilo = 1;
+		else
+			hilo = 0;
+
+		if (emsg.event_dir == EVENT_DIR_ASSERT)
+			dir = hilo;
+		else
+			dir = !hilo;
+
+		if ((emsg.event_dir == EVENT_DIR_ASSERT   && hilo == 1) ||
+		    (emsg.event_dir == EVENT_DIR_DEASSERT && hilo == 0))
+			emsg.event_data[0] = (uint8_t)(str2val(state, ipmi_event_thresh_hi) & 0xf);
+		else if ((emsg.event_dir == EVENT_DIR_ASSERT   && hilo == 0) ||
+			 (emsg.event_dir == EVENT_DIR_DEASSERT && hilo == 1))
+			emsg.event_data[0] = (uint8_t)(str2val(state, ipmi_event_thresh_lo) & 0xf);
+		else {
+			lprintf(LOG_ERR, "Invalid Event");
+			return -1;
+		}
+
+		rsp = ipmi_sdr_get_sensor_thresholds(intf, emsg.sensor_num,
+							target, lun, channel);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR,
+					"Command Get Sensor Thresholds failed: invalid response.");
+			return (-1);
+		} else if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Command Get Sensor Thresholds failed: %s",
+					val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+		}
+
+		/* threshold reading */
+		emsg.event_data[2] = rsp->data[(emsg.event_data[0] / 2) + 1];
+
+		rsp = ipmi_sdr_get_sensor_hysteresis(intf, emsg.sensor_num,
+							target, lun, channel);
+		if (rsp != NULL && rsp->ccode == 0)
+			off = dir ? rsp->data[0] : rsp->data[1];
+		if (off <= 0)
+			off = 1;
+
+		/* trigger reading */
+		if (dir) {
+			if ((emsg.event_data[2] + off) > 0xff)
+				emsg.event_data[1] = 0xff;
+			else
+				emsg.event_data[1] = emsg.event_data[2] + off;
+		}
+		else {
+			if ((emsg.event_data[2] - off) < 0)
+				emsg.event_data[1] = 0;
+			else
+				emsg.event_data[1] = emsg.event_data[2] - off;
+		}
+
+		/* trigger in byte 2, threshold in byte 3 */
+		emsg.event_data[0] |= 0x50;
+	}
+	break;
+
+	/*
+	 * Digital Discrete
+	 */
+	case 3: case 4: case 5: case 6: case 8: case 9:
+	{
+		int x;
+		const char * digi_on[] = { "present", "assert", "limit",
+					   "fail", "yes", "on", "up" };
+		const char * digi_off[] = { "absent", "deassert", "nolimit",
+					    "nofail", "no", "off", "down" };
+		/* 
+		 * print list of available states for this sensor
+		 */
+		if (state == NULL || strncasecmp(state, "list", 4) == 0) {
+			print_sensor_states(intf, emsg.sensor_type, emsg.event_type);
+			printf("Sensor State Shortcuts:\n");
+			for (x = 0; x < sizeof(digi_on)/sizeof(*digi_on); x++) {
+				printf("  %-9s  %-9s\n", digi_on[x], digi_off[x]);
+			}
+			return 0;
+		}
+
+		off = 0;
+		for (x = 0; x < sizeof(digi_on)/sizeof(*digi_on); x++) {
+			if (strncasecmp(state, digi_on[x], strlen(digi_on[x])) == 0) {
+				emsg.event_data[0] = 1;
+				off = 1;
+				break;
+			}
+			else if (strncasecmp(state, digi_off[x], strlen(digi_off[x])) == 0) {
+				emsg.event_data[0] = 0;
+				off = 1;
+				break;
+			}
+		}
+		if (off == 0) {
+			off = ipmi_event_find_offset(intf,
+				emsg.sensor_type, emsg.event_type, state);
+			if (off < 0)
+				return -1;
+			emsg.event_data[0] = off;
+		}
+	}
+	break;
+
+	/*
+	 * Generic Discrete
+	 */
+	case 2: case 7: case 10: case 11: case 12:
+	{
+		/* 
+		 * print list of available states for this sensor
+		 */
+		if (state == NULL || strncasecmp(state, "list", 4) == 0) {
+			print_sensor_states(intf, emsg.sensor_type, emsg.event_type);
+			return 0;
+		}
+		off = ipmi_event_find_offset(intf,
+			emsg.sensor_type, emsg.event_type, state);
+		if (off < 0)
+			return -1;
+		emsg.event_data[0] = off;
+	}
+	break;
+		
+	/*
+	 * Sensor-Specific Discrete
+	 */
+	case 0x6f:
+	{
+		/* 
+		 * print list of available states for this sensor
+		 */
+		if (state == NULL || strncasecmp(state, "list", 4) == 0) {
+			print_sensor_states(intf, emsg.sensor_type, emsg.event_type);
+			return 0;
+		}
+		off = ipmi_event_find_offset(intf,
+			emsg.sensor_type, emsg.event_type, state);
+		if (off < 0)
+			return -1;
+		emsg.event_data[0] = off;
+	}
+	break;
+
+	default:
+		return -1;
+
+	}
+
+	return ipmi_send_platform_event(intf, &emsg);
+}
+
+static int
+ipmi_event_fromfile(struct ipmi_intf * intf, char * file)
+{
+	FILE * fp;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct sel_event_record sel_event;
+	uint8_t rqdata[8];
+	char buf[1024];
+	char * ptr, * tok;
+	int i, j;
+	uint8_t chmed;
+	int rc = 0;
+
+	if (file == NULL)
+		return -1;
+
+	memset(rqdata, 0, 8);
+
+	/* setup Platform Event Message command */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = 0x02;
+	req.msg.data = rqdata;
+	req.msg.data_len = 7;
+
+	chmed = ipmi_current_channel_medium(intf);
+	if (chmed == IPMI_CHANNEL_MEDIUM_SYSTEM) {
+		/* system interface, need extra generator ID */
+		rqdata[0] = 0x41;   // As per Fig. 29-2 and Table 5-4
+		req.msg.data_len = 8;
+	}
+
+	fp = ipmi_open_file_read(file);
+	if (fp == NULL)
+		return -1;
+
+	while (feof(fp) == 0) {
+		if (fgets(buf, 1024, fp) == NULL)
+			continue;
+
+		/* clip off optional comment tail indicated by # */
+		ptr = strchr(buf, '#');
+		if (ptr)
+			*ptr = '\0';
+		else
+			ptr = buf + strlen(buf);
+
+		/* clip off trailing and leading whitespace */
+		ptr--;
+		while (isspace((int)*ptr) && ptr >= buf)
+			*ptr-- = '\0';
+		ptr = buf;
+		while (isspace((int)*ptr))
+			ptr++;
+		if (strlen(ptr) == 0)
+			continue;
+
+		/* parse the event, 7 bytes with optional comment */
+		/* 0x00 0x00 0x00 0x00 0x00 0x00 0x00 # event */
+		i = 0;
+		tok = strtok(ptr, " ");
+		while (tok) {
+			if (i == 7)
+				break;
+			j = i++;
+			if (chmed == IPMI_CHANNEL_MEDIUM_SYSTEM)
+				j++;
+			rqdata[j] = (uint8_t)strtol(tok, NULL, 0);
+			tok = strtok(NULL, " ");
+		}
+		if (i < 7) {
+			lprintf(LOG_ERR, "Invalid Event: %s",
+			       buf2str(rqdata, sizeof(rqdata)));
+			continue;
+		}
+
+		memset(&sel_event, 0, sizeof(struct sel_event_record));
+		sel_event.record_id = 0;
+		sel_event.sel_type.standard_type.gen_id = 2;
+
+		j = (chmed == IPMI_CHANNEL_MEDIUM_SYSTEM) ? 1 : 0;
+		sel_event.sel_type.standard_type.evm_rev = rqdata[j++];
+		sel_event.sel_type.standard_type.sensor_type = rqdata[j++];
+		sel_event.sel_type.standard_type.sensor_num = rqdata[j++];
+		sel_event.sel_type.standard_type.event_type = rqdata[j] & 0x7f;
+		sel_event.sel_type.standard_type.event_dir = (rqdata[j++] & 0x80) >> 7;
+		sel_event.sel_type.standard_type.event_data[0] = rqdata[j++];
+		sel_event.sel_type.standard_type.event_data[1] = rqdata[j++];
+		sel_event.sel_type.standard_type.event_data[2] = rqdata[j++];
+
+		ipmi_sel_print_std_entry(intf, &sel_event);
+		
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Platform Event Message command failed");
+			rc = -1;
+		}
+		else if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Platform Event Message command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			rc = -1;
+		}
+	}
+
+	fclose(fp);
+	return rc;
+}
+
+static void
+ipmi_event_usage(void)
+{
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "usage: event <num>");
+	lprintf(LOG_NOTICE, "   Send generic test events");
+	lprintf(LOG_NOTICE, "   1 : Temperature - Upper Critical - Going High");
+	lprintf(LOG_NOTICE, "   2 : Voltage Threshold - Lower Critical - Going Low");
+	lprintf(LOG_NOTICE, "   3 : Memory - Correctable ECC");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "usage: event file <filename>");
+	lprintf(LOG_NOTICE, "   Read and generate events from file");
+	lprintf(LOG_NOTICE, "   Use the 'sel save' command to generate from SEL");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "usage: event <sensorid> <state> [event_dir]");
+	lprintf(LOG_NOTICE, "   sensorid  : Sensor ID string to use for event data");
+	lprintf(LOG_NOTICE, "   state     : Sensor state, use 'list' to see possible states for sensor");
+	lprintf(LOG_NOTICE, "   event_dir : assert, deassert [default=assert]");
+	lprintf(LOG_NOTICE, "");
+}
+
+int
+ipmi_event_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if (argc == 0 || strncmp(argv[0], "help", 4) == 0) {
+		ipmi_event_usage();
+		return 0;
+	}
+	if (strncmp(argv[0], "file", 4) == 0) {
+		if (argc < 2) {
+			ipmi_event_usage();
+			return 0;
+		}
+		return ipmi_event_fromfile(intf, argv[1]);
+	}
+	if (strlen(argv[0]) == 1) {
+		switch (argv[0][0]) {
+		case '1': return ipmi_send_platform_event_num(intf, 1);
+		case '2': return ipmi_send_platform_event_num(intf, 2);
+		case '3': return ipmi_send_platform_event_num(intf, 3);
+		}
+	}
+	if (argc < 2)
+		rc = ipmi_event_fromsensor(intf, argv[0], NULL, NULL);
+	else if (argc < 3)
+		rc = ipmi_event_fromsensor(intf, argv[0], argv[1], NULL);
+	else
+		rc = ipmi_event_fromsensor(intf, argv[0], argv[1], argv[2]);
+
+	return rc;
+}
diff --git a/lib/ipmi_firewall.c b/lib/ipmi_firewall.c
new file mode 100644
index 0000000..26bfd30
--- /dev/null
+++ b/lib/ipmi_firewall.c
@@ -0,0 +1,1194 @@
+/*
+ * Copyright (c) 2005 International Business Machines, Inc.  All Rights Reserved.
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_firewall.h>
+#include <ipmitool/ipmi_strings.h>
+
+static void
+printf_firewall_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"Firmware Firewall Commands:");
+	lprintf(LOG_NOTICE,
+"\tinfo [channel H] [lun L]");
+	lprintf(LOG_NOTICE,
+"\tinfo [channel H] [lun L [netfn N [command C [subfn S]]]]");
+	lprintf(LOG_NOTICE,
+"\tenable [channel H] [lun L [netfn N [command C [subfn S]]]]");
+	lprintf(LOG_NOTICE,
+"\tdisable [channel H] [lun L [netfn N [command C [subfn S]]]] [force])");
+	lprintf(LOG_NOTICE,
+"\treset [channel H]");
+	lprintf(LOG_NOTICE,
+"\t\twhere H is a Channel, L is a LUN, N is a NetFn,");
+	lprintf(LOG_NOTICE,
+"\t\tC is a Command and S is a Sub-Function");
+}
+
+void
+printf_firewall_info_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"info [channel H]");
+	lprintf(LOG_NOTICE,
+"\tList all of the firewall information for all LUNs, NetFns");
+	lprintf(LOG_NOTICE,
+"\tand Commands, This is a long list and is not very human readable.");
+	lprintf(LOG_NOTICE,
+"info [channel H] lun L");
+	lprintf(LOG_NOTICE,
+"\tThis also prints a long list that is not very human readable.");
+	lprintf(LOG_NOTICE,
+"info [channel H] lun L netfn N");
+	lprintf(LOG_NOTICE,
+"\tThis prints out information for a single LUN/NetFn pair.");
+	lprintf(LOG_NOTICE,
+"\tThat is not really very usable, but at least it is short.");
+	lprintf(LOG_NOTICE,
+"info [channel H] lun L netfn N command C");
+	lprintf(LOG_NOTICE,
+"\tThis is the one you want -- it prints out detailed human");
+	lprintf(LOG_NOTICE,
+"\treadable information.  It shows the support, configurable, and");
+	lprintf(LOG_NOTICE,
+"\tenabled bits for the Command C on LUN/NetFn pair L,N and the");
+	lprintf(LOG_NOTICE,
+"\tsame information about each of its Sub-functions.");
+}
+
+// print n bytes of bit field bf (if invert, print ~bf)
+static void print_bitfield(const unsigned char * bf, int n, int invert, int loglevel) {
+	int i = 0;
+	if (loglevel < 0) {
+		while (i<n) {
+			printf("%02x", (unsigned char) (invert?~bf[i]:bf[i]));
+			if (++i % 4 == 0)
+				printf(" ");
+		}
+		printf("\n");
+	} else {
+		while (i<n) {
+			lprintf(loglevel, "%02x", (unsigned char) (invert?~bf[i]:bf[i]));
+			if (++i % 4 == 0)
+				lprintf(loglevel, " ");
+		}
+		lprintf(loglevel, "\n");
+	}
+
+}
+
+static int
+ipmi_firewall_parse_args(int argc, char ** argv, struct ipmi_function_params * p)
+{
+	int i;
+	uint8_t conv_err = 0;
+
+	if (!p) {
+		lprintf(LOG_ERR, "ipmi_firewall_parse_args: p is NULL");
+		return -1;
+	}
+	for (i=0; i<argc; i++) {
+		if (strncmp(argv[i], "channel", 7) == 0 && (++i < argc)) {
+			uint8_t channel_tmp = 0;
+			if (is_ipmi_channel_num(argv[i], &channel_tmp) != 0) {
+				conv_err = 1;
+				break;
+			} else {
+				p->channel = channel_tmp;
+			}
+		}
+		else if (strncmp(argv[i], "lun", 3) == 0 && (++i < argc)) {
+			if (str2int(argv[i], &(p->lun)) != 0) {
+				lprintf(LOG_ERR, "Given lun '%s' is invalid.", argv[i]);
+				conv_err = 1;
+				break;
+			}
+		}
+		else if (strncmp(argv[i], "force", 5) == 0) {
+			p->force = 1;
+		}
+		else if (strncmp(argv[i], "netfn", 5) == 0 && (++i < argc)) {
+			if (str2int(argv[i], &(p->netfn)) != 0) {
+				lprintf(LOG_ERR, "Given netfn '%s' is invalid.", argv[i]);
+				conv_err = 1;
+				break;
+			}
+		}
+		else if (strncmp(argv[i], "command", 7) == 0 && (++i < argc)) {
+			if (str2int(argv[i], &(p->command)) != 0) {
+				lprintf(LOG_ERR, "Given command '%s' is invalid.", argv[i]);
+				conv_err = 1;
+				break;
+			}
+		}
+		else if (strncmp(argv[i], "subfn", 5) == 0 && (++i < argc)) {
+			if (str2int(argv[i], &(p->subfn)) != 0) {
+				lprintf(LOG_ERR, "Given subfn '%s' is invalid.", argv[i]);
+				conv_err = 1;
+				break;
+			}
+		}
+	}
+	if (conv_err != 0) {
+		return (-1);
+	}
+	if (p->subfn >= MAX_SUBFN) {
+		lprintf(LOG_ERR, "subfn is out of range (0-%d)", MAX_SUBFN-1);
+		return -1;
+	}
+	if (p->command >= MAX_COMMAND) {
+		lprintf(LOG_ERR, "command is out of range (0-%d)", MAX_COMMAND-1);
+		return -1;
+	}
+	if (p->netfn >= MAX_NETFN) {
+		lprintf(LOG_ERR, "netfn is out of range (0-%d)", MAX_NETFN-1);
+		return -1;
+	}
+	if (p->lun >= MAX_LUN) {
+		lprintf(LOG_ERR, "lun is out of range (0-%d)", MAX_LUN-1);
+		return -1;
+	}
+	if (p->netfn >= 0 && p->lun < 0) {
+		lprintf(LOG_ERR, "if netfn is set, so must be lun");
+		return -1;
+	}
+	if (p->command >= 0 && p->netfn < 0) {
+		lprintf(LOG_ERR, "if command is set, so must be netfn");
+		return -1;
+	}
+	if (p->subfn >= 0 && p->command < 0) {
+		lprintf(LOG_ERR, "if subfn is set, so must be command");
+		return -1;
+	}
+	return 0;
+}
+
+/* _get_netfn_suport
+ *
+ * @intf:	ipmi interface
+ * @channel:	ipmi channel
+ * @lun:	a pointer to a 4 byte field
+ * @netfn:	a pointer to a 128-bit bitfield (16 bytes)
+ *
+ * returns 0 on success and fills in the bitfield for 
+ * the 32 netfn * 4 LUN pairs that support commands
+ * returns -1 on error
+ */
+static int
+_get_netfn_support(struct ipmi_intf * intf, int channel, unsigned char * lun, unsigned char * netfn)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char * d, rqdata;
+	unsigned int l;
+
+	if (!lun || !netfn) {
+		lprintf(LOG_ERR, "_get_netfn_suport: lun or netfn is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_NETFN_SUPPORT;
+	rqdata = (unsigned char) channel;
+	req.msg.data = &rqdata;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get NetFn Support command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get NetFn Support command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (l=0; l<4; l++) {
+		lun[l] = (*d)>>(2*l) & 0x3;
+	}
+	d++;
+
+	memcpy(netfn, d, 16);
+
+	return 0;
+}
+
+/* _get_command_suport
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @lnfn:	a pointer to a struct lun_netfn_support
+ *
+ * returns 0 on success and fills in lnfn according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_command_support(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct lun_netfn_support * lnfn)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char * d, rqdata[3];
+	unsigned int c;
+
+	if (!p || !lnfn) {
+		lprintf(LOG_ERR, "_get_netfn_suport: p or lnfn is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_SUPPORT;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Support (LUN=%d, NetFn=%d, op=0) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Support (LUN=%d, NetFn=%d, op=0) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (!(d[c>>3] & (1<<(c%8))))
+			lnfn->command[c].support |= BIT_AVAILABLE;
+	}
+	memcpy(lnfn->command_mask, d, MAX_COMMAND_BYTES/2);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_SUPPORT;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = 0x40 | p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Support (LUN=%d, NetFn=%d, op=1) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Support (LUN=%d, NetFn=%d, op=1) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (!(d[c>>3] & (1<<(c%8))))
+			lnfn->command[128+c].support |= BIT_AVAILABLE;
+	}
+	memcpy(lnfn->command_mask+MAX_COMMAND_BYTES/2, d, MAX_COMMAND_BYTES/2);
+	return 0;
+}
+
+/* _get_command_configurable
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @lnfn:	a pointer to a struct lun_netfn_support
+ *
+ * returns 0 on success and fills in lnfn according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_command_configurable(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct lun_netfn_support * lnfn)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char * d, rqdata[3];
+	unsigned int c;
+
+	if (!p || !lnfn) {
+		lprintf(LOG_ERR, "_get_command_configurable: p or lnfn is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_CONFIGURABLE_COMMANDS;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Configurable Command (LUN=%d, NetFn=%d, op=0) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Configurable Command (LUN=%d, NetFn=%d, op=0) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (d[c>>3] & (1<<(c%8)))
+			lnfn->command[c].support |= BIT_CONFIGURABLE;
+	}
+	memcpy(lnfn->config_mask, d, MAX_COMMAND_BYTES/2);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_CONFIGURABLE_COMMANDS;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = 0x40 | p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Configurable Command (LUN=%d, NetFn=%d, op=1) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Configurable Command (LUN=%d, NetFn=%d, op=1) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (d[c>>3] & (1<<(c%8)))
+			lnfn->command[128+c].support |= BIT_CONFIGURABLE;
+	}
+	memcpy(lnfn->config_mask+MAX_COMMAND_BYTES/2, d, MAX_COMMAND_BYTES/2);
+	return 0;
+}
+
+/* _get_command_enables
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @lnfn:	a pointer to a struct lun_netfn_support
+ *
+ * returns 0 on success and fills in lnfn according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_command_enables(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct lun_netfn_support * lnfn)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char * d, rqdata[3];
+	unsigned int c;
+
+	if (!p || !lnfn) {
+		lprintf(LOG_ERR, "_get_command_enables: p or lnfn is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Enables (LUN=%d, NetFn=%d, op=0) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Enables (LUN=%d, NetFn=%d, op=0) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (d[c>>3] & (1<<(c%8)))
+			lnfn->command[c].support |= BIT_ENABLED;
+	}
+	memcpy(lnfn->enable_mask, d, MAX_COMMAND_BYTES/2);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = 0x40 | p->netfn;
+	rqdata[2] = p->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Enables (LUN=%d, NetFn=%d, op=1) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Enables (LUN=%d, NetFn=%d, op=1) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	d = rsp->data;
+	for (c=0; c<128; c++) {
+		if (d[c>>3] & (1<<(c%8)))
+			lnfn->command[128+c].support |= BIT_ENABLED;
+	}
+	memcpy(lnfn->enable_mask+MAX_COMMAND_BYTES/2, d, MAX_COMMAND_BYTES/2);
+	return 0;
+}
+
+/* _set_command_enables
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @lnfn:	a pointer to a struct lun_netfn_support that contains current info
+ * @enable:	a pointer to a 32 byte bitfield that contains the desired enable state
+ * @gun:	here is a gun to shoot yourself in the foot.  If this is true
+ * 		you are allowed to disable this command
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+_set_command_enables(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct lun_netfn_support * lnfn,
+	unsigned char * enable, int gun)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char rqdata[19];
+	unsigned int c;
+
+	if (!p || !lnfn) {
+		lprintf(LOG_ERR, "_set_command_enables: p or lnfn is NULL");
+		return -1;
+	}
+
+	lprintf(LOG_INFO, "support:            ");
+	print_bitfield(lnfn->command_mask, MAX_COMMAND_BYTES, 1, LOG_INFO);
+	lprintf(LOG_INFO, "configurable:       ");
+	print_bitfield(lnfn->config_mask, MAX_COMMAND_BYTES, 0, LOG_INFO);
+	lprintf(LOG_INFO, "enabled:            ");
+	print_bitfield(lnfn->enable_mask, MAX_COMMAND_BYTES, 0, LOG_INFO);
+	lprintf(LOG_INFO, "enable mask before: ");
+	print_bitfield(enable, MAX_COMMAND_BYTES, 0, LOG_INFO);
+
+	// mask off the appropriate bits (if not configurable, set enable bit
+	// must be the same as the current enable bit)
+	for (c=0; c<(MAX_COMMAND_BYTES); c++) {
+		enable[c] = (lnfn->config_mask[c] & enable[c]) |
+			(~lnfn->config_mask[c] & lnfn->enable_mask[c]);
+	}
+
+	// take the gun out of their hand if they are not supposed to have it
+	if (!gun) {
+		enable[SET_COMMAND_ENABLE_BYTE] = 
+			(lnfn->config_mask[SET_COMMAND_ENABLE_BYTE]
+			 & SET_COMMAND_ENABLE_BIT) |
+			(~lnfn->config_mask[SET_COMMAND_ENABLE_BYTE]
+			 & lnfn->enable_mask[SET_COMMAND_ENABLE_BYTE]);
+	}
+	lprintf(LOG_INFO, "enable mask after: ");
+	print_bitfield(enable, MAX_COMMAND_BYTES, 0, LOG_INFO);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_SET_COMMAND_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	memcpy(&rqdata[3], enable, MAX_COMMAND_BYTES/2);
+	req.msg.data = rqdata;
+	req.msg.data_len = 19;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Command Enables (LUN=%d, NetFn=%d, op=0) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Command Enables (LUN=%d, NetFn=%d, op=0) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_SET_COMMAND_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = 0x40 | p->netfn;
+	rqdata[2] = p->lun;
+	memcpy(&rqdata[3], enable+MAX_COMMAND_BYTES/2, MAX_COMMAND_BYTES/2);
+	req.msg.data = rqdata;
+	req.msg.data_len = 19;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Command Enables (LUN=%d, NetFn=%d, op=1) command failed", p->lun, p->netfn);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Command Enables (LUN=%d, NetFn=%d, op=1) command failed: %s",
+			p->lun, p->netfn, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+/* _get_subfn_support
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @cmd:	a pointer to a struct command_support
+ *
+ * returns 0 on success and fills in cmd according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_subfn_support(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct command_support * cmd)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char rqdata[4];
+
+	if (!p || !cmd) {
+		lprintf(LOG_ERR, "_get_subfn_support: p or cmd is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_SUBFUNCTION_SUPPORT;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	rqdata[3] = p->command;
+	req.msg.data = rqdata;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Sub-function Support (LUN=%d, NetFn=%d, command=%d) command failed", p->lun, p->netfn, p->command);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Sub-function Support (LUN=%d, NetFn=%d, command=%d) command failed: %s",
+			p->lun, p->netfn, p->command, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memcpy(cmd->subfn_support, rsp->data, sizeof(cmd->subfn_support));
+	return 0;
+}
+
+/* _get_subfn_configurable
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @cmd:	a pointer to a struct command_support
+ *
+ * returns 0 on success and fills in cmd according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_subfn_configurable(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct command_support * cmd)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char rqdata[4];
+
+	if (!p || !cmd) {
+		lprintf(LOG_ERR, "_get_subfn_configurable: p or cmd is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_CONFIGURABLE_COMMAND_SUBFUNCTIONS;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	rqdata[3] = p->command;
+	req.msg.data = rqdata;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Configurable Command Sub-function (LUN=%d, NetFn=%d, command=%d) command failed", p->lun, p->netfn, p->command);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Configurable Command Sub-function (LUN=%d, NetFn=%d, command=%d) command failed: %s",
+			p->lun, p->netfn, p->command, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memcpy(cmd->subfn_config, rsp->data, sizeof(cmd->subfn_config));
+	return 0;
+}
+
+/* _get_subfn_enables
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @cmd:	a pointer to a struct command_support
+ *
+ * returns 0 on success and fills in cmd according to the request in p
+ * returns -1 on error
+ */
+static int
+_get_subfn_enables(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct command_support * cmd)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char rqdata[4];
+
+	if (!p || !cmd) {
+		lprintf(LOG_ERR, "_get_subfn_enables: p or cmd is NULL");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_COMMAND_SUBFUNCTION_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	rqdata[3] = p->command;
+	req.msg.data = rqdata;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Command Sub-function Enables (LUN=%d, NetFn=%d, command=%d) command failed", p->lun, p->netfn, p->command);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Command Sub-function Enables (LUN=%d, NetFn=%d, command=%d) command failed: %s",
+			p->lun, p->netfn, p->command, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memcpy(cmd->subfn_enable, rsp->data, sizeof(cmd->subfn_enable));
+	return 0;
+}
+
+/* _set_subfn_enables
+ *
+ * @intf:	ipmi interface
+ * @p:  	a pointer to a struct ipmi_function_params
+ * @cmd:	a pointer to a struct command_support
+ * @enable:	a pointer to a 4 byte bitfield that contains the desired enable state
+ *
+ * returns 0 on success (and modifies enable to be the bits it actually set)
+ * returns -1 on error
+ */
+static int
+_set_subfn_enables(struct ipmi_intf * intf,
+	struct ipmi_function_params * p, struct command_support * cmd,
+	unsigned char * enable)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char rqdata[8];
+	unsigned int c;
+
+	if (!p || !cmd) {
+		lprintf(LOG_ERR, "_set_subfn_enables: p or cmd is NULL");
+		return -1;
+	}
+
+	lprintf(LOG_INFO, "support:            ");
+	print_bitfield(cmd->subfn_support, MAX_SUBFN_BYTES, 1, LOG_INFO);
+	lprintf(LOG_INFO, "configurable:       ");
+	print_bitfield(cmd->subfn_config, MAX_SUBFN_BYTES, 0, LOG_INFO);
+	lprintf(LOG_INFO, "enabled:            ");
+	print_bitfield(cmd->subfn_enable, MAX_SUBFN_BYTES, 0, LOG_INFO);
+	lprintf(LOG_INFO, "enable mask before: ");
+	print_bitfield(enable, MAX_SUBFN_BYTES, 0, LOG_INFO);
+	// mask off the appropriate bits (if not configurable, set enable bit
+	// must be the same as the current enable bit)
+	for (c=0; c<sizeof(cmd->subfn_enable); c++) {
+		enable[c] = (cmd->subfn_config[c] & enable[c]) |
+			(~cmd->subfn_config[c] & cmd->subfn_enable[c]);
+	}
+	lprintf(LOG_INFO, "enable mask after: ");
+	print_bitfield(enable, MAX_SUBFN_BYTES, 0, LOG_INFO);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_SET_COMMAND_SUBFUNCTION_ENABLES;
+	rqdata[0] = (unsigned char) p->channel;
+	rqdata[1] = p->netfn;
+	rqdata[2] = p->lun;
+	rqdata[3] = p->command;
+	memcpy(&rqdata[4], enable, MAX_SUBFN_BYTES);
+	req.msg.data = rqdata;
+	req.msg.data_len = 8;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Command Sub-function Enables (LUN=%d, NetFn=%d, command=%d) command failed", p->lun, p->netfn, p->command);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Command Sub-function Enables (LUN=%d, NetFn=%d, command=%d) command failed: %s",
+			p->lun, p->netfn, p->command, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+/* _gather_info
+ *
+ * @intf:	ipmi interface
+ * @p:		a pointer to a struct ipmi_function_params
+ * @bmc:	a pointer to a struct bmc_fn_support
+ * @enable:	a pointer to a 4 byte bitfield that contains the desired enable state
+ *
+ * returns 0 on success and fills in bmc according to request p
+ * returns -1 on error
+ */
+static int _gather_info(struct ipmi_intf * intf, struct ipmi_function_params * p, struct bmc_fn_support * bmc)
+{
+	int ret, l, n;
+	unsigned char lun[MAX_LUN], netfn[16];
+
+	ret = _get_netfn_support(intf, p->channel, lun, netfn);
+	if (!ret) {
+		for (l=0; l<MAX_LUN; l++) {
+			if (p->lun >= 0 && p->lun != l)
+				continue;
+			bmc->lun[l].support = lun[l];
+			if (lun[l]) {
+				for (n=0; n<MAX_NETFN_PAIR; n++) {
+					int offset = l*MAX_NETFN_PAIR+n;
+					bmc->lun[l].netfn[n].support = 
+						!!(netfn[offset>>3] & (1<<(offset%8)));
+				}
+			}
+		}
+	}
+	if (p->netfn >= 0) {
+		if (!((p->lun < 0 || bmc->lun[p->lun].support) &&
+		      (p->netfn < 0 || bmc->lun[p->lun].netfn[p->netfn>>1].support))) {
+			lprintf(LOG_ERR, "LUN or LUN/NetFn pair %d,%d not supported", p->lun, p->netfn);
+			return 0;
+		}
+		ret = _get_command_support(intf, p, &(bmc->lun[p->lun].netfn[p->netfn>>1]));
+		ret |= _get_command_configurable(intf, p, &(bmc->lun[p->lun].netfn[p->netfn>>1]));
+		ret |= _get_command_enables(intf, p, &(bmc->lun[p->lun].netfn[p->netfn>>1]));
+		if (!ret && p->command >= 0) {
+			ret = _get_subfn_support(intf, p,
+						 &(bmc->lun[p->lun].netfn[p->netfn>>1].command[p->command]));
+			ret |= _get_subfn_configurable(intf, p,
+						       &(bmc->lun[p->lun].netfn[p->netfn>>1].command[p->command]));
+			ret |= _get_subfn_enables(intf, p,
+						  &(bmc->lun[p->lun].netfn[p->netfn>>1].command[p->command]));
+		}
+	}
+	else if (p->lun >= 0) {
+		l = p->lun;
+		if (bmc->lun[l].support) {
+			for (n=0; n<MAX_NETFN_PAIR; n++) {
+				p->netfn = n*2;
+				if (bmc->lun[l].netfn[n].support) {
+					ret = _get_command_support(intf, p, &(bmc->lun[l].netfn[n]));
+					ret |= _get_command_configurable(intf, p, &(bmc->lun[l].netfn[n]));
+					ret |= _get_command_enables(intf, p, &(bmc->lun[l].netfn[n]));
+				}
+				if (ret)
+					bmc->lun[l].netfn[n].support = 0;
+			}
+		}
+		p->netfn = -1;
+	} else {
+		for (l=0; l<4; l++) {
+			p->lun = l;
+			if (bmc->lun[l].support) {
+				for (n=0; n<MAX_NETFN_PAIR; n++) {
+					p->netfn = n*2;
+					if (bmc->lun[l].netfn[n].support) {
+						ret = _get_command_support(intf, p, &(bmc->lun[l].netfn[n]));
+						ret |= _get_command_configurable(intf, p, &(bmc->lun[l].netfn[n]));
+						ret |= _get_command_enables(intf, p, &(bmc->lun[l].netfn[n]));
+					}
+					if (ret)
+						bmc->lun[l].netfn[n].support = 0;
+				}
+			}
+		}
+		p->lun = -1;
+		p->netfn = -1;
+	}
+
+	return 0;
+}
+
+/* ipmi_firewall_info - print out info for firewall functions
+ *
+ * @intf:	ipmi inteface
+ * @argc:	argument count
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int ret = 0;
+	struct ipmi_function_params p = {0xe, -1, -1, -1, -1, 0};
+	struct bmc_fn_support * bmc_fn_support;
+	unsigned int l, n, c;
+
+	if ((argc > 0 && strncmp(argv[0], "help", 4) == 0) || ipmi_firewall_parse_args(argc, argv, &p) < 0)
+	{
+		printf_firewall_info_usage();
+		return 0;
+	}
+
+	bmc_fn_support = malloc(sizeof(struct bmc_fn_support));
+	if (!bmc_fn_support) {
+		lprintf(LOG_ERR, "malloc struct bmc_fn_support failed");
+		return -1;
+	}
+
+	ret = _gather_info(intf, &p, bmc_fn_support);
+
+	if (p.command >= 0) {
+      struct command_support * cmd;
+		if (!((p.lun < 0 || bmc_fn_support->lun[p.lun].support) &&
+			(p.netfn < 0 || bmc_fn_support->lun[p.lun].netfn[p.netfn>>1].support) &&
+			bmc_fn_support->lun[p.lun].netfn[p.netfn>>1].command[p.command].support))
+		{
+			lprintf(LOG_ERR, "Command 0x%02x not supported on LUN/NetFn pair %02x,%02x",
+				p.command, p.lun, p.netfn);
+			free(bmc_fn_support);
+			bmc_fn_support = NULL;
+			return 0;
+		}
+		cmd =
+			&bmc_fn_support->lun[p.lun].netfn[p.netfn>>1].command[p.command];
+		c = cmd->support;
+		printf("(A)vailable, (C)onfigurable, (E)nabled: | A | C | E |\n");
+		printf("-----------------------------------------------------\n");
+		printf("LUN %01d, NetFn 0x%02x, Command 0x%02x:        | %c | %c | %c |\n",
+			p.lun, p.netfn, p.command,
+			(c & BIT_AVAILABLE) ? 'X' : ' ',
+			(c & BIT_CONFIGURABLE) ? 'X' : ' ',
+			(c & BIT_ENABLED) ? 'X': ' ');
+
+		for (n=0; n<MAX_SUBFN; n++) {
+			printf("sub-function 0x%02x:                      | %c | %c | %c |\n", n,
+				(!bit_test(cmd->subfn_support, n)) ? 'X' : ' ',
+				(bit_test(cmd->subfn_config, n)) ? 'X' : ' ',
+				(bit_test(cmd->subfn_enable, n)) ? 'X' : ' ');
+		}
+	}
+	else if (p.netfn >= 0) {
+		if (!((p.lun < 0 || bmc_fn_support->lun[p.lun].support) &&
+			(bmc_fn_support->lun[p.lun].netfn[p.netfn>>1].support)))
+		{
+			lprintf(LOG_ERR, "LUN or LUN/NetFn pair %02x,%02x not supported",
+				p.lun, p.netfn);
+			free(bmc_fn_support);
+			bmc_fn_support = NULL;
+			return 0;
+		}
+		n = p.netfn >> 1;
+		l = p.lun;
+		printf("Commands on LUN 0x%02x, NetFn 0x%02x\n", p.lun, p.netfn);
+		printf("support:      ");
+		print_bitfield(bmc_fn_support->lun[l].netfn[n].command_mask,
+				MAX_COMMAND_BYTES, 1, -1);
+		printf("configurable: ");
+		print_bitfield(bmc_fn_support->lun[l].netfn[n].config_mask,
+				MAX_COMMAND_BYTES, 0, -1);
+		printf("enabled:      ");
+		print_bitfield(bmc_fn_support->lun[l].netfn[n].enable_mask,
+				MAX_COMMAND_BYTES, 0, -1);
+	}
+	else {
+	    for (l=0; l<4; l++) {
+                p.lun = l;
+                if (bmc_fn_support->lun[l].support) {
+                    for (n=0; n<MAX_NETFN_PAIR; n++) {
+                        p.netfn = n*2;
+                        if (bmc_fn_support->lun[l].netfn[n].support) {
+                            printf("%02x,%02x support:      ", p.lun, p.netfn);
+                            print_bitfield(bmc_fn_support->lun[l].netfn[n].command_mask,
+                                    MAX_COMMAND_BYTES, 1, -1);
+                            printf("%02x,%02x configurable: ", p.lun, p.netfn);
+                            print_bitfield(bmc_fn_support->lun[l].netfn[n].config_mask,
+                                    MAX_COMMAND_BYTES, 0, -1);
+                            printf("%02x,%02x enabled:      ", p.lun, p.netfn);
+                            print_bitfield(bmc_fn_support->lun[l].netfn[n].enable_mask,
+                                    MAX_COMMAND_BYTES, 0, -1);
+                        }
+                    }
+                }
+            }
+            p.lun = -1;
+            p.netfn = -1;
+	}
+
+	free(bmc_fn_support);
+	bmc_fn_support = NULL;
+	return ret;
+}
+
+/* ipmi_firewall_enable_disable  -  enable/disable BMC functions
+ *
+ * @intf:	ipmi inteface
+ * @enable:     whether to enable or disable
+ * @argc:	argument count
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char ** argv)
+{
+	struct ipmi_function_params p = {0xe, -1, -1, -1, -1, 0};
+	struct bmc_fn_support * bmc_fn_support;
+	int ret;
+	unsigned int l, n, c;
+	unsigned char enables[MAX_COMMAND_BYTES];
+
+	if (argc < 1 || strncmp(argv[0], "help", 4) == 0) {
+		char * s1 = enable?"en":"dis";
+		char * s2 = enable?"":" [force]";
+		printf("%sable [channel H] lun L netfn N%s\n", s1, s2);
+		printf("\t%sable all commands on this LUN/NetFn pair\n", s1);
+		printf("%sable [channel H] lun L netfn N command C%s\n", s1, s2);
+		printf("\t%sable Command C and all its Sub-functions for this LUN/NetFn pair\n", s1);
+		printf("%sable [channel H] lun L netfn N command C subfn S\n", s1);
+		printf("\t%sable Sub-function S for Command C for this LUN/NetFn pair\n", s1);
+		if (!enable) {
+			printf("* force will allow you to disable the \"Command Set Enable\" command\n");
+			printf("\tthereby letting you shoot yourself in the foot\n");
+			printf("\tthis is only recommended for advanced users\n");
+		}
+		return 0;
+	}
+	if (ipmi_firewall_parse_args(argc, argv, &p) < 0)
+		return -1;
+
+	bmc_fn_support = malloc(sizeof(struct bmc_fn_support));
+	if (!bmc_fn_support) {
+		lprintf(LOG_ERR, "malloc struct bmc_fn_support failed");
+		return -1;
+	}
+
+	ret = _gather_info(intf, &p, bmc_fn_support);
+	if (ret < 0) {
+		free(bmc_fn_support);
+		bmc_fn_support = NULL;
+		return ret;
+	}
+
+	l = p.lun;
+	n = p.netfn>>1;
+	c = p.command;
+	if (p.subfn >= 0) {
+		// firewall (en|dis)able [channel c] lun l netfn n command m subfn s
+		// (en|dis)able this sub-function for this commnad on this lun/netfn pair
+		memcpy(enables,
+			bmc_fn_support->lun[l].netfn[n].command[c].subfn_enable,
+			MAX_SUBFN_BYTES);
+		bit_set(enables, p.subfn, enable);
+		ret = _set_subfn_enables(intf, &p,
+			&bmc_fn_support->lun[l].netfn[n].command[c], enables);
+
+	} else if (p.command >= 0) {
+		// firewall (en|dis)able [channel c] lun l netfn n command m
+		//    (en|dis)able all subfn and command for this commnad on this lun/netfn pair
+		memset(enables, enable?0xff:0, MAX_SUBFN_BYTES);
+		ret = _set_subfn_enables(intf, &p,
+			&bmc_fn_support->lun[l].netfn[n].command[c], enables);
+		memcpy(enables,
+			&bmc_fn_support->lun[l].netfn[n].enable_mask, sizeof(enables));
+		bit_set(enables, p.command, enable);
+		ret |= _set_command_enables(intf, &p,
+			&bmc_fn_support->lun[l].netfn[n], enables, p.force);
+	} else if (p.netfn >= 0) {
+		// firewall (en|dis)able [channel c] lun l netfn n
+		//    (en|dis)able all commnads on this lun/netfn pair
+		memset(enables, enable?0xff:0, sizeof(enables));
+		ret = _set_command_enables(intf, &p,
+			&bmc_fn_support->lun[l].netfn[n], enables, p.force);
+		/*
+		   } else if (p.lun >= 0) {
+		// firewall (en|dis)able [channel c] lun l
+		//    (en|dis)able all commnads on all netfn pairs for this lun
+		*/
+	}
+	free(bmc_fn_support);
+	bmc_fn_support = NULL;
+	return ret;
+}
+
+/* ipmi_firewall_reset - reset firmware firewall to enable everything
+ *
+ * @intf:	ipmi inteface
+ * @argc:	argument count
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_firewall_reset(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_function_params p = {0xe, -1, -1, -1, -1, 0};
+	struct bmc_fn_support * bmc_fn_support;
+	int ret;
+	unsigned int l, n, c;
+	unsigned char enables[MAX_COMMAND_BYTES];
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_firewall_usage();
+		return (-1);
+	} else if (argc > 0 && strncmp(argv[0], "help", 4) == 0) {
+		printf_firewall_usage();
+		return 0;
+	}
+	if (ipmi_firewall_parse_args(argc, argv, &p) < 0)
+		return -1;
+
+	bmc_fn_support = malloc(sizeof(struct bmc_fn_support));
+	if (!bmc_fn_support) {
+		lprintf(LOG_ERR, "malloc struct bmc_fn_support failed");
+		return -1;
+	}
+
+	ret = _gather_info(intf, &p, bmc_fn_support);
+	if (ret < 0) {
+		free(bmc_fn_support);
+		bmc_fn_support = NULL;
+		return ret;
+	}
+
+	for (l=0; l<MAX_LUN; l++) {
+		p.lun = l;
+		for (n=0; n<MAX_NETFN_PAIR; n++) {
+			p.netfn = n*2;
+			for (c=0; c<MAX_COMMAND; c++) {
+				p.command = c;
+				printf("reset lun %d, netfn %d, command %d, subfn\n", l, n, c);
+				memset(enables, 0xff, MAX_SUBFN_BYTES);
+				ret = _set_subfn_enables(intf, &p,
+					&bmc_fn_support->lun[l].netfn[n].command[c], enables);
+			}
+			printf("reset lun %d, netfn %d, command\n", l, n);
+			memset(enables, 0xff, sizeof(enables));
+			ret = _set_command_enables(intf, &p,
+				&bmc_fn_support->lun[l].netfn[n], enables, 0);
+		}
+	}
+
+	free(bmc_fn_support);
+	bmc_fn_support = NULL;
+	return ret;
+}
+
+
+/* ipmi_firewall_main - top-level handler for firmware firewall functions
+ *
+ * @intf:	ipmi interface
+ * @argc:	number of arguments
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_firewall_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if (argc < 1 || strncmp(argv[0], "help", 4) == 0) {
+		printf_firewall_usage();
+	}
+	else if (strncmp(argv[0], "info", 4) == 0) {
+		rc = ipmi_firewall_info(intf, argc-1, &(argv[1]));
+	}
+	else if (strncmp(argv[0], "enable", 6) == 0) {
+		rc = ipmi_firewall_enable_disable(intf, 1, argc-1, &(argv[1]));
+	}
+	else if (strncmp(argv[0], "disable", 7) == 0) {
+		rc = ipmi_firewall_enable_disable(intf, 0, argc-1, &(argv[1]));
+	}
+	else if (strncmp(argv[0], "reset", 5) == 0) {
+		rc = ipmi_firewall_reset(intf, argc-1, &(argv[1]));
+	}
+	else {
+		printf_firewall_usage();
+	}
+
+	return rc;
+}
diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
new file mode 100644
index 0000000..cf00eff
--- /dev/null
+++ b/lib/ipmi_fru.c
@@ -0,0 +1,5212 @@
+/*
+* Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* Redistribution of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+*
+* Redistribution in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* Neither the name of Sun Microsystems, Inc. or the names of
+* contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* This software is provided "AS IS," without a warranty of any kind.
+* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+* INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+* PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+* SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+* FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+* OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+* SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+* OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+* PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+* LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+* EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+*/
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_strings.h>  /* IANA id strings */
+
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define FRU_MULTIREC_CHUNK_SIZE     (255 + sizeof(struct fru_multirec_header))
+
+static const char *section_id[4] = {
+	"Internal Use Section",
+	"Chassis Section",
+	"Board Section",
+	"Product Section"
+};
+
+/* From lib/dimm_spd.c: */
+int
+ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id);
+
+/* From src/plugins/ipmi_intf.c: */
+void
+ipmi_intf_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size);
+void
+ipmi_intf_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size);
+
+extern int verbose;
+
+static void ipmi_fru_read_to_bin(struct ipmi_intf * intf, char * pFileName, uint8_t fruId);
+static void ipmi_fru_write_from_bin(struct ipmi_intf * intf, char * pFileName, uint8_t fruId);
+static int ipmi_fru_upg_ekeying(struct ipmi_intf * intf, char * pFileName, uint8_t fruId);
+static int ipmi_fru_get_multirec_location_from_fru(struct ipmi_intf * intf, uint8_t fruId,
+							struct fru_info *pFruInfo, uint32_t * pRetLocation,
+							uint32_t * pRetSize);
+static int ipmi_fru_get_multirec_from_file(char * pFileName, uint8_t * pBufArea,
+						uint32_t size, uint32_t offset);
+static int ipmi_fru_get_multirec_size_from_file(char * pFileName, uint32_t * pSize, uint32_t * pOffset);
+int ipmi_fru_get_adjust_size_from_buffer(uint8_t *pBufArea, uint32_t *pSize);
+static void ipmi_fru_picmg_ext_print(uint8_t * fru_data, int off, int length);
+
+static int ipmi_fru_set_field_string(struct ipmi_intf * intf, unsigned
+						char fruId, uint8_t f_type, uint8_t f_index, char *f_string);
+static int
+ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId,
+											struct fru_info fru, struct fru_header header,
+											uint8_t f_type, uint8_t f_index, char *f_string);
+
+static void
+fru_area_print_multirec_bloc(struct ipmi_intf * intf, struct fru_info * fru,
+			uint8_t id, uint32_t offset);
+int
+read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+			uint32_t offset, uint32_t length, uint8_t *frubuf);
+void free_fru_bloc(t_ipmi_fru_bloc *bloc);
+
+/* get_fru_area_str  -  Parse FRU area string from raw data
+*
+* @data:   raw FRU data
+* @offset: offset into data for area
+*
+* returns pointer to FRU area string
+*/
+char * get_fru_area_str(uint8_t * data, uint32_t * offset)
+{
+	static const char bcd_plus[] = "0123456789 -.:,_";
+	char * str;
+	int len, off, size, i, j, k, typecode;
+	union {
+		uint32_t bits;
+		char chars[4];
+	} u;
+
+	size = 0;
+	off = *offset;
+
+	/* bits 6:7 contain format */
+	typecode = ((data[off] & 0xC0) >> 6);
+
+	// printf("Typecode:%i\n", typecode);
+	/* bits 0:5 contain length */
+	len = data[off++];
+	len &= 0x3f;
+
+	switch (typecode) {
+	case 0:           /* 00b: binary/unspecified */
+		/* hex dump -> 2x length */
+		size = (len*2);
+		break;
+	case 2:           /* 10b: 6-bit ASCII */
+		/* 4 chars per group of 1-3 bytes */
+		size = ((((len+2)*4)/3) & ~3);
+		break;
+	case 3:           /* 11b: 8-bit ASCII */
+	case 1:           /* 01b: BCD plus */
+		/* no length adjustment */
+		size = len;
+		break;
+	}
+
+	if (size < 1) {
+		*offset = off;
+		return NULL;
+	}
+	str = malloc(size+1);
+	if (str == NULL)
+		return NULL;
+	memset(str, 0, size+1);
+
+	if (len == 0) {
+		str[0] = '\0';
+		*offset = off;
+		return str;
+	}
+
+	switch (typecode) {
+	case 0:        /* Binary */
+		strncpy(str, buf2str(&data[off], len), len*2);
+		break;
+
+	case 1:        /* BCD plus */
+		for (k=0; k<len; k++)
+			str[k] = bcd_plus[(data[off+k] & 0x0f)];
+		str[k] = '\0';
+		break;
+
+	case 2:        /* 6-bit ASCII */
+		for (i=j=0; i<len; i+=3) {
+			u.bits = 0;
+			k = ((len-i) < 3 ? (len-i) : 3);
+#if WORDS_BIGENDIAN
+			u.chars[3] = data[off+i];
+			u.chars[2] = (k > 1 ? data[off+i+1] : 0);
+			u.chars[1] = (k > 2 ? data[off+i+2] : 0);
+#define CHAR_IDX 3
+#else
+			memcpy((void *)&u.bits, &data[off+i], k);
+#define CHAR_IDX 0
+#endif
+			for (k=0; k<4; k++) {
+				str[j++] = ((u.chars[CHAR_IDX] & 0x3f) + 0x20);
+				u.bits >>= 6;
+			}
+		}
+		str[j] = '\0';
+		break;
+
+	case 3:
+		memcpy(str, &data[off], len);
+		str[len] = '\0';
+		break;
+	}
+
+	off += len;
+	*offset = off;
+
+	return str;
+}
+
+/* is_valid_filename - checks file/path supplied by user
+ *
+ * input_filename - user input string
+ *
+ * returns   0  if path is ok
+ * returns (-1) if path is NULL
+ * returns (-2) if path is too short
+ * returns (-3) if path is too long
+ */
+int
+is_valid_filename(const char *input_filename)
+{
+	if (input_filename == NULL) {
+		lprintf(LOG_ERR, "ERROR: NULL pointer passed.");
+		return (-1);
+	}
+
+	if (strlen(input_filename) < 1) {
+		lprintf(LOG_ERR, "File/path is invalid.");
+		return (-2);
+	}
+
+	if (strlen(input_filename) >= 512) {
+		lprintf(LOG_ERR, "File/path must be shorter than 512 bytes.");
+		return (-3);
+	}
+
+	return 0;
+} /* is_valid_filename() */
+
+/* build_fru_bloc  -  build fru bloc for write protection
+*
+* @intf:     ipmi interface
+* @fru_info: information about FRU device
+* @id      : Fru id
+* @soffset : Source offset      (from buffer)
+* @doffset : Destination offset (in device)
+* @length  : Size of data to write (in bytes)
+* @pFrubuf : Pointer on data to write
+*
+* returns 0 on success
+* returns -1 on error
+*/
+#define FRU_NUM_BLOC_COMMON_HEADER  6
+t_ipmi_fru_bloc *
+build_fru_bloc(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id)
+{
+	t_ipmi_fru_bloc * p_first, * p_bloc, * p_new;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_header header;
+	struct fru_multirec_header rec_hdr;
+	uint8_t msg_data[4];
+	uint32_t off;
+	uint16_t i;
+
+	/*
+	* get COMMON Header format
+	*/
+	msg_data[0] = id;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, " Device not present (No Response)");
+		return NULL;
+	}
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR," Device not present (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return NULL;
+	}
+
+	if (verbose > 1) {
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+	}
+
+	memcpy(&header, rsp->data + 1, 8);
+
+	/* verify header checksum */
+	if (ipmi_csum((uint8_t *)&header, 8)) {
+		lprintf(LOG_ERR, " Bad header checksum");
+		return NULL;
+	}
+
+	if (header.version != 1) {
+		lprintf(LOG_ERR, " Unknown FRU header version 0x%02x", header.version);
+		return NULL;
+	}
+
+	/******************************************
+		Malloc and fill up the bloc contents
+	*******************************************/
+
+	// Common header
+	p_first = malloc(sizeof(struct ipmi_fru_bloc));
+	if (!p_first) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+
+	p_bloc = p_first;
+	p_bloc->next = NULL;
+	p_bloc->start= 0;
+	p_bloc->size = fru->size;
+	strcpy((char *)p_bloc->blocId, "Common Header Section");
+
+	for (i = 0; i < 4; i++) {
+		if (header.offsets[i]) {
+			p_new = malloc(sizeof(struct ipmi_fru_bloc));
+			if (!p_new) {
+				lprintf(LOG_ERR, "ipmitool: malloc failure");
+				free_fru_bloc(p_first);
+				return NULL;
+			}
+
+			p_new->next = NULL;
+			p_new->start = header.offsets[i] * 8;
+			p_new->size = fru->size - p_new->start;
+
+			strncpy((char *)p_new->blocId, section_id[i], sizeof(p_new->blocId));
+			/* Make sure string is null terminated */
+			p_new->blocId[sizeof(p_new->blocId)-1] = 0;
+
+			p_bloc->next = p_new;
+			p_bloc->size = p_new->start - p_bloc->start;
+			p_bloc = p_new;
+		}
+	}
+
+	// Multi
+	if (header.offset.multi) {
+		off = header.offset.multi * 8;
+
+		do {
+			/*
+			 * check for odd offset for the case of fru devices
+			 * accessed by words
+			 */
+			if (fru->access && (off & 1)) {
+				lprintf(LOG_ERR, " Unaligned offset for a block: %d", off);
+				/* increment offset */
+				off++;
+				break;
+			}
+
+			if (read_fru_area(intf, fru, id, off, 5,
+					(uint8_t *) &rec_hdr) < 0) {
+				break;
+			}
+
+			p_new = malloc(sizeof(struct ipmi_fru_bloc));
+			if (!p_new) {
+				lprintf(LOG_ERR, "ipmitool: malloc failure");
+				free_fru_bloc(p_first);
+				return NULL;
+			}
+
+			p_new->next = NULL;
+			p_new->start = off;
+			p_new->size = fru->size - p_new->start;
+			sprintf((char *)p_new->blocId, "Multi-Rec Area: Type %i",
+					rec_hdr.type);
+
+			p_bloc->next = p_new;
+			p_bloc->size = p_new->start - p_bloc->start;
+			p_bloc = p_new;
+
+			off += rec_hdr.len + sizeof(struct fru_multirec_header);
+
+			/* verify record header */
+			if (ipmi_csum((uint8_t *)&rec_hdr,
+					sizeof(struct fru_multirec_header))) {
+				/* can't reliably judge for the rest space */
+				break;
+			}
+		} while (!(rec_hdr.format & 0x80) && (off < fru->size));
+
+		lprintf(LOG_DEBUG,"Multi-Record area ends at: %i (%xh)", off, off);
+
+		if (fru->size > off) {
+			// Bloc for remaining space
+			p_new = malloc(sizeof(struct ipmi_fru_bloc));
+			if (!p_new) {
+				lprintf(LOG_ERR, "ipmitool: malloc failure");
+				free_fru_bloc(p_first);
+				return NULL;
+			}
+
+			p_new->next = NULL;
+			p_new->start = off;
+			p_new->size = fru->size - p_new->start;
+			strcpy((char *)p_new->blocId, "Unused space");
+
+			p_bloc->next = p_new;
+			p_bloc->size = p_new->start - p_bloc->start;
+		}
+	}
+
+	/* Dump blocs */
+	for(p_bloc = p_first, i = 0; p_bloc; p_bloc = p_bloc->next) {
+		lprintf(LOG_DEBUG ,"Bloc Numb : %i", i++);
+		lprintf(LOG_DEBUG ,"Bloc Id   : %s", p_bloc->blocId);
+		lprintf(LOG_DEBUG ,"Bloc Start: %i", p_bloc->start);
+		lprintf(LOG_DEBUG ,"Bloc Size : %i", p_bloc->size);
+		lprintf(LOG_DEBUG ,"");
+	}
+
+	return p_first;
+}
+
+void
+free_fru_bloc(t_ipmi_fru_bloc *bloc)
+{
+	t_ipmi_fru_bloc * del;
+
+	while (bloc) {
+		del = bloc;
+		bloc = bloc->next;
+		free(del);
+		del = NULL;
+	}
+}
+
+/*
+ * write FRU[doffset:length] from the pFrubuf[soffset:length]
+ * rc=1 on success
+**/
+int
+write_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+					uint16_t soffset,  uint16_t doffset,
+					uint16_t length, uint8_t *pFrubuf)
+{
+	uint16_t tmp, finish;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[255+3];
+	uint16_t writeLength;
+	uint16_t found_bloc = 0;
+
+	finish = doffset + length;        /* destination offset */
+	if (finish > fru->size)
+	{
+		lprintf(LOG_ERROR, "Return error");
+		return -1;
+	}
+
+	if (fru->access && ((doffset & 1) || (length & 1))) {
+		lprintf(LOG_ERROR, "Odd offset or length specified");
+		return (-1);
+	}
+
+	t_ipmi_fru_bloc * fru_bloc = build_fru_bloc(intf, fru, id);
+	t_ipmi_fru_bloc * saved_fru_bloc = fru_bloc;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = SET_FRU_DATA;
+	req.msg.data = msg_data;
+
+	/* initialize request size only once */
+	if (fru->max_write_size == 0) {
+		uint16_t max_rq_size = ipmi_intf_get_max_request_data_size(intf);
+
+		/* validate lower bound of the maximum request data size */
+		if (max_rq_size <= 3) {
+			lprintf(LOG_ERROR, "Maximum request size is too small to send "
+					"a write request");
+			return -1;
+		}
+
+		/*
+		 * Write FRU Info command returns the number of written bytes in
+		 * a single byte field.
+		 */
+		if (max_rq_size - 3 > 255) {
+			/*  Limit the max write size with 255 bytes. */
+			fru->max_write_size = 255;
+		} else {
+			/* subtract 1 byte for FRU ID an 2 bytes for offset */
+			fru->max_write_size = max_rq_size - 3;
+		}
+
+		/* check word access */
+		if (fru->access) {
+			fru->max_write_size &= ~1;
+		}
+	}
+
+	do {
+		uint16_t end_bloc;
+		uint8_t protected_bloc = 0;
+
+		/* Write per bloc, try to find the end of a bloc*/
+		while (fru_bloc && fru_bloc->start + fru_bloc->size <= doffset) {
+			fru_bloc = fru_bloc->next;
+			found_bloc++;
+		}
+
+		if (fru_bloc && fru_bloc->start + fru_bloc->size < finish) {
+			end_bloc = fru_bloc->start + fru_bloc->size;
+		} else {
+			end_bloc = finish;
+		}
+
+		/* calculate write length */
+		tmp = end_bloc - doffset;
+
+		/* check that write length is more than maximum request size */
+		if (tmp > fru->max_write_size) {
+			writeLength = fru->max_write_size;
+		} else {
+			writeLength = tmp;
+		}
+
+		/* copy fru data */
+		memcpy(&msg_data[3], pFrubuf + soffset, writeLength);
+
+		/* check word access */
+		if (fru->access) {
+			writeLength &= ~1;
+		}
+
+		tmp = doffset;
+		if (fru->access) {
+			tmp >>= 1;
+		}
+
+		msg_data[0] = id;
+		msg_data[1] = (uint8_t)tmp;
+		msg_data[2] = (uint8_t)(tmp >> 8);
+		req.msg.data_len = writeLength + 3;
+
+		if(fru_bloc) {
+			lprintf(LOG_INFO,"Writing %d bytes (Bloc #%i: %s)",
+					writeLength, found_bloc, fru_bloc->blocId);
+		} else {
+			lprintf(LOG_INFO,"Writing %d bytes", writeLength);
+		}
+
+		rsp = intf->sendrecv(intf, &req);
+		if (!rsp) {
+			break;
+		}
+
+		if (rsp->ccode == 0xc7 || rsp->ccode == 0xc8 || rsp->ccode == 0xca) {
+			if (fru->max_write_size > 8) {
+				fru->max_write_size -= 8;
+				lprintf(LOG_INFO, "Retrying FRU write with request size %d",
+						fru->max_write_size);
+				continue;
+			}
+		} else if(rsp->ccode == 0x80) {
+			rsp->ccode = 0;
+			// Write protected section
+			protected_bloc = 1;
+		}
+
+		if (rsp->ccode > 0)
+			break;
+
+		if (protected_bloc == 0) {
+			// Write OK, bloc not protected, continue
+			lprintf(LOG_INFO,"Wrote %d bytes", writeLength);
+			doffset += writeLength;
+			soffset += writeLength;
+		} else {
+			if(fru_bloc) {
+				// Bloc protected, advise user and jump over protected bloc
+				lprintf(LOG_INFO,
+						"Bloc [%s] protected at offset: %i (size %i bytes)",
+						fru_bloc->blocId, fru_bloc->start, fru_bloc->size);
+				lprintf(LOG_INFO,"Jumping over this bloc");
+			} else {
+				lprintf(LOG_INFO,
+						"Remaining FRU is protected following offset: %i",
+						doffset);
+			}
+			soffset += end_bloc - doffset;
+			doffset = end_bloc;
+		}
+	} while (doffset < finish);
+
+	if (saved_fru_bloc) {
+		free_fru_bloc(saved_fru_bloc);
+	}
+
+	return doffset >= finish;
+}
+
+/* read_fru_area  -  fill in frubuf[offset:length] from the FRU[offset:length]
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:     fru id
+* @offset: offset into buffer
+* @length: how much to read
+* @frubuf: buffer read into
+*
+* returns -1 on error
+* returns 0 if successful
+*/
+int
+read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+			uint32_t offset, uint32_t length, uint8_t *frubuf)
+{
+	uint32_t off = offset, tmp, finish;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4];
+
+	if (offset > fru->size) {
+		lprintf(LOG_ERR, "Read FRU Area offset incorrect: %d > %d",
+			offset, fru->size);
+		return -1;
+	}
+
+	finish = offset + length;
+	if (finish > fru->size) {
+		finish = fru->size;
+		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+			"Adjusting to %d",
+			offset + length, finish - offset);
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	if (fru->max_read_size == 0) {
+		uint16_t max_rs_size = ipmi_intf_get_max_response_data_size(intf) - 1;
+
+		/* validate lower bound of the maximum response data size */
+		if (max_rs_size <= 1) {
+			lprintf(LOG_ERROR, "Maximum response size is too small to send "
+					"a read request");
+			return -1;
+		}
+
+		/*
+		 * Read FRU Info command may read up to 255 bytes of data.
+		 */
+		if (max_rs_size - 1 > 255) {
+			/*  Limit the max read size with 255 bytes. */
+			fru->max_read_size = 255;
+		} else {
+			/* subtract 1 byte for bytes count */
+			fru->max_read_size = max_rs_size - 1;
+		}
+
+		/* check word access */
+		if (fru->access) {
+			fru->max_read_size &= ~1;
+		}
+	}
+
+	do {
+		tmp = fru->access ? off >> 1 : off;
+		msg_data[0] = id;
+		msg_data[1] = (uint8_t)(tmp & 0xff);
+		msg_data[2] = (uint8_t)(tmp >> 8);
+		tmp = finish - off;
+		if (tmp > fru->max_read_size)
+			msg_data[3] = (uint8_t)fru->max_read_size;
+		else
+			msg_data[3] = (uint8_t)tmp;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_NOTICE, "FRU Read failed");
+			break;
+		}
+		if (rsp->ccode > 0) {
+			/* if we get C7h or C8h or CAh return code then we requested too
+			* many bytes at once so try again with smaller size */
+			if ((rsp->ccode == 0xc7 || rsp->ccode == 0xc8 || rsp->ccode == 0xca)
+					&& fru->max_read_size > 8) {
+				if (fru->max_read_size > 32) {
+					/* subtract read length more aggressively */
+					fru->max_read_size -= 8;
+				} else {
+					/* subtract length less aggressively */
+					fru->max_read_size--;
+				}
+
+				lprintf(LOG_INFO, "Retrying FRU read with request size %d",
+						fru->max_read_size);
+				continue;
+			}
+
+			lprintf(LOG_NOTICE, "FRU Read failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			break;
+		}
+
+		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
+		memcpy(frubuf, rsp->data + 1, tmp);
+		off += tmp;
+		frubuf += tmp;
+		/* sometimes the size returned in the Info command
+		* is too large.  return 0 so higher level function
+		* still attempts to parse what was returned */
+		if (tmp == 0 && off < finish) {
+			return 0;
+		}
+	} while (off < finish);
+
+	if (off < finish) {
+		return -1;
+	}
+
+	return 0;
+}
+
+/* read_fru_area  -  fill in frubuf[offset:length] from the FRU[offset:length]
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:     fru id
+* @offset: offset into buffer
+* @length: how much to read
+* @frubuf: buffer read into
+*
+* returns -1 on error
+* returns 0 if successful
+*/
+int
+read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+			uint32_t offset, uint32_t length, uint8_t *frubuf)
+{
+	static uint32_t fru_data_rqst_size = 20;
+	uint32_t off = offset, tmp, finish;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4];
+
+	if (offset > fru->size) {
+		lprintf(LOG_ERR, "Read FRU Area offset incorrect: %d > %d",
+			offset, fru->size);
+		return -1;
+	}
+
+	finish = offset + length;
+	if (finish > fru->size) {
+		finish = fru->size;
+		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+			"Adjusting to %d",
+			offset + length, finish - offset);
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+#ifdef LIMIT_ALL_REQUEST_SIZE
+	if (fru_data_rqst_size > 16)
+#else
+	if (fru->access && fru_data_rqst_size > 16)
+#endif
+		fru_data_rqst_size = 16;
+	do {
+		tmp = fru->access ? off >> 1 : off;
+		msg_data[0] = id;
+		msg_data[1] = (uint8_t)(tmp & 0xff);
+		msg_data[2] = (uint8_t)(tmp >> 8);
+		tmp = finish - off;
+		if (tmp > fru_data_rqst_size)
+			msg_data[3] = (uint8_t)fru_data_rqst_size;
+		else
+			msg_data[3] = (uint8_t)tmp;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_NOTICE, "FRU Read failed");
+			break;
+		}
+		if (rsp->ccode > 0) {
+			/* if we get C7 or C8  or CA return code then we requested too
+			* many bytes at once so try again with smaller size */
+			if ((rsp->ccode == 0xc7 || rsp->ccode == 0xc8 || rsp->ccode == 0xca) &&
+				(--fru_data_rqst_size > 8)) {
+				lprintf(LOG_INFO, "Retrying FRU read with request size %d",
+					fru_data_rqst_size);
+				continue;
+			}
+			lprintf(LOG_NOTICE, "FRU Read failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			break;
+		}
+
+		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
+		memcpy((frubuf + off)-offset, rsp->data + 1, tmp);
+		off += tmp;
+
+		/* sometimes the size returned in the Info command
+		* is too large.  return 0 so higher level function
+		* still attempts to parse what was returned */
+		if (tmp == 0 && off < finish)
+			return 0;
+
+	} while (off < finish);
+
+	if (off < finish)
+		return -1;
+
+	return 0;
+}
+
+
+static void
+fru_area_print_multirec_bloc(struct ipmi_intf * intf, struct fru_info * fru,
+			uint8_t id, uint32_t offset)
+{
+	uint8_t * fru_data = NULL;
+	uint32_t i;
+	struct fru_multirec_header * h;
+	uint32_t last_off, len;
+
+	i = last_off = offset;
+
+	fru_data = malloc(fru->size + 1);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, " Out of memory!");
+		return;
+	}
+
+	memset(fru_data, 0, fru->size + 1);
+
+	do {
+		h = (struct fru_multirec_header *) (fru_data + i);
+
+		// read area in (at most) FRU_MULTIREC_CHUNK_SIZE bytes at a time
+		if ((last_off < (i + sizeof(*h))) || (last_off < (i + h->len)))
+		{
+			len = fru->size - last_off;
+			if (len > FRU_MULTIREC_CHUNK_SIZE)
+				len = FRU_MULTIREC_CHUNK_SIZE;
+
+			if (read_fru_area(intf, fru, id, last_off, len, fru_data) < 0)
+				break;
+
+			last_off += len;
+		}
+
+		//printf("Bloc Numb : %i\n", counter);
+		printf("Bloc Start: %i\n", i);
+		printf("Bloc Size : %i\n", h->len);
+		printf("\n");
+
+		i += h->len + sizeof (struct fru_multirec_header);
+	} while (!(h->format & 0x80));
+
+	i = offset;
+	do {
+		h = (struct fru_multirec_header *) (fru_data + i);
+
+		printf("Bloc Start: %i\n", i);
+		printf("Bloc Size : %i\n", h->len);
+		printf("\n");
+
+		i += h->len + sizeof (struct fru_multirec_header);
+	} while (!(h->format & 0x80));
+
+	lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)",i,i);
+
+	free(fru_data);
+	fru_data = NULL;
+}
+
+
+/* fru_area_print_chassis  -  Print FRU Chassis Area
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:  fru id
+* @offset: offset pointer
+*/
+static void
+fru_area_print_chassis(struct ipmi_intf * intf, struct fru_info * fru,
+			uint8_t id, uint32_t offset)
+{
+	char * fru_area;
+	uint8_t * fru_data;
+	uint32_t fru_len, i;
+	uint8_t tmp[2];
+
+	fru_len = 0;
+
+	/* read enough to check length field */
+	if (read_fru_area(intf, fru, id, offset, 2, tmp) == 0) {
+		fru_len = 8 * tmp[1];
+	}
+
+	if (fru_len == 0) {
+		return;
+	}
+
+	fru_data = malloc(fru_len);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return;
+	}
+
+	memset(fru_data, 0, fru_len);
+
+	/* read in the full fru */
+	if (read_fru_area(intf, fru, id, offset, fru_len, fru_data) < 0) {
+		free(fru_data);
+		fru_data = NULL;
+		return;
+	}
+
+	/*
+	 * skip first two bytes which specify
+	 * fru area version and fru area length
+	 */
+	i = 2;
+
+	printf(" Chassis Type          : %s\n",
+ 		chassis_type_desc[fru_data[i] >
+ 		(sizeof(chassis_type_desc)/sizeof(chassis_type_desc[0])) - 1 ?
+ 		2 : fru_data[i]]);
+
+ 	i++;
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Chassis Part Number   : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Chassis Serial        : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	/* read any extra fields */
+	while ((fru_data[i] != 0xc1) && (i < fru_len))
+	{
+		int j = i;
+		fru_area = get_fru_area_str(fru_data, &i);
+		if (fru_area != NULL) {
+			if (strlen(fru_area) > 0) {
+				printf(" Chassis Extra         : %s\n", fru_area);
+			}
+			free(fru_area);
+			fru_area = NULL;
+		}
+
+		if (i == j) {
+			break;
+		}
+	}
+
+	if (fru_data != NULL) {
+		free(fru_data);
+		fru_data = NULL;
+	}
+}
+
+/* fru_area_print_board  -  Print FRU Board Area
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:  fru id
+* @offset: offset pointer
+*/
+static void
+fru_area_print_board(struct ipmi_intf * intf, struct fru_info * fru,
+			uint8_t id, uint32_t offset)
+{
+	char * fru_area;
+	uint8_t * fru_data;
+	uint32_t fru_len;
+	uint32_t i;
+	time_t tval;
+	uint8_t tmp[2];
+
+	fru_len = 0;
+
+	/* read enough to check length field */
+	if (read_fru_area(intf, fru, id, offset, 2, tmp) == 0) {
+		fru_len = 8 * tmp[1];
+	}
+
+	if (fru_len <= 0) {
+		return;
+	}
+
+	fru_data = malloc(fru_len);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return;
+	}
+
+	memset(fru_data, 0, fru_len);
+
+	/* read in the full fru */
+	if (read_fru_area(intf, fru, id, offset, fru_len, fru_data) < 0) {
+		free(fru_data);
+		fru_data = NULL;
+		return;
+	}
+
+	/*
+	 * skip first three bytes which specify
+	 * fru area version, fru area length
+	 * and fru board language
+	 */
+	i = 3;
+
+	tval=((fru_data[i+2] << 16) + (fru_data[i+1] << 8) + (fru_data[i]));
+	tval=tval * 60;
+	tval=tval + secs_from_1970_1996;
+	printf(" Board Mfg Date        : %s", asctime(localtime(&tval)));
+	i += 3;  /* skip mfg. date time */
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Board Mfg             : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Board Product         : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Board Serial          : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Board Part Number     : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0 && verbose > 0) {
+			printf(" Board FRU ID          : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	/* read any extra fields */
+	while ((fru_data[i] != 0xc1) && (i < fru_len))
+	{
+		int j = i;
+		fru_area = get_fru_area_str(fru_data, &i);
+		if (fru_area != NULL) {
+			if (strlen(fru_area) > 0) {
+				printf(" Board Extra           : %s\n", fru_area);
+			}
+			free(fru_area);
+			fru_area = NULL;
+		}
+		if (i == j)
+			break;
+	}
+
+	if (fru_data != NULL) {
+		free(fru_data);
+		fru_data = NULL;
+	}
+}
+
+/* fru_area_print_product  -  Print FRU Product Area
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:  fru id
+* @offset: offset pointer
+*/
+static void
+fru_area_print_product(struct ipmi_intf * intf, struct fru_info * fru,
+				uint8_t id, uint32_t offset)
+{
+	char * fru_area;
+	uint8_t * fru_data;
+	uint32_t fru_len, i;
+	uint8_t tmp[2];
+
+	fru_len = 0;
+
+	/* read enough to check length field */
+	if (read_fru_area(intf, fru, id, offset, 2, tmp) == 0) {
+		fru_len = 8 * tmp[1];
+	}
+
+	if (fru_len == 0) {
+		return;
+	}
+
+	fru_data = malloc(fru_len);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return;
+	}
+
+	memset(fru_data, 0, fru_len);
+
+
+	/* read in the full fru */
+	if (read_fru_area(intf, fru, id, offset, fru_len, fru_data) < 0) {
+		free(fru_data);
+		fru_data = NULL;
+		return;
+	}
+
+	/*
+	 * skip first three bytes which specify
+	 * fru area version, fru area length
+	 * and fru board language
+	 */
+	i = 3;
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Manufacturer  : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Name          : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Part Number   : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Version       : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Serial        : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0) {
+			printf(" Product Asset Tag     : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	fru_area = get_fru_area_str(fru_data, &i);
+	if (fru_area != NULL) {
+		if (strlen(fru_area) > 0 && verbose > 0) {
+			printf(" Product FRU ID        : %s\n", fru_area);
+		}
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	/* read any extra fields */
+	while ((fru_data[i] != 0xc1) && (i < fru_len))
+	{
+		int j = i;
+		fru_area = get_fru_area_str(fru_data, &i);
+		if (fru_area != NULL) {
+			if (strlen(fru_area) > 0) {
+				printf(" Product Extra         : %s\n", fru_area);
+			}
+			free(fru_area);
+			fru_area = NULL;
+		}
+		if (i == j)
+			break;
+	}
+
+	if (fru_data != NULL) {
+		free(fru_data);
+		fru_data = NULL;
+	}
+}
+
+/* fru_area_print_multirec  -  Print FRU Multi Record Area
+*
+* @intf:   ipmi interface
+* @fru: fru info
+* @id:  fru id
+* @offset: offset pointer
+*/
+static void
+fru_area_print_multirec(struct ipmi_intf * intf, struct fru_info * fru,
+			uint8_t id, uint32_t offset)
+{
+	uint8_t * fru_data;
+	struct fru_multirec_header * h;
+	struct fru_multirec_powersupply * ps;
+	struct fru_multirec_dcoutput * dc;
+	struct fru_multirec_dcload * dl;
+	uint16_t peak_capacity;
+	uint8_t peak_hold_up_time;
+	uint32_t last_off;
+
+	last_off = offset;
+
+	fru_data = malloc(FRU_MULTIREC_CHUNK_SIZE);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return;
+	}
+
+	memset(fru_data, 0, FRU_MULTIREC_CHUNK_SIZE);
+
+	h = (struct fru_multirec_header *) (fru_data);
+
+	do {
+		if (read_fru_area(intf, fru, id, last_off, sizeof(*h), fru_data) < 0) {
+			break;
+		}
+
+		if (h->len && read_fru_area(intf, fru, id,
+				last_off + sizeof(*h), h->len, fru_data + sizeof(*h)) < 0) {
+			break;
+		}
+
+		last_off += h->len + sizeof(*h);
+
+		switch (h->type) {
+		case FRU_RECORD_TYPE_POWER_SUPPLY_INFORMATION:
+			ps = (struct fru_multirec_powersupply *)
+				(fru_data + sizeof(struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+			ps->capacity      = BSWAP_16(ps->capacity);
+			ps->peak_va    = BSWAP_16(ps->peak_va);
+			ps->lowend_input1 = BSWAP_16(ps->lowend_input1);
+			ps->highend_input1   = BSWAP_16(ps->highend_input1);
+			ps->lowend_input2 = BSWAP_16(ps->lowend_input2);
+			ps->highend_input2   = BSWAP_16(ps->highend_input2);
+			ps->combined_capacity   = BSWAP_16(ps->combined_capacity);
+			ps->peak_cap_ht      = BSWAP_16(ps->peak_cap_ht);
+#endif
+			peak_hold_up_time = (ps->peak_cap_ht & 0xf000) >> 12;
+			peak_capacity     = ps->peak_cap_ht & 0x0fff;
+
+			printf (" Power Supply Record\n");
+			printf ("  Capacity                   : %d W\n",
+				ps->capacity);
+			printf ("  Peak VA                    : %d VA\n",
+				ps->peak_va);
+			printf ("  Inrush Current             : %d A\n",
+				ps->inrush_current);
+			printf ("  Inrush Interval            : %d ms\n",
+				ps->inrush_interval);
+			printf ("  Input Voltage Range 1      : %d-%d V\n",
+				ps->lowend_input1 / 100, ps->highend_input1 / 100);
+			printf ("  Input Voltage Range 2      : %d-%d V\n",
+				ps->lowend_input2 / 100, ps->highend_input2 / 100);
+			printf ("  Input Frequency Range      : %d-%d Hz\n",
+				ps->lowend_freq, ps->highend_freq);
+			printf ("  A/C Dropout Tolerance      : %d ms\n",
+				ps->dropout_tolerance);
+			printf ("  Flags                      : %s%s%s%s%s\n",
+				ps->predictive_fail ? "'Predictive fail' " : "",
+				ps->pfc ? "'Power factor correction' " : "",
+				ps->autoswitch ? "'Autoswitch voltage' " : "",
+				ps->hotswap ? "'Hot swap' " : "",
+				ps->predictive_fail ? ps->rps_threshold ?
+				ps->tach ? "'Two pulses per rotation'" : "'One pulse per rotation'" :
+				ps->tach ? "'Failure on pin de-assertion'" : "'Failure on pin assertion'" : "");
+			printf ("  Peak capacity              : %d W\n",
+				peak_capacity);
+			printf ("  Peak capacity holdup       : %d s\n",
+				peak_hold_up_time);
+			if (ps->combined_capacity == 0)
+				printf ("  Combined capacity          : not specified\n");
+			else
+				printf ("  Combined capacity          : %d W (%s and %s)\n",
+					ps->combined_capacity,
+					combined_voltage_desc [ps->combined_voltage1],
+					combined_voltage_desc [ps->combined_voltage2]);
+			if (ps->predictive_fail)
+				printf ("  Fan lower threshold        : %d RPS\n",
+					ps->rps_threshold);
+			break;
+
+		case FRU_RECORD_TYPE_DC_OUTPUT:
+			dc = (struct fru_multirec_dcoutput *)
+				(fru_data + sizeof(struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+			dc->nominal_voltage  = BSWAP_16(dc->nominal_voltage);
+			dc->max_neg_dev      = BSWAP_16(dc->max_neg_dev);
+			dc->max_pos_dev      = BSWAP_16(dc->max_pos_dev);
+			dc->ripple_and_noise = BSWAP_16(dc->ripple_and_noise);
+			dc->min_current      = BSWAP_16(dc->min_current);
+			dc->max_current      = BSWAP_16(dc->max_current);
+#endif
+
+			printf (" DC Output Record\n");
+			printf ("  Output Number              : %d\n",
+				dc->output_number);
+			printf ("  Standby power              : %s\n",
+				dc->standby ? "Yes" : "No");
+			printf ("  Nominal voltage            : %.2f V\n",
+				(double) dc->nominal_voltage / 100);
+			printf ("  Max negative deviation     : %.2f V\n",
+				(double) dc->max_neg_dev / 100);
+			printf ("  Max positive deviation     : %.2f V\n",
+				(double) dc->max_pos_dev / 100);
+			printf ("  Ripple and noise pk-pk     : %d mV\n",
+				dc->ripple_and_noise);
+			printf ("  Minimum current draw       : %.3f A\n",
+				(double) dc->min_current / 1000);
+			printf ("  Maximum current draw       : %.3f A\n",
+				(double) dc->max_current / 1000);
+			break;
+
+		case FRU_RECORD_TYPE_DC_LOAD:
+			dl = (struct fru_multirec_dcload *)
+				(fru_data + sizeof(struct fru_multirec_header));
+
+#if WORDS_BIGENDIAN
+			dl->nominal_voltage  = BSWAP_16(dl->nominal_voltage);
+			dl->min_voltage      = BSWAP_16(dl->min_voltage);
+			dl->max_voltage      = BSWAP_16(dl->max_voltage);
+			dl->ripple_and_noise = BSWAP_16(dl->ripple_and_noise);
+			dl->min_current      = BSWAP_16(dl->min_current);
+			dl->max_current      = BSWAP_16(dl->max_current);
+#endif
+
+			printf (" DC Load Record\n");
+			printf ("  Output Number              : %d\n",
+				dl->output_number);
+			printf ("  Nominal voltage            : %.2f V\n",
+				(double) dl->nominal_voltage / 100);
+			printf ("  Min voltage allowed        : %.2f V\n",
+				(double) dl->min_voltage / 100);
+			printf ("  Max voltage allowed        : %.2f V\n",
+				(double) dl->max_voltage / 100);
+			printf ("  Ripple and noise pk-pk     : %d mV\n",
+				dl->ripple_and_noise);
+			printf ("  Minimum current load       : %.3f A\n",
+				(double) dl->min_current / 1000);
+			printf ("  Maximum current load       : %.3f A\n",
+				(double) dl->max_current / 1000);
+			break;
+		case FRU_RECORD_TYPE_OEM_EXTENSION:
+			{
+				struct fru_multirec_oem_header *oh=(struct fru_multirec_oem_header *)
+										&fru_data[sizeof(struct fru_multirec_header)];
+				uint32_t iana = oh->mfg_id[0] | oh->mfg_id[1]<<8 | oh->mfg_id[2]<<16;
+
+				/* Now makes sure this is really PICMG record */
+
+				if( iana == IPMI_OEM_PICMG ){
+					printf("  PICMG Extension Record\n");
+					ipmi_fru_picmg_ext_print(fru_data,
+													sizeof(struct fru_multirec_header),
+													h->len);
+				}
+				/* FIXME: Add OEM record support here */
+				else{
+					printf("  OEM (%s) Record\n", val2str( iana, ipmi_oem_info));
+				}
+			}
+			break;
+		}
+	} while (!(h->format & 0x80));
+
+	lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)", last_off, last_off);
+
+	free(fru_data);
+}
+
+/* ipmi_fru_query_new_value  -  Query new values to replace original FRU content
+*
+* @data:   FRU data
+* @offset: offset of the bytes to be modified in data
+* @len:    size of the modified data
+*
+* returns : TRUE if data changed
+* returns : FALSE if data not changed
+*/
+int ipmi_fru_query_new_value(uint8_t *data,int offset, size_t len)
+{
+	int status=FALSE;
+	int ret;
+	char answer;
+
+	printf("Would you like to change this value <y/n> ? ");
+	ret = scanf("%c", &answer);
+	if (ret != 1) {
+		return FALSE;
+	}
+
+	if( answer == 'y' || answer == 'Y' ){
+		int i;
+		unsigned int *holder;
+
+		holder = malloc(len);
+		printf(
+		 "Enter hex values for each of the %d entries (lsb first), "
+		 "hit <enter> between entries\n", (int)len);
+
+		/* I can't assign scanf' %x into a single char */
+		for( i=0;i<len;i++ ){
+			ret = scanf("%x", holder+i);
+			if (ret != 1) {
+				free(holder);
+				return FALSE;
+			}
+		}
+		for( i=0;i<len;i++ ){
+			data[offset++] = (unsigned char) *(holder+i);
+		}
+		/* &data[offset++] */
+		free(holder);
+		holder = NULL;
+		status = TRUE;
+	}
+	else{
+		printf("Entered %c\n",answer);
+	}
+
+	return status;
+}
+
+/* ipmi_fru_oemkontron_edit  -
+*  Query new values to replace original FRU content
+*  This is a generic enough to support any type of 'OEM' record
+*  because the user supplies 'IANA number' , 'record Id' and 'record' version'
+*
+* However, the parser must have 'apriori' knowledge of the record format
+* The currently supported record is :
+*
+*    IANA          : 15000  (Kontron)
+*    RECORD ID     : 3
+*    RECORD VERSION: 0 (or 1)
+*
+* I would have like to put that stuff in an OEM specific file, but apart for
+* the record format information, all commands are really standard 'FRU' command
+*
+*
+* @data:   FRU data
+* @offset: start of the current multi record (start of header)
+* @len:    len of the current record (excluding header)
+* @h:      pointer to record header
+* @oh:     pointer to OEM /PICMG header
+*
+* returns: TRUE if data changed
+* returns: FALSE if data not changed
+*/
+#define OEM_KONTRON_INFORMATION_RECORD 3
+
+#define EDIT_OEM_KONTRON_COMPLETE_ARG_COUNT    12
+#define GET_OEM_KONTRON_COMPLETE_ARG_COUNT     5
+/*
+./src/ipmitool  fru edit 0
+oem 15000 3 0 name instance FIELD1 FIELD2 FIELD3 crc32
+*/
+
+#define OEM_KONTRON_SUBCOMMAND_ARG_POS   2
+#define OEM_KONTRON_IANA_ARG_POS         3
+#define OEM_KONTRON_RECORDID_ARG_POS     4
+#define OEM_KONTRON_FORMAT_ARG_POS       5
+#define OEM_KONTRON_NAME_ARG_POS         6
+#define OEM_KONTRON_INSTANCE_ARG_POS     7
+#define OEM_KONTRON_VERSION_ARG_POS      8
+#define OEM_KONTRON_BUILDDATE_ARG_POS    9
+#define OEM_KONTRON_UPDATEDATE_ARG_POS   10
+#define OEM_KONTRON_CRC32_ARG_POS        11
+
+#define OEM_KONTRON_FIELD_SIZE          8
+#define OEM_KONTRON_VERSION_FIELD_SIZE 10
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+typedef struct OemKontronInformationRecordV0{
+	uint8_t field1TypeLength;
+	uint8_t field1[OEM_KONTRON_FIELD_SIZE];
+	uint8_t field2TypeLength;
+	uint8_t field2[OEM_KONTRON_FIELD_SIZE];
+	uint8_t field3TypeLength;
+	uint8_t field3[OEM_KONTRON_FIELD_SIZE];
+	uint8_t crcTypeLength;
+	uint8_t crc32[OEM_KONTRON_FIELD_SIZE];
+}tOemKontronInformationRecordV0;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+typedef struct OemKontronInformationRecordV1{
+	uint8_t field1TypeLength;
+	uint8_t field1[OEM_KONTRON_VERSION_FIELD_SIZE];
+	uint8_t field2TypeLength;
+	uint8_t field2[OEM_KONTRON_FIELD_SIZE];
+	uint8_t field3TypeLength;
+	uint8_t field3[OEM_KONTRON_FIELD_SIZE];
+	uint8_t crcTypeLength;
+	uint8_t crc32[OEM_KONTRON_FIELD_SIZE];
+}tOemKontronInformationRecordV1;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+/*
+./src/ipmitool  fru get 0 oem iana 3
+
+*/
+
+static void ipmi_fru_oemkontron_get( int argc, char ** argv,uint8_t * fru_data,
+												int off,int len,
+												struct fru_multirec_header *h,
+												struct fru_multirec_oem_header *oh)
+{
+	static int badParams=FALSE;
+	int start = off;
+	int offset = start;
+	offset += sizeof(struct fru_multirec_oem_header);
+
+	if(!badParams){
+		/* the 'OEM' field is already checked in caller */
+		if( argc > OEM_KONTRON_SUBCOMMAND_ARG_POS ){
+			if(strncmp("oem", argv[OEM_KONTRON_SUBCOMMAND_ARG_POS],3)){
+				printf("usage: fru get <id> <oem>\n");
+				badParams = TRUE;
+				return;
+			}
+		}
+		if( argc<GET_OEM_KONTRON_COMPLETE_ARG_COUNT ){
+			printf("usage: oem <iana> <recordid>\n");
+			printf("usage: oem 15000 3\n");
+			badParams = TRUE;
+			return;
+		}
+	}
+
+	if(!badParams){
+
+		if(oh->record_id == OEM_KONTRON_INFORMATION_RECORD ) {
+
+			uint8_t version;
+
+			printf("Kontron OEM Information Record\n");
+			version = oh->record_version;
+
+			uint8_t blockCount;
+			uint8_t blockIndex=0;
+
+			unsigned int matchInstance = 0;
+			uint8_t instance = 0;
+			
+			if (str2uchar(argv[OEM_KONTRON_INSTANCE_ARG_POS], &instance) != 0) {
+				lprintf(LOG_ERR,
+						"Instance argument '%s' is either invalid or out of range.",
+						argv[OEM_KONTRON_INSTANCE_ARG_POS]);
+				badParams = TRUE;
+				return;
+			}
+
+			blockCount = fru_data[offset++];
+
+			for(blockIndex=0;blockIndex<blockCount;blockIndex++){
+				void * pRecordData;
+				uint8_t nameLen;
+
+				nameLen = ( fru_data[offset++] &= 0x3F );
+				printf("  Name: %*.*s\n",nameLen, nameLen, (const char *)(fru_data+offset));
+
+				offset+=nameLen;
+
+				pRecordData = &fru_data[offset];
+
+				printf("  Record Version: %d\n", version);
+				if( version == 0 )
+				{
+					printf("  Version: %*.*s\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV0 *) pRecordData)->field1);
+					printf("  Build Date: %*.*s\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV0 *) pRecordData)->field2);
+					printf("  Update Date: %*.*s\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV0 *) pRecordData)->field3);
+					printf("  Checksum: %*.*s\n\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV0 *) pRecordData)->crc32);
+					matchInstance++;
+					offset+= sizeof(tOemKontronInformationRecordV0);
+					offset++;
+				}
+				else if ( version == 1 )
+				{
+					printf("  Version: %*.*s\n",
+						OEM_KONTRON_VERSION_FIELD_SIZE,
+						OEM_KONTRON_VERSION_FIELD_SIZE,
+						((tOemKontronInformationRecordV1 *) pRecordData)->field1);
+					printf("  Build Date: %*.*s\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV1 *) pRecordData)->field2);
+					printf("  Update Date: %*.*s\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV1 *) pRecordData)->field3);
+					printf("  Checksum: %*.*s\n\n",
+						OEM_KONTRON_FIELD_SIZE,
+						OEM_KONTRON_FIELD_SIZE,
+						((tOemKontronInformationRecordV1 *) pRecordData)->crc32);
+					matchInstance++;
+					offset+= sizeof(tOemKontronInformationRecordV1);
+					offset++;
+				}
+				else
+				{
+					printf ("  Unsupported version %d\n",version);
+				}
+			}
+		}
+	}
+}
+
+static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
+												int off,int len,
+												struct fru_multirec_header *h,
+												struct fru_multirec_oem_header *oh)
+{
+	static int badParams=FALSE;
+	int hasChanged = FALSE;
+	int start = off;
+	int offset = start;
+	int length = len;
+	int i;
+	uint8_t record_id = 0;
+	offset += sizeof(struct fru_multirec_oem_header);
+
+	if(!badParams){
+		/* the 'OEM' field is already checked in caller */
+		if( argc > OEM_KONTRON_SUBCOMMAND_ARG_POS ){
+			if(strncmp("oem", argv[OEM_KONTRON_SUBCOMMAND_ARG_POS],3)){
+				printf("usage: fru edit <id> <oem> <args...>\n");
+				badParams = TRUE;
+				return hasChanged;
+			}
+		}
+		if( argc<EDIT_OEM_KONTRON_COMPLETE_ARG_COUNT ){
+			printf("usage: oem <iana> <recordid> <format> <args...>\n");
+			printf("usage: oem 15000 3 0 <name> <instance> <field1>"\
+					" <field2> <field3> <crc32>\n");
+			badParams = TRUE;
+			return hasChanged;
+		}
+		if (str2uchar(argv[OEM_KONTRON_RECORDID_ARG_POS], &record_id) != 0) {
+			lprintf(LOG_ERR,
+					"Record ID argument '%s' is either invalid or out of range.",
+					argv[OEM_KONTRON_RECORDID_ARG_POS]);
+			badParams = TRUE;
+			return hasChanged;
+		}
+		if (record_id == OEM_KONTRON_INFORMATION_RECORD) {
+			for(i=OEM_KONTRON_VERSION_ARG_POS;i<=OEM_KONTRON_CRC32_ARG_POS;i++){
+				if( (strlen(argv[i]) != OEM_KONTRON_FIELD_SIZE) &&
+					(strlen(argv[i]) != OEM_KONTRON_VERSION_FIELD_SIZE)) {
+					printf("error: version fields must have %d characters\n",
+										OEM_KONTRON_FIELD_SIZE);
+					badParams = TRUE;
+					return hasChanged;
+				}
+			}
+		}
+	}
+
+	if(!badParams){
+
+		if(oh->record_id == OEM_KONTRON_INFORMATION_RECORD ) {
+			uint8_t formatVersion = 0;
+			uint8_t version;
+
+			if (str2uchar(argv[OEM_KONTRON_FORMAT_ARG_POS], &formatVersion) != 0) {
+				lprintf(LOG_ERR,
+						"Format argument '%s' is either invalid or out of range.",
+						argv[OEM_KONTRON_FORMAT_ARG_POS]);
+				badParams = TRUE;
+				return hasChanged;
+			}
+
+			printf("   Kontron OEM Information Record\n");
+			version = oh->record_version;
+
+			if( version == formatVersion  ){
+				uint8_t blockCount;
+				uint8_t blockIndex=0;
+
+				uint8_t matchInstance = 0;
+				uint8_t instance = 0;
+				
+				if (str2uchar(argv[OEM_KONTRON_INSTANCE_ARG_POS], &instance) != 0) {
+					lprintf(LOG_ERR,
+							"Instance argument '%s' is either invalid or out of range.",
+							argv[OEM_KONTRON_INSTANCE_ARG_POS]);
+					badParams = TRUE;
+					return hasChanged;
+				}
+
+				blockCount = fru_data[offset++];
+				printf("   blockCount: %d\n",blockCount);
+
+				for(blockIndex=0;blockIndex<blockCount;blockIndex++){
+					void * pRecordData;
+					uint8_t nameLen;
+
+					nameLen = ( fru_data[offset++] & 0x3F );
+
+					if( version == 0 || version == 1 )
+					{
+						if(!strncmp((char *)argv[OEM_KONTRON_NAME_ARG_POS],
+						(const char *)(fru_data+offset),nameLen)&& (matchInstance == instance)){
+
+							printf ("Found : %s\n",argv[OEM_KONTRON_NAME_ARG_POS]);
+							offset+=nameLen;
+
+							pRecordData =  &fru_data[offset];
+
+							if( version == 0 )
+							{
+								memcpy( ((tOemKontronInformationRecordV0 *)
+															pRecordData)->field1 ,
+								argv[OEM_KONTRON_VERSION_ARG_POS] ,
+								OEM_KONTRON_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV0 *)
+															pRecordData)->field2 ,
+								argv[OEM_KONTRON_BUILDDATE_ARG_POS],
+								OEM_KONTRON_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV0 *)
+															pRecordData)->field3 ,
+								argv[OEM_KONTRON_UPDATEDATE_ARG_POS],
+								OEM_KONTRON_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV0 *)
+															pRecordData)->crc32 ,
+							argv[OEM_KONTRON_CRC32_ARG_POS] ,
+							OEM_KONTRON_FIELD_SIZE);
+							}
+							else
+							{
+								memcpy( ((tOemKontronInformationRecordV1 *)
+															pRecordData)->field1 ,
+								argv[OEM_KONTRON_VERSION_ARG_POS] ,
+								OEM_KONTRON_VERSION_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV1 *)
+															pRecordData)->field2 ,
+								argv[OEM_KONTRON_BUILDDATE_ARG_POS],
+								OEM_KONTRON_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV1 *)
+															pRecordData)->field3 ,
+								argv[OEM_KONTRON_UPDATEDATE_ARG_POS],
+								OEM_KONTRON_FIELD_SIZE);
+								memcpy( ((tOemKontronInformationRecordV1 *)
+															pRecordData)->crc32 ,
+							argv[OEM_KONTRON_CRC32_ARG_POS] ,
+							OEM_KONTRON_FIELD_SIZE);
+							}
+
+							matchInstance++;
+							hasChanged = TRUE;
+						}
+						else if(!strncmp((char *)argv[OEM_KONTRON_NAME_ARG_POS],
+							(const char *)(fru_data+offset), nameLen)){
+							printf ("Skipped : %s  [instance %d]\n",argv[OEM_KONTRON_NAME_ARG_POS],
+									(unsigned int)matchInstance);
+							matchInstance++;
+							offset+=nameLen;
+						}
+						else {
+							offset+=nameLen;
+						}
+
+						if( version == 0 )
+						{
+							offset+= sizeof(tOemKontronInformationRecordV0);
+						}
+						else
+						{
+							offset+= sizeof(tOemKontronInformationRecordV1);
+						}
+						offset++;
+					}
+					else
+					{
+						printf ("  Unsupported version %d\n",version);
+					}
+				}
+			}
+			else{
+				printf("   Version: %d\n",version);
+			}
+		}
+		if( hasChanged ){
+
+			uint8_t record_checksum =0;
+			uint8_t header_checksum =0;
+			int index;
+
+			lprintf(LOG_DEBUG,"Initial record checksum : %x",h->record_checksum);
+			lprintf(LOG_DEBUG,"Initial header checksum : %x",h->header_checksum);
+			for(index=0;index<length;index++){
+				record_checksum+=  fru_data[start+index];
+			}
+			/* Update Record checksum */
+			h->record_checksum =  ~record_checksum + 1;
+
+
+			for(index=0;index<(sizeof(struct fru_multirec_header) -1);index++){
+				uint8_t data= *( (uint8_t *)h+ index);
+				header_checksum+=data;
+			}
+			/* Update header checksum */
+			h->header_checksum =  ~header_checksum + 1;
+
+			lprintf(LOG_DEBUG,"Final record checksum : %x",h->record_checksum);
+			lprintf(LOG_DEBUG,"Final header checksum : %x",h->header_checksum);
+
+			/* write back data */
+		}
+	}
+
+	return hasChanged;
+}
+
+/* ipmi_fru_picmg_ext_edit  -  Query new values to replace original FRU content
+*
+* @data:   FRU data
+* @offset: start of the current multi record (start of header)
+* @len:    len of the current record (excluding header)
+* @h:      pointer to record header
+* @oh:     pointer to OEM /PICMG header
+*
+* returns: TRUE if data changed
+* returns: FALSE if data not changed
+*/
+static int ipmi_fru_picmg_ext_edit(uint8_t * fru_data,
+												int off,int len,
+												struct fru_multirec_header *h,
+												struct fru_multirec_oem_header *oh)
+{
+	int hasChanged = FALSE;
+	int start = off;
+	int offset = start;
+	int length = len;
+	offset += sizeof(struct fru_multirec_oem_header);
+
+	switch (oh->record_id)
+	{
+		case FRU_AMC_ACTIVATION:
+			printf("    FRU_AMC_ACTIVATION\n");
+			{
+				int index=offset;
+				uint16_t max_current;
+
+				max_current = fru_data[offset];
+				max_current |= fru_data[++offset]<<8;
+
+				printf("      Maximum Internal Current(@12V): %.2f A (0x%02x)\n",
+								(float)max_current / 10.0f, max_current);
+
+				if( ipmi_fru_query_new_value(fru_data,index,2) ){
+					max_current = fru_data[index];
+					max_current |= fru_data[++index]<<8;
+					printf("      New Maximum Internal Current(@12V): %.2f A (0x%02x)\n",
+								(float)max_current / 10.0f, max_current);
+					hasChanged = TRUE;
+
+				}
+
+				printf("      Module Activation Readiness:       %i sec.\n", fru_data[++offset]);
+				printf("      Descriptor Count: %i\n", fru_data[++offset]);
+				printf("\n");
+
+				for (++offset;
+					offset < (off + length);
+					offset += sizeof(struct fru_picmgext_activation_record)) {
+					struct fru_picmgext_activation_record * a =
+						(struct fru_picmgext_activation_record *) &fru_data[offset];
+
+					printf("        IPMB-Address:         0x%x\n", a->ibmb_addr);
+					printf("        Max. Module Current:  %.2f A\n", (float)a->max_module_curr / 10.0f);
+
+					printf("\n");
+				}
+			}
+			break;
+
+		case FRU_AMC_CURRENT:
+			printf("    FRU_AMC_CURRENT\n");
+			{
+				int index=offset;
+				unsigned char current;
+
+				current = fru_data[index];
+
+				printf("      Current draw(@12V): %.2f A (0x%02x)\n",
+								(float)current / 10.0f, current);
+
+				if( ipmi_fru_query_new_value(fru_data, index, 1) ){
+					current = fru_data[index];
+
+					printf("      New Current draw(@12V): %.2f A (0x%02x)\n",
+								(float)current / 10.0f, current);
+					hasChanged = TRUE;
+				}
+			}
+			break;
+	}
+
+	if( hasChanged ){
+
+		uint8_t record_checksum =0;
+		uint8_t header_checksum =0;
+		int index;
+
+		lprintf(LOG_DEBUG,"Initial record checksum : %x",h->record_checksum);
+		lprintf(LOG_DEBUG,"Initial header checksum : %x",h->header_checksum);
+		for(index=0;index<length;index++){
+			record_checksum+=  fru_data[start+index];
+		}
+		/* Update Record checksum */
+		h->record_checksum =  ~record_checksum + 1;
+
+
+		for(index=0;index<(sizeof(struct fru_multirec_header) -1);index++){
+			uint8_t data= *( (uint8_t *)h+ index);
+			header_checksum+=data;
+		}
+		/* Update header checksum */
+		h->header_checksum =  ~header_checksum + 1;
+
+		lprintf(LOG_DEBUG,"Final record checksum : %x",h->record_checksum);
+		lprintf(LOG_DEBUG,"Final header checksum : %x",h->header_checksum);
+
+		/* write back data */
+	}
+
+	return hasChanged;
+}
+
+/* ipmi_fru_picmg_ext_print  - prints OEM fru record (PICMG)
+*
+* @fru_data:  FRU data
+* @offset:    offset of the bytes to be modified in data
+* @length:    size of the record
+*
+* returns : n/a
+*/
+static void ipmi_fru_picmg_ext_print(uint8_t * fru_data, int off, int length)
+{
+	struct fru_multirec_oem_header *h;
+	int guid_count;
+	int offset = off;
+	int start_offset = off;
+	int i;
+
+	h = (struct fru_multirec_oem_header *) &fru_data[offset];
+	offset += sizeof(struct fru_multirec_oem_header);
+
+	switch (h->record_id)
+	{
+		case FRU_PICMG_BACKPLANE_P2P:
+		{
+			uint8_t index;
+			unsigned int data;
+			struct fru_picmgext_slot_desc *slot_d;
+
+			slot_d =
+				(struct fru_picmgext_slot_desc*)&fru_data[offset];
+			offset += sizeof(struct fru_picmgext_slot_desc);
+			printf("    FRU_PICMG_BACKPLANE_P2P\n");
+
+			while (offset <= (start_offset+length)) {
+				printf("\n");
+				printf("    Channel Type:  ");
+				switch (slot_d->chan_type)
+				{
+					case 0x00:
+					case 0x07:
+						printf("PICMG 2.9\n");
+						break;
+					case 0x08:
+						printf("Single Port Fabric IF\n");
+						break;
+					case 0x09:
+						printf("Double Port Fabric IF\n");
+						break;
+					case 0x0a:
+						printf("Full Channel Fabric IF\n");
+						break;
+					case 0x0b:
+						printf("Base IF\n");
+						break;
+					case 0x0c:
+						printf("Update Channel IF\n");
+						break;
+					case 0x0d:
+						printf("ShMC Cross Connect\n");
+						break;
+					default:
+						printf("Unknown IF (0x%x)\n",
+								slot_d->chan_type);
+						break;
+				}
+				printf("    Slot Addr.   : %02x\n",
+						slot_d->slot_addr );
+				printf("    Channel Count: %i\n",
+						slot_d->chn_count);
+
+				for (index = 0;
+						index < (slot_d->chn_count);
+						index++) {
+					struct fru_picmgext_chn_desc *d;
+					data = (fru_data[offset+0]) |
+						(fru_data[offset+1] << 8) |
+						(fru_data[offset+2] << 16);
+					d = (struct fru_picmgext_chn_desc *)&data;
+					if (verbose) {
+						printf( "       "
+								"Chn: %02x  ->  "
+								"Chn: %02x in "
+								"Slot: %02x\n",
+								d->local_chn,
+								d->remote_chn,
+								d->remote_slot);
+					}
+					offset += FRU_PICMGEXT_CHN_DESC_RECORD_SIZE;
+				}
+				slot_d = (struct fru_picmgext_slot_desc*)&fru_data[offset];
+				offset += sizeof(struct fru_picmgext_slot_desc);
+			}
+		}
+		break;
+
+		case FRU_PICMG_ADDRESS_TABLE:
+		{
+			unsigned int hwaddr;
+			unsigned int sitetype;
+			unsigned int sitenum;
+			unsigned int entries;
+			unsigned int i;
+			char *picmg_site_type_strings[] = {
+					"AdvancedTCA Board",
+					"Power Entry",
+					"Shelf FRU Information",
+					"Dedicated ShMC",
+					"Fan Tray",
+					"Fan Filter Tray",
+					"Alarm",
+					"AdvancedMC Module",
+					"PMC",
+					"Rear Transition Module"};
+
+
+			printf("    FRU_PICMG_ADDRESS_TABLE\n");
+			printf("      Type/Len:  0x%02x\n", fru_data[offset++]);
+			printf("      Shelf Addr: ");
+			for (i=0;i<20;i++) {
+				printf("0x%02x ", fru_data[offset++]);
+			}
+			printf("\n");
+
+			entries = fru_data[offset++];
+			printf("      Addr Table Entries: 0x%02x\n", entries);
+
+			for (i=0; i<entries; i++) {
+				hwaddr = fru_data[offset];
+				sitenum = fru_data[offset + 1];
+				sitetype = fru_data[offset + 2];
+				printf(
+						"        HWAddr: 0x%02x (0x%02x) SiteNum: %d SiteType: 0x%02x %s\n",
+						hwaddr, hwaddr * 2,
+						sitenum, sitetype,
+						(sitetype < 0xa) ?
+						picmg_site_type_strings[sitetype] :
+						"Reserved");
+				offset += 3;
+			}
+		}
+		break;
+
+		case FRU_PICMG_SHELF_POWER_DIST:
+		{
+			unsigned int entries;
+			unsigned int feeds;
+			unsigned int hwaddr;
+			unsigned int i;
+			unsigned int id;
+			unsigned int j;
+			unsigned int maxext;
+			unsigned int maxint;
+			unsigned int minexp;
+
+			printf("    FRU_PICMG_SHELF_POWER_DIST\n");
+
+			feeds = fru_data[offset++];
+			printf("      Number of Power Feeds:   0x%02x\n",
+					feeds);
+
+			for (i=0; i<feeds; i++) {
+				printf("    Feed %d:\n", i);
+				maxext = fru_data[offset] |
+					(fru_data[offset+1] << 8);
+				offset += 2;
+				maxint = fru_data[offset] |
+					(fru_data[offset+1] << 8);
+				offset += 2;
+				minexp = fru_data[offset];
+				offset += 1;
+				entries = fru_data[offset];
+				offset += 1;
+
+				printf(
+						"      Max External Current:   %d.%d Amps (0x%04x)\n",
+						maxext / 10, maxext % 10, maxext);
+				if (maxint < 0xffff) {
+					printf(
+							"      Max Internal Current:   %d.%d Amps (0x%04x)\n",
+							maxint / 10, maxint % 10,
+							maxint);
+				} else {
+					printf(
+							"      Max Internal Current:   Not Specified\n");
+				}
+
+				if (minexp >= 0x48 && minexp <= 0x90) {
+					printf(
+							"      Min Expected Voltage:   -%02d.%dV\n",
+							minexp / 2, (minexp % 2) * 5);
+				} else {
+					printf(
+							"      Min Expected Voltage:   -%dV (actual invalid value 0x%x)\n",
+							36, minexp);
+				}
+				for (j=0; j < entries; j++) {
+					hwaddr = fru_data[offset++];
+					id = fru_data[offset++];
+					printf(
+							"        FRU HW Addr: 0x%02x (0x%02x)",
+							hwaddr, hwaddr * 2);
+					printf(
+							"   FRU ID: 0x%02x\n",
+							id);
+				}
+			}
+		}
+		break;
+
+		case FRU_PICMG_SHELF_ACTIVATION:
+		{
+			unsigned int i;
+			unsigned int count = 0;
+
+			printf("    FRU_PICMG_SHELF_ACTIVATION\n");
+			printf(
+					"      Allowance for FRU Act Readiness:   0x%02x\n",
+					fru_data[offset++]);
+
+			count = fru_data[offset++];
+			printf(
+					"      FRU activation and Power Desc Cnt: 0x%02x\n",
+					count);
+
+			for (i=0; i<count; i++) {
+				printf("         HW Addr: 0x%02x ",
+						fru_data[offset++]);
+				printf("         FRU ID: 0x%02x ",
+						fru_data[offset++]);
+				printf("         Max FRU Power: 0x%04x ",
+						fru_data[offset+0] |
+						(fru_data[offset+1]<<8));
+				offset += 2;
+				printf("         Config: 0x%02x \n",
+						fru_data[offset++]);
+			}
+		}
+		break;
+
+		case FRU_PICMG_SHMC_IP_CONN:
+			printf("    FRU_PICMG_SHMC_IP_CONN\n");
+			break;
+
+		case FRU_PICMG_BOARD_P2P:
+			printf("    FRU_PICMG_BOARD_P2P\n");
+
+			guid_count = fru_data[offset++];
+			printf("      GUID count: %2d\n", guid_count);
+			for (i = 0 ; i < guid_count; i++ ) {
+				int j;
+				printf("        GUID [%2d]: 0x", i);
+
+				for (j=0; j < sizeof(struct fru_picmgext_guid);
+						j++) {
+					printf("%02x", fru_data[offset+j]);
+				}
+
+				printf("\n");
+				offset += sizeof(struct fru_picmgext_guid);
+			}
+			printf("\n");
+
+			for (; offset < off + length;
+					offset += sizeof(struct fru_picmgext_link_desc)) {
+
+				/* to solve little endian /big endian problem */
+				struct fru_picmgext_link_desc *d;
+				unsigned int data = (fru_data[offset+0]) |
+					(fru_data[offset+1] << 8) |
+					(fru_data[offset+2] << 16) |
+					(fru_data[offset+3] << 24);
+				d = (struct fru_picmgext_link_desc *) &data;
+
+				printf("      Link Grouping ID:     0x%02x\n",
+						d->grouping);
+				printf("      Link Type Extension:  0x%02x - ",
+						d->ext);
+				if (d->type == FRU_PICMGEXT_LINK_TYPE_BASE) {
+					switch (d->ext) {
+						case 0:
+							printf("10/100/1000BASE-T Link (four-pair)\n");
+							break;
+						case 1:
+							printf("ShMC Cross-connect (two-pair)\n");
+							break;
+						default:
+							printf("Unknown\n");
+							break;
+					}
+				} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET) {
+					switch (d->ext) {
+						case 0:
+							printf("1000Base-BX\n");
+							break;
+						case 1:
+							printf("10GBase-BX4 [XAUI]\n");
+							break;
+						case 2:
+							printf("FC-PI\n");
+							break;
+						case 3:
+							printf("1000Base-KX\n");
+							break;
+						case 4:
+							printf("10GBase-KX4\n");
+							break;
+						default:
+							printf("Unknown\n");
+							break;
+					}
+				} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET_10GBD) {
+					switch (d->ext) {
+						case 0:
+							printf("10GBase-KR\n");
+							break;
+						case 1:
+							printf("40GBase-KR4\n");
+							break;
+						default:
+							printf("Unknown\n");
+							break;
+					}
+				} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND) {
+					printf("Unknown\n");
+				} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR) {
+					printf("Unknown\n");
+				} else if (d->type == FRU_PICMGEXT_LINK_TYPE_PCIE) {
+					printf("Unknown\n");
+				} else {
+					printf("Unknown\n");
+				}
+
+				printf("      Link Type:            0x%02x - ",
+						d->type);
+				switch (d->type) {
+					case FRU_PICMGEXT_LINK_TYPE_BASE:
+						printf("PICMG 3.0 Base Interface 10/100/1000\n");
+						break;
+					case FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET:
+						printf("PICMG 3.1 Ethernet Fabric Interface\n");
+						printf("                                   Base signaling Link Class\n");
+						break;
+					case FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND:
+						printf("PICMG 3.2 Infiniband Fabric Interface\n");
+						break;
+					case FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR:
+						printf("PICMG 3.3 Star Fabric Interface\n");
+						break;
+					case  FRU_PICMGEXT_LINK_TYPE_PCIE:
+						printf("PICMG 3.4 PCI Express Fabric Interface\n");
+						break;
+					case FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET_10GBD:
+						printf("PICMG 3.1 Ethernet Fabric Interface\n");
+						printf("                                   10.3125Gbd signaling Link Class\n");
+						break;
+					default:
+						if (d->type == 0 || d->type == 0xff) {
+							printf("Reserved\n");
+						} else if (d->type >= 0x06 && d->type <= 0xef) {
+							printf("Reserved\n");
+						} else if (d->type >= 0xf0 && d->type <= 0xfe) {
+							printf("OEM GUID Definition\n");
+						} else {
+							printf("Invalid\n");
+						}
+						break;
+				}
+				printf("      Link Designator: \n");
+				printf("        Port Flag:            0x%02x\n",
+						d->desig_port);
+				printf("        Interface:            0x%02x - ",
+						d->desig_if);
+				switch (d->desig_if) {
+					case FRU_PICMGEXT_DESIGN_IF_BASE:
+						printf("Base Interface\n");
+						break;
+					case FRU_PICMGEXT_DESIGN_IF_FABRIC:
+						printf("Fabric Interface\n");
+						break;
+					case FRU_PICMGEXT_DESIGN_IF_UPDATE_CHANNEL:
+						printf("Update Channel\n");
+						break;
+					case FRU_PICMGEXT_DESIGN_IF_RESERVED:
+						printf("Reserved\n");
+						break;
+					default:
+						printf("Invalid");
+						break;
+				}
+				printf("        Channel Number:       0x%02x\n",
+						d->desig_channel);
+				printf("\n");
+			}
+
+			break;
+
+		case FRU_AMC_CURRENT:
+		{
+			unsigned char current;
+			printf("    FRU_AMC_CURRENT\n");
+
+			current = fru_data[offset];
+			printf("      Current draw(@12V): %.2f A [ %.2f Watt ]\n",
+					(float)current / 10.0f,
+					(float)current / 10.0f * 12.0f);
+			printf("\n");
+		}
+		break;
+
+		case FRU_AMC_ACTIVATION:
+			printf("    FRU_AMC_ACTIVATION\n");
+			{
+				uint16_t max_current;
+
+				max_current = fru_data[offset];
+				max_current |= fru_data[++offset]<<8;
+				printf("      Maximum Internal Current(@12V): %.2f A [ %.2f Watt ]\n",
+						(float)max_current / 10.0f,
+						(float)max_current / 10.0f * 12.0f);
+
+				printf("      Module Activation Readiness:    %i sec.\n", fru_data[++offset]);
+				printf("      Descriptor Count: %i\n", fru_data[++offset]);
+				printf("\n");
+
+				for(++offset; offset < off + length;
+						offset += sizeof(struct fru_picmgext_activation_record))
+				{
+					struct fru_picmgext_activation_record *a;
+					a = (struct fru_picmgext_activation_record *)&fru_data[offset];
+					printf("        IPMB-Address:         0x%x\n",
+							a->ibmb_addr);
+					printf("        Max. Module Current:  %.2f A\n",
+							(float)a->max_module_curr / 10.0f);
+					printf("\n");
+				}
+			}
+			break;
+
+		case FRU_AMC_CARRIER_P2P:
+			{
+				uint16_t index;
+				printf("    FRU_CARRIER_P2P\n");
+				for(; offset < off + length; ) {
+					struct fru_picmgext_carrier_p2p_record * h =
+						(struct fru_picmgext_carrier_p2p_record *)&fru_data[offset];
+					printf("\n");
+					printf("      Resource ID:      %i",
+							(h->resource_id & 0x07));
+						printf("  Type: ");
+					if ((h->resource_id>>7) == 1) {
+						printf("AMC\n");
+					} else {
+						printf("Local\n");
+					}
+					printf("      Descriptor Count: %i\n",
+							h->p2p_count);
+					offset += sizeof(struct fru_picmgext_carrier_p2p_record);
+					for (index = 0; index < h->p2p_count; index++) {
+						/* to solve little endian /big endian problem */
+						unsigned char data[3];
+						struct fru_picmgext_carrier_p2p_descriptor * desc;
+# ifndef WORDS_BIGENDIAN
+						data[0] = fru_data[offset+0];
+						data[1] = fru_data[offset+1];
+						data[2] = fru_data[offset+2];
+# else
+						data[0] = fru_data[offset+2];
+						data[1] = fru_data[offset+1];
+						data[2] = fru_data[offset+0];
+# endif
+						desc = (struct fru_picmgext_carrier_p2p_descriptor*)&data;
+						printf("        Port: %02d\t->  Remote Port: %02d\t",
+								desc->local_port, desc->remote_port);
+						if ((desc->remote_resource_id >> 7) == 1) {
+							printf("[ AMC   ID: %02d ]\n",
+									desc->remote_resource_id & 0x0F);
+						} else {
+							printf("[ local ID: %02d ]\n",
+									desc->remote_resource_id & 0x0F);
+						}
+						offset += sizeof(struct fru_picmgext_carrier_p2p_descriptor);
+					}
+				}
+			}
+			break;
+
+		case FRU_AMC_P2P:
+			{
+				unsigned int index;
+				unsigned char channel_count;
+				struct fru_picmgext_amc_p2p_record * h;
+				printf("    FRU_AMC_P2P\n");
+				guid_count = fru_data[offset];
+				printf("      GUID count: %2d\n", guid_count);
+				for (i = 0 ; i < guid_count; i++) {
+					int j;
+					printf("        GUID %2d: ", i);
+					for (j=0; j < sizeof(struct fru_picmgext_guid);
+							j++) {
+						printf("%02x", fru_data[offset+j]);
+						offset += sizeof(struct fru_picmgext_guid);
+						printf("\n");
+					}
+					h = (struct fru_picmgext_amc_p2p_record *)&fru_data[++offset];
+					printf("      %s",
+							(h->record_type ?
+							 "AMC Module:" : "On-Carrier Device"));
+					printf("   Resource ID: %i\n", h->resource_id);
+					offset += sizeof(struct fru_picmgext_amc_p2p_record);
+					channel_count = fru_data[offset++];
+					printf("       Descriptor Count: %i\n",
+							channel_count);
+					for (index = 0; index < channel_count; index++) {
+						unsigned int data;
+						struct fru_picmgext_amc_channel_desc_record *d;
+						/* pack the data in little endian format.
+						 * Stupid intel...
+						 */
+						data = fru_data[offset] |
+							(fru_data[offset + 1] << 8) |
+							(fru_data[offset + 2] << 16);
+						d = (struct fru_picmgext_amc_channel_desc_record *)&data;
+						printf("        Lane 0 Port: %i\n",
+								d->lane0port);
+						printf("        Lane 1 Port: %i\n",
+								d->lane1port);
+						printf("        Lane 2 Port: %i\n",
+								d->lane2port);
+						printf("        Lane 3 Port: %i\n\n",
+								d->lane3port);
+						offset += FRU_PICMGEXT_AMC_CHANNEL_DESC_RECORD_SIZE;
+					}
+					for (; offset < off + length;) {
+						unsigned int data[2];
+						struct fru_picmgext_amc_link_desc_record *l;
+						l = (struct fru_picmgext_amc_link_desc_record *)&data[0];
+						data[0] = fru_data[offset] |
+							(fru_data[offset + 1] << 8) |
+							(fru_data[offset + 2] << 16) |
+							(fru_data[offset + 3] << 24);
+						data[1] = fru_data[offset + 4];
+						printf( "      Link Designator:  Channel ID: %i\n"
+								"            Port Flag 0: %s%s%s%s\n",
+								l->channel_id,
+								(l->port_flag_0)?"o":"-",
+								(l->port_flag_1)?"o":"-",
+								(l->port_flag_2)?"o":"-",
+								(l->port_flag_3)?"o":"-"  );
+						switch (l->type) {
+							case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE:
+								/* AMC.1 */
+								printf( "        Link Type:       %02x - "
+										"AMC.1 PCI Express\n", l->type);
+								switch (l->type_ext) {
+									case AMC_LINK_TYPE_EXT_PCIE_G1_NSSC:
+										printf( "        Link Type Ext:   %i - "
+												" Gen 1 capable - non SSC\n",
+												l->type_ext);
+									break;
+									case AMC_LINK_TYPE_EXT_PCIE_G1_SSC:
+										printf( "        Link Type Ext:   %i - "
+												" Gen 1 capable - SSC\n",
+												l->type_ext);
+										break;
+									case AMC_LINK_TYPE_EXT_PCIE_G2_NSSC:
+										printf( "        Link Type Ext:   %i - "
+												" Gen 2 capable - non SSC\n",
+												l->type_ext);
+										break;
+									case AMC_LINK_TYPE_EXT_PCIE_G2_SSC:
+										printf( "        Link Type Ext:   %i - "
+												" Gen 2 capable - SSC\n",
+												l->type_ext);
+										break;
+									default:
+										printf( "        Link Type Ext:   %i - "
+												" Invalid\n",
+												l->type_ext);
+										break;
+								}
+								break;
+
+							case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS1:
+							case FRU_PICMGEXT_AMC_LINK_TYPE_PCIE_AS2:
+								/* AMC.1 */
+								printf( "        Link Type:       %02x - "
+										"AMC.1 PCI Express Advanced Switching\n",
+										l->type);
+								printf("        Link Type Ext:   %i\n",
+										l->type_ext);
+								break;
+
+							case FRU_PICMGEXT_AMC_LINK_TYPE_ETHERNET:
+								/* AMC.2 */
+								printf( "        Link Type:       %02x - "
+										"AMC.2 Ethernet\n",
+										l->type);
+								switch (l->type_ext) {
+									case AMC_LINK_TYPE_EXT_ETH_1000_BX:
+										printf( "        Link Type Ext:   %i - "
+												" 1000Base-Bx (SerDES Gigabit) Ethernet Link\n",
+												l->type_ext);
+										break;
+
+									case AMC_LINK_TYPE_EXT_ETH_10G_XAUI:
+										printf( "        Link Type Ext:   %i - "
+												" 10Gbit XAUI Ethernet Link\n",
+										l->type_ext);
+										break;
+
+									default:
+										printf( "        Link Type Ext:   %i - "
+												" Invalid\n",
+												l->type_ext);
+										break;
+								}
+								break;
+
+							case FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE:
+								/* AMC.3 */
+								printf( "        Link Type:       %02x - "
+										"AMC.3 Storage\n",
+										l->type);
+								switch (l->type_ext) {
+									case AMC_LINK_TYPE_EXT_STORAGE_FC:
+										printf( "        Link Type Ext:   %i - "
+												" Fibre Channel\n",
+												l->type_ext);
+										break;
+
+									case AMC_LINK_TYPE_EXT_STORAGE_SATA:
+										printf( "        Link Type Ext:   %i - "
+												" Serial ATA\n",
+												l->type_ext);
+										break;
+
+									case AMC_LINK_TYPE_EXT_STORAGE_SAS:
+										printf( "        Link Type Ext:   %i - "
+												" Serial Attached SCSI\n",
+												l->type_ext);
+										break;
+
+									default:
+										printf( "        Link Type Ext:   %i - "
+												" Invalid\n",
+												l->type_ext);
+										break;
+								}
+								break;
+
+							case FRU_PICMGEXT_AMC_LINK_TYPE_RAPIDIO:
+								/* AMC.4 */
+								printf( "        Link Type:       %02x - "
+										"AMC.4 Serial Rapid IO\n",
+										l->type);
+								printf("        Link Type Ext:   %i\n",
+										l->type_ext);
+								break;
+
+							default:
+								printf( "        Link Type:       %02x - "
+										"reserved or OEM GUID",
+										l->type);
+								printf("        Link Type Ext:   %i\n",
+										l->type_ext);
+								break;
+						}
+
+						printf("        Link group Id:   %i\n",
+								l->group_id);
+						printf("        Link Asym Match: %i\n\n",
+								l->asym_match);
+						offset += FRU_PICMGEXT_AMC_LINK_DESC_RECORD_SIZE;
+					}
+				}
+			}
+			break;
+
+		case FRU_AMC_CARRIER_INFO:
+		{
+			unsigned char extVersion;
+			unsigned char siteCount;
+
+			printf("    FRU_CARRIER_INFO\n");
+
+			extVersion = fru_data[offset++];
+			siteCount  = fru_data[offset++];
+
+			printf("      AMC.0 extension version: R%d.%d\n",
+					(extVersion >> 0)& 0x0F,
+					(extVersion >> 4)& 0x0F );
+			printf("      Carrier Sie Number Cnt: %d\n", siteCount);
+
+			for (i = 0 ; i < siteCount; i++ ){
+				printf("       Site ID: %i \n", fru_data[offset++]);
+			}
+			printf("\n");
+		}
+		break;
+		case FRU_PICMG_CLK_CARRIER_P2P:
+		{
+			unsigned char desc_count;
+			int i,j;
+
+			printf("    FRU_PICMG_CLK_CARRIER_P2P\n");
+
+			desc_count = fru_data[offset++];
+
+			for(i=0; i<desc_count; i++){
+				unsigned char resource_id;
+				unsigned char channel_count;
+
+				resource_id   = fru_data[offset++];
+				channel_count = fru_data[offset++];
+
+				printf("\n");
+				printf("      Clock Resource ID: 0x%02x  Type: ", resource_id);
+				if((resource_id & 0xC0)>>6 == 0) {printf("On-Carrier-Device\n");}
+				else if((resource_id & 0xC0)>>6 == 1) {printf("AMC slot\n");}
+				else if((resource_id & 0xC0)>>6 == 2) {printf("Backplane\n");}
+				else{ printf("reserved\n");}
+				printf("      Channel Count: 0x%02x\n", channel_count);
+
+				for(j=0; j<channel_count; j++){
+					unsigned char loc_channel, rem_channel, rem_resource;
+
+					loc_channel  = fru_data[offset++];
+					rem_channel  = fru_data[offset++];
+					rem_resource = fru_data[offset++];
+
+					printf("        CLK-ID: 0x%02x    ->", loc_channel);
+					printf(" remote CLKID: 0x%02x   ", rem_channel);
+					if((rem_resource & 0xC0)>>6 == 0) {printf("[ Carrier-Dev");}
+					else if((rem_resource & 0xC0)>>6 == 1) {printf("[ AMC slot   ");}
+					else if((rem_resource & 0xC0)>>6 == 2) {printf("[ Backplane  ");}
+					else{ printf("reserved         ");}
+					printf(" 0x%02x ]\n", rem_resource&0xF);
+				}
+			}
+			printf("\n");
+		}
+		break;
+		case FRU_PICMG_CLK_CONFIG:
+		{
+			unsigned char resource_id, descr_count;
+			int i,j;
+
+			printf("    FRU_PICMG_CLK_CONFIG\n");
+
+			resource_id = fru_data[offset++];
+			descr_count = fru_data[offset++];
+
+			printf("\n");
+			printf("      Clock Resource ID: 0x%02x\n", resource_id);
+			printf("      Descr. Count:      0x%02x\n", descr_count);
+
+			for(i=0; i<descr_count; i++){
+				unsigned char channel_id, control;
+				unsigned char indirect_cnt, direct_cnt;
+
+				channel_id = fru_data[offset++];
+				control    = fru_data[offset++];
+				printf("        CLK-ID: 0x%02x  -  ", channel_id);
+				printf("CTRL 0x%02x [ %12s ]\n",
+									control,
+									((control&0x1)==0)?"Carrier IPMC":"Application");
+
+				indirect_cnt = fru_data[offset++];
+				direct_cnt   = fru_data[offset++];
+				printf("         Cnt: Indirect 0x%02x  /  Direct 0x%02x\n",
+						indirect_cnt,
+						direct_cnt);
+
+				/* indirect desc */
+				for(j=0; j<indirect_cnt; j++){
+					unsigned char feature;
+					unsigned char dep_chn_id;
+
+					feature    = fru_data[offset++];
+					dep_chn_id = fru_data[offset++];
+
+					printf("          Feature: 0x%02x [%8s] - ", feature, (feature&0x1)==1?"Source":"Receiver");
+					printf("          Dep. CLK-ID: 0x%02x\n", dep_chn_id);
+				}
+
+				/* direct desc */
+				for(j=0; j<direct_cnt; j++){
+					unsigned char feature, family, accuracy;
+					unsigned int freq, min_freq, max_freq;
+
+					feature  = fru_data[offset++];
+					family   = fru_data[offset++];
+					accuracy = fru_data[offset++];
+					freq     = (fru_data[offset+0] << 0 ) | (fru_data[offset+1] << 8 )
+								| (fru_data[offset+2] << 16) | (fru_data[offset+3] << 24);
+					offset += 4;
+					min_freq = (fru_data[offset+0] << 0 ) | (fru_data[offset+1] << 8 )
+								| (fru_data[offset+2] << 16) | (fru_data[offset+3] << 24);
+					offset += 4;
+					max_freq = (fru_data[offset+0] << 0 ) | (fru_data[offset+1] << 8 )
+								| (fru_data[offset+2] << 16) | (fru_data[offset+3] << 24);
+					offset += 4;
+
+					printf("          - Feature: 0x%02x  - PLL: %x / Asym: %s\n",
+							feature,
+							(feature > 1) & 1,
+							(feature&1)?"Source":"Receiver");
+					printf("            Family:  0x%02x  - AccLVL: 0x%02x\n", family, accuracy);
+					printf("            FRQ: %-9ld - min: %-9ld - max: %-9ld\n",
+							freq, min_freq, max_freq);
+				}
+				printf("\n");
+			}
+			printf("\n");
+		}
+		break;
+
+		case FRU_UTCA_FRU_INFO_TABLE:
+		case FRU_UTCA_CARRIER_MNG_IP:
+		case FRU_UTCA_CARRIER_INFO:
+		case FRU_UTCA_CARRIER_LOCATION:
+		case FRU_UTCA_SHMC_IP_LINK:
+		case FRU_UTCA_POWER_POLICY:
+		case FRU_UTCA_ACTIVATION:
+		case FRU_UTCA_PM_CAPABILTY:
+		case FRU_UTCA_FAN_GEOGRAPHY:
+		case FRU_UTCA_CLOCK_MAPPING:
+		case FRU_UTCA_MSG_BRIDGE_POLICY:
+		case FRU_UTCA_OEM_MODULE_DESC:
+			printf("    Not implemented yet. uTCA specific record found!!\n");
+			printf("     - Record ID: 0x%02x\n", h->record_id);
+		break;
+
+		default:
+			printf("    Unknown OEM Extension Record ID: %x\n", h->record_id);
+		break;
+
+	}
+}
+
+
+/* __ipmi_fru_print  -  Do actual work to print a FRU by its ID
+*
+* @intf:   ipmi interface
+* @id:     fru id
+*
+* returns -1 on error
+* returns 0 if successful
+* returns 1 if device not present
+*/
+static int
+__ipmi_fru_print(struct ipmi_intf * intf, uint8_t id)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	struct fru_header header;
+	uint8_t msg_data[4];
+
+	memset(&fru, 0, sizeof(struct fru_info));
+	memset(&header, 0, sizeof(struct fru_header));
+
+	/*
+	* get info about this FRU
+	*/
+	memset(msg_data, 0, 4);
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
+		fru.size, fru.access ? "words" : "bytes");
+
+	if (fru.size < 1) {
+		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
+		return -1;
+	}
+
+	/*
+	* retrieve the FRU header
+	*/
+	msg_data[0] = id;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return 1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		return 1;
+	}
+
+	if (verbose > 1)
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+
+	memcpy(&header, rsp->data + 1, 8);
+
+	if (header.version != 1) {
+		lprintf(LOG_ERR, " Unknown FRU header version 0x%02x",
+			header.version);
+		return -1;
+	}
+
+	/* offsets need converted to bytes
+	* but that conversion is not done to the structure
+	* because we may end up with offset > 255
+	* which would overflow our 1-byte offset field */
+
+	lprintf(LOG_DEBUG, "fru.header.version:         0x%x",
+		header.version);
+	lprintf(LOG_DEBUG, "fru.header.offset.internal: 0x%x",
+		header.offset.internal * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.chassis:  0x%x",
+		header.offset.chassis * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.board:    0x%x",
+		header.offset.board * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.product:  0x%x",
+		header.offset.product * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.multi:    0x%x",
+		header.offset.multi * 8);
+
+	/*
+	* rather than reading the entire part
+	* only read the areas we'll format
+	*/
+	/* chassis area */
+	if ((header.offset.chassis*8) >= sizeof(struct fru_header))
+		fru_area_print_chassis(intf, &fru, id, header.offset.chassis*8);
+
+	/* board area */
+	if ((header.offset.board*8) >= sizeof(struct fru_header))
+		fru_area_print_board(intf, &fru, id, header.offset.board*8);
+
+	/* product area */
+	if ((header.offset.product*8) >= sizeof(struct fru_header))
+		fru_area_print_product(intf, &fru, id, header.offset.product*8);
+
+	/* multirecord area */
+	if( verbose==0 ) /* scipp parsing multirecord */
+		return 0;
+
+	if ((header.offset.multi*8) >= sizeof(struct fru_header))
+		fru_area_print_multirec(intf, &fru, id, header.offset.multi*8);
+
+	return 0;
+}
+
+/* ipmi_fru_print  -  Print a FRU from its SDR locator record
+*
+* @intf:   ipmi interface
+* @fru: SDR FRU Locator Record
+*
+* returns -1 on error
+*/
+int
+ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+{
+	char desc[17];
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+	int rc = 0;
+
+	if (fru == NULL)
+		return __ipmi_fru_print(intf, 0);
+
+	/* Logical FRU Device
+	*  dev_type == 0x10
+	*  modifier
+	*   0x00 = IPMI FRU Inventory
+	*   0x01 = DIMM Memory ID
+	*   0x02 = IPMI FRU Inventory
+	*   0x03 = System Processor FRU
+	*   0xff = unspecified
+	*
+	* EEPROM 24C01 or equivalent
+	*  dev_type >= 0x08 && dev_type <= 0x0f
+	*  modifier
+	*   0x00 = unspecified
+	*   0x01 = DIMM Memory ID
+	*   0x02 = IPMI FRU Inventory
+	*   0x03 = System Processor Cartridge
+	*/
+	if (fru->dev_type != 0x10 &&
+		(fru->dev_type_modifier != 0x02 ||
+		fru->dev_type < 0x08 || fru->dev_type > 0x0f))
+		return -1;
+
+	if (fru->dev_slave_addr == IPMI_BMC_SLAVE_ADDR &&
+		fru->device_id == 0)
+		return 0;
+
+	memset(desc, 0, sizeof(desc));
+	memcpy(desc, fru->id_string, fru->id_code & 0x01f);
+	desc[fru->id_code & 0x01f] = 0;
+	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
+
+	switch (fru->dev_type_modifier) {
+	case 0x00:
+	case 0x02:
+		if (BRIDGE_TO_SENSOR(intf, fru->dev_slave_addr,
+					   fru->channel_num)) {
+			bridged_request = 1;
+			save_addr = intf->target_addr;
+			intf->target_addr = fru->dev_slave_addr;
+			save_channel = intf->target_channel;
+			intf->target_channel = fru->channel_num;
+		}
+		/* print FRU */
+		rc = __ipmi_fru_print(intf, fru->device_id);
+		if (bridged_request) {
+			intf->target_addr = save_addr;
+			intf->target_channel = save_channel;
+		}
+		break;
+	case 0x01:
+		rc = ipmi_spd_print_fru(intf, fru->device_id);
+		break;
+	default:
+		if (verbose)
+			printf(" Unsupported device 0x%02x "
+					"type 0x%02x with modifier 0x%02x\n",
+					fru->device_id, fru->dev_type,
+					fru->dev_type_modifier);
+		else
+			printf(" Unsupported device\n");
+	}
+	printf("\n");
+
+	return rc;
+}
+
+/* ipmi_fru_print_all  -  Print builtin FRU + SDR FRU Locator records
+*
+* @intf:   ipmi interface
+*
+* returns -1 on error
+*/
+static int
+ipmi_fru_print_all(struct ipmi_intf * intf)
+{
+	struct ipmi_sdr_iterator * itr;
+	struct sdr_get_rs * header;
+	struct sdr_record_fru_locator * fru;
+	int rc;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipm_devid_rsp *devid;
+	struct sdr_record_mc_locator * mc;
+	uint32_t save_addr;
+
+	printf("FRU Device Description : Builtin FRU Device (ID 0)\n");
+	/* TODO: Figure out if FRU device 0 may show up in SDR records. */
+
+	/* Do a Get Device ID command to determine device support */
+	memset (&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Device ID command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Device ID command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	devid = (struct ipm_devid_rsp *) rsp->data;
+
+	/* Check the FRU inventory device bit to decide whether various */
+	/* FRU commands can be issued to FRU device #0 LUN 0		*/
+
+	if (devid->adtl_device_support & 0x08) {	/* FRU Inventory Device bit? */
+		rc = ipmi_fru_print(intf, NULL);
+		printf("\n");
+	}
+
+	if ((itr = ipmi_sdr_start(intf, 0)) == NULL)
+		return -1;
+
+	/* Walk the SDRs looking for FRU Devices and Management Controller Devices. */
+	/* For FRU devices, print the FRU from the SDR locator record.		    */
+	/* For MC devices, issue FRU commands to the satellite controller to print  */
+	/* FRU data.								    */
+	while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL)
+	{
+		if (header->type == SDR_RECORD_TYPE_MC_DEVICE_LOCATOR ) {
+			/* Check the capabilities of the Management Controller Device */
+			mc = (struct sdr_record_mc_locator *)
+				ipmi_sdr_get_record(intf, header, itr);
+			/* Does this MC device support FRU inventory device? */
+			if (mc && (mc->dev_support & 0x08) && /* FRU inventory device? */
+				intf->target_addr != mc->dev_slave_addr) {
+				/* Yes. Prepare to issue FRU commands to FRU device #0 LUN 0  */
+				/* using the slave address specified in the MC record.	      */
+
+				/* save current target address */
+				save_addr = intf->target_addr;
+
+				/* set new target address to satellite controller */
+				intf->target_addr = mc->dev_slave_addr;
+
+				printf("FRU Device Description : %-16s\n", mc->id_string);
+
+				/* print the FRU by issuing FRU commands to the satellite     */
+				/* controller.						      */
+				rc = __ipmi_fru_print(intf, 0);
+
+				printf("\n");
+
+				/* restore previous target */
+				intf->target_addr = save_addr;
+			}
+
+			if (mc) {
+				free(mc);
+				mc = NULL;
+			}
+
+			continue;
+		}
+
+		if (header->type != SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR)
+			continue;
+
+		/* Print the FRU from the SDR locator record. */
+		fru = (struct sdr_record_fru_locator *)
+			ipmi_sdr_get_record(intf, header, itr);
+		if (fru == NULL || !fru->logical) {
+			if (fru) {
+				free(fru);
+				fru = NULL;
+			}
+			continue;
+		}
+		rc = ipmi_fru_print(intf, fru);
+		free(fru);
+		fru = NULL;
+	}
+
+	ipmi_sdr_end(intf, itr);
+
+	return rc;
+}
+
+/* ipmi_fru_read_help() - print help text for 'read'
+ *
+ * returns void
+ */
+void
+ipmi_fru_read_help()
+{
+	lprintf(LOG_NOTICE, "fru read <fru id> <fru file>");
+	lprintf(LOG_NOTICE, "Note: FRU ID and file(incl. full path) must be specified.");
+	lprintf(LOG_NOTICE, "Example: ipmitool fru read 0 /root/fru.bin");
+} /* ipmi_fru_read_help() */
+
+static void
+ipmi_fru_read_to_bin(struct ipmi_intf * intf,
+			char * pFileName,
+			uint8_t fruId)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	uint8_t msg_data[4];
+	uint8_t * pFruBuf;
+
+	msg_data[0] = fruId;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp)
+		return;
+
+	if (rsp->ccode > 0) {
+		if (rsp->ccode == 0xc3)
+			printf ("  Timeout accessing FRU info. (Device not present?)\n");
+		return;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	if (verbose) {
+		printf("Fru Size   = %d bytes\n",fru.size);
+		printf("Fru Access = %xh\n", fru.access);
+	}
+
+	pFruBuf = malloc(fru.size);
+	if (pFruBuf != NULL) {
+		printf("Fru Size         : %d bytes\n",fru.size);
+		read_fru_area(intf, &fru, fruId, 0, fru.size, pFruBuf);
+	} else {
+		lprintf(LOG_ERR, "Cannot allocate %d bytes\n", fru.size);
+		return;
+	}
+
+	if(pFruBuf != NULL)
+	{
+		FILE * pFile;
+		pFile = fopen(pFileName,"wb");
+		if (pFile) {
+			fwrite(pFruBuf, fru.size, 1, pFile);
+			printf("Done\n");
+		} else {
+			lprintf(LOG_ERR, "Error opening file %s\n", pFileName);
+			free(pFruBuf);
+			pFruBuf = NULL;
+			return;
+		}
+		fclose(pFile);
+	}
+	free(pFruBuf);
+	pFruBuf = NULL;
+}
+
+static void
+ipmi_fru_write_from_bin(struct ipmi_intf * intf,
+			char * pFileName,
+			uint8_t fruId)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	uint8_t msg_data[4];
+	uint8_t *pFruBuf;
+	uint16_t len = 0;
+	FILE *pFile;
+
+	msg_data[0] = fruId;
+
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp)
+		return;
+
+	if (rsp->ccode) {
+		if (rsp->ccode == 0xc3)
+			printf("  Timeout accessing FRU info. (Device not present?)\n");
+		return;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	if (verbose) {
+		printf("Fru Size   = %d bytes\n", fru.size);
+		printf("Fru Access = %xh\n", fru.access);
+	}
+
+	pFruBuf = malloc(fru.size);
+	if (pFruBuf == NULL) {
+		lprintf(LOG_ERR, "Cannot allocate %d bytes\n", fru.size);
+		return;
+	}
+
+		pFile = fopen(pFileName, "rb");
+		if (pFile != NULL) {
+			len = fread(pFruBuf, 1, fru.size, pFile);
+			printf("Fru Size         : %d bytes\n", fru.size);
+			printf("Size to Write    : %d bytes\n", len);
+			fclose(pFile);
+		} else {
+		lprintf(LOG_ERR, "Error opening file %s\n", pFileName);
+		}
+
+		if (len != 0) {
+			write_fru_area(intf, &fru, fruId,0, 0, len, pFruBuf);
+			lprintf(LOG_INFO,"Done");
+		}
+
+	free(pFruBuf);
+	pFruBuf = NULL;
+}
+
+/* ipmi_fru_write_help() - print help text for 'write'
+ *
+ * retruns void
+ */
+void
+ipmi_fru_write_help()
+{
+	lprintf(LOG_NOTICE, "fru write <fru id> <fru file>");
+	lprintf(LOG_NOTICE, "Note: FRU ID and file(incl. full path) must be specified.");
+	lprintf(LOG_NOTICE, "Example: ipmitool fru write 0 /root/fru.bin");
+} /* ipmi_fru_write_help() */
+
+/* ipmi_fru_edit_help - print help text for 'fru edit' command
+ *
+ * returns void
+ */
+void
+ipmi_fru_edit_help()
+{
+	lprintf(LOG_NOTICE,
+			"fru edit <fruid> field <section> <index> <string> - edit FRU string");
+	lprintf(LOG_NOTICE,
+			"fru edit <fruid> oem iana <record> <format> <args> - limited OEM support");
+} /* ipmi_fru_edit_help() */
+
+/* ipmi_fru_edit_multirec  -  Query new values to replace original FRU content
+*
+* @intf:   interface to use
+* @id:  FRU id to work on
+*
+* returns: nothing
+*/
+/* Work in progress, copy paste most of the stuff for other functions in this
+	file ... not elegant yet */
+static int
+ipmi_fru_edit_multirec(struct ipmi_intf * intf, uint8_t id ,
+												int argc, char ** argv)
+{
+
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	struct fru_header header;
+	uint8_t msg_data[4];
+
+	uint16_t retStatus = 0;
+	uint32_t offFruMultiRec;
+	uint32_t fruMultiRecSize = 0;
+	struct fru_info fruInfo;
+	retStatus = ipmi_fru_get_multirec_location_from_fru(intf, id, &fruInfo,
+								&offFruMultiRec,
+								&fruMultiRecSize);
+	if (retStatus != 0) {
+		return retStatus;
+	}
+
+
+	lprintf(LOG_DEBUG, "FRU Size        : %lu\n", fruMultiRecSize);
+	lprintf(LOG_DEBUG, "Multi Rec offset: %lu\n", offFruMultiRec);
+
+	{
+
+
+	memset(&fru, 0, sizeof(struct fru_info));
+	memset(&header, 0, sizeof(struct fru_header));
+
+	/*
+	* get info about this FRU
+	*/
+	memset(msg_data, 0, 4);
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
+		fru.size, fru.access ? "words" : "bytes");
+
+	if (fru.size < 1) {
+		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
+		return -1;
+	}
+	}
+
+	{
+		uint8_t * fru_data;
+		uint32_t i;
+		uint32_t offset= offFruMultiRec;
+		struct fru_multirec_header * h;
+		uint32_t last_off, len;
+		uint8_t error=0;
+
+		i = last_off = offset;
+
+		memset(&fru, 0, sizeof(fru));
+		fru_data = malloc(fru.size + 1);
+		if (fru_data == NULL) {
+			lprintf(LOG_ERR, " Out of memory!");
+			return -1;
+		}
+		memset(fru_data, 0, fru.size + 1);
+
+		do {
+			h = (struct fru_multirec_header *) (fru_data + i);
+
+			/* read area in (at most) FRU_MULTIREC_CHUNK_SIZE bytes at a time */
+			if ((last_off < (i + sizeof(*h))) || (last_off < (i + h->len)))
+			{
+				len = fru.size - last_off;
+				if (len > FRU_MULTIREC_CHUNK_SIZE)
+					len = FRU_MULTIREC_CHUNK_SIZE;
+
+				if (read_fru_area(intf, &fru, id, last_off, len, fru_data) < 0)
+					break;
+
+				last_off += len;
+			}
+			if( h->type ==  FRU_RECORD_TYPE_OEM_EXTENSION ){
+
+				struct fru_multirec_oem_header *oh=(struct fru_multirec_oem_header *)
+										&fru_data[i + sizeof(struct fru_multirec_header)];
+				uint32_t iana = oh->mfg_id[0] | oh->mfg_id[1]<<8 | oh->mfg_id[2]<<16;
+
+				uint32_t suppliedIana = 0 ;
+				/* Now makes sure this is really PICMG record */
+
+				/* Default to PICMG for backward compatibility */
+				if( argc <=2 ) {
+					suppliedIana =  IPMI_OEM_PICMG;
+				}  else {
+					if( !strncmp( argv[2] , "oem" , 3 )) {
+						/* Expect IANA number next */
+						if( argc <= 3 ) {
+							lprintf(LOG_ERR, "oem iana <record> <format> [<args>]");
+							error = 1;
+						} else {
+							if (str2uint(argv[3], &suppliedIana) == 0) {
+								lprintf(LOG_DEBUG,
+										"using iana: %d",
+										suppliedIana);
+							} else {
+								lprintf(LOG_ERR,
+										"Given IANA '%s' is invalid.",
+										argv[3]);
+								error = 1;
+							}
+						}
+					}
+				}
+
+				if( suppliedIana == iana ) {
+					lprintf(LOG_DEBUG, "Matching record found" );
+
+					if( iana == IPMI_OEM_PICMG ){
+						if( ipmi_fru_picmg_ext_edit(fru_data,
+						i + sizeof(struct fru_multirec_header),
+						h->len, h, oh )){
+							/* The fru changed */
+							write_fru_area(intf,&fru,id, i,i,
+						h->len+ sizeof(struct fru_multirec_header), fru_data);
+						}
+					}
+					else if( iana == IPMI_OEM_KONTRON ) {
+						if( ipmi_fru_oemkontron_edit( argc,argv,fru_data,
+						i + sizeof(struct fru_multirec_header),
+						h->len, h, oh )){
+							/* The fru changed */
+							write_fru_area(intf,&fru,id, i,i,
+						h->len+ sizeof(struct fru_multirec_header), fru_data);
+						}
+					}
+					/* FIXME: Add OEM record support here */
+					else{
+						printf("  OEM IANA (%s) Record not support in this mode\n",
+															val2str( iana,  ipmi_oem_info));
+						error = 1;
+					}
+				}
+			}
+			i += h->len + sizeof (struct fru_multirec_header);
+		} while (!(h->format & 0x80) && (error != 1));
+
+		free(fru_data);
+		fru_data = NULL;
+	}
+	return 0;
+}
+
+/* ipmi_fru_get_help - print help text for 'fru get'
+ *
+ * returns void
+ */
+void
+ipmi_fru_get_help()
+{
+	lprintf(LOG_NOTICE,
+			"fru get <fruid> oem iana <record> <format> <args> - limited OEM support");
+} /* ipmi_fru_get_help() */
+
+void
+ipmi_fru_internaluse_help()
+{
+	lprintf(LOG_NOTICE,
+			"fru internaluse <fru id> info             - get internal use area size");
+	lprintf(LOG_NOTICE,
+			"fru internaluse <fru id> print            - print internal use area in hex");
+	lprintf(LOG_NOTICE,
+			"fru internaluse <fru id> read  <fru file> - read internal use area to file");
+	lprintf(LOG_NOTICE,
+			"fru internaluse <fru id> write <fru file> - write internal use area from file");
+} /* void ipmi_fru_internaluse_help() */
+
+/* ipmi_fru_get_multirec   -  Query new values to replace original FRU content
+*
+* @intf:   interface to use
+* @id:  FRU id to work on
+*
+* returns: nothing
+*/
+/* Work in progress, copy paste most of the stuff for other functions in this
+	file ... not elegant yet */
+static int
+ipmi_fru_get_multirec(struct ipmi_intf * intf, uint8_t id ,
+												int argc, char ** argv)
+{
+
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_info fru;
+	struct fru_header header;
+	uint8_t msg_data[4];
+
+	uint16_t retStatus = 0;
+	uint32_t offFruMultiRec;
+	uint32_t fruMultiRecSize = 0;
+	struct fru_info fruInfo;
+	retStatus = ipmi_fru_get_multirec_location_from_fru(intf, id, &fruInfo,
+								&offFruMultiRec,
+								&fruMultiRecSize);
+	if (retStatus != 0) {
+		return retStatus;
+	}
+
+
+	lprintf(LOG_DEBUG, "FRU Size        : %lu\n", fruMultiRecSize);
+	lprintf(LOG_DEBUG, "Multi Rec offset: %lu\n", offFruMultiRec);
+
+	{
+
+
+	memset(&fru, 0, sizeof(struct fru_info));
+	memset(&header, 0, sizeof(struct fru_header));
+
+	/*
+	* get info about this FRU
+	*/
+	memset(msg_data, 0, 4);
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
+		fru.size, fru.access ? "words" : "bytes");
+
+	if (fru.size < 1) {
+		lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
+		return -1;
+	}
+	}
+
+	{
+		uint8_t * fru_data;
+		uint32_t i;
+		uint32_t offset= offFruMultiRec;
+		struct fru_multirec_header * h;
+		uint32_t last_off, len;
+		uint8_t error=0;
+
+		i = last_off = offset;
+
+		fru_data = malloc(fru.size + 1);
+		if (fru_data == NULL) {
+			lprintf(LOG_ERR, " Out of memory!");
+			return -1;
+		}
+		memset(fru_data, 0, fru.size + 1);
+
+		do {
+			h = (struct fru_multirec_header *) (fru_data + i);
+
+			/* read area in (at most) FRU_MULTIREC_CHUNK_SIZE bytes at a time */
+			if ((last_off < (i + sizeof(*h))) || (last_off < (i + h->len)))
+			{
+				len = fru.size - last_off;
+				if (len > FRU_MULTIREC_CHUNK_SIZE)
+					len = FRU_MULTIREC_CHUNK_SIZE;
+
+				if (read_fru_area(intf, &fru, id, last_off, len, fru_data) < 0)
+					break;
+
+				last_off += len;
+			}
+			if( h->type ==  FRU_RECORD_TYPE_OEM_EXTENSION ){
+
+				struct fru_multirec_oem_header *oh=(struct fru_multirec_oem_header *)
+										&fru_data[i + sizeof(struct fru_multirec_header)];
+				uint32_t iana = oh->mfg_id[0] | oh->mfg_id[1]<<8 | oh->mfg_id[2]<<16;
+
+				uint32_t suppliedIana = 0 ;
+				/* Now makes sure this is really PICMG record */
+				if( !strncmp( argv[2] , "oem" , 3 )) {
+					/* Expect IANA number next */
+					if( argc <= 3 ) {
+						lprintf(LOG_ERR, "oem iana <record> <format>");
+						error = 1;
+					} else {
+						if (str2uint(argv[3], &suppliedIana) == 0) {
+							lprintf(LOG_DEBUG,
+									"using iana: %d",
+									suppliedIana);
+						} else {
+							lprintf(LOG_ERR,
+									"Given IANA '%s' is invalid.",
+									argv[3]);
+							error = 1;
+						}
+					}
+				}
+
+				if( suppliedIana == iana ) {
+					lprintf(LOG_DEBUG, "Matching record found" );
+
+				if( iana == IPMI_OEM_KONTRON ) {
+						ipmi_fru_oemkontron_get( argc,argv,fru_data,
+						i + sizeof(struct fru_multirec_header),
+						h->len, h, oh );
+					}
+					/* FIXME: Add OEM record support here */
+					else{
+						printf("  OEM IANA (%s) Record not supported in this mode\n",
+															val2str( iana,  ipmi_oem_info));
+						error = 1;
+					}
+				}
+			}
+			i += h->len + sizeof (struct fru_multirec_header);
+		} while (!(h->format & 0x80) && (error != 1));
+
+		free(fru_data);
+		fru_data = NULL;
+	}
+	return 0;
+}
+
+static int
+ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
+			char * pFileName,
+			uint8_t fruId)
+{
+	struct fru_info fruInfo = {0};
+	uint8_t *buf = NULL;
+	uint32_t offFruMultiRec = 0;
+	uint32_t fruMultiRecSize = 0;
+	uint32_t offFileMultiRec = 0;
+	uint32_t fileMultiRecSize = 0;
+	if (pFileName == NULL) {
+		lprintf(LOG_ERR, "File expected, but none given.");
+		return (-1);
+	}
+	if (ipmi_fru_get_multirec_location_from_fru(intf, fruId, &fruInfo,
+							&offFruMultiRec, &fruMultiRecSize) != 0) {
+		lprintf(LOG_ERR, "Failed to get multirec location from FRU.");
+		return (-1);
+	}
+	lprintf(LOG_DEBUG, "FRU Size        : %lu\n", fruMultiRecSize);
+	lprintf(LOG_DEBUG, "Multi Rec offset: %lu\n", offFruMultiRec);
+	if (ipmi_fru_get_multirec_size_from_file(pFileName, &fileMultiRecSize,
+				&offFileMultiRec) != 0) {
+		lprintf(LOG_ERR, "Failed to get multirec size from file '%s'.", pFileName);
+		return (-1);
+	}
+	buf = malloc(fileMultiRecSize);
+	if (buf == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return (-1);
+	}
+	if (ipmi_fru_get_multirec_from_file(pFileName, buf, fileMultiRecSize,
+				offFileMultiRec) != 0) {
+		lprintf(LOG_ERR, "Failed to get multirec from file '%s'.", pFileName);
+		if (buf != NULL) {
+			free(buf);
+			buf = NULL;
+		}
+		return (-1);
+	}
+	if (ipmi_fru_get_adjust_size_from_buffer(buf, &fileMultiRecSize) != 0) {
+		lprintf(LOG_ERR, "Failed to adjust size from buffer.");
+		if (buf != NULL) {
+			free(buf);
+			buf = NULL;
+		}
+		return (-1);
+	}
+	if (write_fru_area(intf, &fruInfo, fruId, 0, offFruMultiRec,
+				fileMultiRecSize, buf) != 0) {
+		lprintf(LOG_ERR, "Failed to write FRU area.");
+		if (buf != NULL) {
+			free(buf);
+			buf = NULL;
+		}
+		return (-1);
+	}
+	if (buf != NULL) {
+		free(buf);
+		buf = NULL;
+	}
+	lprintf(LOG_INFO, "Done upgrading Ekey.");
+	return 0;
+}
+
+/* ipmi_fru_upgekey_help - print help text for 'upgEkey'
+ *
+ * returns void
+ */
+void
+ipmi_fru_upgekey_help()
+{
+	lprintf(LOG_NOTICE, "fru upgEkey <fru id> <fru file>");
+	lprintf(LOG_NOTICE, "Note: FRU ID and file(incl. full path) must be specified.");
+	lprintf(LOG_NOTICE, "Example: ipmitool fru upgEkey 0 /root/fru.bin");
+} /* ipmi_fru_upgekey_help() */
+
+static int
+ipmi_fru_get_multirec_size_from_file(char * pFileName,
+					uint32_t * pSize,
+					uint32_t * pOffset)
+{
+	struct fru_header header;
+	FILE * pFile;
+	uint8_t len = 0;
+	uint32_t end = 0;
+	*pSize = 0;
+
+	pFile = fopen(pFileName,"rb");
+	if (pFile) {
+		rewind(pFile);
+		len = fread(&header, 1, 8, pFile);
+		fseek(pFile, 0, SEEK_END);
+		end = ftell(pFile);
+		fclose(pFile);
+	}
+
+	lprintf(LOG_DEBUG, "File Size = %lu\n", end);
+	lprintf(LOG_DEBUG, "Len = %u\n", len);
+
+	if (len != 8) {
+		printf("Error with file %s in getting size\n", pFileName);
+		return -1;
+	}
+
+	if (header.version != 0x01) {
+		printf ("Unknown FRU header version %02x.\n", header.version);
+		return -1;
+	}
+
+	/* Retreive length */
+	if (((header.offset.internal * 8) > (header.offset.internal * 8)) &&
+		((header.offset.internal * 8) < end))
+		end = (header.offset.internal * 8);
+
+	if (((header.offset.chassis * 8) > (header.offset.chassis * 8)) &&
+		((header.offset.chassis * 8) < end))
+		end = (header.offset.chassis * 8);
+
+	if (((header.offset.board * 8) > (header.offset.board * 8)) &&
+		((header.offset.board * 8) < end))
+		end = (header.offset.board * 8);
+
+	if (((header.offset.product * 8) > (header.offset.product * 8)) &&
+		((header.offset.product * 8) < end))
+		end = (header.offset.product * 8);
+
+	*pSize = end - (header.offset.multi * 8);
+	*pOffset = (header.offset.multi * 8);
+
+	return 0;
+}
+
+int
+ipmi_fru_get_adjust_size_from_buffer(uint8_t * fru_data, uint32_t *pSize)
+{
+	struct fru_multirec_header * head;
+	int status = 0;
+	uint8_t checksum = 0;
+	uint8_t counter = 0;
+	uint16_t count = 0;
+	do {
+		checksum = 0;
+		head = (struct fru_multirec_header *) (fru_data + count);
+		if (verbose) {
+			printf("Adding (");
+		}
+		for (counter = 0; counter < sizeof(struct fru_multirec_header); counter++) {
+			if (verbose) {
+				printf(" %02X", *(fru_data + count + counter));
+			}
+			checksum += *(fru_data + count + counter);
+		}
+		if (verbose) {
+			printf(")");
+		}
+		if (checksum != 0) {
+			lprintf(LOG_ERR, "Bad checksum in Multi Records");
+			status = (-1);
+			if (verbose) {
+				printf("--> FAIL");
+			}
+		} else if (verbose) {
+			printf("--> OK");
+		}
+		if (verbose > 1 && checksum == 0) {
+			for (counter = 0; counter < head->len; counter++) {
+				printf(" %02X", *(fru_data + count + counter
+							+ sizeof(struct fru_multirec_header)));
+			}
+		}
+		if (verbose) {
+			printf("\n");
+		}
+		count += head->len + sizeof (struct fru_multirec_header);
+	} while ((!(head->format & 0x80)) && (status == 0));
+
+	*pSize = count;
+	lprintf(LOG_DEBUG, "Size of multirec: %lu\n", *pSize);
+	return status;
+}
+
+static int
+ipmi_fru_get_multirec_from_file(char * pFileName, uint8_t * pBufArea,
+		uint32_t size, uint32_t offset)
+{
+	FILE * pFile;
+	uint32_t len = 0;
+	if (pFileName == NULL) {
+		lprintf(LOG_ERR, "Invalid file name given.");
+		return (-1);
+	}
+	
+	errno = 0;
+	pFile = fopen(pFileName, "rb");
+	if (!pFile) {
+		lprintf(LOG_ERR, "Error opening file '%s': %i -> %s.", pFileName, errno,
+				strerror(errno));
+		return (-1);
+	}
+	errno = 0;
+	if (fseek(pFile, offset, SEEK_SET) != 0) {
+		lprintf(LOG_ERR, "Failed to seek in file '%s': %i -> %s.", pFileName, errno,
+				strerror(errno));
+		fclose(pFile);
+		return (-1);
+	}
+	len = fread(pBufArea, size, 1, pFile);
+	fclose(pFile);
+
+	if (len != 1) {
+		lprintf(LOG_ERR, "Error in file '%s'.", pFileName);
+		return (-1);
+	}
+	return 0;
+}
+
+static int
+ipmi_fru_get_multirec_location_from_fru(struct ipmi_intf * intf,
+					uint8_t fruId,
+												struct fru_info *pFruInfo,
+					uint32_t * pRetLocation,
+					uint32_t * pRetSize)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4];
+	uint32_t end;
+	struct fru_header header;
+
+	*pRetLocation = 0;
+
+	msg_data[0] = fruId;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp) {
+		if (verbose > 1)
+			printf("no response\n");
+		return -1;
+	}
+
+	if (rsp->ccode > 0) {
+		if (rsp->ccode == 0xc3)
+			printf ("  Timeout accessing FRU info. (Device not present?)\n");
+		else
+			printf ("   CCODE = 0x%02x\n", rsp->ccode);
+		return -1;
+	}
+	pFruInfo->size = (rsp->data[1] << 8) | rsp->data[0];
+	pFruInfo->access = rsp->data[2] & 0x1;
+
+	if (verbose > 1)
+		printf("pFruInfo->size = %d bytes (accessed by %s)\n",
+				pFruInfo->size, pFruInfo->access ? "words" : "bytes");
+
+	if (!pFruInfo->size)
+		return -1;
+
+	msg_data[0] = fruId;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp)
+		return -1;
+	if (rsp->ccode > 0) {
+		if (rsp->ccode == 0xc3)
+			printf ("  Timeout while reading FRU data. (Device not present?)\n");
+		return -1;
+	}
+
+	if (verbose > 1)
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+
+	memcpy(&header, rsp->data + 1, 8);
+
+	if (header.version != 0x01) {
+		printf ("  Unknown FRU header version %02x.\n", header.version);
+		return -1;
+	}
+
+	end = pFruInfo->size;
+
+	/* Retreive length */
+	if (((header.offset.internal * 8) > (header.offset.internal * 8)) &&
+		((header.offset.internal * 8) < end))
+		end = (header.offset.internal * 8);
+
+	if (((header.offset.chassis * 8) > (header.offset.chassis * 8)) &&
+		((header.offset.chassis * 8) < end))
+		end = (header.offset.chassis * 8);
+
+	if (((header.offset.board * 8) > (header.offset.board * 8)) &&
+		((header.offset.board * 8) < end))
+		end = (header.offset.board * 8);
+
+	if (((header.offset.product * 8) > (header.offset.product * 8)) &&
+		((header.offset.product * 8) < end))
+		end = (header.offset.product * 8);
+
+	*pRetSize = end;
+	*pRetLocation = 8 * header.offset.multi;
+
+	return 0;
+}
+
+/* ipmi_fru_get_internal_use_offset -  Retreive internal use offset
+*
+* @intf:   ipmi interface
+* @id:     fru id
+*
+* returns -1 on error
+* returns 0 if successful
+* returns 1 if device not present
+*/
+static int
+ipmi_fru_get_internal_use_info(  struct ipmi_intf * intf,
+											uint8_t id,
+											struct fru_info * fru,
+											uint16_t * size,
+											uint16_t * offset)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct fru_header header;
+	uint8_t msg_data[4];
+
+	// Init output value
+	* offset = 0;
+	* size = 0;
+
+	memset(fru, 0, sizeof(struct fru_info));
+	memset(&header, 0, sizeof(struct fru_header));
+
+	/*
+	* get info about this FRU
+	*/
+	memset(msg_data, 0, 4);
+	msg_data[0] = id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru->size = (rsp->data[1] << 8) | rsp->data[0];
+	fru->access = rsp->data[2] & 0x1;
+
+	lprintf(LOG_DEBUG, "fru.size = %d bytes (accessed by %s)",
+		fru->size, fru->access ? "words" : "bytes");
+
+	if (fru->size < 1) {
+		lprintf(LOG_ERR, " Invalid FRU size %d", fru->size);
+		return -1;
+	}
+
+	/*
+	* retrieve the FRU header
+	*/
+	msg_data[0] = id;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return 1;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		return 1;
+	}
+
+	if (verbose > 1)
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+
+	memcpy(&header, rsp->data + 1, 8);
+
+	if (header.version != 1) {
+		lprintf(LOG_ERR, " Unknown FRU header version 0x%02x",
+			header.version);
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "fru.header.version:         0x%x",
+		header.version);
+	lprintf(LOG_DEBUG, "fru.header.offset.internal: 0x%x",
+		header.offset.internal * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.chassis:  0x%x",
+		header.offset.chassis * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.board:    0x%x",
+		header.offset.board * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.product:  0x%x",
+		header.offset.product * 8);
+	lprintf(LOG_DEBUG, "fru.header.offset.multi:    0x%x",
+		header.offset.multi * 8);
+
+	if((header.offset.internal*8) == 0)
+	{
+		* size = 0;
+		* offset = 0;
+	}
+	else
+	{
+		(* offset) = (header.offset.internal*8);
+
+		if(header.offset.chassis != 0)
+		{
+			(* size) = ((header.offset.chassis*8)-(* offset));
+		}
+		else if(header.offset.board != 0)
+		{
+			(* size) = ((header.offset.board*8)-(* offset));
+		}
+		else if(header.offset.product != 0)
+		{
+			(* size) = ((header.offset.product*8)-(* offset));
+		}
+		else if(header.offset.multi != 0)
+		{
+			(* size) = ((header.offset.multi*8)-(* offset));
+		}
+		else
+		{
+			(* size) = (fru->size - (* offset));
+		}
+	}
+	return 0;
+}
+
+/* ipmi_fru_info_internal_use -  print internal use info
+*
+* @intf:   ipmi interface
+* @id:     fru id
+*
+* returns -1 on error
+* returns 0 if successful
+* returns 1 if device not present
+*/
+static int
+ipmi_fru_info_internal_use(struct ipmi_intf * intf, uint8_t id)
+{
+	struct fru_info fru;
+	uint16_t size;
+	uint16_t offset;
+	int rc = 0;
+
+	rc = ipmi_fru_get_internal_use_info(intf, id, &fru, &size, &offset);
+
+	if(rc == 0)
+	{
+		lprintf(LOG_DEBUG, "Internal Use Area Offset: %i", offset);
+		printf(          "Internal Use Area Size  : %i\n", size);
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Cannot access internal use area");
+		return -1;
+	}
+	return 0;
+}
+
+/* ipmi_fru_help - print help text for FRU subcommand
+ *
+ * returns void
+ */
+void
+ipmi_fru_help()
+{
+	lprintf(LOG_NOTICE,
+			"FRU Commands:  print read write upgEkey edit internaluse get");
+} /* ipmi_fru_help() */
+
+/* ipmi_fru_read_internal_use -  print internal use are in hex or file
+*
+* @intf:   ipmi interface
+* @id:     fru id
+*
+* returns -1 on error
+* returns 0 if successful
+* returns 1 if device not present
+*/
+static int
+ipmi_fru_read_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileName)
+{
+	struct fru_info fru;
+	uint16_t size;
+	uint16_t offset;
+	int rc = 0;
+
+	rc = ipmi_fru_get_internal_use_info(intf, id, &fru, &size, &offset);
+
+	if(rc == 0)
+	{
+		uint8_t * frubuf;
+
+		lprintf(LOG_DEBUG, "Internal Use Area Offset: %i", offset);
+		printf(          "Internal Use Area Size  : %i\n", size);
+
+		frubuf = malloc( size );
+		if(frubuf)
+		{
+			rc = read_fru_area_section(intf, &fru, id, offset, size, frubuf);
+
+			if(rc == 0)
+			{
+				if(pFileName == NULL)
+				{
+					uint16_t counter;
+					for(counter = 0; counter < size; counter ++)
+					{
+						if((counter % 16) == 0)
+							printf("\n%02i- ", (counter / 16));
+						printf("%02X ", frubuf[counter]);
+					}
+				}
+				else
+				{
+					FILE * pFile;
+					pFile = fopen(pFileName,"wb");
+					if (pFile)
+					{
+						fwrite(frubuf, size, 1, pFile);
+						printf("Done\n");
+					}
+					else
+					{
+						lprintf(LOG_ERR, "Error opening file %s\n", pFileName);
+						free(frubuf);
+						frubuf = NULL;
+						return -1;
+					}
+					fclose(pFile);
+				}
+			}
+			printf("\n");
+
+			free(frubuf);
+			frubuf = NULL;
+		}
+
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Cannot access internal use area");
+	}
+	return 0;
+}
+
+/* ipmi_fru_write_internal_use   -  print internal use are in hex or file
+*
+* @intf:   ipmi interface
+* @id:     fru id
+*
+* returns -1 on error
+* returns 0 if successful
+* returns 1 if device not present
+*/
+static int
+ipmi_fru_write_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileName)
+{
+	struct fru_info fru;
+	uint16_t size;
+	uint16_t offset;
+	int rc = 0;
+
+	rc = ipmi_fru_get_internal_use_info(intf, id, &fru, &size, &offset);
+
+	if(rc == 0)
+	{
+		uint8_t * frubuf;
+		FILE * fp;
+		uint32_t fileLength = 0;
+
+		lprintf(LOG_DEBUG, "Internal Use Area Offset: %i", offset);
+		printf(            "Internal Use Area Size  : %i\n", size);
+
+		fp = fopen(pFileName, "r");
+
+		if(fp)
+		{
+			/* Retreive file length, check if it's fits the Eeprom Size */
+			fseek(fp, 0 ,SEEK_END);
+			fileLength = ftell(fp);
+
+			lprintf(LOG_ERR, "File Size: %i", fileLength);
+			lprintf(LOG_ERR, "Area Size: %i", size);
+			if(fileLength != size)
+			{
+				lprintf(LOG_ERR, "File size does not fit Eeprom Size");
+				fclose(fp);
+				fp = NULL;
+			}
+			else
+			{
+				fseek(fp, 0 ,SEEK_SET);
+			}
+		}
+
+		if(fp)
+		{
+			frubuf = malloc( size );
+			if(frubuf)
+			{
+				uint16_t fru_read_size;
+				fru_read_size = fread(frubuf, 1, size, fp);
+
+				if(fru_read_size == size)
+				{
+					rc = write_fru_area(intf, &fru, id, 0, offset, size, frubuf);
+
+					if(rc == 0)
+					{
+						lprintf(LOG_INFO, "Done\n");
+					}
+				}
+				else
+				{
+					lprintf(LOG_ERR, "Unable to read file: %i\n", fru_read_size);
+				}
+
+				free(frubuf);
+				frubuf = NULL;
+			}
+			fclose(fp);
+			fp = NULL;
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Cannot access internal use area");
+	}
+	return 0;
+}
+
+int
+ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	uint8_t fru_id = 0;
+
+	if (argc < 1) {
+		rc = ipmi_fru_print_all(intf);
+	}
+	else if (strncmp(argv[0], "help", 4) == 0) {
+		ipmi_fru_help();
+		return 0;
+	}
+	else if (strncmp(argv[0], "print", 5) == 0 ||
+		strncmp(argv[0], "list", 4) == 0) {
+		if (argc > 1) {
+			if (strcmp(argv[1], "help") == 0) {
+				lprintf(LOG_NOTICE, "fru print [fru id] - print information about FRU(s)");
+				return 0;
+			}
+
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			rc = __ipmi_fru_print(intf, fru_id);
+		} else {
+			rc = ipmi_fru_print_all(intf);
+		}
+	}
+	else if (!strncmp(argv[0], "read", 5)) {
+		if (argc > 1 && strcmp(argv[1], "help") == 0) {
+			ipmi_fru_read_help();
+			return 0;
+		} else if (argc < 3) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_fru_read_help();
+			return (-1);
+		}
+
+		if (is_fru_id(argv[1], &fru_id) != 0)
+			return (-1);
+
+		/* There is a file name in the parameters */
+		if (is_valid_filename(argv[2]) != 0)
+				return (-1);
+
+		if (verbose) {
+			printf("FRU ID           : %d\n", fru_id);
+			printf("FRU File         : %s\n", argv[2]);
+		}
+		/* TODO - rc is missing */
+		ipmi_fru_read_to_bin(intf, argv[2], fru_id);
+	}
+	else if (!strncmp(argv[0], "write", 5)) {
+		if (argc > 1 && strcmp(argv[1], "help") == 0) {
+			ipmi_fru_write_help();
+			return 0;
+		} else if (argc < 3) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_fru_write_help();
+			return (-1);
+		}
+
+		if (is_fru_id(argv[1], &fru_id) != 0)
+			return (-1);
+
+		/* There is a file name in the parameters */
+		if (is_valid_filename(argv[2]) != 0)
+				return (-1);
+
+		if (verbose) {
+			printf("FRU ID           : %d\n", fru_id);
+			printf("FRU File         : %s\n", argv[2]);
+		}
+		/* TODO - rc is missing */
+		ipmi_fru_write_from_bin(intf, argv[2], fru_id);
+	}
+	else if (!strncmp(argv[0], "upgEkey", 7)) {
+		if (argc > 1 && strcmp(argv[1], "help") == 0) {
+			ipmi_fru_upgekey_help();
+			return 0;
+		} else if (argc < 3) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_fru_upgekey_help();
+			return (-1);
+		}
+
+		if (is_fru_id(argv[1], &fru_id) != 0)
+			return (-1);
+
+		/* There is a file name in the parameters */
+		if (is_valid_filename(argv[2]) != 0)
+				return (-1);
+
+		rc = ipmi_fru_upg_ekeying(intf, argv[2], fru_id);
+	}
+	else if (!strncmp(argv[0], "internaluse", 11)) {
+		if (argc > 1 && strcmp(argv[1], "help") == 0) {
+			ipmi_fru_internaluse_help();
+			return 0;
+		}
+
+		if ( (argc >= 3) && (!strncmp(argv[2], "info", 4)) ) {
+
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			rc = ipmi_fru_info_internal_use(intf, fru_id);
+		}
+		else if ( (argc >= 3) && (!strncmp(argv[2], "print", 5)) ) {
+
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			rc = ipmi_fru_read_internal_use(intf, fru_id, NULL);
+		}
+		else if ( (argc >= 4) && (!strncmp(argv[2], "read", 4)) ) {
+
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			/* There is a file name in the parameters */
+			if (is_valid_filename(argv[3]) != 0)
+					return (-1);
+
+			lprintf(LOG_DEBUG, "FRU ID           : %d", fru_id);
+			lprintf(LOG_DEBUG, "FRU File         : %s", argv[3]);
+
+			rc = ipmi_fru_read_internal_use(intf, fru_id, argv[3]);
+		}
+		else if ( (argc >= 4) && (!strncmp(argv[2], "write", 5)) ) {
+
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			/* There is a file name in the parameters */
+			if (is_valid_filename(argv[3]) != 0)
+					return (-1);
+
+			lprintf(LOG_DEBUG, "FRU ID           : %d", fru_id);
+			lprintf(LOG_DEBUG, "FRU File         : %s", argv[3]);
+
+			rc = ipmi_fru_write_internal_use(intf, fru_id, argv[3]);
+		} else {
+			lprintf(LOG_ERR,
+					"Either unknown command or not enough parameters given.");
+			ipmi_fru_internaluse_help();
+			return (-1);
+		}
+	}
+	else if (!strncmp(argv[0], "edit", 4)) {
+		if (argc > 1 && strcmp(argv[1], "help") == 0) {
+			ipmi_fru_edit_help();
+			return 0;
+		} else if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_fru_edit_help();
+			return (-1);
+		}
+		
+		if (argc >= 2) {
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			if (verbose) {
+				printf("FRU ID           : %d\n", fru_id);
+			}
+		} else {
+			printf("Using default FRU ID: %d\n", fru_id);
+		}
+
+		if (argc >= 3) {
+			if (!strncmp(argv[2], "field", 5)) {
+				if (argc != 6) {
+					lprintf(LOG_ERR, "Not enough parameters given.");
+					ipmi_fru_edit_help();
+					return (-1);
+				}
+				rc = ipmi_fru_set_field_string(intf, fru_id, *argv[3], *argv[4],
+						(char *) argv[5]);
+			} else if (!strncmp(argv[2], "oem", 3)) {
+				rc = ipmi_fru_edit_multirec(intf, fru_id, argc, argv);
+			} else {
+				lprintf(LOG_ERR, "Invalid command: %s", argv[2]);
+				ipmi_fru_edit_help();
+				return (-1);
+			}
+		} else {
+			rc = ipmi_fru_edit_multirec(intf, fru_id, argc, argv);
+		}
+	}
+	else if (!strncmp(argv[0], "get", 4)) {
+		if (argc > 1 && (strncmp(argv[1], "help", 4) == 0)) {
+			ipmi_fru_get_help();
+			return 0;
+		} else if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_fru_get_help();
+			return (-1);
+		}
+
+		if (argc >= 2) {
+			if (is_fru_id(argv[1], &fru_id) != 0)
+				return (-1);
+
+			if (verbose) {
+				printf("FRU ID           : %d\n", fru_id);
+			}
+		} else {
+			printf("Using default FRU ID: %d\n", fru_id);
+		}
+
+		if (argc >= 3) {
+			if (!strncmp(argv[2], "oem", 3)) {
+				rc = ipmi_fru_get_multirec(intf, fru_id, argc, argv);
+			} else {
+				lprintf(LOG_ERR, "Invalid command: %s", argv[2]);
+				ipmi_fru_get_help();
+				return (-1);
+			}
+		} else {
+			rc = ipmi_fru_get_multirec(intf, fru_id, argc, argv);
+		}
+	}
+	else {
+		lprintf(LOG_ERR, "Invalid FRU command: %s", argv[0]);
+		ipmi_fru_help();
+		return (-1);
+	}
+
+	return rc;
+}
+
+/* ipmi_fru_set_field_string -  Set a field string to a new value, Need to be the same size.  If
+*                              size if not equal, the function ipmi_fru_set_field_string_rebuild
+*                              will be called.
+*
+* @intf:       ipmi interface
+* @id:         fru id
+* @f_type:    Type of the Field : c=Chassis b=Board p=Product
+* @f_index:   findex of the field, zero indexed.
+* @f_string:  NULL terminated string
+*
+* returns -1 on error
+* returns 1 if successful
+*/
+static int
+ipmi_fru_set_field_string(struct ipmi_intf * intf, uint8_t fruId, uint8_t
+f_type, uint8_t f_index, char *f_string)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	struct fru_info fru;
+	struct fru_header header;
+	uint8_t msg_data[4];
+	uint8_t checksum;
+	int i = 0;
+	int rc = 1;
+	uint8_t *fru_data = NULL;
+	uint8_t *fru_area = NULL;
+	uint32_t fru_field_offset, fru_field_offset_tmp;
+	uint32_t fru_section_len, header_offset;
+
+	memset(msg_data, 0, 4);
+	msg_data[0] = fruId;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+	if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+			val2str(rsp->ccode, completion_code_vals));
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+
+	if (fru.size < 1) {
+		printf(" Invalid FRU size %d", fru.size);
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+	/*
+	* retrieve the FRU header
+	*/
+	msg_data[0] = fruId;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL)
+	{
+		printf(" Device not present (No Response)\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+	if (rsp->ccode > 0)
+	{
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+
+	if (verbose > 1)
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+
+	memcpy(&header, rsp->data + 1, 8);
+
+	if (header.version != 1)
+	{
+		printf(" Unknown FRU header version 0x%02x",
+			header.version);
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+
+	fru_data = malloc( fru.size );
+
+	if( fru_data == NULL )
+	{
+		printf("Out of memory!\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+
+	/* Setup offset from the field type */
+
+	/* Chassis type field */
+	if (f_type == 'c' ) {
+		header_offset = (header.offset.chassis * 8);
+		read_fru_area(intf ,&fru, fruId, header_offset , 3 , fru_data);
+		fru_field_offset = 3;
+		fru_section_len = *(fru_data + 1) * 8;
+	}
+	/* Board type field */
+	else if (f_type == 'b' ) {
+		header_offset = (header.offset.board * 8);
+		read_fru_area(intf ,&fru, fruId, header_offset , 3 , fru_data);
+		fru_field_offset = 6;
+		fru_section_len = *(fru_data + 1) * 8;
+	}
+	/* Product type field */
+	else if (f_type == 'p' ) {
+		header_offset = (header.offset.product * 8);
+		read_fru_area(intf ,&fru, fruId, header_offset , 3 , fru_data);
+		fru_field_offset = 3;
+		fru_section_len = *(fru_data + 1) * 8;
+	}
+	else
+	{
+		printf("Wrong field type.");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+	memset(fru_data, 0, fru.size);
+	if( read_fru_area(intf ,&fru, fruId, header_offset ,
+					fru_section_len , fru_data) < 0 )
+	{
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+	/* Convert index from character to decimal */
+	f_index= f_index - 0x30;
+
+	/*Seek to field index */
+	for (i=0; i <= f_index; i++) {
+		fru_field_offset_tmp = fru_field_offset;
+		if (fru_area != NULL) {
+			free(fru_area);
+			fru_area = NULL;
+		}
+		fru_area = (uint8_t *) get_fru_area_str(fru_data, &fru_field_offset);
+	}
+
+	if( (fru_area == NULL )  || strlen((const char *)fru_area) == 0 ) {
+		printf("Field not found !\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_out;
+	}
+
+	if ( strlen((const char *)fru_area) == strlen((const char *)f_string) )
+	{
+		printf("Updating Field '%s' with '%s' ...\n", fru_area, f_string );
+		memcpy(fru_data + fru_field_offset_tmp + 1,
+								f_string, strlen(f_string));
+
+		checksum = 0;
+		/* Calculate Header Checksum */
+		for (i = 0; i < fru_section_len - 1; i++)
+		{
+			checksum += fru_data[i];
+		}
+		checksum = (~checksum) + 1;
+		fru_data[fru_section_len - 1] = checksum;
+
+		/* Write the updated section to the FRU data; source offset => 0 */
+		if( write_fru_area(intf, &fru, fruId, 0,
+				header_offset, fru_section_len, fru_data) < 0 )
+		{
+			printf("Write to FRU data failed.\n");
+			rc = (-1);
+			goto ipmi_fru_set_field_string_out;
+		}
+	}
+	else {
+		printf("String size are not equal, resizing fru to fit new string\n");
+		if(
+				ipmi_fru_set_field_string_rebuild(intf,fruId,fru,header,f_type,f_index,f_string)
+		)
+		{
+			rc = (-1);
+			goto ipmi_fru_set_field_string_out;
+		}
+	}
+
+	ipmi_fru_set_field_string_out:
+	if (fru_data != NULL) {
+		free(fru_data);
+		fru_data = NULL;
+	}
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+
+	return rc;
+}
+
+/*
+	This function can update a string within of the following section when the size is not equal:
+
+	Chassis
+	Product
+	Board
+*/
+/* ipmi_fru_set_field_string_rebuild -  Set a field string to a new value, When size are not
+*                                      the same size.
+*
+*  This function can update a string within of the following section when the size is not equal:
+*
+*      - Chassis
+*      - Product
+*      - Board
+*
+* @intf:     ipmi interface
+* @fruId:    fru id
+* @fru:      info about fru
+* @header:   contain the header of the FRU
+* @f_type:   Type of the Field : c=Chassis b=Board p=Product
+* @f_index:  findex of the field, zero indexed.
+* @f_string: NULL terminated string
+*
+* returns -1 on error
+* returns 1 if successful
+*/
+
+#define DBG_RESIZE_FRU
+static int
+ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId,
+											struct fru_info fru, struct fru_header header,
+											uint8_t f_type, uint8_t f_index, char *f_string)
+{
+	int i = 0;
+	uint8_t *fru_data_old = NULL;
+	uint8_t *fru_data_new = NULL;
+	uint8_t *fru_area = NULL;
+	uint32_t fru_field_offset, fru_field_offset_tmp;
+	uint32_t fru_section_len, header_offset;
+	uint32_t chassis_offset, board_offset, product_offset;
+	uint32_t chassis_len, board_len, product_len, product_len_new;
+	int      num_byte_change = 0, padding_len = 0;
+	uint32_t counter;
+	unsigned char cksum;
+	int rc = 1;
+
+	fru_data_old = calloc( fru.size, sizeof(uint8_t) );
+
+	fru_data_new = malloc( fru.size );
+
+	if( fru_data_old == NULL || fru_data_new == NULL )
+	{
+		printf("Out of memory!\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_rebuild_out;
+	}
+
+	/*************************
+	1) Read ALL FRU */
+	printf("Read All FRU area\n");
+	printf("Fru Size       : %u bytes\n", fru.size);
+
+	/* Read current fru data */
+	read_fru_area(intf ,&fru, fruId, 0, fru.size , fru_data_old);
+
+	#ifdef DBG_RESIZE_FRU
+	printf("Copy to new FRU\n");
+	#endif
+
+	/*************************
+	2) Copy all FRU to new FRU */
+	memcpy(fru_data_new, fru_data_old, fru.size);
+
+	/* Build location of all modifiable components */
+	chassis_offset = (header.offset.chassis * 8);
+	board_offset   = (header.offset.board   * 8);
+	product_offset = (header.offset.product * 8);
+
+	/* Retrieve length of all modifiable components */
+	chassis_len    =  *(fru_data_old + chassis_offset + 1) * 8;
+	board_len      =  *(fru_data_old + board_offset   + 1) * 8;
+	product_len    =  *(fru_data_old + product_offset + 1) * 8;
+	product_len_new = product_len;
+
+	/* Chassis type field */
+	if (f_type == 'c' )
+	{
+		header_offset    = chassis_offset;
+		fru_field_offset = chassis_offset + 3;
+		fru_section_len  = chassis_len;
+	}
+	/* Board type field */
+	else if (f_type == 'b' )
+	{
+		header_offset    = board_offset;
+		fru_field_offset = board_offset + 6;
+		fru_section_len  = board_len;
+	}
+	/* Product type field */
+	else if (f_type == 'p' )
+	{
+		header_offset    = product_offset;
+		fru_field_offset = product_offset + 3;
+		fru_section_len  = product_len;
+	}
+	else
+	{
+		printf("Wrong field type.");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_rebuild_out;
+	}
+
+	/*************************
+	3) Seek to field index */
+	for (i = 0;i <= f_index; i++) {
+		fru_field_offset_tmp = fru_field_offset;
+		if (fru_area != NULL) {
+			free(fru_area);
+			fru_area = NULL;
+		}
+		fru_area = (uint8_t *) get_fru_area_str(fru_data_old, &fru_field_offset);
+	}
+
+	if( (fru_area == NULL )  || strlen((const char *)fru_area) == 0 ) {
+		printf("Field not found (1)!\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_rebuild_out;
+	}
+
+	#ifdef DBG_RESIZE_FRU
+	printf("Section Length: %u\n", fru_section_len);
+	#endif
+
+	/*************************
+	4) Check number of padding bytes and bytes changed */
+	for(counter = 2; counter < fru_section_len; counter ++)
+	{
+		if(*(fru_data_old + (header_offset + fru_section_len - counter)) == 0)
+			padding_len ++;
+		else
+			break;
+	}
+	num_byte_change = strlen(f_string) - strlen(fru_area);
+
+	#ifdef DBG_RESIZE_FRU
+	printf("Padding Length: %u\n", padding_len);
+	printf("NumByte Change: %i\n", num_byte_change);
+	printf("Start SecChnge: %x\n", *(fru_data_old + fru_field_offset_tmp));
+	printf("End SecChnge  : %x\n", *(fru_data_old + fru_field_offset_tmp + strlen(f_string) + 1));
+
+	printf("Start Section : %x\n", *(fru_data_old + header_offset));
+	printf("End Sec wo Pad: %x\n", *(fru_data_old + header_offset + fru_section_len - 2 - padding_len));
+	printf("End Section   : %x\n", *(fru_data_old + header_offset + fru_section_len - 1));
+	#endif
+
+	/* Calculate New Padding Length */
+	padding_len -= num_byte_change;
+
+	#ifdef DBG_RESIZE_FRU
+	printf("New Padding Length: %i\n", padding_len);
+	#endif
+
+	/*************************
+	5) Check if section must be resize.  This occur when padding length is not between 0 and 7 */
+	if( (padding_len < 0) || (padding_len >= 8))
+	{
+		uint32_t remaining_offset = ((header.offset.product * 8) + product_len);
+		int change_size_by_8;
+
+		if(padding_len >= 8)
+		{
+			/* Section must be set smaller */
+			change_size_by_8 = ((padding_len) / 8) * (-1);
+		}
+		else
+		{
+			/* Section must be set bigger */
+			change_size_by_8 = 1 + (((padding_len+1) / 8) * (-1));
+		}
+
+		/* Recalculate padding and section length base on the section changes */
+		fru_section_len += (change_size_by_8 * 8);
+		padding_len     += (change_size_by_8 * 8);
+
+		#ifdef DBG_RESIZE_FRU
+		printf("change_size_by_8: %i\n", change_size_by_8);
+		printf("New Padding Length: %i\n", padding_len);
+		printf("change_size_by_8: %i\n", change_size_by_8);
+		printf("header.offset.board: %i\n", header.offset.board);
+		#endif
+
+		/* Must move sections */
+		/* Section that can be modified are as follow
+			Chassis
+			Board
+			product */
+
+		/* Chassis type field */
+		if (f_type == 'c' )
+		{
+			printf("Moving Section Chassis, from %i to %i\n",
+						((header.offset.board) * 8),
+						((header.offset.board + change_size_by_8) * 8)
+					);
+			memcpy(
+						(fru_data_new + ((header.offset.board + change_size_by_8) * 8)),
+						(fru_data_old + (header.offset.board) * 8),
+						board_len
+					);
+			header.offset.board   += change_size_by_8;
+		}
+		/* Board type field */
+		if ((f_type == 'c' ) || (f_type == 'b' ))
+		{
+			printf("Moving Section Product, from %i to %i\n",
+						((header.offset.product) * 8),
+						((header.offset.product + change_size_by_8) * 8)
+					);
+			memcpy(
+						(fru_data_new + ((header.offset.product + change_size_by_8) * 8)),
+						(fru_data_old + (header.offset.product) * 8),
+						product_len
+					);
+			header.offset.product += change_size_by_8;
+		}
+
+		if ((f_type == 'c' ) || (f_type == 'b' ) || (f_type == 'p' )) {
+			printf("Change multi offset from %d to %d\n", header.offset.multi, header.offset.multi + change_size_by_8);
+			header.offset.multi += change_size_by_8;
+		}
+
+		/* Adjust length of the section */
+		if (f_type == 'c')
+		{
+			*(fru_data_new + chassis_offset + 1) += change_size_by_8;
+		}
+		else if( f_type == 'b')
+		{
+			*(fru_data_new + board_offset + 1)   += change_size_by_8;
+		}
+		else if( f_type == 'p')
+		{
+			*(fru_data_new + product_offset + 1) += change_size_by_8;
+			product_len_new = *(fru_data_new + product_offset + 1) * 8;
+		}
+
+		/* Rebuild Header checksum */
+		{
+			unsigned char * pfru_header = (unsigned char *) &header;
+			header.checksum = 0;
+			for(counter = 0; counter < (sizeof(struct fru_header) -1); counter ++)
+			{
+				header.checksum += pfru_header[counter];
+			}
+			header.checksum = (0 - header.checksum);
+			memcpy(fru_data_new, pfru_header, sizeof(struct fru_header));
+		}
+
+		/* Move remaining sections in 1 copy */
+		printf("Moving Remaining Bytes (Multi-Rec , etc..), from %i to %i\n",
+					remaining_offset,
+					((header.offset.product) * 8) + product_len_new
+				);
+		if(((header.offset.product * 8) + product_len_new - remaining_offset) < 0)
+		{
+			memcpy(
+						fru_data_new + (header.offset.product * 8) + product_len_new,
+						fru_data_old + remaining_offset,
+						fru.size - remaining_offset
+					);
+		}
+		else
+		{
+			memcpy(
+						fru_data_new + (header.offset.product * 8) + product_len_new,
+						fru_data_old + remaining_offset,
+						fru.size - ((header.offset.product * 8) + product_len_new)
+					);
+		}
+	}
+
+	/* Update only if it's fits padding length as defined in the spec, otherwise, it's an internal
+	error */
+	/*************************
+	6) Update Field and sections */
+	if( (padding_len >=0) && (padding_len < 8))
+	{
+		/* Do not requires any change in other section */
+
+		/* Change field length */
+		printf(
+			"Updating Field : '%s' with '%s' ... (Length from '%d' to '%d')\n",
+			fru_area, f_string, 
+			(int)*(fru_data_old + fru_field_offset_tmp), 
+			(int)(0xc0 + strlen(f_string)));
+		*(fru_data_new + fru_field_offset_tmp) = (0xc0 + strlen(f_string));
+		memcpy(fru_data_new + fru_field_offset_tmp + 1, f_string, strlen(f_string));
+
+		/* Copy remaing bytes in section */
+#ifdef DBG_RESIZE_FRU
+		printf("Copying remaining of sections: %d \n",
+		 (int)((fru_data_old + header_offset + fru_section_len - 1) -
+		 (fru_data_old + fru_field_offset_tmp + strlen(f_string) + 1)));
+#endif
+
+		memcpy((fru_data_new + fru_field_offset_tmp + 1 + 
+			strlen(f_string)),
+			(fru_data_old + fru_field_offset_tmp + 1 + 
+			strlen(fru_area)),
+		((fru_data_old + header_offset + fru_section_len - 1) -
+		(fru_data_old + fru_field_offset_tmp + strlen(f_string) + 1)));
+
+		/* Add Padding if required */
+		for(counter = 0; counter < padding_len; counter ++)
+		{
+			*(fru_data_new + header_offset + fru_section_len - 1 - 
+			  padding_len + counter) = 0;
+		}
+
+		/* Calculate New Checksum */
+		cksum = 0;
+		for( counter = 0; counter <fru_section_len-1; counter ++ )
+		{
+			cksum += *(fru_data_new + header_offset + counter);
+		}
+		*(fru_data_new + header_offset + fru_section_len - 1) = (0 - cksum);
+
+		#ifdef DBG_RESIZE_FRU
+		printf("Calculate New Checksum: %x\n", (0 - cksum));
+		#endif
+	}
+	else
+	{
+		printf( "Internal error, padding length %i (must be from 0 to 7) ", padding_len );
+		rc = (-1);
+		goto ipmi_fru_set_field_string_rebuild_out;
+	}
+
+	/*************************
+	7) Finally, write new FRU */
+	printf("Writing new FRU.\n");
+	if( write_fru_area( intf, &fru, fruId, 0, 0, fru.size, fru_data_new ) < 0 )
+	{
+		printf("Write to FRU data failed.\n");
+		rc = (-1);
+		goto ipmi_fru_set_field_string_rebuild_out;
+	}
+
+	printf("Done.\n");
+
+	ipmi_fru_set_field_string_rebuild_out:
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	if (fru_data_new != NULL) {
+		free(fru_data_new);
+		fru_data_new = NULL;
+	}
+	if (fru_data_old != NULL) {
+		free(fru_data_old);
+		fru_data_old = NULL;
+	}
+
+	return rc;
+}
diff --git a/lib/ipmi_fwum.c b/lib/ipmi_fwum.c
new file mode 100644
index 0000000..d1e3f4f
--- /dev/null
+++ b/lib/ipmi_fwum.c
@@ -0,0 +1,1128 @@
+/*
+ * Copyright (c) 2004 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+#include <math.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_fwum.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+
+extern int verbose;
+unsigned char firmBuf[1024*512];
+tKFWUM_SaveFirmwareInfo save_fw_nfo;
+
+int KfwumGetFileSize(const char *pFileName,
+		unsigned long *pFileSize);
+int KfwumSetupBuffersFromFile(const char *pFileName,
+		unsigned long fileSize);
+void KfwumShowProgress(const char *task, unsigned long current,
+		unsigned long total);
+unsigned short KfwumCalculateChecksumPadding(unsigned char *pBuffer,
+		unsigned long totalSize);
+int KfwumGetInfo(struct ipmi_intf *intf, unsigned char output,
+		unsigned char *pNumBank);
+int KfwumGetDeviceInfo(struct ipmi_intf *intf,
+		unsigned char output, tKFWUM_BoardInfo *pBoardInfo);
+int KfwumGetStatus(struct ipmi_intf *intf);
+int KfwumManualRollback(struct ipmi_intf *intf);
+int KfwumStartFirmwareImage(struct ipmi_intf *intf,
+		unsigned long length, unsigned short padding);
+int KfwumSaveFirmwareImage(struct ipmi_intf *intf,
+		unsigned char sequenceNumber, unsigned long address,
+		unsigned char *pFirmBuf, unsigned char *pInBufLength);
+int KfwumFinishFirmwareImage(struct ipmi_intf *intf,
+		tKFWUM_InFirmwareInfo firmInfo);
+int KfwumUploadFirmware(struct ipmi_intf *intf,
+		unsigned char *pBuffer, unsigned long totalSize);
+int KfwumStartFirmwareUpgrade(struct ipmi_intf *intf);
+int KfwumGetInfoFromFirmware(unsigned char *pBuf,
+		unsigned long bufSize, tKFWUM_InFirmwareInfo *pInfo);
+void KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo *pInfo);
+int KfwumGetTraceLog(struct ipmi_intf *intf);
+int ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo,
+		tKFWUM_InFirmwareInfo firmInfo);
+
+int ipmi_fwum_fwupgrade(struct ipmi_intf *intf, char *file, int action);
+int ipmi_fwum_info(struct ipmi_intf *intf);
+int ipmi_fwum_status(struct ipmi_intf *intf);
+void printf_kfwum_help(void);
+void printf_kfwum_info(tKFWUM_BoardInfo boardInfo,
+		tKFWUM_InFirmwareInfo firmInfo);
+
+/* String table */
+/* Must match eFWUM_CmdId */
+const char *CMD_ID_STRING[] = {
+	"GetFwInfo",
+	"KickWatchdog",
+	"GetLastAnswer",
+	"BootHandshake",
+	"ReportStatus",
+	"CtrlIPMBLine",
+	"SetFwState",
+	"GetFwStatus",
+	"GetSpiMemStatus",
+	"StartFwUpdate",
+	"StartFwImage",
+	"SaveFwImage",
+	"FinishFwImage",
+	"ReadFwImage",
+	"ManualRollback",
+	"GetTraceLog"
+};
+
+const char *EXT_CMD_ID_STRING[] = {
+	"FwUpgradeLock",
+	"ProcessFwUpg",
+	"ProcessFwRb",
+	"WaitHSAfterUpg",
+	"WaitFirstHSUpg",
+	"FwInfoStateChange"
+};
+
+const char *CMD_STATE_STRING[] = {
+	"Invalid",
+	"Begin",
+	"Progress",
+	"Completed"
+};
+
+const struct valstr bankStateValS[] = {
+	{ 0x00, "Not programmed" },
+	{ 0x01, "New firmware" },
+	{ 0x02, "Wait for validation" },
+	{ 0x03, "Last Known Good" },
+	{ 0x04, "Previous Good" }
+};
+
+/* ipmi_fwum_main  -  entry point for this ipmitool mode
+ *
+ * @intf: ipmi interface
+ * @arc: number of arguments
+ * @argv: point to argument array
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+	printf("FWUM extension Version %d.%d\n", VER_MAJOR, VER_MINOR);
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_kfwum_help();
+		return (-1);
+	}
+	if (strncmp(argv[0], "help", 4) == 0) {
+		printf_kfwum_help();
+		rc = 0;
+	} else if (strncmp(argv[0], "info", 4) == 0) {
+		rc = ipmi_fwum_info(intf);
+	} else if (strncmp(argv[0], "status", 6) == 0) {
+		rc = ipmi_fwum_status(intf);
+	} else if (strncmp(argv[0], "rollback", 8) == 0) {
+		rc = KfwumManualRollback(intf);
+	} else if (strncmp(argv[0], "download", 8) == 0) {
+		if ((argc < 2) || (strlen(argv[1]) < 1)) {
+			lprintf(LOG_ERR,
+					"Path and file name must be specified.");
+			return (-1);
+		}
+		printf("Firmware File Name         : %s\n", argv[1]);
+		rc = ipmi_fwum_fwupgrade(intf, argv[1], 0);
+	} else if (strncmp(argv[0], "upgrade", 7) == 0) {
+		if ((argc >= 2) && (strlen(argv[1]) > 0)) {
+			printf("Upgrading using file name %s\n", argv[1]);
+			rc = ipmi_fwum_fwupgrade(intf, argv[1], 1);
+		} else {
+			rc = KfwumStartFirmwareUpgrade(intf);
+		}
+	} else if (strncmp(argv[0], "tracelog", 8) == 0) {
+		rc = KfwumGetTraceLog(intf);
+	} else {
+		lprintf(LOG_ERR, "Invalid KFWUM command: %s", argv[0]);
+		printf_kfwum_help();
+		rc = (-1);
+	}
+	return rc;
+}
+
+void
+printf_kfwum_help(void)
+{
+	lprintf(LOG_NOTICE,
+"KFWUM Commands:  info status download upgrade rollback tracelog");
+}
+
+/*  private definitions and macros */
+typedef enum eFWUM_CmdId
+{
+	KFWUM_CMD_ID_GET_FIRMWARE_INFO                         = 0,
+	KFWUM_CMD_ID_KICK_IPMC_WATCHDOG                        = 1,
+	KFWUM_CMD_ID_GET_LAST_ANSWER                           = 2,
+	KFWUM_CMD_ID_BOOT_HANDSHAKE                            = 3,
+	KFWUM_CMD_ID_REPORT_STATUS                             = 4,
+	KFWUM_CMD_ID_GET_FIRMWARE_STATUS                       = 7,
+	KFWUM_CMD_ID_START_FIRMWARE_UPDATE                     = 9,
+	KFWUM_CMD_ID_START_FIRMWARE_IMAGE                      = 0x0a,
+	KFWUM_CMD_ID_SAVE_FIRMWARE_IMAGE                       = 0x0b,
+	KFWUM_CMD_ID_FINISH_FIRMWARE_IMAGE                     = 0x0c,
+	KFWUM_CMD_ID_READ_FIRMWARE_IMAGE                       = 0x0d,
+	KFWUM_CMD_ID_MANUAL_ROLLBACK                           = 0x0e,
+	KFWUM_CMD_ID_GET_TRACE_LOG                             = 0x0f,
+	KFWUM_CMD_ID_STD_MAX_CMD,
+	KFWUM_CMD_ID_EXTENDED_CMD                              = 0xC0
+}  tKFWUM_CmdId;
+
+int
+ipmi_fwum_info(struct ipmi_intf *intf)
+{
+	tKFWUM_BoardInfo b_info;
+	int rc = 0;
+	unsigned char not_used;
+	if (verbose) {
+		printf("Getting Kontron FWUM Info\n");
+	}
+	if (KfwumGetDeviceInfo(intf, 1, &b_info) != 0) {
+		rc = (-1);
+	}
+	if (KfwumGetInfo(intf, 1, &not_used) != 0) {
+		rc = (-1);
+	}
+	return rc;
+}
+
+int
+ipmi_fwum_status(struct ipmi_intf *intf)
+{
+	if (verbose) {
+		printf("Getting Kontron FWUM Status\n");
+	}
+	if (KfwumGetStatus(intf) != 0) {
+		return (-1);
+	}
+	return 0;
+}
+
+/* ipmi_fwum_fwupgrade - function implements download/upload of the firmware
+ * data received as parameters
+ *
+ * @file: fw file
+ * @action: 0 = download, 1 = upload/start upload
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+ipmi_fwum_fwupgrade(struct ipmi_intf *intf, char *file, int action)
+{
+	tKFWUM_BoardInfo b_info;
+	tKFWUM_InFirmwareInfo fw_info = { 0 };
+	unsigned short padding;
+	unsigned long fsize = 0;
+	unsigned char not_used;
+	if (file == NULL) {
+		lprintf(LOG_ERR, "No file given.");
+		return (-1);
+	}
+	if (KfwumGetFileSize(file, &fsize) != 0) {
+		return (-1);
+	}
+	if (KfwumSetupBuffersFromFile(file, fsize) != 0) {
+		return (-1);
+	}
+	padding = KfwumCalculateChecksumPadding(firmBuf, fsize);
+	if (KfwumGetInfoFromFirmware(firmBuf, fsize, &fw_info) != 0) {
+		return (-1);
+	}
+	if (KfwumGetDeviceInfo(intf, 0, &b_info) != 0) {
+		return (-1);
+	}
+	if (ipmi_kfwum_checkfwcompat(b_info, fw_info) != 0) {
+		return (-1);
+	}
+	KfwumGetInfo(intf, 0, &not_used);
+	printf_kfwum_info(b_info, fw_info);
+	if (KfwumStartFirmwareImage(intf, fsize, padding) != 0) {
+		return (-1);
+	}
+	if (KfwumUploadFirmware(intf, firmBuf, fsize) != 0) {
+		return (-1);
+	}
+	if (KfwumFinishFirmwareImage(intf, fw_info) != 0) {
+		return (-1);
+	}
+	if (KfwumGetStatus(intf) != 0) {
+		return (-1);
+	}
+	if (action != 0) {
+		if (KfwumStartFirmwareUpgrade(intf) != 0) {
+			return (-1);
+		}
+	}
+	return 0;
+}
+
+/* KfwumGetFileSize  -  gets the file size
+ *
+ * @pFileName : filename ptr
+ * @pFileSize : output ptr for filesize
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+KfwumGetFileSize(const char *pFileName, unsigned long *pFileSize)
+{
+	FILE *pFileHandle = NULL;
+	pFileHandle = fopen(pFileName, "rb");
+	if (pFileHandle == NULL) {
+		return (-1);
+	}
+	if (fseek(pFileHandle, 0L , SEEK_END) == 0) {
+		*pFileSize = ftell(pFileHandle);
+	}
+	fclose(pFileHandle);
+	if (*pFileSize != 0) {
+		return 0;
+	}
+	return (-1);
+}
+
+/* KfwumSetupBuffersFromFile  -  small buffers are used to store the file data
+ *
+ * @pFileName : filename ptr
+ * unsigned long : filesize
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+KfwumSetupBuffersFromFile(const char *pFileName, unsigned long fileSize)
+{
+	int rc = (-1);
+	FILE *pFileHandle = NULL;
+	int count;
+	int modulus;
+	int qty = 0;
+
+	pFileHandle = fopen(pFileName, "rb");
+	if (pFileHandle == NULL) {
+		lprintf(LOG_ERR, "Failed to open '%s' for reading.",
+				pFileName);
+		return (-1);
+	}
+	count = fileSize / MAX_BUFFER_SIZE;
+	modulus = fileSize % MAX_BUFFER_SIZE;
+
+	rewind(pFileHandle);
+	for (qty = 0; qty < count; qty++) {
+		KfwumShowProgress("Reading Firmware from File",
+				qty, count);
+		if (fread(&firmBuf[qty * MAX_BUFFER_SIZE], 1,
+					MAX_BUFFER_SIZE,
+					pFileHandle) == MAX_BUFFER_SIZE) {
+			rc = 0;
+		}
+	}
+	if (modulus) {
+		if (fread(&firmBuf[qty * MAX_BUFFER_SIZE], 1,
+					modulus, pFileHandle) == modulus) {
+			rc = 0;
+		}
+	}
+	if (rc == 0) {
+		KfwumShowProgress("Reading Firmware from File", 100, 100);
+	}
+	fclose(pFileHandle);
+	return rc;
+}
+
+/* KfwumShowProgress  -  helper routine to display progress bar
+ *
+ * Converts current/total in percent
+ *
+ * *task  : string identifying current operation
+ * current: progress
+ * total  : limit
+ */
+void
+KfwumShowProgress(const char *task, unsigned long current, unsigned long total)
+{
+# define PROG_LENGTH 42
+	static unsigned long staticProgress=0xffffffff;
+	unsigned char spaces[PROG_LENGTH + 1];
+	unsigned short hash;
+	float percent = ((float)current / total);
+	unsigned long progress =  100 * (percent);
+
+	if (staticProgress == progress) {
+		/* We displayed the same last time.. so don't do it */
+		return;
+	}
+	staticProgress = progress;
+	printf("%-25s : ", task); /* total 20 bytes */
+	hash = (percent * PROG_LENGTH);
+	memset(spaces, '#', hash);
+	spaces[hash] = '\0';
+
+	printf("%s", spaces);
+	memset(spaces, ' ', (PROG_LENGTH - hash));
+	spaces[(PROG_LENGTH - hash)] = '\0';
+	printf("%s", spaces );
+
+	printf(" %3ld %%\r", progress); /* total 7 bytes */
+	if (progress == 100) {
+		printf("\n");
+	}
+	fflush(stdout);
+}
+
+/* KfwumCalculateChecksumPadding - TBD
+ */
+unsigned short
+KfwumCalculateChecksumPadding(unsigned char *pBuffer, unsigned long totalSize)
+{
+	unsigned short sumOfBytes = 0;
+	unsigned short padding;
+	unsigned long  counter;
+	for (counter = 0; counter < totalSize; counter ++) {
+		sumOfBytes += pBuffer[counter];
+	}
+	padding = 0 - sumOfBytes;
+	return padding;
+}
+
+/* KfwumGetInfo  -  Get Firmware Update Manager (FWUM) information
+ *
+ * *intf  : IPMI interface
+ * output  : when set to non zero, queried information is displayed
+ * pNumBank: output ptr for number of banks
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+KfwumGetInfo(struct ipmi_intf *intf, unsigned char output,
+		unsigned char *pNumBank)
+{
+	int rc = 0;
+	static struct KfwumGetInfoResp *pGetInfo;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_FIRMWARE;
+	req.msg.cmd = KFWUM_CMD_ID_GET_FIRMWARE_INFO;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp) {
+		lprintf(LOG_ERR, "Error in FWUM Firmware Get Info Command.");
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "FWUM Firmware Get Info returned %x",
+				rsp->ccode);
+		return (-1);
+	}
+
+	pGetInfo = (struct KfwumGetInfoResp *)rsp->data;
+	if (output) {
+		printf("\nFWUM info\n");
+		printf("=========\n");
+		printf("Protocol Revision         : %02Xh\n",
+				pGetInfo->protocolRevision);
+		printf("Controller Device Id      : %02Xh\n",
+				pGetInfo->controllerDeviceId);
+		printf("Firmware Revision         : %u.%u%u",
+				pGetInfo->firmRev1, pGetInfo->firmRev2 >> 4,
+				pGetInfo->firmRev2 & 0x0f);
+		if (pGetInfo->byte.mode != 0) {
+			printf(" - DEBUG BUILD\n");
+		} else {
+			printf("\n");
+		}
+		printf("Number Of Memory Bank     : %u\n", pGetInfo->numBank);
+	}
+	*pNumBank = pGetInfo->numBank;
+	/* Determine wich type of download to use: */
+	/* Old FWUM or Old IPMC fw (data_len < 7)
+	 * --> Address with small buffer size
+	 */
+	if ((pGetInfo->protocolRevision) <= 0x05 || (rsp->data_len < 7 )) {
+		save_fw_nfo.downloadType = KFWUM_DOWNLOAD_TYPE_ADDRESS;
+		save_fw_nfo.bufferSize   = KFWUM_SMALL_BUFFER;
+		save_fw_nfo.overheadSize = KFWUM_OLD_CMD_OVERHEAD;
+		if (verbose) {
+			printf("Protocol Revision          :");
+			printf(" <= 5 detected, adjusting buffers\n");
+		}
+	} else {
+		/* Both fw are using the new protocol */
+		save_fw_nfo.downloadType = KFWUM_DOWNLOAD_TYPE_SEQUENCE;
+		save_fw_nfo.overheadSize = KFWUM_NEW_CMD_OVERHEAD;
+		/* Buffer size depending on access type (Local or remote) */
+		/* Look if we run remote or locally */
+		if (verbose) {
+			printf("Protocol Revision          :");
+			printf(" > 5 optimizing buffers\n");
+		}
+		if (strstr(intf->name,"lan") != NULL) {
+			/* also covers lanplus */
+			save_fw_nfo.bufferSize = KFWUM_SMALL_BUFFER;
+			if (verbose) {
+				printf("IOL payload size           : %d\n",
+						save_fw_nfo.bufferSize);
+			}
+		} else if ((strstr(intf->name,"open")!= NULL)
+				&& intf->target_addr != IPMI_BMC_SLAVE_ADDR 
+				&& (intf->target_addr !=  intf->my_addr)) {
+			save_fw_nfo.bufferSize = KFWUM_SMALL_BUFFER;
+			if (verbose) {
+				printf("IPMB payload size          : %d\n",
+						save_fw_nfo.bufferSize);
+			}
+		} else {
+			save_fw_nfo.bufferSize = KFWUM_BIG_BUFFER;
+			if (verbose) {
+				printf("SMI payload size           : %d\n",
+						save_fw_nfo.bufferSize);
+			}
+		}
+	}
+	return rc;
+}
+
+/* KfwumGetDeviceInfo - Get IPMC/Board information
+ *
+ * *intf: IPMI interface
+ * output: when set to non zero, queried information is displayed
+ * tKFWUM_BoardInfo: output ptr for IPMC/Board information
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+KfwumGetDeviceInfo(struct ipmi_intf *intf, unsigned char output,
+		tKFWUM_BoardInfo *pBoardInfo)
+{
+	struct ipm_devid_rsp *pGetDevId;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	/* Send Get Device Id */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in Get Device Id Command");
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Get Device Id returned %x",
+				rsp->ccode);
+		return (-1);
+	}
+	pGetDevId = (struct ipm_devid_rsp *)rsp->data;
+	pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id);
+	pBoardInfo->boardId = buf2short(pGetDevId->product_id);
+	if (output) {
+		printf("\nIPMC Info\n");
+		printf("=========\n");
+		printf("Manufacturer Id           : %u\n",
+				pBoardInfo->iana);
+		printf("Board Id                  : %u\n",
+				pBoardInfo->boardId);
+		printf("Firmware Revision         : %u.%u%u",
+				pGetDevId->fw_rev1, pGetDevId->fw_rev2 >> 4,
+				pGetDevId->fw_rev2 & 0x0f);
+		if (((pBoardInfo->iana == IPMI_OEM_KONTRON)
+					&& (pBoardInfo->boardId == KFWUM_BOARD_KONTRON_5002))) {
+			printf(" SDR %u", pGetDevId->aux_fw_rev[0]);
+		}
+		printf("\n");
+	}
+	return 0;
+}
+
+/* KfwumGetStatus  -  Get (and prints) FWUM  banks information
+ *
+ * *intf  : IPMI interface
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+KfwumGetStatus(struct ipmi_intf * intf)
+{
+	int rc = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct KfwumGetStatusResp *pGetStatus;
+	unsigned char numBank;
+	unsigned char counter;
+	unsigned long firmLength;
+	if (verbose) {
+		printf(" Getting Status!\n");
+	}
+	/* Retreive the number of bank */
+	rc = KfwumGetInfo(intf, 0, &numBank);
+	for(counter = 0;
+			(counter < numBank) && (rc == 0);
+			counter ++) {
+		/* Retreive the status of each bank */
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_FIRMWARE;
+		req.msg.cmd = KFWUM_CMD_ID_GET_FIRMWARE_STATUS;
+		req.msg.data = &counter;
+		req.msg.data_len = 1;
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR,
+					"Error in FWUM Firmware Get Status Command.");
+			rc = (-1);
+			break;
+		} else if (rsp->ccode) {
+			lprintf(LOG_ERR,
+					"FWUM Firmware Get Status returned %x",
+					rsp->ccode);
+			rc = (-1);
+			break;
+		}
+		pGetStatus = (struct KfwumGetStatusResp *) rsp->data;
+		printf("\nBank State %d               : %s\n",
+				counter,
+				val2str(pGetStatus->bankState, bankStateValS));
+		if (!pGetStatus->bankState) {
+			continue;
+		}
+		firmLength  = pGetStatus->firmLengthMSB;
+		firmLength  = firmLength << 8;
+		firmLength |= pGetStatus->firmLengthMid;
+		firmLength  = firmLength << 8;
+		firmLength |= pGetStatus->firmLengthLSB;
+		printf("Firmware Length            : %ld bytes\n",
+				firmLength);
+		printf("Firmware Revision          : %u.%u%u SDR %u\n",
+				pGetStatus->firmRev1,
+				pGetStatus->firmRev2 >> 4,
+				pGetStatus->firmRev2 & 0x0f,
+				pGetStatus->firmRev3);
+	}
+	printf("\n");
+	return rc;
+}
+
+/* KfwumManualRollback  -  Ask IPMC to rollback to previous version
+ *
+ * *intf  : IPMI interface
+ *
+ * returns 0 on success
+ * returns (-1) on error
+ */
+int
+KfwumManualRollback(struct ipmi_intf *intf)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct KfwumManualRollbackReq thisReq;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_FIRMWARE;
+	req.msg.cmd = KFWUM_CMD_ID_MANUAL_ROLLBACK;
+	thisReq.type = 0; /* Wait BMC shutdown */
+	req.msg.data = (unsigned char *)&thisReq;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in FWUM Manual Rollback Command.");
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR,
+				"Error in FWUM Manual Rollback Command returned %x",
+				rsp->ccode);
+		return (-1);
+	}
+	printf("FWUM Starting Manual Rollback \n");
+	return 0;
+}
+
+int
+KfwumStartFirmwareImage(struct ipmi_intf *intf, unsigned long length,
+		unsigned short padding)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct KfwumStartFirmwareDownloadResp *pResp;
+	struct KfwumStartFirmwareDownloadReq thisReq;
+
+	thisReq.lengthLSB  = length         & 0x000000ff;
+	thisReq.lengthMid  = (length >>  8) & 0x000000ff;
+	thisReq.lengthMSB  = (length >> 16) & 0x000000ff;
+	thisReq.paddingLSB = padding        & 0x00ff;
+	thisReq.paddingMSB = (padding>>  8) & 0x00ff;
+	thisReq.useSequence = 0x01;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_FIRMWARE;
+	req.msg.cmd = KFWUM_CMD_ID_START_FIRMWARE_IMAGE;
+	req.msg.data = (unsigned char *) &thisReq;
+	/* Look for download type */
+	if (save_fw_nfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) {
+		req.msg.data_len = 5;
+	} else {
+		req.msg.data_len = 6;
+	}
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR,
+				"Error in FWUM Firmware Start Firmware Image Download Command.");
+		return (-1);
+	} else if (rsp->ccode) {
+		lprintf(LOG_ERR,
+				"FWUM Firmware Start Firmware Image Download returned %x",
+				rsp->ccode);
+		return (-1);
+	}
+	pResp = (struct KfwumStartFirmwareDownloadResp *)rsp->data;
+	printf("Bank holding new firmware  : %d\n", pResp->bank);
+	sleep(5);
+	return 0;
+}
+
+int
+KfwumSaveFirmwareImage(struct ipmi_intf *intf, unsigned char sequenceNumber,
+		unsigned long address, unsigned char *pFirmBuf,
+		unsigned char *pInBufLength)
+{
+	int rc = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct KfwumSaveFirmwareAddressReq addr_req;
+	struct KfwumSaveFirmwareSequenceReq seq_req;
+	int retry = 0;
+	int no_rsp = 0;
+	do {
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_FIRMWARE;
+		req.msg.cmd = KFWUM_CMD_ID_SAVE_FIRMWARE_IMAGE;
+		if (save_fw_nfo.downloadType == KFWUM_DOWNLOAD_TYPE_ADDRESS) {
+			addr_req.addressLSB  = address         & 0x000000ff;
+			addr_req.addressMid  = (address >>  8) & 0x000000ff;
+			addr_req.addressMSB  = (address >> 16) & 0x000000ff;
+			addr_req.numBytes    = *pInBufLength;
+			memcpy(addr_req.txBuf, pFirmBuf, *pInBufLength);
+			req.msg.data = (unsigned char *)&addr_req;
+			req.msg.data_len = *pInBufLength + 4;
+		} else {
+			seq_req.sequenceNumber = sequenceNumber;
+			memcpy(seq_req.txBuf, pFirmBuf, *pInBufLength);
+			req.msg.data = (unsigned char *)&seq_req;
+			req.msg.data_len = *pInBufLength + sizeof(unsigned char);
+			/* + 1 => sequenceNumber*/
+		}
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR,
+					"Error in FWUM Firmware Save Firmware Image Download Command.");
+			/* We don't receive "C7" on errors with IOL,
+			 * instead we receive nothing
+			 */
+			if (strstr(intf->name, "lan") != NULL) {
+				no_rsp++;
+				if (no_rsp < FWUM_SAVE_FIRMWARE_NO_RESPONSE_LIMIT) {
+					*pInBufLength -= 1;
+					continue;
+				}
+				lprintf(LOG_ERR,
+						"Error, too many commands without response.");
+				*pInBufLength = 0;
+				break;
+			} /* For other interface keep trying */
+		} else if (rsp->ccode != 0) {
+			if (rsp->ccode == 0xc0) {
+				sleep(1);
+			} else if ((rsp->ccode == 0xc7)
+					|| ((rsp->ccode == 0xc3)
+						&& (sequenceNumber == 0))) {
+				*pInBufLength -= 1;
+				retry = 1;
+			} else if (rsp->ccode == 0x82) {
+				/* Double sent, continue */
+				rc = 0;
+				break;
+			} else if (rsp->ccode == 0x83) {
+				if (retry == 0) {
+					retry = 1;
+					continue;
+				}
+				rc = (-1);
+				break;
+			} else if (rsp->ccode == 0xcf) {
+				/* Ok if receive duplicated request */
+				retry = 1;
+			} else if (rsp->ccode == 0xc3) {
+				if (retry == 0) {
+					retry = 1;
+					continue;
+				}
+				rc = (-1);
+				break;
+			} else {
+				lprintf(LOG_ERR,
+						"FWUM Firmware Save Firmware Image Download returned %x",
+						rsp->ccode);
+				rc = (-1);
+				break;
+			}
+		} else {
+			break;
+		}
+	} while (1);
+	return rc;
+}
+
+int
+KfwumFinishFirmwareImage(struct ipmi_intf *intf, tKFWUM_InFirmwareInfo firmInfo)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct KfwumFinishFirmwareDownloadReq thisReq;
+
+	thisReq.versionMaj = firmInfo.versMajor;
+	thisReq.versionMinSub = ((firmInfo.versMinor <<4)
+			| firmInfo.versSubMinor);
+	thisReq.versionSdr = firmInfo.sdrRev;
+	thisReq.reserved = 0;
+	/* Byte 4 reserved, write 0 */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_FIRMWARE;
+	req.msg.cmd = KFWUM_CMD_ID_FINISH_FIRMWARE_IMAGE;
+	req.msg.data = (unsigned char *)&thisReq;
+	req.msg.data_len = 4;
+	/* Infinite loop if BMC doesn't reply or replies 0xc0 every time. */
+	do {
+		rsp = intf->sendrecv(intf, &req);
+	} while (rsp == NULL || rsp->ccode == 0xc0);
+
+	if (rsp->ccode != 0) {
+		lprintf(LOG_ERR,
+				"FWUM Firmware Finish Firmware Image Download returned %x",
+				rsp->ccode);
+		return (-1);
+	}
+	return 0;
+}
+
+int
+KfwumUploadFirmware(struct ipmi_intf *intf, unsigned char *pBuffer,
+		unsigned long totalSize)
+{
+	int rc = (-1);
+	unsigned long address = 0x0;
+	unsigned char writeSize;
+	unsigned char oldWriteSize;
+	unsigned long lastAddress = 0;
+	unsigned char sequenceNumber = 0;
+	unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
+	do {
+		writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize;
+		/* Reach the end */
+		if (address + writeSize > totalSize) {
+			writeSize = (totalSize - address);
+		} else if (((address % KFWUM_PAGE_SIZE)
+					+ writeSize) > KFWUM_PAGE_SIZE) {
+			/* Reach boundary end */
+			writeSize = (KFWUM_PAGE_SIZE - (address % KFWUM_PAGE_SIZE));
+		}
+		oldWriteSize = writeSize;
+		rc = KfwumSaveFirmwareImage(intf, sequenceNumber,
+				address, &pBuffer[address], &writeSize);
+		if ((rc != 0) && (retry-- != 0)) {
+			address = lastAddress;
+			rc = 0;
+		} else if ( writeSize == 0) {
+			rc = (-1);
+		} else {
+			if (writeSize != oldWriteSize) {
+				printf("Adjusting length to %d bytes \n",
+						writeSize);
+				save_fw_nfo.bufferSize -= (oldWriteSize - writeSize);
+			}
+			retry = FWUM_MAX_UPLOAD_RETRY;
+			lastAddress = address;
+			address+= writeSize;
+		}
+		if (rc == 0) {
+			if ((address % 1024) == 0) {
+				KfwumShowProgress("Writing Firmware in Flash",
+						address, totalSize);
+			}
+			sequenceNumber++;
+		}
+	} while ((rc == 0) && (address < totalSize));
+	if (rc == 0) {
+		KfwumShowProgress("Writing Firmware in Flash",
+				100, 100);
+	}
+	return rc;
+}
+
+int
+KfwumStartFirmwareUpgrade(struct ipmi_intf *intf)
+{
+	int rc = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	/* Upgrade type, wait BMC shutdown */
+	unsigned char upgType = 0 ;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_FIRMWARE;
+	req.msg.cmd = KFWUM_CMD_ID_START_FIRMWARE_UPDATE;
+	req.msg.data = (unsigned char *) &upgType;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR,
+				"Error in FWUM Firmware Start Firmware Upgrade Command");
+		rc = (-1);
+	} else if (rsp->ccode) {
+		if (rsp->ccode == 0xd5) {
+			lprintf(LOG_ERR,
+					"No firmware available for upgrade.  Download Firmware first.");
+		} else {
+			lprintf(LOG_ERR,
+					"FWUM Firmware Start Firmware Upgrade returned %x",
+					rsp->ccode);
+		}
+		rc = (-1);
+	}
+	return rc;
+}
+
+int
+KfwumGetTraceLog(struct ipmi_intf *intf)
+{
+	int rc = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char chunkIdx;
+	unsigned char cmdIdx;
+	if (verbose) {
+		printf(" Getting Trace Log!\n");
+	}
+	for (chunkIdx = 0;
+			(chunkIdx < TRACE_LOG_CHUNK_COUNT)
+			&& (rc == 0);
+			chunkIdx++) {
+		/* Retreive each log chunk and print it */
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_FIRMWARE;
+		req.msg.cmd = KFWUM_CMD_ID_GET_TRACE_LOG;
+		req.msg.data = &chunkIdx;
+		req.msg.data_len = 1;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR,
+					"Error in FWUM Firmware Get Trace Log Command");
+			rc = (-1);
+			break;
+		} else if (rsp->ccode) {
+			lprintf(LOG_ERR,
+					"FWUM Firmware Get Trace Log returned %x",
+					rsp->ccode);
+			rc = (-1);
+			break;
+		}
+		for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++) {
+			/* Don't diplay commands with an invalid state */
+			if ((rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1] != 0)
+					&& (rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx] < KFWUM_CMD_ID_STD_MAX_CMD)) {
+				printf("  Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n",
+						CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx]],
+						CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1]],
+						rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 2]);
+			} else if ((rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1] != 0)
+					&& (rsp->data[TRACE_LOG_ATT_COUNT*cmdIdx] >= KFWUM_CMD_ID_EXTENDED_CMD)) {
+				printf("  Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n",
+						EXT_CMD_ID_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx] - KFWUM_CMD_ID_EXTENDED_CMD],
+						CMD_STATE_STRING[rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1]],
+						rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 2]);
+			}
+		}
+	}
+	printf("\n");
+	return rc;
+}
+
+int
+KfwumGetInfoFromFirmware(unsigned char *pBuf, unsigned long bufSize,
+		tKFWUM_InFirmwareInfo *pInfo)
+{
+	unsigned long offset = 0;
+	if (bufSize < (IN_FIRMWARE_INFO_OFFSET_LOCATION + IN_FIRMWARE_INFO_SIZE)) {
+		return (-1);
+	}
+	offset = IN_FIRMWARE_INFO_OFFSET_LOCATION;
+
+	/* Now, fill the structure with read informations */
+	pInfo->checksum = (unsigned short)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + 0 + IN_FIRMWARE_INFO_OFFSET_CHECKSUM ) << 8;
+
+	pInfo->checksum|= (unsigned short)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + 1 + IN_FIRMWARE_INFO_OFFSET_CHECKSUM);
+
+	pInfo->sumToRemoveFromChecksum = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_CHECKSUM);
+
+	pInfo->sumToRemoveFromChecksum+= KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_CHECKSUM + 1);
+
+	pInfo->fileSize = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_FILE_SIZE + 0) << 24;
+
+	pInfo->fileSize|= (unsigned long)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_FILE_SIZE + 1) << 16;
+
+	pInfo->fileSize|= (unsigned long)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_FILE_SIZE + 2) << 8;
+
+	pInfo->fileSize|= (unsigned long)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_FILE_SIZE + 3);
+
+	pInfo->boardId = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_BOARD_ID + 0) << 8;
+
+	pInfo->boardId|= KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_BOARD_ID + 1);
+
+	pInfo->deviceId = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_DEVICE_ID);
+
+	pInfo->tableVers = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_TABLE_VERSION);
+
+	pInfo->implRev = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_IMPLEMENT_REV);
+
+	pInfo->versMajor = (KWUM_GET_BYTE_AT_OFFSET(pBuf,
+				offset
+				+ IN_FIRMWARE_INFO_OFFSET_VER_MAJOROR)) & 0x0f;
+
+	pInfo->versMinor = (KWUM_GET_BYTE_AT_OFFSET(pBuf,
+				offset
+				+ IN_FIRMWARE_INFO_OFFSET_VER_MINORSUB) >> 4) & 0x0f;
+
+	pInfo->versSubMinor = (KWUM_GET_BYTE_AT_OFFSET(pBuf,
+				offset + IN_FIRMWARE_INFO_OFFSET_VER_MINORSUB)) & 0x0f;
+
+	pInfo->sdrRev = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_SDR_REV);
+
+	pInfo->iana = KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_IANA2) << 16;
+
+	pInfo->iana|= (unsigned long)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_IANA1) << 8;
+
+	pInfo->iana|= (unsigned long)KWUM_GET_BYTE_AT_OFFSET(pBuf,
+			offset + IN_FIRMWARE_INFO_OFFSET_IANA0);
+
+	KfwumFixTableVersionForOldFirmware(pInfo);
+	return 0;
+}
+
+void
+KfwumFixTableVersionForOldFirmware(tKFWUM_InFirmwareInfo * pInfo)
+{
+	switch(pInfo->boardId) {
+	case KFWUM_BOARD_KONTRON_UNKNOWN:
+		pInfo->tableVers = 0xff;
+		break;
+	default:
+		/* pInfo->tableVers is already set for
+		 * the right version
+		 */
+		break;
+	}
+}
+
+/* ipmi_kfwum_checkfwcompat - check whether firmware we're about to upload is
+ * compatible with board.
+ *
+ * @boardInfo:
+ * @firmInfo:
+ *
+ * returns 0 if compatible, otherwise (-1)
+ */
+int
+ipmi_kfwum_checkfwcompat(tKFWUM_BoardInfo boardInfo,
+		tKFWUM_InFirmwareInfo firmInfo)
+{
+	int compatible = 0;
+	if (boardInfo.iana != firmInfo.iana) {
+		lprintf(LOG_ERR,
+				"Board IANA does not match firmware IANA.");
+		compatible = (-1);
+	}
+	if (boardInfo.boardId != firmInfo.boardId) {
+		lprintf(LOG_ERR,
+				"Board IANA does not match firmware IANA.");
+		compatible = (-1);
+	}
+	if (compatible != 0) {
+		lprintf(LOG_ERR,
+				"Firmware invalid for target board. Download of upgrade aborted.");
+	}
+	return compatible;
+}
+
+void
+printf_kfwum_info(tKFWUM_BoardInfo boardInfo, tKFWUM_InFirmwareInfo firmInfo)
+{
+	printf(
+"Target Board Id            : %u\n", boardInfo.boardId);
+	printf(
+"Target IANA number         : %u\n", boardInfo.iana);
+	printf(
+"File Size                  : %lu bytes\n", firmInfo.fileSize);
+	printf(
+"Firmware Version           : %d.%d%d SDR %d\n", firmInfo.versMajor,
+firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev);
+}
diff --git a/lib/ipmi_gendev.c b/lib/ipmi_gendev.c
new file mode 100644
index 0000000..7a4cf08
--- /dev/null
+++ b/lib/ipmi_gendev.c
@@ -0,0 +1,640 @@
+/*
+ * Copyright (c) 2003 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+
+#include <math.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <time.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_gendev.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_entity.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_raw.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+extern int verbose;
+
+
+#define GENDEV_RETRY_COUNT    5
+#define GENDEV_MAX_SIZE       16
+
+typedef struct gendev_eeprom_info
+{
+   uint32_t size;
+   uint16_t page_size;
+   uint8_t  address_span;
+   uint8_t  address_length;
+}t_gendev_eeprom_info;
+
+
+static int
+ipmi_gendev_get_eeprom_size(
+                        struct ipmi_intf *intf, 
+                        struct sdr_record_generic_locator *dev,
+                        t_gendev_eeprom_info *info
+                     )
+{
+   int eeprom_size = 0;
+   /*
+   lprintf(LOG_ERR, "Gen Device : %s", dev->id_string);
+   lprintf(LOG_ERR, "Access Addr: %x", dev->dev_access_addr);
+   lprintf(LOG_ERR, "Slave Addr : %x", dev->dev_slave_addr);
+   lprintf(LOG_ERR, "Channel Num: %x", dev->channel_num);
+   lprintf(LOG_ERR, "Lun        : %x", dev->lun);
+   lprintf(LOG_ERR, "Bus        : %x", dev->bus);
+   lprintf(LOG_ERR, "Addr Span  : %x", dev->addr_span);
+   lprintf(LOG_ERR, "DevType    : %x", dev->dev_type);
+   lprintf(LOG_ERR, "DevType Mod: %x", dev->dev_type_modifier);
+   */
+   if( info != NULL)
+   {
+      switch(dev->dev_type)
+      {
+         case 0x08:  // 24C01
+            info->size = 128;
+            info->page_size = 8;
+            info->address_span = dev->addr_span;
+            info->address_length = 1;
+         break;   
+         case 0x09:  // 24C02
+            info->size = 256;
+            info->page_size = 8;
+            info->address_span = dev->addr_span;
+            info->address_length = 1;
+         break;   
+         case 0x0A:  // 24C04
+            info->size = 512;
+            info->page_size = 8;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0x0B:  // 24C08
+            info->size = 1024;
+            info->page_size = 8;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0x0C:  // 24C16
+            info->size = 2048;
+            info->page_size = 256;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0x0D:  // 24C17
+            info->size = 2048;
+            info->page_size = 256;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0x0E:  // 24C32
+            info->size = 4096;
+            info->page_size = 8;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0x0F:  // 24C64
+            info->size = 8192;
+            info->page_size = 32;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0xC0:  // Proposed OEM Code for 24C128
+            info->size = 16384;
+            info->page_size = 64;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0xC1:  // Proposed OEM Code for 24C256
+            info->size = 32748;
+            info->page_size = 64;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;   
+         case 0xC2:  // Proposed OEM Code for 24C512
+            info->size = 65536;
+            info->page_size = 128;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;
+         case 0xC3:  // Proposed OEM Code for 24C1024
+            info->size = 131072;
+            info->page_size = 128;
+            info->address_span = dev->addr_span;
+            info->address_length = 2;
+         break;
+         /* Please reserved up to CFh for future update */    
+         default:   // Not a eeprom, return size = 0;
+            info->size = 0;
+            info->page_size = 0;
+            info->address_span = 0;
+            info->address_length = 0;
+         break;
+      }
+      
+      eeprom_size = info->size;
+   }
+
+   return eeprom_size;
+}
+
+
+
+static int
+ipmi_gendev_read_file(
+                        struct ipmi_intf *intf, 
+                        struct sdr_record_generic_locator *dev, 
+                        const char *ofile
+                     )
+{
+   int rc = 0;
+   int eeprom_size;
+   t_gendev_eeprom_info eeprom_info;
+
+   eeprom_size = ipmi_gendev_get_eeprom_size(intf, dev, &eeprom_info);
+
+   if(eeprom_size > 0)
+   {
+      FILE *fp;
+   
+      /* now write to file */
+      fp = ipmi_open_file_write(ofile);
+
+      if(fp)
+      {
+         struct ipmi_rs *rsp;
+         int numWrite;
+         uint32_t counter;
+         uint8_t msize;
+         uint8_t channel = dev->channel_num;
+         uint8_t i2cbus = dev->bus;
+         uint8_t i2caddr = dev->dev_slave_addr;
+         uint8_t privatebus = 1;
+         uint32_t address_span_size;
+         uint8_t percentCompleted = 0;
+
+
+         /* Handle Address Span */
+         if( eeprom_info.address_span != 0)
+         {
+            address_span_size = 
+               (eeprom_info.size / (eeprom_info.address_span+1));
+         }
+         else
+         {
+            address_span_size = eeprom_info.size;
+         }
+
+         /* Setup read/write size */
+         if( eeprom_info.page_size < GENDEV_MAX_SIZE)
+         {
+            msize = eeprom_info.page_size;
+         }
+         else
+         {
+            msize = GENDEV_MAX_SIZE;  
+               // All eeprom with page higher than 32 is on the 
+               // 16 bytes boundary
+         }
+
+         /* Setup i2c bus byte */
+         i2cbus = ((channel & 0xF) << 4) | ((i2cbus & 7) << 1) | privatebus;
+
+/*   
+         lprintf(LOG_ERR, "Generic device: %s", dev->id_string);
+         lprintf(LOG_ERR, "I2C Chnl: %x", channel);
+         lprintf(LOG_ERR, "I2C Bus : %x", i2cbus);
+         lprintf(LOG_ERR, "I2C Addr: %x", i2caddr);    */
+
+         for (
+               counter = 0; 
+               (counter < (eeprom_info.size)) && (rc == 0); 
+               counter+= msize
+             ) 
+         {
+            uint8_t retryCounter;
+
+            for(
+                  retryCounter = 0; 
+                  retryCounter<GENDEV_RETRY_COUNT; 
+                  retryCounter ++
+               )
+            {
+               uint8_t wrByte[GENDEV_MAX_SIZE+2];
+
+               wrByte[0] =  (uint8_t) (counter>>0);
+               if(eeprom_info.address_length > 1)
+               {
+                  wrByte[1] =  (uint8_t) (counter>>8);
+               }
+            
+               i2caddr+= (((eeprom_info.size) % address_span_size) * 2);
+                                           
+               rsp = ipmi_master_write_read(
+                           intf,
+                           i2cbus,
+                           i2caddr,
+                           (uint8_t *) wrByte,
+                           eeprom_info.address_length,
+                           msize
+                           );
+
+               if (rsp != NULL) 
+               {
+                  retryCounter = GENDEV_RETRY_COUNT;
+                  rc = 0;
+               }
+               else if(retryCounter < GENDEV_RETRY_COUNT)
+               {
+                  retryCounter ++;
+                  lprintf(LOG_ERR, "Retry");
+                  sleep(1);
+                  rc = -1;
+               }
+               else
+               {
+                  lprintf(LOG_ERR, "Unable to perform I2C Master Write-Read");
+                  rc = -1;
+               }
+            }
+
+            if( rc == 0 )
+            {
+               static uint8_t previousCompleted = 101;
+               numWrite = fwrite(rsp->data, 1, msize, fp);
+               if (numWrite != msize) 
+               {
+                  lprintf(LOG_ERR, "Error writing file %s", ofile);
+                  rc = -1;
+                  break;
+               }
+
+               percentCompleted = ((counter * 100) / eeprom_info.size );
+               
+               if(percentCompleted != previousCompleted)
+               {
+                  printf("\r%i percent completed", percentCompleted);
+                  previousCompleted = percentCompleted;
+               }
+
+
+            }
+         }
+         if(counter == (eeprom_info.size))
+         {
+            printf("\r%%100 percent completed\n");
+         }
+         else
+         {
+            printf("\rError: %i percent completed, read not completed \n", percentCompleted);
+         }
+
+         fclose(fp);
+      }
+   }
+   else
+   {
+      lprintf(LOG_ERR, "The selected generic device is not an eeprom");
+   }
+
+   return rc;
+}
+
+
+/* ipmi_gendev_write_file  -  Read raw SDR from binary file
+ *
+ * used for writing generic locator device Eeprom type
+ *
+ * @intf:	ipmi interface
+ * @dev:		generic device to read
+ * @ofile:	output filename
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_gendev_write_file(
+                        struct ipmi_intf *intf, 
+                        struct sdr_record_generic_locator *dev, 
+                        const char *ofile
+                     )
+{
+   int rc = 0;
+   int eeprom_size;
+   t_gendev_eeprom_info eeprom_info;
+
+   eeprom_size = ipmi_gendev_get_eeprom_size(intf, dev, &eeprom_info);
+
+   if(eeprom_size > 0)
+   {
+      FILE *fp;
+      uint32_t fileLength = 0;
+   
+      /* now write to file */
+      fp = ipmi_open_file_read(ofile);
+      
+      if(fp)
+      {
+         /* Retreive file length, check if it's fits the Eeprom Size */
+         fseek(fp, 0 ,SEEK_END);
+         fileLength = ftell(fp);
+
+         lprintf(LOG_ERR, "File   Size: %i", fileLength);
+         lprintf(LOG_ERR, "Eeprom Size: %i", eeprom_size);
+         if(fileLength != eeprom_size)
+         {
+            lprintf(LOG_ERR, "File size does not fit Eeprom Size");
+            fclose(fp);
+            fp = NULL;
+         }
+         else
+         {
+            fseek(fp, 0 ,SEEK_SET);
+         }
+      }
+      
+      if(fp)
+      {
+         struct ipmi_rs *rsp;
+         int numRead;
+         uint32_t counter;
+         uint8_t msize;
+         uint8_t channel = dev->channel_num;
+         uint8_t i2cbus = dev->bus;
+         uint8_t i2caddr = dev->dev_slave_addr;
+         uint8_t privatebus = 1;
+         uint32_t address_span_size;
+         uint8_t percentCompleted = 0;
+
+
+         /* Handle Address Span */
+         if( eeprom_info.address_span != 0)
+         {
+            address_span_size = 
+               (eeprom_info.size / (eeprom_info.address_span+1));
+         }
+         else
+         {
+            address_span_size = eeprom_info.size;
+         }
+
+         /* Setup read/write size */
+         if( eeprom_info.page_size < GENDEV_MAX_SIZE)
+         {
+            msize = eeprom_info.page_size;
+         }
+         else
+         {
+            msize = GENDEV_MAX_SIZE;  
+                     // All eeprom with page higher than 32 is on the 
+                     // 16 bytes boundary
+         }
+
+         /* Setup i2c bus byte */
+         i2cbus = ((channel & 0xF) << 4) | ((i2cbus & 7) << 1) | privatebus;
+
+/*   
+         lprintf(LOG_ERR, "Generic device: %s", dev->id_string);
+         lprintf(LOG_ERR, "I2C Chnl: %x", channel);
+         lprintf(LOG_ERR, "I2C Bus : %x", i2cbus);
+         lprintf(LOG_ERR, "I2C Addr: %x", i2caddr);    */
+
+         for (
+               counter = 0; 
+               (counter < (eeprom_info.size)) && (rc == 0); 
+               counter+= msize
+             ) 
+         {
+            uint8_t retryCounter;
+            uint8_t readByte[GENDEV_MAX_SIZE];
+
+            numRead = fread(readByte, 1, msize, fp);
+            if (numRead != msize) 
+            {
+               lprintf(LOG_ERR, "Error reading file %s", ofile);
+               rc = -1;
+               break;
+            }
+
+
+
+            for(
+                  retryCounter = 0; 
+                  retryCounter<GENDEV_RETRY_COUNT; 
+                  retryCounter ++
+               )
+            {
+               uint8_t wrByte[GENDEV_MAX_SIZE+2];
+               wrByte[0] =  (uint8_t) (counter>>0);
+               if(eeprom_info.address_length > 1)
+               {
+                  wrByte[1] =  (uint8_t) (counter>>8);
+               }
+               memcpy(&wrByte[eeprom_info.address_length], readByte, msize);
+
+               i2caddr+= (((eeprom_info.size) % address_span_size) * 2);
+
+               rsp = ipmi_master_write_read(intf, i2cbus, i2caddr, (uint8_t *) wrByte, eeprom_info.address_length+msize, 0);
+               if (rsp != NULL) 
+               {
+                  retryCounter = GENDEV_RETRY_COUNT;
+                  rc = 0;
+               }
+               else if(retryCounter < GENDEV_RETRY_COUNT)
+               {
+                  retryCounter ++;
+                  lprintf(LOG_ERR, "Retry");
+                  sleep(1);
+                  rc = -1;
+               }
+               else
+               {
+                  lprintf(LOG_ERR, "Unable to perform I2C Master Write-Read");
+                  rc = -1;
+               }
+            }
+
+            if( rc == 0 )
+            {
+               static uint8_t previousCompleted = 101;
+               percentCompleted = ((counter * 100) / eeprom_info.size );
+
+               if(percentCompleted != previousCompleted)
+               {
+                  printf("\r%i percent completed", percentCompleted);
+                  previousCompleted = percentCompleted;
+               }
+
+            }
+         }
+         if(counter == (eeprom_info.size))
+         {
+            printf("\r%%100 percent completed\n");
+         }
+         else
+         {
+            printf("\rError: %i percent completed, read not completed \n", percentCompleted);
+         }
+
+         fclose(fp);
+      }
+   }
+   else
+   {
+      lprintf(LOG_ERR, "The selected generic device is not an eeprom");
+   }
+
+   return rc;
+}
+
+
+/* ipmi_gendev_main  -  top-level handler for generic device
+ *
+ * @intf:	ipmi interface
+ * @argc:	number of arguments
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_gendev_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+   int rc = 0;
+
+   /* initialize random numbers used later */
+   srand(time(NULL));
+
+   lprintf(LOG_ERR, "Rx gendev command: %s", argv[0]);
+
+   if (
+         (argc == 0)
+         ||
+         (strncmp(argv[0], "help", 4) == 0) 
+      )
+   {
+      lprintf(LOG_ERR,
+         "SDR Commands:  list read write");
+      lprintf(LOG_ERR,
+         "                     list                     List All Generic Device Locators");
+      lprintf(LOG_ERR,
+         "                     read <sdr name> <file>   Read to file eeprom specify by Generic Device Locators");
+      lprintf(LOG_ERR,
+         "                     write <sdr name> <file>  Write from file eeprom specify by Generic Device Locators");
+   } 
+   else if ( strncmp(argv[0], "list", 4) == 0)
+   {
+      rc = ipmi_sdr_print_sdr(intf,
+                  SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
+   }
+   else if (strncmp(argv[0], "read", 4) == 0) 
+   {
+      if (argc < 3)
+         lprintf(LOG_ERR, "usage: gendev read <gendev> <filename>");
+      else
+      {
+         struct sdr_record_list *sdr;
+
+         lprintf(LOG_ERR, "Gendev read sdr name : %s", argv[1]);
+
+         printf("Locating sensor record '%s'...\n", argv[1]);
+
+         /* lookup by sensor name */
+         sdr = ipmi_sdr_find_sdr_byid(intf, argv[1]);
+         if (sdr == NULL) 
+         {
+            lprintf(LOG_ERR, "Sensor data record not found!");
+            return -1;
+         }
+
+         if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) 
+         {
+            lprintf(LOG_ERR, "Target SDR is not a generic device locator");
+            return -1;
+         }
+
+         lprintf(LOG_ERR, "Gendev read file name: %s", argv[2]);
+         ipmi_gendev_read_file(intf, sdr->record.genloc, argv[2]);
+
+      }
+   } 
+   else if (strncmp(argv[0], "write", 5) == 0) 
+   {
+      if (argc < 3)
+         lprintf(LOG_ERR, "usage: gendev write <gendev> <filename>");
+      else
+      {
+         struct sdr_record_list *sdr;
+
+         lprintf(LOG_ERR, "Gendev write sdr name : %s", argv[1]);
+
+         printf("Locating sensor record '%s'...\n", argv[1]);
+
+         /* lookup by sensor name */
+         sdr = ipmi_sdr_find_sdr_byid(intf, argv[1]);
+         if (sdr == NULL) 
+         {
+            lprintf(LOG_ERR, "Sensor data record not found!");
+            return -1;
+         }
+
+         if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) 
+         {
+            lprintf(LOG_ERR, "Target SDR is not a generic device locator");
+            return -1;
+         }
+
+         lprintf(LOG_ERR, "Gendev write file name: %s", argv[2]);
+         ipmi_gendev_write_file(intf, sdr->record.genloc, argv[2]);
+
+      }
+   } 
+   else 
+   {
+      lprintf(LOG_ERR, "Invalid gendev command: %s", argv[0]);
+      rc = -1;
+   }
+
+   return rc;
+}
diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
new file mode 100644
index 0000000..bbcffc0
--- /dev/null
+++ b/lib/ipmi_hpmfwupg.c
@@ -0,0 +1,2636 @@
+/*
+ * Copyright (c) 2006 Kontron Canada, Inc.  All Rights Reserved.
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _BSD_SOURCE || \
+	(_XOPEN_SOURCE >= 500 || \
+                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+	!(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_hpmfwupg.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/log.h>
+#include "../src/plugins/lan/md5.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <time.h>
+#include <sys/param.h>
+#include <unistd.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* From src/plugins/ipmi_intf.c: */
+uint16_t
+ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
+
+extern int verbose;
+
+int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
+		int activate, int, int);
+int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgPreparationStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option);
+int HpmfwupgUpgradeStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option);
+int HpmfwupgActivationStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf,
+		struct HpmfwupgGetTargetUpgCapabilitiesCtx *pCtx);
+int HpmfwupgGetComponentProperties(struct ipmi_intf *intf,
+		struct HpmfwupgGetComponentPropertiesCtx *pCtx);
+int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf,
+		struct HpmfwupgQuerySelftestResultCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf,
+		struct HpmfwupgQueryRollbackStatusCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgAbortUpgrade(struct ipmi_intf *intf,
+		struct HpmfwupgAbortUpgradeCtx *pCtx);
+int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf,
+		struct HpmfwupgInitiateUpgradeActionCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
+		struct HpmfwupgUploadFirmwareBlockCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int count,
+		unsigned int *pOffset, unsigned int *blockLen);
+int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf,
+		struct HpmfwupgFinishFirmwareUploadCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option);
+int HpmfwupgActivateFirmware(struct ipmi_intf *intf,
+		struct HpmfwupgActivateFirmwareCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf,
+		struct HpmfwupgGetUpgradeStatusCtx *pCtxstruct,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int silent);
+int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf,
+		struct HpmfwupgManualFirmwareRollbackCtx *pCtx);
+void HpmfwupgPrintUsage(void);
+unsigned char HpmfwupgCalculateChecksum(unsigned char *pData,
+		unsigned int length);
+int HpmfwupgGetDeviceId(struct ipmi_intf *intf,
+		struct ipm_devid_rsp *pGetDevId);
+int HpmfwupgGetBufferFromFile(char *imageFilename,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx);
+struct ipmi_rs *HpmfwupgSendCmd(struct ipmi_intf *intf,
+		struct ipmi_rq req, struct HpmfwupgUpgradeCtx* pFwupgCtx);
+
+
+int HpmFwupgActionUploadFirmware(struct HpmfwupgComponentBitMask components,
+		struct HpmfwupgUpgradeCtx* pFwupgCtx,
+		unsigned char **pImagePtr,
+		struct ipmi_intf *intf,
+		int option,
+		int *pFlagColdReset);
+int
+HpmfwupgPreUpgradeCheck(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx,
+		int componentMask, int option);
+
+/* HpmGetuserInput - get input from user
+ *
+ * returns TRUE if its Yes or FALSE if its No
+ */
+int
+HpmGetUserInput(char *str)
+{
+	char userInput[2];
+	int ret;
+
+	printf("%s", str);
+	ret = scanf("%s", userInput);
+	if (!ret) {
+		return 1;
+	}
+	if (toupper(userInput[0]) == 'Y') {
+		return 1;
+	}
+	return 0;
+}
+
+/* HpmDisplayLine - display the line with the given character
+ */
+void
+HpmDisplayLine(char *s, int n)
+{
+	while (n--) {
+		printf ("%c", *s);
+	}
+	printf("\n");
+}
+
+/* HpmDisplayUpgradeHeader - display the Upgrade header information
+ */
+void
+HpmDisplayUpgradeHeader(void)
+{
+	printf("\n");
+	HpmDisplayLine("-", 79);
+	printf(
+"|ID  | Name        |                     Versions                        | %%  |\n");
+	printf(
+"|    |             |      Active     |      Backup     |      File       |    |\n");
+	printf(
+"|----|-------------|-----------------|-----------------|-----------------|----|\n");
+}
+
+/* HpmDisplayUpgrade - display the progress of the upgrade; prints the "."
+ * for every 5% of its completion.
+ */
+void
+HpmDisplayUpgrade(int skip, unsigned int totalSent,
+		unsigned int displayFWLength, time_t timeElapsed)
+{
+	int percent;
+	static int old_percent = -1;
+	if (skip) {
+		printf("Skip|\n");
+		return;
+	}
+	fflush(stdout);
+
+	percent = ((float)totalSent / displayFWLength) * 100;
+	if (percent != old_percent) {
+		if (old_percent != -1) {
+			printf("\b\b\b\b\b");
+		}
+		printf("%3d%%|", percent);
+		old_percent = percent;
+	}
+	if (totalSent == displayFWLength) {
+		/* Display the time taken to complete the upgrade */
+		printf(
+"\n|    |Upload Time: %02ld:%02ld             | Image Size: %7d bytes              |\n",
+			timeElapsed / 60, timeElapsed % 60, totalSent);
+		old_percent = -1;
+	}
+}
+
+/* HpmDisplayVersionHeader - display the information about version header
+ */
+void
+HpmDisplayVersionHeader(int mode)
+{
+	if (mode & IMAGE_VER) {
+		HpmDisplayLine("-", 74);
+		printf(
+"|ID  | Name        |                     Versions                        |\n");
+		printf(
+"|    |             |     Active      |     Backup      |      File       |\n");
+		HpmDisplayLine("-", 74);
+	} else {
+		HpmDisplayLine("-",74 );
+		printf(
+"|ID  | Name        |                     Versions                        |\n");
+		printf(
+"|    |             |     Active      |     Backup      |      Deferred   |\n");
+		HpmDisplayLine("-", 74);
+	}
+}
+
+/* HpmDisplayVersion - display the version of the image and target
+ */
+void
+HpmDisplayVersion(int mode, VERSIONINFO *pVersion, int upgradable)
+{
+	/*
+	 * If the cold reset is required then we can display * on it
+	 * so that user is aware that he needs to do payload power
+	 * cycle after upgrade
+	 */
+	printf("|%c%c%2d|%-13s|",
+			pVersion->coldResetRequired ? '*' : ' ',
+			upgradable ? '^' : ' ',
+			pVersion->componentId, pVersion->descString);
+
+	if (mode & TARGET_VER) {
+		if ((pVersion->targetMajor == 0xFF
+					|| (pVersion->targetMajor == 0x7F))
+				&& pVersion->targetMinor == 0xFF) {
+			printf(" ---.-- -------- |");
+		} else {
+			printf(" %3d.%02x %02X%02X%02X%02X |",
+					pVersion->targetMajor,
+					pVersion->targetMinor,
+					pVersion->targetAux[0],
+					pVersion->targetAux[1],
+					pVersion->targetAux[2],
+					pVersion->targetAux[3]);
+		}
+		if (mode & ROLLBACK_VER) {
+			if ((pVersion->rollbackMajor == 0xFF
+						|| (pVersion->rollbackMajor == 0x7F))
+					&& pVersion->rollbackMinor == 0xFF) {
+				printf(" ---.-- -------- |");
+			} else {
+				printf(" %3d.%02x %02X%02X%02X%02X |",
+						pVersion->rollbackMajor,
+						pVersion->rollbackMinor,
+						pVersion->rollbackAux[0],
+						pVersion->rollbackAux[1],
+						pVersion->rollbackAux[2],
+						pVersion->rollbackAux[3]);
+			}
+		} else {
+			printf(" ---.-- -------- |");
+		}
+	}
+	if (mode & IMAGE_VER) {
+		if ((pVersion->imageMajor == 0xFF
+					|| (pVersion->imageMajor == 0x7F))
+				&& pVersion->imageMinor == 0xFF) {
+			printf(" ---.-- |");
+		} else {
+			printf(" %3d.%02x %02X%02X%02X%02X |",
+					pVersion->imageMajor,
+					pVersion->imageMinor,
+					pVersion->imageAux[0],
+					pVersion->imageAux[1],
+					pVersion->imageAux[2],
+					pVersion->imageAux[3]);
+		}
+	} else {
+		if ((pVersion->deferredMajor == 0xFF
+					|| (pVersion->deferredMajor == 0x7F))
+				&& pVersion->deferredMinor == 0xFF) {
+			printf(" ---.-- -------- |");
+		} else {
+			printf(" %3d.%02x %02X%02X%02X%02X |",
+					pVersion->deferredMajor,
+					pVersion->deferredMinor,
+					pVersion->deferredAux[0],
+					pVersion->deferredAux[1],
+					pVersion->deferredAux[2],
+					pVersion->deferredAux[3]);
+		}
+	}
+}
+
+/* HpmfwupgTargerCheck - get target information and displays it on the screen
+ */
+int
+HpmfwupgTargetCheck(struct ipmi_intf *intf, int option)
+{
+	struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
+	int rc = HPMFWUPG_SUCCESS;
+	int componentId = 0;
+	struct ipm_devid_rsp devIdrsp;
+	struct HpmfwupgGetComponentPropertiesCtx getCompProp;
+	int mode = 0;
+	rc = HpmfwupgGetDeviceId(intf, &devIdrsp);
+	if (rc != HPMFWUPG_SUCCESS) {
+		lprintf(LOG_NOTICE,
+				"Verify whether the Target board is present \n");
+		return HPMFWUPG_ERROR;
+	}
+	rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
+	if (rc != HPMFWUPG_SUCCESS) {
+		/* That indicates the target is not responding to the command
+		 * May be that there is no HPM support
+		 */
+		lprintf(LOG_NOTICE,
+				"Board might not be supporting the HPM.1 Standards\n");
+		return rc;
+	}
+	if (option & VIEW_MODE) {
+		lprintf(LOG_NOTICE, "-------Target Information-------");
+		lprintf(LOG_NOTICE, "Device Id          : 0x%x",
+				devIdrsp.device_id);
+		lprintf(LOG_NOTICE, "Device Revision    : 0x%x",
+				devIdrsp.device_revision);
+		lprintf(LOG_NOTICE, "Product Id         : 0x%04x",
+				buf2short(devIdrsp.product_id));
+		lprintf(LOG_NOTICE, "Manufacturer Id    : 0x%04x (%s)\n\n",
+				buf2short(devIdrsp.manufacturer_id),
+				val2str(buf2short(devIdrsp.manufacturer_id),ipmi_oem_info));
+		HpmDisplayVersionHeader(TARGET_VER|ROLLBACK_VER);
+	}
+	for (componentId = HPMFWUPG_COMPONENT_ID_0;
+			componentId < HPMFWUPG_COMPONENT_ID_MAX;
+			componentId++ ) {
+		/* If the component is supported */
+		if (((1 << componentId) & targetCapCmd.resp.componentsPresent.ComponentBits.byte)) {
+			memset((PVERSIONINFO)&gVersionInfo[componentId], 0x00, sizeof(VERSIONINFO));
+			getCompProp.req.componentId = componentId;
+			getCompProp.req.selector = HPMFWUPG_COMP_GEN_PROPERTIES;
+			rc = HpmfwupgGetComponentProperties(intf, &getCompProp);
+			if (rc != HPMFWUPG_SUCCESS) {
+				lprintf(LOG_NOTICE, "Get CompGenProp Failed for component Id %d\n",
+						componentId);
+				return rc;
+			}
+			gVersionInfo[componentId].rollbackSupported = getCompProp.resp.Response.
+				generalPropResp.GeneralCompProperties.bitfield.rollbackBackup;
+			gVersionInfo[componentId].coldResetRequired =  getCompProp.resp.Response.
+				generalPropResp.GeneralCompProperties.bitfield.payloadColdReset;
+			gVersionInfo[componentId].deferredActivationSupported =  getCompProp.resp.Response.
+				generalPropResp.GeneralCompProperties.bitfield.deferredActivation;
+			getCompProp.req.selector = HPMFWUPG_COMP_DESCRIPTION_STRING;
+			rc = HpmfwupgGetComponentProperties(intf, &getCompProp);
+			if (rc != HPMFWUPG_SUCCESS) {
+				lprintf(LOG_NOTICE,
+						"Get CompDescString Failed for component Id %d\n",
+						componentId);
+				return rc;
+			}
+			memcpy(gVersionInfo[componentId].descString,
+					getCompProp.resp.Response.descStringResp.descString,
+					HPMFWUPG_DESC_STRING_LENGTH);
+			gVersionInfo[componentId].descString[HPMFWUPG_DESC_STRING_LENGTH] = '\0';
+			getCompProp.req.selector = HPMFWUPG_COMP_CURRENT_VERSION;
+			rc = HpmfwupgGetComponentProperties(intf, &getCompProp);
+			if (rc != HPMFWUPG_SUCCESS) {
+				lprintf(LOG_NOTICE,
+						"Get CompCurrentVersion Failed for component Id %d\n",
+						componentId);
+				return rc;
+			}
+			gVersionInfo[componentId].componentId = componentId;
+			gVersionInfo[componentId].targetMajor = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[0];
+			gVersionInfo[componentId].targetMinor = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[1];
+			gVersionInfo[componentId].targetAux[0] = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[2];
+			gVersionInfo[componentId].targetAux[1] = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[3];
+			gVersionInfo[componentId].targetAux[2] = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[4];
+			gVersionInfo[componentId].targetAux[3] = getCompProp.resp.Response.
+				currentVersionResp.currentVersion[5];
+			mode = TARGET_VER;
+			if (gVersionInfo[componentId].rollbackSupported) {
+				getCompProp.req.selector = HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION;
+				rc = HpmfwupgGetComponentProperties(intf, &getCompProp);
+				if (rc != HPMFWUPG_SUCCESS) {
+					lprintf(LOG_NOTICE,
+							"Get CompRollbackVersion Failed for component Id %d\n",
+							componentId);
+				} else {
+					gVersionInfo[componentId].rollbackMajor = getCompProp.resp
+						.Response.rollbackFwVersionResp.rollbackFwVersion[0];
+					gVersionInfo[componentId].rollbackMinor = getCompProp.resp
+						.Response.rollbackFwVersionResp.rollbackFwVersion[1];
+					gVersionInfo[componentId].rollbackAux[0] = getCompProp.resp.Response.rollbackFwVersionResp.rollbackFwVersion[2];
+					gVersionInfo[componentId].rollbackAux[1] = getCompProp.resp.Response.rollbackFwVersionResp.rollbackFwVersion[3];
+					gVersionInfo[componentId].rollbackAux[2] = getCompProp.resp.Response.rollbackFwVersionResp.rollbackFwVersion[4];
+					gVersionInfo[componentId].rollbackAux[3] = getCompProp.resp.Response.rollbackFwVersionResp.rollbackFwVersion[5];
+				}
+				mode |= ROLLBACK_VER;
+			} else {
+				gVersionInfo[componentId].rollbackMajor = 0xff;
+				gVersionInfo[componentId].rollbackMinor = 0xff;
+				gVersionInfo[componentId].rollbackAux[0] = 0xff;
+				gVersionInfo[componentId].rollbackAux[1] = 0xff;
+				gVersionInfo[componentId].rollbackAux[2] = 0xff;
+				gVersionInfo[componentId].rollbackAux[3] = 0xff;
+			}
+			if (gVersionInfo[componentId].deferredActivationSupported) {
+				getCompProp.req.selector = HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION;
+				rc = HpmfwupgGetComponentProperties(intf, &getCompProp);
+				if (rc != HPMFWUPG_SUCCESS) {
+					lprintf(LOG_NOTICE,
+							"Get CompRollbackVersion Failed for component Id %d\n",
+							componentId);
+				} else {
+					gVersionInfo[componentId].deferredMajor = getCompProp.resp
+						.Response.deferredFwVersionResp.deferredFwVersion[0];
+					gVersionInfo[componentId].deferredMinor = getCompProp.resp
+						.Response.deferredFwVersionResp.deferredFwVersion[1];
+					gVersionInfo[componentId].deferredAux[0] = getCompProp.resp.Response.deferredFwVersionResp.deferredFwVersion[2];
+					gVersionInfo[componentId].deferredAux[1] = getCompProp.resp.Response.deferredFwVersionResp.deferredFwVersion[3];
+					gVersionInfo[componentId].deferredAux[2] = getCompProp.resp.Response.deferredFwVersionResp.deferredFwVersion[4];
+					gVersionInfo[componentId].deferredAux[3] = getCompProp.resp.Response.deferredFwVersionResp.deferredFwVersion[5];
+				}
+			} else {
+				gVersionInfo[componentId].deferredMajor = 0xff;
+				gVersionInfo[componentId].deferredMinor = 0xff;
+				gVersionInfo[componentId].deferredAux[0] = 0xff;
+				gVersionInfo[componentId].deferredAux[1] = 0xff;
+				gVersionInfo[componentId].deferredAux[2] = 0xff;
+				gVersionInfo[componentId].deferredAux[3] = 0xff;
+			}
+			if (option & VIEW_MODE) {
+				HpmDisplayVersion(mode,
+						&gVersionInfo[componentId],
+						0);
+				printf("\n");
+			}
+		}
+	}
+	if (option & VIEW_MODE) {
+		HpmDisplayLine("-",74 );
+		fflush(stdout);
+		lprintf(LOG_NOTICE,
+				"(*) Component requires Payload Cold Reset");
+		printf("\n\n");
+	}
+	return HPMFWUPG_SUCCESS;
+}
+
+/* HpmfwupgUpgrade - perform the HPM.1 firmware upgrade procedure as defined
+ * the IPM Controller Firmware Upgrade Specification version 1.0
+ */
+int
+HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, int activate,
+		int componentMask, int option)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct HpmfwupgUpgradeCtx  fwupgCtx;
+	/* INITIALIZE UPGRADE CONTEXT */
+	memset(&fwupgCtx, 0, sizeof (fwupgCtx));
+	/* GET IMAGE BUFFER FROM FILE */
+	rc = HpmfwupgGetBufferFromFile(imageFilename, &fwupgCtx);
+	/* VALIDATE IMAGE INTEGRITY */
+	if (rc == HPMFWUPG_SUCCESS) {
+		printf("Validating firmware image integrity...");
+		fflush(stdout);
+		rc = HpmfwupgValidateImageIntegrity(&fwupgCtx);
+		if (rc == HPMFWUPG_SUCCESS) {
+			printf("OK\n");
+			fflush(stdout);
+		}
+	}
+	/* PREPARATION STAGE */
+	if (rc == HPMFWUPG_SUCCESS) {
+		printf("Performing preparation stage...");
+		fflush(stdout);
+		rc = HpmfwupgPreparationStage(intf, &fwupgCtx, option);
+		if (rc == HPMFWUPG_SUCCESS) {
+			printf("OK\n");
+			fflush(stdout);
+		}
+	}
+	/* UPGRADE STAGE */
+	if (rc == HPMFWUPG_SUCCESS) {
+		if (option & VIEW_MODE) {
+			lprintf(LOG_NOTICE,
+					"\nComparing Target & Image File version");
+		} else if (option & COMPARE_MODE) {
+			lprintf(LOG_NOTICE,
+					"\nPerforming upload for compare stage:");
+		} else {
+			lprintf(LOG_NOTICE, "\nPerforming upgrade stage:");
+		}
+		if (option & VIEW_MODE) {
+			rc = HpmfwupgPreUpgradeCheck(intf,
+					&fwupgCtx,componentMask, VIEW_MODE);
+		} else {
+			rc = HpmfwupgPreUpgradeCheck(intf, &fwupgCtx,
+					componentMask, option);
+			if (rc == HPMFWUPG_SUCCESS) {
+				if (verbose) {
+					printf("Component update mask : 0x%02x\n",
+							fwupgCtx.compUpdateMask.ComponentBits.byte);
+				}
+				rc = HpmfwupgUpgradeStage(intf, &fwupgCtx, option);
+			}
+		}
+	}
+	/* ACTIVATION STAGE */
+	if (rc == HPMFWUPG_SUCCESS && activate) {
+		/* check if upgrade components mask is non-zero */
+		if (fwupgCtx.compUpdateMask.ComponentBits.byte) {
+			lprintf(LOG_NOTICE, "Performing activation stage: ");
+			rc = HpmfwupgActivationStage(intf, &fwupgCtx);
+		} else {
+			lprintf(LOG_NOTICE,
+					"No components updated. Skipping activation stage.\n");
+		}
+	}
+	if (rc == HPMFWUPG_SUCCESS) {
+		if (option & VIEW_MODE) {
+		/* Dont display anything here in case we are just viewing it */
+		lprintf(LOG_NOTICE," ");
+		} else if (option & COMPARE_MODE) {
+			lprintf(LOG_NOTICE,
+					"\nFirmware comparison procedure complete\n");
+		} else {
+			lprintf(LOG_NOTICE,
+					"\nFirmware upgrade procedure successful\n");
+		}
+	} else if (option & VIEW_MODE) {
+		/* Dont display anything here in case we are just viewing it */
+		lprintf(LOG_NOTICE," ");
+	} else if (option & COMPARE_MODE) {
+		lprintf(LOG_NOTICE,
+				"Firmware comparison procedure failed\n");
+	} else {
+		lprintf(LOG_NOTICE, "Firmware upgrade procedure failed\n");
+	}
+	if (fwupgCtx.pImageData) {
+		free(fwupgCtx.pImageData);
+		fwupgCtx.pImageData = NULL;
+	}
+	return rc;
+}
+
+/* HpmfwupgValidateImageIntegrity - validate a HPM.1 firmware image file as
+ * defined in section 4 of the IPM Controller Firmware Upgrade Specification
+ * version 1.0
+ */
+int
+HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)pFwupgCtx->pImageData;
+	md5_state_t ctx;
+	static unsigned char md[HPMFWUPG_MD5_SIGNATURE_LENGTH];
+	unsigned char *pMd5Sig = pFwupgCtx->pImageData
+		+ (pFwupgCtx->imageSize - HPMFWUPG_MD5_SIGNATURE_LENGTH);
+	/* Validate MD5 checksum */
+	memset(md, 0, HPMFWUPG_MD5_SIGNATURE_LENGTH);
+	memset(&ctx, 0, sizeof(md5_state_t));
+	md5_init(&ctx);
+	md5_append(&ctx, pFwupgCtx->pImageData,
+			pFwupgCtx->imageSize - HPMFWUPG_MD5_SIGNATURE_LENGTH);
+	md5_finish(&ctx, md);
+	if (memcmp(md, pMd5Sig, HPMFWUPG_MD5_SIGNATURE_LENGTH) != 0) {
+		lprintf(LOG_NOTICE, "\n    Invalid MD5 signature");
+		return HPMFWUPG_ERROR;
+	}
+	/* Validate Header signature */
+	if(strncmp(pImageHeader->signature,
+				HPMFWUPG_IMAGE_SIGNATURE,
+				HPMFWUPG_HEADER_SIGNATURE_LENGTH) != 0) {
+		lprintf(LOG_NOTICE,"\n    Invalid image signature");
+		return HPMFWUPG_ERROR;
+	}
+	/* Validate Header image format version */
+	if (pImageHeader->formatVersion != HPMFWUPG_IMAGE_HEADER_VERSION) {
+		lprintf(LOG_NOTICE,"\n    Unrecognized image version");
+		return HPMFWUPG_ERROR;
+	}
+	/* Validate header checksum */
+	if (HpmfwupgCalculateChecksum((unsigned char*)pImageHeader,
+				sizeof(struct HpmfwupgImageHeader)
+				+ pImageHeader->oemDataLength
+				+ sizeof(unsigned char)/*checksum*/) != 0) {
+		lprintf(LOG_NOTICE,"\n    Invalid header checksum");
+		return HPMFWUPG_ERROR;
+	}
+	return HPMFWUPG_SUCCESS;
+}
+
+/* HpmfwupgPreparationStage - prepere stage of a firmware upgrade procedure as
+ * defined in section 3.2 of the IPM Controller Firmware Upgrade Specification
+ * version 1.0
+ */
+int
+HpmfwupgPreparationStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option)
+{
+	int componentId;
+	int rc = HPMFWUPG_SUCCESS;
+	struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
+	struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)
+		pFwupgCtx->pImageData;
+	/* Get device ID */
+	rc = HpmfwupgGetDeviceId(intf, &pFwupgCtx->devId);
+	/* Match current IPMC IDs with upgrade image */
+	if (rc != HPMFWUPG_SUCCESS) {
+		return HPMFWUPG_ERROR;
+	}
+	/* Validate device ID */
+	if (pImageHeader->deviceId == pFwupgCtx->devId.device_id) {
+		/* Validate product ID */
+		if (memcmp(pImageHeader->prodId,
+					pFwupgCtx->devId.product_id,
+					HPMFWUPG_PRODUCT_ID_LENGTH ) == 0) {
+			/* Validate man ID */
+			if (memcmp(pImageHeader->manId,
+						pFwupgCtx->devId.manufacturer_id,
+						HPMFWUPG_MANUFATURER_ID_LENGTH) != 0) {
+				lprintf(LOG_NOTICE,
+						"\n    Invalid image file for manufacturer %u",
+						buf2short(pFwupgCtx->devId.manufacturer_id));
+				rc = HPMFWUPG_ERROR;
+			}
+		} else {
+			lprintf(LOG_NOTICE,
+					"\n    Invalid image file for product %u",
+					buf2short(pFwupgCtx->devId.product_id));
+			rc = HPMFWUPG_ERROR;
+		}
+	} else {
+		lprintf(LOG_NOTICE, "\n    Invalid device ID %x",
+				pFwupgCtx->devId.device_id);
+		rc = HPMFWUPG_ERROR;
+	}
+	if (rc != HPMFWUPG_SUCCESS) {
+		/* Giving one more chance to user to check whether its OK to continue even if the
+		 * product ID does not match. This is helpful as sometimes we just want to update
+		 * and dont care whether we have a different product Id. If the user says NO then
+		 * we need to just bail out from here
+		 */
+		if (!((option & FORCE_MODE) || (option & VIEW_MODE))) {
+			printf("\n\n Use \"force\" option for copying all the components\n");
+			return HPMFWUPG_ERROR;
+		}
+		printf("\n    Image Information");
+		printf("\n        Device Id : 0x%x", pImageHeader->deviceId);
+		printf("\n        Prod   Id : 0x%02x%02x",
+				pImageHeader->prodId[1], pImageHeader->prodId[0]);
+		printf("\n        Manuf  Id : 0x%02x%02x%02x",
+				pImageHeader->manId[2],
+				pImageHeader->manId[1],
+				pImageHeader->manId[0]);
+		printf("\n    Board Information");
+		printf("\n        Device Id : 0x%x", pFwupgCtx->devId.device_id);
+		printf("\n        Prod   Id : 0x%02x%02x",
+				pFwupgCtx->devId.product_id[1], pFwupgCtx->devId.product_id[0]);
+		printf("\n        Manuf  Id : 0x%02x%02x%02x",
+				pFwupgCtx->devId.manufacturer_id[2],
+				pFwupgCtx->devId.manufacturer_id[1],
+				pFwupgCtx->devId.manufacturer_id[0]);
+		if (HpmGetUserInput("\n Continue ignoring DeviceID/ProductID/ManufacturingID (Y/N): ")) {
+			rc = HPMFWUPG_SUCCESS;
+		} else {
+			return HPMFWUPG_ERROR;
+		}
+	}
+	/* Validate earliest compatible revision */
+	/* Validate major & minor revision */
+	if (pImageHeader->compRevision[0] > pFwupgCtx->devId.fw_rev1
+			|| (pImageHeader->compRevision[0] == pFwupgCtx->devId.fw_rev1
+				&& pImageHeader->compRevision[1] > pFwupgCtx->devId.fw_rev2)) {
+		/* Version not compatible for upgrade */
+		lprintf(LOG_NOTICE, "\n    Version: Major: %d", pImageHeader->compRevision[0]);
+		lprintf(LOG_NOTICE, "             Minor: %x", pImageHeader->compRevision[1]);
+		lprintf(LOG_NOTICE, "    Not compatible with ");
+		lprintf(LOG_NOTICE, "    Version: Major: %d", pFwupgCtx->devId.fw_rev1);
+		lprintf(LOG_NOTICE, "             Minor: %x", pFwupgCtx->devId.fw_rev2);
+		/* Confirming it once again */
+		if (!((option & FORCE_MODE) || (option & VIEW_MODE))) {
+			return HPMFWUPG_ERROR;
+		}
+		if (HpmGetUserInput("\n Continue IGNORING Earliest compatibility (Y/N): ")) {
+			rc = HPMFWUPG_SUCCESS;
+		} else {
+			return HPMFWUPG_ERROR;
+		}
+	}
+	/* Get target upgrade capabilities */
+	rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
+	if (rc != HPMFWUPG_SUCCESS) {
+		return HPMFWUPG_ERROR;
+	}
+	/* Copy response to context */
+	memcpy(&pFwupgCtx->targetCap,
+			&targetCapCmd.resp,
+			sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
+	if (option & VIEW_MODE) {
+		/* do nothing */
+	} else {
+		/* Make sure all component IDs defined in the
+		 * upgrade image are supported by the IPMC
+		 */
+		if ((pImageHeader->components.ComponentBits.byte &
+					pFwupgCtx->targetCap.componentsPresent.ComponentBits.byte) !=
+					pImageHeader->components.ComponentBits.byte) {
+			lprintf(LOG_NOTICE,
+					"\n    Some components present in the image file are not supported by the IPMC");
+			return HPMFWUPG_ERROR;
+		}
+		/* Make sure the upgrade is desirable rigth now */
+		if (pFwupgCtx->targetCap.GlobalCapabilities.bitField.fwUpgUndesirable == 1) {
+			lprintf(LOG_NOTICE, "\n    Upgrade undesirable at this moment");
+			return HPMFWUPG_ERROR;
+		}
+		/* Get confimation from the user if he wants to continue when
+		 * service affected during upgrade
+		 */
+		if (!(option & COMPARE_MODE)
+				&& (pFwupgCtx->targetCap.GlobalCapabilities.bitField.servAffectDuringUpg == 1
+					|| pImageHeader->imageCapabilities.bitField.servAffected == 1)) {
+			if (HpmGetUserInput("\nServices may be affected during upgrade. Do you wish to continue? (y/n): ")) {
+				rc = HPMFWUPG_SUCCESS;
+			} else {
+				return HPMFWUPG_ERROR;
+			}
+		}
+	}
+	/* Get the general properties of each component present in image */
+	for (componentId = HPMFWUPG_COMPONENT_ID_0;
+			componentId < HPMFWUPG_COMPONENT_ID_MAX;
+			componentId++) {
+		/* Reset component properties */
+		memset(&pFwupgCtx->genCompProp[componentId], 0,
+				sizeof (struct HpmfwupgGetGeneralPropResp));
+		if ((1 << componentId & pImageHeader->components.ComponentBits.byte)) {
+			struct HpmfwupgGetComponentPropertiesCtx getCompPropCmd;
+			/* Get general component properties */
+			getCompPropCmd.req.componentId = componentId;
+			getCompPropCmd.req.selector = HPMFWUPG_COMP_GEN_PROPERTIES;
+			rc = HpmfwupgGetComponentProperties(intf, &getCompPropCmd);
+			if (rc == HPMFWUPG_SUCCESS) {
+				/* Copy response to context */
+				memcpy(&pFwupgCtx->genCompProp[componentId],
+						&getCompPropCmd.resp,
+						sizeof(struct HpmfwupgGetGeneralPropResp));
+			}
+		}
+	}
+	return rc;
+}
+
+int
+image_version_upgradable(VERSIONINFO *pVersionInfo)
+{
+	/* If the image and active target versions are different, then
+	 * upgrade */
+	if ((pVersionInfo->imageMajor != pVersionInfo->targetMajor)
+			|| (pVersionInfo->imageMinor != pVersionInfo->targetMinor)
+			|| (pVersionInfo->imageAux[0] != pVersionInfo->targetAux[0])
+			|| (pVersionInfo->imageAux[1] != pVersionInfo->targetAux[1])
+			|| (pVersionInfo->imageAux[2] != pVersionInfo->targetAux[2])
+			|| (pVersionInfo->imageAux[3] != pVersionInfo->targetAux[3])) {
+		return (1);
+	}
+	/* If the image and active target versions are the same and rollback
+	 * is not supported, then there's nothing to do, skip the upgrade
+	 */
+	if (!pVersionInfo->rollbackSupported) {
+		return (0);
+	}
+	/* If the image and rollback target versions are different, then
+	 * go ahead and upgrade
+	 */
+	if ((pVersionInfo->imageMajor != pVersionInfo->rollbackMajor)
+			|| (pVersionInfo->imageMinor != pVersionInfo->rollbackMinor)
+			|| (pVersionInfo->imageAux[0] != pVersionInfo->rollbackAux[0])
+			|| (pVersionInfo->imageAux[1] != pVersionInfo->rollbackAux[1])
+			|| (pVersionInfo->imageAux[2] != pVersionInfo->rollbackAux[2])
+			|| (pVersionInfo->imageAux[3] != pVersionInfo->rollbackAux[3])) {
+		return (1);
+	}
+	/* Image and rollback target versions are the same too, skip it */
+	return (0);
+}
+
+/* HpmfwupgValidateActionRecordChecksum - validate checksum of the specified
+ * action record header.
+ */
+int
+HpmfwupgValidateActionRecordChecksum(struct HpmfwupgActionRecord *pActionRecord)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	/* Validate action record checksum */
+	if (HpmfwupgCalculateChecksum((unsigned char*)pActionRecord,
+				sizeof(struct HpmfwupgActionRecord)) != 0) {
+	/* Due to ambiguity in the HPM.1 specification, for the case of
+	 * the Upload Firmware Image action type, the record header length
+	 * might be thought as either the first 3 bytes, or the first 34 bytes
+	 * which precede the firmware image data.
+	 * For the latter case we re-calculate the Upload Firmware Image
+	 * record checksum for the 34 byte header length.
+	 */
+		if (pActionRecord->actionType != HPMFWUPG_ACTION_UPLOAD_FIRMWARE
+				|| HpmfwupgCalculateChecksum((unsigned char*)pActionRecord,
+					sizeof(struct HpmfwupgActionRecord)
+					+ sizeof(struct HpmfwupgFirmwareImage))) {
+			lprintf(LOG_NOTICE, "    Invalid Action record.");
+			rc = HPMFWUPG_ERROR;
+		}
+	}
+	return rc;
+}
+
+/* HpmfwupgPreUpgradeCheck - make pre-Upgrade check, this mainly helps in
+ * checking which all version upgrade is skippable because the image version
+ * is same as target version.
+ */
+int
+HpmfwupgPreUpgradeCheck(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx,
+		int componentMask, int option)
+{
+	unsigned char *pImagePtr;
+	struct HpmfwupgActionRecord *pActionRecord;
+	struct HpmfwupgImageHeader *pImageHeader;
+	int componentId;
+	pImageHeader = (struct HpmfwupgImageHeader*)pFwupgCtx->pImageData;
+	/* Put pointer after image header */
+	pImagePtr = (unsigned char*)(pFwupgCtx->pImageData
+			+ sizeof(struct HpmfwupgImageHeader)
+			+ pImageHeader->oemDataLength
+			+ sizeof(unsigned char)/*chksum*/);
+	if (option & VIEW_MODE) {
+		HpmDisplayVersionHeader(TARGET_VER|ROLLBACK_VER|IMAGE_VER);
+	}
+	/* Perform actions defined in the image */
+	while (pImagePtr < (pFwupgCtx->pImageData + pFwupgCtx->imageSize
+				- HPMFWUPG_MD5_SIGNATURE_LENGTH)) {
+		/* Get action record */
+		pActionRecord = (struct HpmfwupgActionRecord*)pImagePtr;
+		/* Validate action record checksum */
+		if (HpmfwupgValidateActionRecordChecksum(pActionRecord) != HPMFWUPG_SUCCESS) {
+			return HPMFWUPG_ERROR;
+		}
+		/* Validate affected components */
+		if (pActionRecord->components.ComponentBits.byte
+				&& !pFwupgCtx->targetCap.componentsPresent.ComponentBits.byte) {
+			lprintf(LOG_NOTICE,
+					"    Invalid action record. One or more affected components is not supported");
+			return HPMFWUPG_ERROR;
+		}
+		switch (pActionRecord->actionType) {
+		case HPMFWUPG_ACTION_BACKUP_COMPONENTS:
+			{
+				/* Make sure every component specified by
+				 * this action record
+				 * supports the backup operation
+				 */
+				for (componentId = HPMFWUPG_COMPONENT_ID_0;
+						componentId < HPMFWUPG_COMPONENT_ID_MAX;
+						componentId++) {
+					if (((1 << componentId) & pActionRecord->components.ComponentBits.byte)
+							&& pFwupgCtx->genCompProp[componentId].GeneralCompProperties.bitfield.rollbackBackup == 0) {
+						lprintf(LOG_NOTICE,
+								"    Component ID %d does not support backup",
+								componentId);
+						return HPMFWUPG_ERROR;
+					}
+				}
+				pImagePtr += sizeof(struct HpmfwupgActionRecord);
+			}
+			break;
+		case HPMFWUPG_ACTION_PREPARE_COMPONENTS:
+			{
+				/* Make sure every components specified by
+				 * this action
+				 * supports the prepare operation
+				 */
+				for (componentId = HPMFWUPG_COMPONENT_ID_0;
+						componentId < HPMFWUPG_COMPONENT_ID_MAX;
+						componentId++) {
+					if (((1 << componentId) & pActionRecord->components.ComponentBits.byte)
+							&& pFwupgCtx->genCompProp[componentId].GeneralCompProperties.bitfield.preparationSupport == 0) {
+						lprintf(LOG_NOTICE,
+								"    Component ID %d does not support preparation",
+								componentId);
+						return HPMFWUPG_ERROR;
+					}
+				}
+				pImagePtr += sizeof(struct HpmfwupgActionRecord);
+			}
+			break;
+		case HPMFWUPG_ACTION_UPLOAD_FIRMWARE:
+			/* Upload all firmware blocks */
+			{
+				struct HpmfwupgFirmwareImage *pFwImage;
+				unsigned char *pData;
+				unsigned int firmwareLength;
+				unsigned char mode;
+				unsigned char componentId;
+				unsigned char componentIdByte;
+				unsigned int upgrade_comp;
+				VERSIONINFO *pVersionInfo;
+				/* Save component ID on which the upload is done */
+				componentIdByte = pActionRecord->components.ComponentBits.byte;
+				componentId = 0;
+				while ((componentIdByte >>= 1) != 0) {
+					componentId++;
+				}
+				pFwImage = (struct HpmfwupgFirmwareImage*)(pImagePtr
+						+ sizeof(struct HpmfwupgActionRecord));
+				pData = ((unsigned char*)pFwImage
+						+ sizeof(struct HpmfwupgFirmwareImage));
+				/* Get firmware length */
+				firmwareLength  =  pFwImage->length[0];
+				firmwareLength |= (pFwImage->length[1] << 8)  & 0xff00;
+				firmwareLength |= (pFwImage->length[2] << 16) & 0xff0000;
+				firmwareLength |= (pFwImage->length[3] << 24) & 0xff000000;
+
+				pVersionInfo = &gVersionInfo[componentId];
+
+				pVersionInfo->imageMajor   = pFwImage->version[0];
+				pVersionInfo->imageMinor   = pFwImage->version[1];
+				pVersionInfo->imageAux[0]  = pFwImage->version[2];
+				pVersionInfo->imageAux[1]  = pFwImage->version[3];
+				pVersionInfo->imageAux[2]  = pFwImage->version[4];
+				pVersionInfo->imageAux[3]  = pFwImage->version[5];
+
+				mode = TARGET_VER | IMAGE_VER;
+				/* check if component is selected for upgrade */
+				upgrade_comp = !componentMask
+					|| (componentMask & pActionRecord->components.ComponentBits.byte);
+				/* check if current component version requires upgrade */
+				if (upgrade_comp && !(option & (FORCE_MODE|COMPARE_MODE))) {
+					upgrade_comp = image_version_upgradable(pVersionInfo);
+				}
+				if (verbose) {
+					lprintf(LOG_NOTICE,
+							"%s component %d",
+							(upgrade_comp ? "Updating" : "Skipping"), 
+							componentId);
+				}
+				if (upgrade_comp) {
+					pFwupgCtx->compUpdateMask.ComponentBits.byte|= 1 << componentId;
+				}
+				if (option & VIEW_MODE) {
+					if (pVersionInfo->rollbackSupported) {
+						mode|= ROLLBACK_VER;
+					}
+					HpmDisplayVersion(mode,pVersionInfo, upgrade_comp);
+					printf("\n");
+				}
+				pImagePtr = pData + firmwareLength;
+			}
+			break;
+		default:
+			lprintf(LOG_NOTICE,
+					"    Invalid Action type. Cannot continue");
+			return HPMFWUPG_ERROR;
+			break;
+		}
+	}
+	if (option & VIEW_MODE) {
+		HpmDisplayLine("-",74);
+		fflush(stdout);
+		lprintf(LOG_NOTICE,
+				"(*) Component requires Payload Cold Reset");
+		lprintf(LOG_NOTICE,
+				"(^) Indicates component would be upgraded");
+	}
+	return HPMFWUPG_SUCCESS;
+}
+
+/* HpmfwupgUpgradeStage - upgrade stage of a firmware upgrade procedure as
+ * defined in section 3.3 of the IPM Controller Firmware Upgrade Specification
+ * version 1.0
+ */
+int
+HpmfwupgUpgradeStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option)
+{
+	struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)
+		pFwupgCtx->pImageData;
+	struct HpmfwupgActionRecord* pActionRecord;
+	int rc = HPMFWUPG_SUCCESS;
+	unsigned char *pImagePtr;
+	int flagColdReset = FALSE;
+	/* Put pointer after image header */
+	pImagePtr = (unsigned char*)
+		(pFwupgCtx->pImageData + sizeof(struct HpmfwupgImageHeader) +
+		pImageHeader->oemDataLength + sizeof(unsigned char)/*checksum*/);
+	if (!(option & VIEW_MODE)) {
+		HpmDisplayUpgradeHeader();
+	}
+	/* Perform actions defined in the image */
+	while (( pImagePtr < (pFwupgCtx->pImageData + pFwupgCtx->imageSize -
+					HPMFWUPG_MD5_SIGNATURE_LENGTH))
+			&& (rc == HPMFWUPG_SUCCESS)) {
+		/* Get action record */
+		pActionRecord = (struct HpmfwupgActionRecord*)pImagePtr;
+		/* Validate action record checksum */
+		rc = HpmfwupgValidateActionRecordChecksum(pActionRecord);
+		if (rc != HPMFWUPG_SUCCESS) {
+			continue;
+		}
+		switch(pActionRecord->actionType) {
+		case HPMFWUPG_ACTION_BACKUP_COMPONENTS:
+			{
+				if (!(option & COMPARE_MODE)) {
+					/* Send Upgrade Action command */
+					struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+					/* Affect only selected components */
+					initUpgActionCmd.req.componentsMask.ComponentBits.byte =
+						pFwupgCtx->compUpdateMask.ComponentBits.byte &
+						pActionRecord->components.ComponentBits.byte;
+					/* Action is prepare components */
+					if (initUpgActionCmd.req.componentsMask.ComponentBits.byte) {
+						initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_BACKUP;
+						rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+					}
+				}
+				pImagePtr+= sizeof(struct HpmfwupgActionRecord);
+			}
+			break;
+		case HPMFWUPG_ACTION_PREPARE_COMPONENTS:
+			{
+				if (!(option & COMPARE_MODE)) {
+					/* Send prepare components command */
+					struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+					/* Affect only selected components */
+					initUpgActionCmd.req.componentsMask.ComponentBits.byte =
+						pFwupgCtx->compUpdateMask.ComponentBits.byte &
+						pActionRecord->components.ComponentBits.byte;
+					if (initUpgActionCmd.req.componentsMask.ComponentBits.byte) {
+						/* Action is prepare components */
+						initUpgActionCmd.req.upgradeAction = HPMFWUPG_UPGRADE_ACTION_PREPARE;
+						rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+					}
+				}
+				pImagePtr+= sizeof(struct HpmfwupgActionRecord);
+			}
+			break;
+		case HPMFWUPG_ACTION_UPLOAD_FIRMWARE:
+			/* Upload all firmware blocks */
+			rc = HpmFwupgActionUploadFirmware(pActionRecord->components,
+					pFwupgCtx,
+					&pImagePtr,
+					intf,
+					option,
+					&flagColdReset);
+			break;
+		default:
+			lprintf(LOG_NOTICE, "    Invalid Action type. Cannot continue");
+			rc = HPMFWUPG_ERROR;
+			break;
+		}
+	}
+	HpmDisplayLine("-", 79);
+	fflush(stdout);
+	lprintf(LOG_NOTICE, "(*) Component requires Payload Cold Reset");
+	return rc;
+}
+
+int
+HpmFwupgActionUploadFirmware(struct HpmfwupgComponentBitMask components,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx,
+		unsigned char **pImagePtr,
+		struct ipmi_intf *intf,
+		int option,
+		int *pFlagColdReset)
+{
+	struct HpmfwupgFirmwareImage *pFwImage;
+	struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+	struct HpmfwupgUploadFirmwareBlockCtx uploadCmd;
+	struct HpmfwupgFinishFirmwareUploadCtx finishCmd;
+	VERSIONINFO *pVersionInfo;
+	time_t start,end;
+
+	int rc = HPMFWUPG_SUCCESS;
+	int skip = TRUE;
+	unsigned char *pData, *pDataInitial;
+	unsigned short count;
+	unsigned int totalSent = 0;
+	unsigned short bufLength = 0;
+	unsigned short bufLengthIsSet = 0;
+	unsigned int firmwareLength = 0;
+
+	unsigned int displayFWLength = 0;
+	unsigned char *pDataTemp;
+	unsigned int imageOffset = 0x00;
+	unsigned int blockLength = 0x00;
+	unsigned int lengthOfBlock = 0x00;
+	unsigned int numTxPkts = 0;
+	unsigned int numRxPkts = 0;
+	unsigned char mode = 0;
+	unsigned char componentId = 0x00;
+	unsigned char componentIdByte = 0x00;
+	uint16_t max_rq_size;
+
+	/* Save component ID on which the upload is done */
+	componentIdByte = components.ComponentBits.byte;
+	while ((componentIdByte>>= 1) != 0) {
+		componentId++;
+	}
+	pFwupgCtx->componentId = componentId;
+	pVersionInfo = (VERSIONINFO *)&gVersionInfo[componentId];
+	pFwImage = (struct HpmfwupgFirmwareImage*)((*pImagePtr)
+			+ sizeof(struct HpmfwupgActionRecord));
+	pDataInitial = ((unsigned char *)pFwImage
+			+ sizeof(struct HpmfwupgFirmwareImage));
+	pData = pDataInitial;
+
+	/* Find max buffer length according the connection parameters */
+	max_rq_size = ipmi_intf_get_max_request_data_size(intf);
+
+	/* validate lower bound of max request size */
+	if (max_rq_size <= sizeof(struct HpmfwupgUploadFirmwareBlockReq)) {
+		lprintf(LOG_ERROR, "Maximum request size is too small to "
+				"send a upload request.");
+		return HPMFWUPG_ERROR;
+	}
+
+	bufLength = max_rq_size - sizeof(struct HpmfwupgUploadFirmwareBlockReq);
+
+	/* Get firmware length */
+	firmwareLength =  pFwImage->length[0];
+	firmwareLength|= (pFwImage->length[1] << 8)  & 0xff00;
+	firmwareLength|= (pFwImage->length[2] << 16) & 0xff0000;
+	firmwareLength|= (pFwImage->length[3] << 24) & 0xff000000;
+	mode = TARGET_VER | IMAGE_VER;
+	if (pVersionInfo->rollbackSupported) {
+		mode |= ROLLBACK_VER;
+	}
+	if ((option & DEBUG_MODE)) {
+		printf("\n\n Comp ID : %d	 [%-20s]\n",
+				pVersionInfo->componentId,
+				pFwImage->desc);
+	} else {
+		HpmDisplayVersion(mode, pVersionInfo, 0);
+	}
+	if ((1 << componentId) & pFwupgCtx->compUpdateMask.ComponentBits.byte) {
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Do not skip %d",
+					componentId);
+		}
+		skip = FALSE;
+	}
+	if (!skip) {
+		HpmDisplayUpgrade(0,0,1,0);
+		/* Initialize parameters */
+		uploadCmd.req = malloc(max_rq_size);
+		if (!uploadCmd.req) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return HPMFWUPG_ERROR;
+		}
+		uploadCmd.req->blockNumber = 0;
+		/* Send Initiate Upgrade Action */
+		initUpgActionCmd.req.componentsMask = components;
+		if (option & COMPARE_MODE) {
+			/* Action is compare */
+			initUpgActionCmd.req.upgradeAction = HPMFWUPG_UPGRADE_ACTION_COMPARE;
+		} else {
+			/* Action is upgrade */
+			initUpgActionCmd.req.upgradeAction = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
+		}
+		rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+		if (rc != HPMFWUPG_SUCCESS) {
+			skip = TRUE;
+		}
+		if ((pVersionInfo->coldResetRequired) && (!skip)) {
+			*pFlagColdReset = TRUE;
+		}
+		/* pDataInitial is the starting pointer of the image data  */
+		/* pDataTemp is one which we will move across */
+		pData = pDataInitial;
+		pDataTemp = pDataInitial;
+		lengthOfBlock = firmwareLength;
+		totalSent = 0x00;
+		displayFWLength= firmwareLength;
+		time(&start);
+		while ((pData < (pDataTemp+lengthOfBlock)) && (rc == HPMFWUPG_SUCCESS)) {
+			if ((pData+bufLength) <= (pDataTemp+lengthOfBlock)) {
+				count = bufLength;
+			} else {
+				count = (unsigned short)((pDataTemp+lengthOfBlock) - pData);
+			}
+			memcpy(&uploadCmd.req->data, pData, count);
+			imageOffset = 0x00;
+			blockLength = 0x00;
+			numTxPkts++;
+			rc = HpmfwupgUploadFirmwareBlock(intf, &uploadCmd,
+					pFwupgCtx, count, &imageOffset,&blockLength);
+			numRxPkts++;
+			if (rc != HPMFWUPG_SUCCESS) {
+				if (rc == HPMFWUPG_UPLOAD_BLOCK_LENGTH && !bufLengthIsSet) {
+					rc = HPMFWUPG_SUCCESS;
+					/* Retry with a smaller buffer length */
+					if (strstr(intf->name,"lan") != NULL && bufLength > 8) {
+						bufLength-= 8;
+						lprintf(LOG_INFO,
+								"Trying reduced buffer length: %d",
+								bufLength);
+					} else if (bufLength) {
+						bufLength-= 1;
+						lprintf(LOG_INFO,
+								"Trying reduced buffer length: %d",
+								bufLength);
+					} else {
+						rc = HPMFWUPG_ERROR;
+					}
+				} else if (rc == HPMFWUPG_UPLOAD_RETRY) {
+					rc = HPMFWUPG_SUCCESS;
+				} else {
+					fflush(stdout);
+					lprintf(LOG_NOTICE,
+							"\n Error in Upload FIRMWARE command [rc=%d]\n",
+							rc);
+					lprintf(LOG_NOTICE,
+							"\n TotalSent:0x%x ",
+							totalSent);
+					/* Exiting from the function */
+					rc = HPMFWUPG_ERROR;
+				}
+			} else {
+				/* success, buf length is valid */
+				bufLengthIsSet = 1;
+				if (imageOffset + blockLength > firmwareLength ||
+						imageOffset + blockLength < blockLength) {
+					/*
+					 * blockLength is the remaining length of the firmware to upload so
+					 * if imageOffset and blockLength sum is greater than the firmware
+					 * length then its kind of error
+					 */
+					lprintf(LOG_NOTICE,
+							"\n Error in Upload FIRMWARE command [rc=%d]\n",
+							rc);
+					lprintf(LOG_NOTICE,
+							"\n TotalSent:0x%x Img offset:0x%x  Blk length:0x%x  Fwlen:0x%x\n",
+							totalSent,imageOffset,blockLength,firmwareLength);
+					rc = HPMFWUPG_ERROR;
+					continue;
+				}
+				totalSent += count;
+				if (imageOffset != 0x00) {
+					/* block Length is valid  */
+					lengthOfBlock = blockLength;
+					pDataTemp = pDataInitial + imageOffset;
+					pData = pDataTemp;
+					if (displayFWLength == firmwareLength) {
+						/* This is basically used only to make sure that we display uptil 100% */
+						displayFWLength = blockLength + totalSent;
+					}
+				} else {
+					pData += count;
+				}
+				time(&end);
+				/*
+				 * Just added debug mode in case we need to see exactly how many bytes have
+				 * gone through - Its a hidden option used mainly should be used for debugging
+				 */
+				if (option & DEBUG_MODE) {
+					fflush(stdout);
+					printf(" Blk Num : %02x        Bytes : %05x ",
+							uploadCmd.req->blockNumber,totalSent);
+					if (imageOffset || blockLength) {
+						printf("\n--> ImgOff : %x BlkLen : %x\n",
+								imageOffset,blockLength);
+					}
+					if (displayFWLength == totalSent) {
+						printf("\n Time Taken %02ld:%02ld",
+								(end-start)/60, (end-start)%60);
+						printf("\n\n");
+					}
+				} else {
+					HpmDisplayUpgrade(0, totalSent,
+							displayFWLength, (end-start));
+				}
+				uploadCmd.req->blockNumber++;
+			}
+		}
+		/* free buffer */
+		free(uploadCmd.req);
+		uploadCmd.req = NULL;
+	}
+	if (skip) {
+		HpmDisplayUpgrade(1,0,0,0);
+		if ((option & COMPARE_MODE)
+				&& !pFwupgCtx->genCompProp[pFwupgCtx->componentId].GeneralCompProperties.bitfield.comparisonSupport) {
+			printf("|    |Comparison isn't supported for given compenent.                        |\n");
+		}
+		*pImagePtr = pDataInitial + firmwareLength;
+	}
+	if (rc == HPMFWUPG_SUCCESS && !skip) {
+		/* Send finish component */
+		/* Set image length */
+		finishCmd.req.componentId = componentId;
+		/* We need to send the actual data that is sent
+		 * not the comlete firmware image length
+		 */
+		finishCmd.req.imageLength[0] = totalSent & 0xFF;
+		finishCmd.req.imageLength[1] = (totalSent >> 8) & 0xFF;
+		finishCmd.req.imageLength[2] = (totalSent >> 16) & 0xFF;
+		finishCmd.req.imageLength[3] = (totalSent >> 24) & 0xFF;
+		rc = HpmfwupgFinishFirmwareUpload(intf, &finishCmd,
+				pFwupgCtx, option);
+		*pImagePtr = pDataInitial + firmwareLength;
+	}
+	return rc;
+}
+
+/* HpmfwupgActivationStage - validate stage of a firmware upgrade procedure as
+ * defined in section 3.4 of the IPM Controller Firmware Upgrade Specification
+ * version 1.0
+ */
+int
+HpmfwupgActivationStage(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct HpmfwupgActivateFirmwareCtx activateCmd;
+	struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)
+		pFwupgCtx->pImageData;
+	/* Print out stuf...*/
+	printf("    ");
+	fflush(stdout);
+	/* Activate new firmware */
+	activateCmd.req.rollback_override = 0;
+	rc = HpmfwupgActivateFirmware(intf, &activateCmd, pFwupgCtx);
+	if (rc == HPMFWUPG_SUCCESS) {
+		/* Query self test result if supported by target and new image */
+		if ((pFwupgCtx->targetCap.GlobalCapabilities.bitField.ipmcSelftestCap == 1)
+				|| (pImageHeader->imageCapabilities.bitField.imageSelfTest == 1)) {
+			struct HpmfwupgQuerySelftestResultCtx selfTestCmd;
+			rc = HpmfwupgQuerySelftestResult(intf, &selfTestCmd,
+					pFwupgCtx);
+			if (rc == HPMFWUPG_SUCCESS) {
+				/* Get the self test result */
+				if (selfTestCmd.resp.result1 != 0x55) {
+					/* Perform manual rollback if necessary */
+					/* BACKUP/ MANUAL ROLLBACK not supported by this UA */
+					lprintf(LOG_NOTICE, "    Self test failed:");
+					lprintf(LOG_NOTICE, "    Result1 = %x",
+							selfTestCmd.resp.result1);
+					lprintf(LOG_NOTICE, "    Result2 = %x",
+							selfTestCmd.resp.result2);
+					rc = HPMFWUPG_ERROR;
+				}
+			} else {
+				/* Perform manual rollback if necessary */
+				/* BACKUP / MANUAL ROLLBACK not supported by this UA */
+				lprintf(LOG_NOTICE,"    Self test failed.");
+			}
+		}
+	}
+	/* If activation / self test failed, query rollback
+	 * status if automatic rollback supported
+	 */
+	if (rc == HPMFWUPG_ERROR) {
+		if ((pFwupgCtx->targetCap.GlobalCapabilities.bitField.autRollback == 1)
+				&& (pFwupgCtx->genCompProp[pFwupgCtx->componentId].GeneralCompProperties.bitfield.rollbackBackup != 0x00)) {
+			struct HpmfwupgQueryRollbackStatusCtx rollCmd;
+			lprintf(LOG_NOTICE,"    Getting rollback status...");
+			fflush(stdout);
+			rc = HpmfwupgQueryRollbackStatus(intf,
+					&rollCmd, pFwupgCtx);
+		}
+	}
+	return rc;
+}
+
+int
+HpmfwupgGetBufferFromFile(char *imageFilename,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	int ret = 0;
+	FILE *pImageFile = fopen(imageFilename, "rb");
+	if (pImageFile == NULL) {
+		lprintf(LOG_ERR, "Cannot open image file '%s'",
+				imageFilename);
+		return HPMFWUPG_ERROR;
+	}
+	/* Get the raw data in file */
+	ret = fseek(pImageFile, 0, SEEK_END);
+	if (ret != 0) {
+		lprintf(LOG_ERR, "Failed to seek in the image file '%s'",
+				imageFilename);
+		return HPMFWUPG_ERROR;
+	}
+	pFwupgCtx->imageSize  = ftell(pImageFile);
+	pFwupgCtx->pImageData = malloc(sizeof(unsigned char)*pFwupgCtx->imageSize);
+	if (pFwupgCtx->pImageData == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		fclose(pImageFile);
+		return HPMFWUPG_ERROR;
+	}
+	rewind(pImageFile);
+	ret = fread(pFwupgCtx->pImageData,
+			sizeof(unsigned char),
+			pFwupgCtx->imageSize,
+			pImageFile);
+	if (ret != pFwupgCtx->imageSize) {
+		lprintf(LOG_ERR,
+				"Failed to read file %s size %d", 
+				imageFilename,
+				pFwupgCtx->imageSize);
+		rc = HPMFWUPG_ERROR;
+	}
+	fclose(pImageFile);
+	return rc;
+}
+
+int
+HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp *pGetDevId)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+	rsp = HpmfwupgSendCmd(intf, req, NULL);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting device ID.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode != 0x00) {
+		lprintf(LOG_ERR, "Error getting device ID.");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		return HPMFWUPG_ERROR;
+	}
+	memcpy(pGetDevId, rsp->data, sizeof(struct ipm_devid_rsp));
+	return HPMFWUPG_SUCCESS;
+}
+
+int
+HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf,
+		struct HpmfwupgGetTargetUpgCapabilitiesCtx *pCtx)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_GET_TARGET_UPG_CAPABILITIES;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetTargetUpgCapabilitiesReq);
+	rsp = HpmfwupgSendCmd(intf, req, NULL);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR,
+				"Error getting target upgrade capabilities.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode != 0x00) {
+		lprintf(LOG_ERR,
+				"Error getting target upgrade capabilities, ccode: 0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		return HPMFWUPG_ERROR;
+	}
+	memcpy(&pCtx->resp, rsp->data,
+			sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
+	if (verbose) {
+		lprintf(LOG_NOTICE, "TARGET UPGRADE CAPABILITIES");
+		lprintf(LOG_NOTICE, "-------------------------------");
+		lprintf(LOG_NOTICE, "HPM.1 version............%d    ",
+				pCtx->resp.hpmVersion);
+		lprintf(LOG_NOTICE, "Component 0 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component0 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 1 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component1 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 2 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component2 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 3 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component3 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 4 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component4 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 5 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component5 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 6 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component6 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Component 7 presence....[%c]   ",
+				pCtx->resp.componentsPresent.ComponentBits.bitField.component7 ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Upgrade undesirable.....[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.fwUpgUndesirable ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Aut rollback override...[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.autRollbackOverride ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "IPMC degraded...........[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.ipmcDegradedDurinUpg ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Defered activation......[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.deferActivation ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Service affected........[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.servAffectDuringUpg ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Manual rollback.........[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.manualRollback ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Automatic rollback......[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.autRollback ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Self test...............[%c]   ",
+				pCtx->resp.GlobalCapabilities.bitField.ipmcSelftestCap ? 'y' : 'n');
+		lprintf(LOG_NOTICE, "Upgrade timeout.........[%d sec] ",
+				pCtx->resp.upgradeTimeout*5);
+		lprintf(LOG_NOTICE, "Self test timeout.......[%d sec] ",
+				pCtx->resp.selftestTimeout*5);
+		lprintf(LOG_NOTICE, "Rollback timeout........[%d sec] ",
+				pCtx->resp.rollbackTimeout*5);
+		lprintf(LOG_NOTICE, "Inaccessibility timeout.[%d sec] \n",
+				pCtx->resp.inaccessTimeout*5);
+	}
+	return HPMFWUPG_SUCCESS;
+}
+
+int
+HpmfwupgGetComponentProperties(struct ipmi_intf *intf,
+		struct HpmfwupgGetComponentPropertiesCtx *pCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_GET_COMPONENT_PROPERTIES;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetComponentPropertiesReq);
+	rsp = HpmfwupgSendCmd(intf, req, NULL);
+	if (rsp == NULL) {
+		lprintf(LOG_NOTICE,
+				"Error getting component properties\n");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode != 0x00) {
+		lprintf(LOG_NOTICE,
+				"Error getting component properties");
+		lprintf(LOG_NOTICE,
+				"compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		return HPMFWUPG_ERROR;
+	}
+	switch (pCtx->req.selector) {
+	case HPMFWUPG_COMP_GEN_PROPERTIES:
+		memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetGeneralPropResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "GENERAL PROPERTIES");
+			lprintf(LOG_NOTICE, "-------------------------------");
+			lprintf(LOG_NOTICE, "Payload cold reset req....[%c]   ",
+					pCtx->resp.Response.generalPropResp.GeneralCompProperties.bitfield.payloadColdReset ? 'y' : 'n');
+			lprintf(LOG_NOTICE, "Def. activation supported.[%c]   ",
+					pCtx->resp.Response.generalPropResp.GeneralCompProperties.bitfield.deferredActivation ? 'y' : 'n');
+			lprintf(LOG_NOTICE, "Comparison supported......[%c]   ",
+					pCtx->resp.Response.generalPropResp.GeneralCompProperties.bitfield.comparisonSupport ? 'y' : 'n');
+			lprintf(LOG_NOTICE, "Preparation supported.....[%c]   ",
+					pCtx->resp.Response.generalPropResp.GeneralCompProperties.bitfield.preparationSupport ? 'y' : 'n');
+			lprintf(LOG_NOTICE, "Rollback supported........[%c]   \n",
+					pCtx->resp.Response.generalPropResp.GeneralCompProperties.bitfield.rollbackBackup ? 'y' : 'n');
+		}
+		break;
+	case HPMFWUPG_COMP_CURRENT_VERSION:
+		memcpy(&pCtx->resp, rsp->data,
+				sizeof(struct HpmfwupgGetCurrentVersionResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Current Version: ");
+			lprintf(LOG_NOTICE, " Major: %d",
+					pCtx->resp.Response.currentVersionResp.currentVersion[0]);
+			lprintf(LOG_NOTICE, " Minor: %x",
+					pCtx->resp.Response.currentVersionResp.currentVersion[1]);
+			lprintf(LOG_NOTICE, " Aux  : %03d %03d %03d %03d\n",
+					pCtx->resp.Response.currentVersionResp.currentVersion[2],
+					pCtx->resp.Response.currentVersionResp.currentVersion[3],
+					pCtx->resp.Response.currentVersionResp.currentVersion[4],
+					pCtx->resp.Response.currentVersionResp.currentVersion[5]);
+		}
+		break;
+	case HPMFWUPG_COMP_DESCRIPTION_STRING:
+		memcpy(&pCtx->resp, rsp->data,
+				sizeof(struct HpmfwupgGetDescStringResp));
+		if (verbose) {
+			char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+			memcpy(descString,
+					pCtx->resp.Response.descStringResp.descString,
+					HPMFWUPG_DESC_STRING_LENGTH);
+			descString[HPMFWUPG_DESC_STRING_LENGTH] = '\0';
+			lprintf(LOG_NOTICE,
+					"Description string: %s\n",
+					descString);
+		}
+		break;
+	case HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION:
+		memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetRollbackFwVersionResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Rollback FW Version: ");
+			lprintf(LOG_NOTICE, " Major: %d",
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[0]);
+			lprintf(LOG_NOTICE, " Minor: %x",
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[1]);
+			lprintf(LOG_NOTICE, " Aux  : %03d %03d %03d %03d\n",
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[2],
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[3],
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[4],
+					pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[5]);
+		}
+		break;
+	case HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION:
+		memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetDeferredFwVersionResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Deferred FW Version: ");
+			lprintf(LOG_NOTICE, " Major: %d",
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[0]);
+			lprintf(LOG_NOTICE, " Minor: %x",
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[1]);
+			lprintf(LOG_NOTICE, " Aux  : %03d %03d %03d %03d\n",
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[2],
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[3],
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[4],
+					pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[5]);
+		}
+		break;
+	case HPMFWUPG_COMP_OEM_PROPERTIES:
+		/* OEM Properties command */
+		memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetOemProperties));
+		if (verbose) {
+			unsigned char i = 0;
+			lprintf(LOG_NOTICE,"OEM Properties: ");
+			for (i=0; i < HPMFWUPG_OEM_LENGTH; i++) {
+				lprintf(LOG_NOTICE, " 0x%x ",
+						pCtx->resp.Response.oemProperties.oemRspData[i]);
+			}
+		}
+		break;
+	default:
+		lprintf(LOG_NOTICE,"Unsupported component selector");
+		rc = HPMFWUPG_ERROR;
+		break;
+	}
+	return rc;
+}
+
+int
+HpmfwupgAbortUpgrade(struct ipmi_intf *intf,
+		struct HpmfwupgAbortUpgradeCtx *pCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_ABORT_UPGRADE;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgAbortUpgradeReq);
+	rsp = HpmfwupgSendCmd(intf, req, NULL);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error - aborting upgrade.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode != 0x00) {
+		lprintf(LOG_ERR, "Error aborting upgrade");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf,
+		struct HpmfwupgInitiateUpgradeActionCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_INITIATE_UPGRADE_ACTION;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgInitiateUpgradeActionReq);
+	rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error initiating upgrade action.");
+		return HPMFWUPG_ERROR;
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+	} else if (rsp->ccode != 0x00) {
+		lprintf(LOG_NOTICE,"Error initiating upgrade action");
+		lprintf(LOG_NOTICE, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
+		struct HpmfwupgUploadFirmwareBlockCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int count,
+		unsigned int *imageOffset, unsigned int *blockLength)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req->picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_UPLOAD_FIRMWARE_BLOCK;
+	req.msg.data = (unsigned char *)pCtx->req;
+	/* 2 is the size of the upload struct - data */
+	req.msg.data_len = 2 + count;
+	rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+	if (rsp == NULL) {
+		lprintf(LOG_NOTICE, "Error uploading firmware block.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS
+			|| rsp->ccode == 0x00) {
+		/*
+		 * We need to check if the response also contains the next upload firmware offset
+		 * and the firmware length in its response - These are optional but very vital
+		 */
+		if (rsp->data_len > 1) {
+			/*
+			 * If the response data length is greater than 1 it should contain both the
+			 * the Section offset and section length. Because we cannot just have
+			 * Section offset without section length so the length should be 9
+			 */
+			if (rsp->data_len == 9) {
+				/* rsp->data[1] - LSB  rsp->data[2]  - rsp->data[3] = MSB */
+				*imageOffset = (rsp->data[4] << 24) + (rsp->data[3] << 16) + (rsp->data[2] << 8) + rsp->data[1];
+				*blockLength = (rsp->data[8] << 24) + (rsp->data[7] << 16) + (rsp->data[6] << 8) + rsp->data[5];
+			} else {
+				 /*
+				 * The Spec does not say much for this kind of errors where the
+				 * firmware returned only offset and length so currently returning it
+				 * as 0x82 - Internal CheckSum Error
+				 */
+				lprintf(LOG_NOTICE,
+						"Error wrong rsp->datalen %d for Upload Firmware block command\n",
+						rsp->data_len);
+				rsp->ccode = HPMFWUPG_INT_CHECKSUM_ERROR;
+			}
+		}
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+	} else if (rsp->ccode != 0x00)  {
+		/* PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+		 *           This will be fixed in the next release of open ipmi and this
+		 *           check will have to be removed. (Buggy version = 39)
+		 */
+		if (HPMFWUPG_IS_RETRYABLE(rsp->ccode)) {
+			lprintf(LOG_DEBUG, "HPM: [PATCH]Retryable error detected");
+			rc = HPMFWUPG_UPLOAD_RETRY;
+		} else if (rsp->ccode == IPMI_CC_REQ_DATA_INV_LENGTH ||
+				rsp->ccode == IPMI_CC_REQ_DATA_FIELD_EXCEED) {
+			/* If completion code = 0xc7(0xc8), we will retry with a reduced buffer length.
+			 * Do not print error.
+			 */
+			rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
+		} else {
+			lprintf(LOG_ERR, "Error uploading firmware block");
+			lprintf(LOG_ERR, "compcode=0x%x: %s",
+					rsp->ccode,
+					val2str(rsp->ccode,
+						completion_code_vals));
+			rc = HPMFWUPG_ERROR;
+		}
+	}
+	return rc;
+}
+
+int
+HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf,
+		struct HpmfwupgFinishFirmwareUploadCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx, int option)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_FINISH_FIRMWARE_UPLOAD;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgFinishFirmwareUploadReq);
+	rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error fininshing firmware upload.");
+		return HPMFWUPG_ERROR;
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+	} else if ((option & COMPARE_MODE) && rsp->ccode == 0x83) {
+		printf("|    |Component's active copy doesn't match the upgrade image                 |\n");
+	} else if ((option & COMPARE_MODE) && rsp->ccode == IPMI_CC_OK) {
+		printf("|    |Comparison passed                                                       |\n");
+	} else if ( rsp->ccode != IPMI_CC_OK ) {
+		lprintf(LOG_ERR, "Error finishing firmware upload");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgActivateFirmware(struct ipmi_intf *intf,
+		struct HpmfwupgActivateFirmwareCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_ACTIVATE_FIRMWARE;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgActivateFirmwareReq)
+		- (!pCtx->req.rollback_override ? 1 : 0);
+	rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error activating firmware.");
+		return HPMFWUPG_ERROR;
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		printf("Waiting firmware activation...");
+		fflush(stdout);
+		rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+		if (rc == HPMFWUPG_SUCCESS) {
+			lprintf(LOG_NOTICE, "OK");
+		} else {
+			lprintf(LOG_NOTICE, "Failed");
+		}
+	} else if (rsp->ccode != IPMI_CC_OK) {
+		lprintf(LOG_ERR, "Error activating firmware");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf,
+		struct HpmfwupgGetUpgradeStatusCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx,
+		int silent)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_GET_UPGRADE_STATUS;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetUpgradeStatusReq);
+	rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+	if (!rsp) {
+		lprintf(LOG_NOTICE,
+				"Error getting upgrade status. Failed to get response.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode == 0x00) {
+		memcpy(&pCtx->resp, rsp->data, 
+				sizeof(struct HpmfwupgGetUpgradeStatusResp));
+		if (!silent) {
+			lprintf(LOG_NOTICE, "Upgrade status:");
+			lprintf(LOG_NOTICE,
+					" Command in progress:          %x",
+					pCtx->resp.cmdInProcess);
+			lprintf(LOG_NOTICE,
+					" Last command completion code: %x",
+					pCtx->resp.lastCmdCompCode);
+		}
+	} else if (HPMFWUPG_IS_RETRYABLE(rsp->ccode)) {
+		/* PATCH --> This validation is to handle retryable errors 
+		 *           codes on the IPMB bus.
+		 *           This will be fixed in the next release of 
+		 *           open ipmi and this check can be removed. 
+		 *           (Buggy version = 39)
+		 */
+		if (!silent) {
+			lprintf(LOG_DEBUG, "HPM: Retryable error detected");
+		}
+		pCtx->resp.lastCmdCompCode = HPMFWUPG_COMMAND_IN_PROGRESS;
+	} else {
+		lprintf(LOG_NOTICE, "Error getting upgrade status");
+		lprintf(LOG_NOTICE, "compcode=0x%x: %s", rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		return HPMFWUPG_ERROR;
+	}
+	return HPMFWUPG_SUCCESS;
+}
+
+int
+HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf,
+		struct HpmfwupgManualFirmwareRollbackCtx *pCtx)
+{
+	struct HpmfwupgUpgradeCtx fwupgCtx;
+	struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	/* prepare fake upgrade context */
+	memset(&fwupgCtx, 0, sizeof (fwupgCtx));
+	verbose--;
+	rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
+	verbose++;
+	if (rc != HPMFWUPG_SUCCESS) {
+		return rc;
+	}
+	memcpy(&fwupgCtx.targetCap, &targetCapCmd.resp, sizeof(targetCapCmd.resp));
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgManualFirmwareRollbackReq);
+	rsp = HpmfwupgSendCmd(intf, req, &fwupgCtx);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error sending manual rollback.");
+		return HPMFWUPG_ERROR;
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == IPMI_CC_OK
+			|| rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		struct HpmfwupgQueryRollbackStatusCtx resCmd;
+		printf("Waiting firmware rollback...");
+		fflush(stdout);
+		rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, &fwupgCtx);
+	} else if ( rsp->ccode != 0x00 ) {
+		lprintf(LOG_ERR, "Error sending manual rollback");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",  
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf,
+		struct HpmfwupgQueryRollbackStatusCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned int rollbackTimeout = 0;
+	unsigned int timeoutSec1, timeoutSec2;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_QUERY_ROLLBACK_STATUS;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgQueryRollbackStatusReq);
+	/* If we are not in upgrade context, we use default timeout values */
+	if (pFwupgCtx != NULL) {
+		struct HpmfwupgImageHeader *pImageHeader;
+		if (pFwupgCtx->pImageData) {
+			pImageHeader = (struct HpmfwupgImageHeader*)pFwupgCtx->pImageData;
+			rollbackTimeout = pImageHeader->rollbackTimeout;
+		} else {
+			rollbackTimeout = 0;
+		}
+		/* Use the greater of the two timeouts (header and target caps) */
+		rollbackTimeout = MAX(rollbackTimeout,
+				pFwupgCtx->targetCap.rollbackTimeout) * 5;
+	} else {
+		rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+	}
+	/* Poll rollback status until completion or timeout */
+	timeoutSec1 = time(NULL);
+	timeoutSec2 = time(NULL);
+	do {
+		/* Must wait at least 100 ms between status requests */
+		usleep(100000);
+		rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+		/* PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+		 *           This will be fixed in the next release of open ipmi and this
+		 *           check will have to be removed. (Buggy version = 39)
+		 */
+		if (rsp) {
+			if (HPMFWUPG_IS_RETRYABLE(rsp->ccode)) {
+				lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
+				rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+			}
+		}
+		timeoutSec2 = time(NULL);
+	} while (rsp
+			&& ((rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS)
+				|| (rsp->ccode == IPMI_CC_TIMEOUT))
+			&& (timeoutSec2 - timeoutSec1 < rollbackTimeout));
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error getting upgrade status.");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode == 0x00) {
+		memcpy(&pCtx->resp, rsp->data,
+				sizeof(struct HpmfwupgQueryRollbackStatusResp));
+		if (pCtx->resp.rollbackComp.ComponentBits.byte != 0) {
+			/* Rollback occurred */
+			lprintf(LOG_NOTICE,
+					"Rollback occurred on component mask: 0x%02x",
+					pCtx->resp.rollbackComp.ComponentBits.byte);
+		} else {
+			lprintf(LOG_NOTICE,
+					"No Firmware rollback occurred");
+		}
+	} else if (rsp->ccode == 0x81) {
+		lprintf(LOG_ERR,
+				"Rollback failed on component mask: 0x%02x",
+				pCtx->resp.rollbackComp.ComponentBits.byte);
+		rc = HPMFWUPG_ERROR;
+	} else {
+		lprintf(LOG_ERR,
+				"Error getting rollback status");
+		lprintf(LOG_ERR,
+				"compcode=0x%x: %s",  
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+int
+HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelftestResultCtx *pCtx,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char selfTestTimeout = 0;
+	unsigned int timeoutSec1, timeoutSec2;
+	pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+	/* If we are not in upgrade context, we use default timeout values */
+	if (pFwupgCtx != NULL) {
+		/* Getting selftest timeout from new image */
+		struct HpmfwupgImageHeader *pImageHeader = (struct HpmfwupgImageHeader*)
+			pFwupgCtx->pImageData;
+		selfTestTimeout = MAX(pImageHeader->selfTestTimeout,
+		pFwupgCtx->targetCap.selftestTimeout) * 5;
+	} else {
+		selfTestTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = HPMFWUPG_QUERY_SELFTEST_RESULT;
+	req.msg.data = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgQuerySelftestResultReq);
+	/* Poll rollback status until completion or timeout */
+	timeoutSec1 = time(NULL);
+	timeoutSec2 = time(NULL);
+	do {
+		/* Must wait at least 100 ms between status requests */
+		usleep(100000);
+		rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+		/* PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+		 *           This will be fixed in the next release of open ipmi and this
+		 *           check will have to be removed. (Buggy version = 39)
+		 */
+		if (rsp) {
+			if (HPMFWUPG_IS_RETRYABLE(rsp->ccode)) {
+				lprintf(LOG_DEBUG,
+						"HPM: [PATCH]Retryable error detected");
+				rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+			}
+		}
+		timeoutSec2 = time(NULL);
+	} while (rsp
+			&& (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS)
+			&& (timeoutSec2 - timeoutSec1 < selfTestTimeout));
+	if (rsp == NULL) {
+		lprintf(LOG_NOTICE, "Error getting upgrade status\n");
+		return HPMFWUPG_ERROR;
+	}
+	if (rsp->ccode == 0x00) {
+		memcpy(&pCtx->resp, rsp->data,
+				sizeof(struct HpmfwupgQuerySelftestResultResp));
+		if (verbose) {
+			lprintf(LOG_NOTICE, "Self test results:");
+			lprintf(LOG_NOTICE, "Result1 = %x",
+					pCtx->resp.result1);
+			lprintf(LOG_NOTICE, "Result2 = %x",
+					pCtx->resp.result2);
+		}
+	} else {
+		lprintf(LOG_NOTICE, "Error getting self test results");
+		lprintf(LOG_NOTICE, "compcode=0x%x: %s",
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+struct ipmi_rs *
+HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	struct ipmi_rs *rsp;
+	unsigned int inaccessTimeout = 0, inaccessTimeoutCounter = 0;
+	unsigned int upgradeTimeout  = 0, upgradeTimeoutCounter  = 0;
+	unsigned int  timeoutSec1, timeoutSec2;
+	unsigned char retry = 0;
+	/* If we are not in upgrade context, we use default timeout values */
+	if (pFwupgCtx != NULL) {
+		inaccessTimeout = pFwupgCtx->targetCap.inaccessTimeout*5;
+		upgradeTimeout  = pFwupgCtx->targetCap.upgradeTimeout*5;
+	} else {
+		/* keeping the inaccessTimeout to 60 seconds results in almost 2900 retries
+		 * So if the target is not available it will be retrying the command for 2900
+		 * times which is not effecient -So reducing the Timout to 5 seconds which is
+		 * almost 200 retries if it continuously recieves 0xC3 as completion code.
+		 */
+		inaccessTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+		upgradeTimeout  = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+	}
+	timeoutSec1 = time(NULL);
+	do {
+		static unsigned char isValidSize = FALSE;
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			#define HPM_LAN_PACKET_RESIZE_LIMIT 6
+			/* also covers lanplus */
+			if (strstr(intf->name, "lan") != NULL) {
+				static int errorCount=0;
+				static struct ipmi_rs fakeRsp;
+				lprintf(LOG_DEBUG,
+						"HPM: no response available");
+				lprintf(LOG_DEBUG,
+						"HPM: the command may be rejected for security reasons");
+				if (req.msg.netfn == IPMI_NETFN_PICMG
+						&& req.msg.cmd == HPMFWUPG_UPLOAD_FIRMWARE_BLOCK
+						&& errorCount < HPM_LAN_PACKET_RESIZE_LIMIT
+						&& (!isValidSize)) {
+					lprintf(LOG_DEBUG,
+							"HPM: upload firmware block API called");
+					lprintf(LOG_DEBUG,
+							"HPM: returning length error to force resize");
+					fakeRsp.ccode = IPMI_CC_REQ_DATA_INV_LENGTH;
+					rsp = &fakeRsp;
+					errorCount++;
+				} else if (req.msg.netfn == IPMI_NETFN_PICMG
+						&& (req.msg.cmd == HPMFWUPG_ACTIVATE_FIRMWARE
+							|| req.msg.cmd == HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK)) {
+					/*
+					 * rsp == NULL and command activate firmware or manual firmware
+					 * rollback most likely occurs when we have sent a firmware activation
+					 * request. Fake a command in progress response.
+					 */
+					lprintf(LOG_DEBUG,
+							"HPM: activate/rollback firmware API called");
+					lprintf(LOG_DEBUG,
+							"HPM: returning in progress to handle IOL session lost");
+					fakeRsp.ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+					rsp = &fakeRsp;
+				} else if (req.msg.netfn == IPMI_NETFN_PICMG
+						&& (req.msg.cmd == HPMFWUPG_QUERY_ROLLBACK_STATUS
+							|| req.msg.cmd == HPMFWUPG_GET_UPGRADE_STATUS
+							|| req.msg.cmd == HPMFWUPG_QUERY_SELFTEST_RESULT)
+						&& ( !intf->target_addr || intf->target_addr == intf->my_addr)) {
+					/* reopen session only if target IPMC is directly accessed */
+					/*
+					 * rsp == NULL and command get upgrade status or query rollback
+					 * status most likely occurs when we are waiting for firmware
+					 * activation. Try to re-open the IOL session (re-open will work
+					 * once the IPMC recovers from firmware activation.
+					 */
+					lprintf(LOG_DEBUG, "HPM: upg/rollback status firmware API called");
+					lprintf(LOG_DEBUG, "HPM: try to re-open IOL session");
+					{
+						/* force session re-open */
+						intf->abort = 1;
+						intf->close(intf);
+
+						while (intf->open(intf) == HPMFWUPG_ERROR
+								&& inaccessTimeoutCounter < inaccessTimeout) {
+							inaccessTimeoutCounter += (time(NULL) - timeoutSec1);
+							timeoutSec1 = time(NULL);
+						}
+
+						/* Fake timeout to retry command */
+						fakeRsp.ccode = 0xc3;
+						rsp = &fakeRsp;
+					}
+				}
+			}
+		}
+		/* Handle inaccessibility timeout (rsp = NULL if IOL) */
+		if (rsp == NULL || rsp->ccode == 0xff || rsp->ccode == 0xc3 || rsp->ccode == 0xd3) {
+			if (inaccessTimeoutCounter < inaccessTimeout) {
+				timeoutSec2 = time(NULL);
+				if (timeoutSec2 > timeoutSec1) {
+					inaccessTimeoutCounter += timeoutSec2 - timeoutSec1;
+					timeoutSec1 = time(NULL);
+				}
+				usleep(100000);
+				retry = 1;
+			} else {
+				retry = 0;
+			}
+		} else if ( rsp->ccode == 0xc0 ) {
+			/* Handle node busy timeout */
+			if (upgradeTimeoutCounter < upgradeTimeout) {
+				timeoutSec2 = time(NULL);
+				if (timeoutSec2 > timeoutSec1) {
+					timeoutSec1 = time(NULL);
+					upgradeTimeoutCounter += timeoutSec2 - timeoutSec1;
+				}
+				usleep(100000);
+				retry = 1;
+			} else {
+				retry = 0;
+			}
+		} else {
+# ifdef ENABLE_OPENIPMI_V39_PATCH
+			if (rsp->ccode == IPMI_CC_OK) {
+				errorCount = 0 ;
+			}
+# endif
+			retry = 0;
+			if (req.msg.netfn == IPMI_NETFN_PICMG
+					&& req.msg.cmd == HPMFWUPG_UPLOAD_FIRMWARE_BLOCK
+					&& (!isValidSize)) {
+				lprintf(LOG_INFO,
+						"Buffer length is now considered valid");
+				isValidSize = TRUE;
+			}
+		}
+	} while (retry);
+	return rsp;
+}
+
+int
+HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf,
+		struct HpmfwupgUpgradeCtx *pFwupgCtx)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	unsigned int upgradeTimeout = 0;
+	unsigned int  timeoutSec1, timeoutSec2;
+	struct HpmfwupgGetUpgradeStatusCtx upgStatusCmd;
+	/* If we are not in upgrade context, we use default timeout values */
+	if (pFwupgCtx != NULL) {
+		upgradeTimeout = (unsigned int)(pFwupgCtx->targetCap.upgradeTimeout*5);
+		if (verbose) {
+			printf("Use File Upgrade Capabilities: %i seconds\n",
+					upgradeTimeout);
+		}
+	} else {
+		/* Try to retreive from Caps */
+		struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
+		if(HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd) != HPMFWUPG_SUCCESS) {
+			upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+			if (verbose) {
+				printf("Use default timeout: %i seconds\n",
+						upgradeTimeout);
+			}
+		} else {
+			upgradeTimeout = (unsigned int)(targetCapCmd.resp.upgradeTimeout * 5);
+			if (verbose) {
+				printf("Use Command Upgrade Capabilities Timeout: %i seconds\n",
+						upgradeTimeout);
+			}
+		}
+	}
+	if (rc == HPMFWUPG_SUCCESS) {
+		/* Poll upgrade status until completion or timeout*/
+		timeoutSec1 = time(NULL);
+		timeoutSec2 = time(NULL);
+		rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd,
+				pFwupgCtx, 1);
+	}
+	while (
+			/* With KCS: Cover the case where we sometime
+			 * receive d5 (on the first get status) from
+			 * the ipmi driver.
+			 */
+			(upgStatusCmd.resp.lastCmdCompCode == 0x80 ||
+					upgStatusCmd.resp.lastCmdCompCode == 0xD5)
+			&& ((timeoutSec2 - timeoutSec1) < upgradeTimeout )
+			&& (rc == HPMFWUPG_SUCCESS)) {
+		/* Must wait at least 1000 ms between status requests */
+		usleep(1000000);
+		timeoutSec2 = time(NULL);
+		rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx, 1);
+/*
+ *		printf("Get Status: %x - %x = %x _ %x [%x]\n",
+ (				timeoutSec2, timeoutSec1,
+ *				(timeoutSec2 - timeoutSec1),
+ *				upgradeTimeout, rc);
+ */
+	}
+	if (upgStatusCmd.resp.lastCmdCompCode != 0x00) {
+		if (verbose) {
+			lprintf(LOG_NOTICE,
+					"Error waiting for command %x, compcode = %x",
+					upgStatusCmd.resp.cmdInProcess,
+					upgStatusCmd.resp.lastCmdCompCode);
+		}
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
+unsigned char
+HpmfwupgCalculateChecksum(unsigned char *pData, unsigned int length)
+{
+	unsigned char checksum = 0;
+	int dataIdx = 0;
+	for (dataIdx = 0; dataIdx < length; dataIdx++) {
+		checksum += pData[dataIdx];
+	}
+	return checksum;
+}
+
+void
+HpmfwupgPrintUsage(void)
+{
+	lprintf(LOG_NOTICE,
+"help                    - This help menu.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"check                   - Check the target information.");
+	lprintf(LOG_NOTICE,
+"check <file>            - If the user is unsure of what update is going to be ");
+	lprintf(LOG_NOTICE,
+"                          This will display the existing target version and");
+	lprintf(LOG_NOTICE,
+"                          image version on the screen");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"upgrade <file> [component x...] [force] [activate]");
+	lprintf(LOG_NOTICE,
+"                        - Copies components from a valid HPM.1 image to the target.");
+	lprintf(LOG_NOTICE,
+"                          If one or more components specified by \"component\",");
+	lprintf(LOG_NOTICE,
+"                          only the specified components are copied.");
+	lprintf(LOG_NOTICE,
+"                          Otherwise, all the image components are copied.");
+	lprintf(LOG_NOTICE,
+"                          Before copy, each image component undergoes a version check");
+	lprintf(LOG_NOTICE,
+"                          and can be skipped if the target component version");
+	lprintf(LOG_NOTICE,
+"                          is the same or more recent.");
+	lprintf(LOG_NOTICE,
+"                          Use \"force\" to bypass the version check results.");
+	lprintf(LOG_NOTICE,
+"                          Make sure to check the versions first using the");
+	lprintf(LOG_NOTICE,
+"                          \"check <file>\" command.");
+	lprintf(LOG_NOTICE,
+"                          If \"activate\" is specified, the newly uploaded firmware");
+	lprintf(LOG_NOTICE,
+"                          is activated.");
+	lprintf(LOG_NOTICE,
+"upgstatus               - Returns the status of the last long duration command.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"compare <file>          - Perform \"Comparison of the Active Copy\" action for all the");
+	lprintf(LOG_NOTICE,
+"                          components present in the file.");
+	lprintf(LOG_NOTICE,
+"compare <file> component x - Compare only component <x> from the given <file>");
+	lprintf(LOG_NOTICE,
+"activate                - Activate the newly uploaded firmware.");
+	lprintf(LOG_NOTICE,
+"activate norollback     - Activate the newly uploaded firmware but inform");
+	lprintf(LOG_NOTICE,
+"                          the target to not automatically rollback if ");
+	lprintf(LOG_NOTICE,
+"                          the upgrade fails.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"targetcap               - Get the target upgrade capabilities.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"compprop <id> <prop>    - Get specified component properties from the target.");
+	lprintf(LOG_NOTICE,
+"                          Valid component <id>: 0-7 ");
+	lprintf(LOG_NOTICE,
+"                          Properties <prop> can be one of the following: ");
+	lprintf(LOG_NOTICE,
+"                          0- General properties");
+	lprintf(LOG_NOTICE,
+"                          1- Current firmware version");
+	lprintf(LOG_NOTICE,
+"                          2- Description string");
+	lprintf(LOG_NOTICE,
+"                          3- Rollback firmware version");
+	lprintf(LOG_NOTICE,
+"                          4- Deferred firmware version");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"abort                   - Abort the on-going firmware upgrade.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"rollback                - Performs a manual rollback on the IPM Controller.");
+	lprintf(LOG_NOTICE,
+"                          firmware");
+	lprintf(LOG_NOTICE,
+"rollbackstatus          - Query the rollback status.");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"selftestresult          - Query the self test results.\n");
+}
+
+int
+ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = HPMFWUPG_SUCCESS;
+	int activateFlag = 0x00;
+	int componentMask = 0;
+	int componentId = 0;
+	int option = 0;
+
+	lprintf(LOG_DEBUG,"ipmi_hpmfwupg_main()");
+	lprintf(LOG_NOTICE, "\nPICMG HPM.1 Upgrade Agent %d.%d.%d: \n",
+			HPMFWUPG_VERSION_MAJOR, HPMFWUPG_VERSION_MINOR,
+			HPMFWUPG_VERSION_SUBMINOR);
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		HpmfwupgPrintUsage();
+		return HPMFWUPG_ERROR;
+	}
+	if (strcmp(argv[0], "help") == 0) {
+		HpmfwupgPrintUsage();
+		return HPMFWUPG_SUCCESS;
+	} else if ((strcmp(argv[0], "check") == 0)) {
+		/* hpm check */
+		if (argv[1] == NULL) {
+			rc = HpmfwupgTargetCheck(intf,VIEW_MODE);
+		} else {
+			/* hpm check <filename> */
+			rc = HpmfwupgTargetCheck(intf,0);
+			if (rc == HPMFWUPG_SUCCESS) {
+				rc = HpmfwupgUpgrade(intf, argv[1], 0,
+						0, VIEW_MODE);
+			}
+		}
+	} else if (strcmp(argv[0], "upgrade") == 0) {
+		int i =0;
+		for (i=1; i< argc ; i++) {
+			if (strcmp(argv[i],"activate") == 0) {
+				activateFlag = 1;
+			}
+			/* hpm upgrade <filename> force */
+			if (strcmp(argv[i],"force") == 0) {
+				option |= FORCE_MODE;
+			}
+			/* hpm upgrade <filename> component <comp Id> */
+			if (strcmp(argv[i],"component") == 0) {
+				if (i+1 < argc) {
+					/* Error Checking */
+					if (str2int(argv[i+1], &componentId) != 0
+							|| componentId < 0
+							|| componentId > HPMFWUPG_COMPONENT_ID_MAX) {
+						lprintf(LOG_ERR,
+								"Given Component ID '%s' is invalid.",
+								argv[i+1]);
+						lprintf(LOG_ERR,
+								"Valid Compoment ID is: <0..7>");
+						return HPMFWUPG_ERROR;
+					}
+					if( verbose ) {
+						lprintf(LOG_NOTICE,
+								"Component Id %d provided",
+								componentId );
+					}
+					componentMask |= 1 << componentId;
+				} else {
+					/* That indicates the user has
+					 * given component on console but
+					 * not given any ID
+					 */
+					lprintf(LOG_NOTICE,
+							"No component Id provided\n");
+					return  HPMFWUPG_ERROR;
+				}
+			}
+			if (strcmp(argv[i],"debug") == 0) {
+				option |= DEBUG_MODE;
+			}
+		}
+		rc = HpmfwupgTargetCheck(intf, 0);
+		if (rc == HPMFWUPG_SUCCESS) {
+			/* Call the Upgrade function to start the upgrade */
+			rc = HpmfwupgUpgrade(intf, argv[1], activateFlag,
+					componentMask, option);
+		}
+	} else if (strcmp(argv[0], "compare") == 0) {
+		int i = 0;
+		for (i=1; i< argc; i++) {
+			/* hpm compare <file> [component x...] */
+			if (strcmp(argv[i],"component") == 0) {
+				if (i+1 < argc) {
+					/* Error Checking */
+					if (str2int(argv[i+1], &componentId) != 0
+							|| componentId < 0
+							|| componentId > HPMFWUPG_COMPONENT_ID_MAX) {
+						lprintf(LOG_ERR,
+								"Given Component ID '%s' is invalid.",
+								argv[i+1]);
+						lprintf(LOG_ERR,
+								"Valid Compoment ID is: <0..7>");
+						return HPMFWUPG_ERROR;
+					}
+					if( verbose ) {
+						lprintf(LOG_NOTICE,
+								"Component Id %d provided",
+								componentId);
+					}
+					componentMask|= 1 << componentId;
+				} else {
+					/* That indicates the user
+					 * has given component on
+					 * console but not
+					 * given any ID
+					 */
+					lprintf(LOG_NOTICE,
+							"No component Id provided\n");
+					return  HPMFWUPG_ERROR;
+				}
+			} else if (strcmp(argv[i],"debug") == 0) {
+				option|= DEBUG_MODE;
+			}
+		}
+		option|= (COMPARE_MODE);
+		rc = HpmfwupgTargetCheck(intf, 0);
+		if (rc == HPMFWUPG_SUCCESS) {
+			rc = HpmfwupgUpgrade(intf, argv[1], 0,
+					componentMask, option);
+		}
+	} else if ((argc >= 1) && (strcmp(argv[0], "activate") == 0)) {
+		struct HpmfwupgActivateFirmwareCtx cmdCtx;
+		if ((argc == 2) && (strcmp(argv[1], "norollback") == 0)) {
+			cmdCtx.req.rollback_override = 1;
+		} else {
+			cmdCtx.req.rollback_override = 0;
+		}
+		rc = HpmfwupgActivateFirmware(intf, &cmdCtx, NULL);
+	} else if ((argc == 1) && (strcmp(argv[0], "targetcap") == 0)) {
+		struct HpmfwupgGetTargetUpgCapabilitiesCtx cmdCtx;
+		verbose++;
+		rc = HpmfwupgGetTargetUpgCapabilities(intf, &cmdCtx);
+	} else if ((argc == 3) && (strcmp(argv[0], "compprop") == 0)) {
+		struct HpmfwupgGetComponentPropertiesCtx cmdCtx;
+		if (str2uchar(argv[1], &(cmdCtx.req.componentId)) != 0
+				|| cmdCtx.req.componentId > 7) {
+			lprintf(LOG_ERR,
+					"Given Component ID '%s' is invalid.",
+					argv[1]);
+			lprintf(LOG_ERR,
+					"Valid Compoment ID is: <0..7>");
+			return (-1);
+		}
+		if (str2uchar(argv[2], &(cmdCtx.req.selector)) != 0
+				|| cmdCtx.req.selector > 4) {
+			lprintf(LOG_ERR,
+					"Given Properties selector '%s' is invalid.",
+					argv[2]);
+			lprintf(LOG_ERR,
+					"Valid Properties selector is: <0..4>");
+			return (-1);
+		}
+		verbose++;
+		rc = HpmfwupgGetComponentProperties(intf, &cmdCtx);
+	} else if ((argc == 1) && (strcmp(argv[0], "abort") == 0)) {
+		struct HpmfwupgAbortUpgradeCtx cmdCtx;
+		verbose++;
+		rc = HpmfwupgAbortUpgrade(intf, &cmdCtx);
+	} else if ((argc == 1) && (strcmp(argv[0], "upgstatus") == 0)) {
+		struct HpmfwupgGetUpgradeStatusCtx cmdCtx;
+		verbose++;
+		rc = HpmfwupgGetUpgradeStatus(intf, &cmdCtx, NULL, 0);
+	} else if ((argc == 1) && (strcmp(argv[0], "rollback") == 0)) {
+		struct HpmfwupgManualFirmwareRollbackCtx cmdCtx;
+		verbose++;
+		rc = HpmfwupgManualFirmwareRollback(intf, &cmdCtx);
+	} else if ((argc == 1) && (strcmp(argv[0], "rollbackstatus") == 0)) {
+		struct HpmfwupgQueryRollbackStatusCtx  cmdCtx;
+		verbose++;
+		rc = HpmfwupgQueryRollbackStatus(intf, &cmdCtx, NULL);
+	} else if ((argc == 1) && (strcmp(argv[0], "selftestresult") == 0)) {
+		struct HpmfwupgQuerySelftestResultCtx cmdCtx;
+		verbose++;
+		rc = HpmfwupgQuerySelftestResult(intf, &cmdCtx, NULL);
+	} else {
+		lprintf(LOG_ERR, "Invalid HPM command: %s", argv[0]);
+		HpmfwupgPrintUsage();
+		rc = HPMFWUPG_ERROR;
+	}
+	return rc;
+}
+
diff --git a/lib/ipmi_ime.c b/lib/ipmi_ime.c
new file mode 100755
index 0000000..6bdca3b
--- /dev/null
+++ b/lib/ipmi_ime.c
@@ -0,0 +1,1039 @@
+/*
+ * Copyright (c) 2007 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/****************************************************************************
+*
+*       Copyright (c) 2009 Kontron Canada, Inc.  All Rights Reserved.
+*
+*                              IME
+*                    Intel Manageability Engine
+*                      Firmware Update Agent
+*
+* The ME is an IPMI-enabled component included in Intel(R) Next Generation
+*  Server Chipset Nehalem-EP platforms.
+*
+* These are a few synonyms for the ME :
+*
+* - Dynamic Power Node Manager
+* - Intelligent Power Node Manager
+* 
+* Consult Intel litterature for more information on this technology.
+*
+* The ME firmware resides on the platform boot flash and contains read only
+* boot code for the ME as well as boot image redundancy support. 
+*
+* This module implements an Upgrade Agent for the ME firwmare. Because the ME 
+* implements IPMI command handling, the agent speaks directly to the ME. In other
+* words, in order the reach the ME, the BMC must implement IPMB bridging.
+*
+* The update is done through IPMI (this is IPMITOOL right !), not HECI.
+*
+* Example: ME available at address 0x88 on IPMI channel 8:
+*   ipmitool  -m 0x20 -t 0x88 -b 8 ime info
+*
+* !! WARNING - You MUST use an image provided by your board vendor. - WARNING !!
+*
+* author:
+*  Jean-Michel.Audet@ca.kontron.com
+*  Francois.Isabelle@ca.kontron.com
+*
+*****************************************************************************/
+/*
+ * HISTORY
+ * ===========================================================================
+ * 2009-04-20
+ *
+ * First public release of Kontron
+ *
+*/
+#include <ipmitool/ipmi_ime.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_strings.h>
+
+
+#undef OUTPUT_DEBUG
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+
+static const int IME_SUCCESS              = 0;
+static const int IME_ERROR                = -1;
+static const int IME_RESTART              = -2;
+
+#define IME_UPGRADE_BUFFER_SIZE           22
+#define IME_RETRY_COUNT                   5
+
+typedef struct ImeUpdateImageCtx
+{
+   uint32_t   size;
+   uint8_t *  pData;
+   uint8_t    crc8;
+}tImeUpdateImageCtx;
+
+typedef enum eImeState
+{
+   IME_STATE_IDLE                = 0,
+   IME_STATE_UPDATE_REQUESTED    = 1,
+   IME_STATE_UPDATE_IN_PROGRESS  = 2,
+   IME_STATE_SUCCESS             = 3,
+   IME_STATE_FAILED              = 4,
+   IME_STATE_ROLLED_BACK         = 5,
+   IME_STATE_ABORTED             = 6,
+   IME_STATE_INIT_FAILED         = 7
+} tImeStateEnum;
+
+
+typedef enum tImeUpdateType
+{
+   IME_UPDTYPE_NORMAL            = 1,
+   IME_UPDTYPE_MANUAL_ROLLBACK   = 3,
+   IME_UPDTYPE_ABORT             = 4
+} tImeUpdateType;
+
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+typedef struct sImeStatus {
+   uint8_t image_status;
+   tImeStateEnum update_state;
+   uint8_t update_attempt_status;
+   uint8_t rollback_attempt_status;
+   uint8_t update_type;
+   uint8_t dependent_flag;
+   uint8_t free_area_size[4];
+} ATTRIBUTE_PACKING tImeStatus ;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+typedef struct sImeCaps {
+   uint8_t area_supported;
+   uint8_t special_caps;
+} ATTRIBUTE_PACKING tImeCaps ;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+
+static void ImePrintUsage(void);
+static int  ImeGetInfo(struct ipmi_intf *intf);
+static int  ImeUpgrade(struct ipmi_intf *intf, char* imageFilename);
+static int  ImeManualRollback(struct ipmi_intf *intf);
+static int  ImeUpdatePrepare(struct ipmi_intf *intf);
+static int  ImeUpdateOpenArea(struct ipmi_intf *intf);
+static int  ImeUpdateWriteArea(
+                              struct ipmi_intf *intf,
+                              uint8_t sequence, 
+                              uint8_t length, 
+                              uint8_t * pBuf
+                          );
+static int  ImeUpdateCloseArea(
+                              struct ipmi_intf *intf,
+                              uint32_t size, 
+                              uint16_t checksum
+                          );
+
+static int ImeUpdateGetStatus(struct ipmi_intf *intf, tImeStatus *pStatus);
+static int ImeUpdateGetCapabilities(struct ipmi_intf *intf, tImeCaps *pCaps );
+static int  ImeUpdateRegisterUpdate(struct ipmi_intf *intf, tImeUpdateType type);
+
+static int  ImeImageCtxFromFile(
+                                 char * imageFilename, 
+                                 tImeUpdateImageCtx * pImageCtx);
+static int ImeUpdateShowStatus(struct ipmi_intf *intf);
+
+static uint8_t ImeCrc8( uint32_t length, uint8_t * pBuf );
+
+
+static int ImeGetInfo(struct ipmi_intf *intf)
+{
+   int rc = IME_ERROR;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   struct ipm_devid_rsp *devid;
+   const char *product=NULL;
+   tImeStatus status;
+   tImeCaps caps;
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = IPMI_NETFN_APP;
+   req.msg.cmd = BMC_GET_DEVICE_ID;
+   req.msg.data_len = 0;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "Get Device ID command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "Get Device ID command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   devid = (struct ipm_devid_rsp *) rsp->data;
+
+   lprintf(LOG_DEBUG,"Device ID                 : %i", devid->device_id);
+   lprintf(LOG_DEBUG,"Device Revision           : %i",
+                           devid->device_revision & IPM_DEV_DEVICE_ID_REV_MASK);
+
+   if(
+      (devid->device_id == 0)
+      &&
+      ((devid->device_revision & IPM_DEV_DEVICE_ID_REV_MASK) == 0)
+      &&
+      (
+         (devid->manufacturer_id[0] == 0x57) // Intel
+         &&
+         (devid->manufacturer_id[1] == 0x01) // Intel
+         &&
+         (devid->manufacturer_id[2] == 0x00) // Intel
+      )
+      &&
+      (
+         (devid->product_id[1] == 0x0b)
+         &&
+         (devid->product_id[0] == 0x00)
+      )
+     )
+   {
+      rc = IME_SUCCESS;
+      printf("Manufacturer Name          : %s\n",
+               val2str( (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id), 
+               ipmi_oem_info) );
+
+      printf("Product ID                 : %u (0x%02x%02x)\n",
+         buf2short((uint8_t *)(devid->product_id)),
+         devid->product_id[1], devid->product_id[0]);
+ 
+      product=oemval2str(IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id),
+                      (devid->product_id[1]<<8)+devid->product_id[0],
+                      ipmi_oem_product_info);
+
+      if (product!=NULL) 
+      {
+         printf("Product Name               : %s\n", product);
+      }
+
+      printf("Intel ME Firmware Revision : %x.%02x.%02x.%x%x%x.%x\n",
+            ((devid->fw_rev1 & IPM_DEV_FWREV1_MAJOR_MASK )         ),
+            ((devid->fw_rev2                             ) >>     4),
+            ((devid->fw_rev2                             )  &  0x0f),
+            ((devid->aux_fw_rev[1]                       ) >>     4),
+            ((devid->aux_fw_rev[1]                       )  &  0x0f),
+            ((devid->aux_fw_rev[2]                       ) >>     4),
+            ((devid->aux_fw_rev[2]                       )  &  0x0f)
+      );
+
+      printf("SPS FW IPMI cmd version    : %x.%x\n",
+         devid->aux_fw_rev[0] >>     4,
+         devid->aux_fw_rev[0] &  0x0f);
+
+      lprintf(LOG_DEBUG,"Flags: %xh", devid->aux_fw_rev[3]);
+
+      printf("Current Image Type         : ");
+      switch( (devid->aux_fw_rev[3] & 0x03) )
+      {
+         case 0:
+            printf("Recovery\n");
+         break;
+
+         case 1:
+            printf("Operational Image 1\n");
+         break;
+
+         case 2:
+            printf("Operational Image 2\n");
+         break;
+
+         case 3:
+         default:
+            printf("Unknown\n");
+         break;
+      }
+   }
+   else
+   {
+         printf("Supported ME not found\n");
+   }
+
+   if(rc == IME_SUCCESS)
+   {
+      rc = ImeUpdateGetStatus(intf, &status);
+   
+      if(rc == IME_SUCCESS)
+      {
+         rc = ImeUpdateGetCapabilities(intf, &caps);
+      }
+
+   }
+   
+   if(rc == IME_SUCCESS)
+   {
+      uint8_t newImage  = ((status.image_status >> 1) & 0x01);
+      uint8_t rollImage = ((status.image_status >> 2) & 0x01);
+      uint8_t runArea   = ((status.image_status >> 3) & 0x03);
+      uint8_t rollSup   = ((caps.special_caps   >> 0) & 0x01);
+      uint8_t recovSup  = ((caps.special_caps   >> 1) & 0x01);
+
+      uint8_t operSup   = ((caps.area_supported   >> 1) & 0x01);
+      uint8_t piaSup    = ((caps.area_supported   >> 2) & 0x01);
+      uint8_t sdrSup    = ((caps.area_supported   >> 3) & 0x01);
+
+      printf("\nSupported Area\n");
+      printf("   Operation Code          : %s\n", (operSup ? "Supported" : "Unsupported"));
+      printf("   PIA                     : %s\n", (piaSup ? "Supported" : "Unsupported"));
+      printf("   SDR                     : %s\n", (sdrSup ? "Supported" : "Unsupported"));
+
+      printf("\nSpecial Capabilities\n");
+      printf("   Rollback                : %s\n", (rollSup ? "Supported" : "Unsupported"));
+      printf("   Recovery                : %s\n", (recovSup ? "Supported" : "Unsupported"));
+
+      printf("\nImage Status\n");
+      printf("   Staging (new)           : %s\n", (newImage ? "Valid" : "Invalid"));
+      printf("   Rollback                : %s\n", (rollImage ? "Valid" : "Invalid"));
+      if(runArea == 0)
+         printf("   Running Image Area      : CODE\n");
+      else
+         printf("   Running Image Area      : CODE%d\n", runArea);
+
+  }
+
+   return rc;
+}
+
+
+static int ImeUpgrade(struct ipmi_intf *intf, char* imageFilename)
+{
+   int rc = IME_SUCCESS;
+   tImeUpdateImageCtx imgCtx;
+   tImeStatus imeStatus;
+   time_t start,end,current;
+   
+   time(&start);
+
+   memset(&imgCtx, 0, sizeof(tImeUpdateImageCtx));
+
+   rc = ImeImageCtxFromFile(imageFilename, &imgCtx);
+
+   if(
+      (rc == IME_ERROR) ||
+      (imgCtx.pData == NULL) ||
+      (imgCtx.size == 0)
+     )
+   {
+      return IME_ERROR;
+   }
+
+   ImeUpdateGetStatus(intf,&imeStatus);
+
+   if(rc == IME_SUCCESS)
+   {
+      rc = ImeUpdatePrepare(intf);
+      ImeUpdateGetStatus(intf,&imeStatus);
+   }
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_UPDATE_REQUESTED) 
+     )
+   {
+      rc = ImeUpdateOpenArea(intf);
+      ImeUpdateGetStatus(intf,&imeStatus);
+   }
+   else if(rc == IME_SUCCESS)
+   {
+      lprintf(LOG_ERROR,"ME state error (%i), aborting", imeStatus.update_state);
+      rc = IME_ERROR;
+   }
+
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_UPDATE_IN_PROGRESS) 
+     )
+   {
+      uint8_t sequence = 0;
+      uint32_t counter = 0;
+      uint8_t retry = 0;
+      uint8_t shownPercent = 0xff;
+
+      while(   
+            (counter < imgCtx.size) && 
+            (rc == IME_SUCCESS) &&
+            (retry < IME_RETRY_COUNT)
+           )
+      {
+         uint8_t length = IME_UPGRADE_BUFFER_SIZE;
+         uint8_t currentPercent;
+
+         if( (imgCtx.size - counter) < IME_UPGRADE_BUFFER_SIZE )
+         {
+            length = (imgCtx.size - counter);
+         }
+
+         rc = ImeUpdateWriteArea(intf,sequence,length,&imgCtx.pData[counter]);
+         
+         /*
+         As per the flowchart Intel Dynamic Power Node Manager 1.5 IPMI Iface
+         page 65
+         We shall send the GetStatus command each time following a write area
+         but this add too much time to the upgrade
+         */   
+         /*  ImeUpdateGetStatus(intf,&imeStatus); */
+         counter += length;
+         sequence ++;
+
+
+         currentPercent = ((float)counter/imgCtx.size)*100;
+
+         if(currentPercent != shownPercent)
+         {
+            shownPercent = currentPercent;
+            printf("Percent: %02i,  ", shownPercent);
+            time(&current);
+            printf("Elapsed time %02ld:%02ld\r",((current-start)/60), ((current-start)%60));
+            fflush(stdout);
+
+         }
+      }
+      ImeUpdateGetStatus(intf,&imeStatus);
+      printf("\n");
+   }
+   else if(rc == IME_SUCCESS)
+   {
+      lprintf(LOG_ERROR,"ME state error (%i), aborting", imeStatus.update_state);
+      rc = IME_ERROR;
+   }
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_UPDATE_IN_PROGRESS) 
+     )
+   {
+      rc = ImeUpdateCloseArea(intf, imgCtx.size, imgCtx.crc8);
+      ImeUpdateGetStatus(intf,&imeStatus);
+   }
+   else if(rc == IME_SUCCESS)
+   {
+      lprintf(LOG_ERROR,"ME state error, aborting");
+      rc = IME_ERROR;
+   }
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_UPDATE_REQUESTED) 
+     )
+   {
+      printf("UpdateCompleted, Activate now\n");
+      rc = ImeUpdateRegisterUpdate(intf, IME_UPDTYPE_NORMAL);
+      ImeUpdateGetStatus(intf,&imeStatus);
+   }
+   else if(rc == IME_SUCCESS)
+   {
+      lprintf(LOG_ERROR,"ME state error, aborting");
+      rc = IME_ERROR;
+   }
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_SUCCESS) 
+     )
+   {
+      time(&end);
+      printf("Update Completed in %02ld:%02ld\n",(end-start)/60, (end-start)%60);
+   }
+   else
+   {
+      time(&end);
+      printf("Update Error\n");
+      printf("\nTime Taken %02ld:%02ld\n",(end-start)/60, (end-start)%60);
+   }
+
+   return rc;
+}
+
+
+static int ImeUpdatePrepare(struct ipmi_intf *intf)
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+
+   #ifdef OUTPUT_DEBUG
+   printf("ImeUpdatePrepare\n");
+   #endif
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA0;
+   req.msg.data_len = 0;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdatePrepare command succeed");
+   return IME_SUCCESS;
+}
+
+static int ImeUpdateOpenArea(struct ipmi_intf *intf)
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   uint8_t buffer[ 2 ];
+
+   #ifdef OUTPUT_DEBUG
+   printf("ImeUpdateOpenArea\n");
+   #endif
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA1;
+
+   buffer[0] = 0x01; // Area Type : Operational code
+   buffer[1] = 0x00; // Reserved : 0
+   req.msg.data = buffer;
+
+   req.msg.data_len = 2;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdateOpenArea command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdateOpenArea command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdateOpenArea command succeed");
+   return IME_SUCCESS;
+}
+
+static int ImeUpdateWriteArea(
+                              struct ipmi_intf *intf,
+                              uint8_t sequence, 
+                              uint8_t length, 
+                              uint8_t * pBuf
+                          )
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   uint8_t buffer[ IME_UPGRADE_BUFFER_SIZE + 1 ];
+
+//   printf("ImeUpdateWriteArea %i\n", sequence);
+
+   if(length > IME_UPGRADE_BUFFER_SIZE)
+      return IME_ERROR;
+
+   buffer[0] = sequence;
+   memcpy(&buffer[1], pBuf, length);
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA2;
+   req.msg.data = buffer;
+   req.msg.data_len = length + 1;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdateWriteArea command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdateWriteArea command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      if( rsp->ccode == 0x80) // restart operation
+         return IME_RESTART;
+      else
+         return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdateWriteArea command succeed");
+   return IME_SUCCESS;
+}
+
+static int ImeUpdateCloseArea(
+                              struct ipmi_intf *intf,
+                              uint32_t size, 
+                              uint16_t checksum
+                          )
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   uint8_t length = sizeof( uint32_t ) + sizeof( uint16_t ); 
+   uint8_t buffer[ sizeof( uint32_t ) + sizeof( uint16_t ) ];
+
+   #ifdef OUTPUT_DEBUG
+   printf( "ImeUpdateCloseArea\n");
+   #endif
+
+   buffer[0] = (uint8_t)((size & 0x000000ff) >>  0);
+   buffer[1] = (uint8_t)((size & 0x0000ff00) >>  8);
+   buffer[2] = (uint8_t)((size & 0x00ff0000) >> 16);
+   buffer[3] = (uint8_t)((size & 0xff000000) >> 24);
+
+   buffer[4] = (uint8_t)((checksum & 0x00ff) >>  0);
+   buffer[5] = (uint8_t)((checksum & 0xff00) >>  8);
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA3;
+   req.msg.data = buffer;
+   req.msg.data_len = length;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdateCloseArea command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdateCloseArea command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdateCloseArea command succeed");
+   return IME_SUCCESS;
+}
+
+static int ImeUpdateGetStatus(struct ipmi_intf *intf, tImeStatus *pStatus )
+{
+   struct      ipmi_rs * rsp;
+   struct      ipmi_rq req;
+   tImeStatus *pGetStatus;
+   
+   memset(pStatus, 0, sizeof(tImeStatus));
+   pStatus->update_state = IME_STATE_ABORTED;
+
+
+   #ifdef OUTPUT_DEBUG
+   printf("ImeUpdateGetStatus: ");
+   #endif
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA6;
+   req.msg.data_len = 0;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdatePrepare command succeed");
+
+   pGetStatus = (tImeStatus *) rsp->data;
+   
+   memcpy( pStatus, pGetStatus, sizeof(tImeStatus));
+
+   #ifdef OUTPUT_DEBUG
+   printf("%x - ", pStatus->updateState);
+
+   switch( pStatus->update_state )
+   {
+      case IME_STATE_IDLE:
+         printf("IDLE\n");
+      break;
+      case IME_STATE_UPDATE_REQUESTED:
+         printf("Update Requested\n");
+      break;
+      case IME_STATE_UPDATE_IN_PROGRESS:
+         printf("Update in Progress\n");
+      break;
+      case IME_STATE_SUCCESS:
+         printf("Update Success\n");
+      break;
+      case IME_STATE_FAILED:
+         printf("Update Failed\n");
+      break;
+      case IME_STATE_ROLLED_BACK:
+         printf("Update Rolled Back\n");
+      break;
+      case IME_STATE_ABORTED:
+         printf("Update Aborted\n");
+      break;
+      case IME_STATE_INIT_FAILED:
+         printf("Update Init Failed\n");
+      break;
+      default:
+         printf("Unknown, reserved\n");
+      break;
+   }
+   #endif
+
+   return IME_SUCCESS;
+}
+
+static int ImeUpdateGetCapabilities(struct ipmi_intf *intf, tImeCaps *pCaps )
+{
+   struct      ipmi_rs * rsp;
+   struct      ipmi_rq req;
+   tImeCaps *  pGetCaps;
+   
+   memset(pCaps, 0, sizeof(tImeCaps));
+
+
+   #ifdef OUTPUT_DEBUG
+   printf("ImeUpdateGetStatus: ");
+   #endif
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA7;
+   req.msg.data_len = 0;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdatePrepare command succeed");
+
+   pGetCaps = (tImeCaps *) rsp->data;
+   
+   memcpy( pCaps, pGetCaps, sizeof(tImeCaps));
+
+   return IME_SUCCESS;
+}
+
+
+static int ImeUpdateRegisterUpdate(struct ipmi_intf *intf, tImeUpdateType type)
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   uint8_t buffer[ 2 ];
+
+   #ifdef OUTPUT_DEBUG
+   printf( "ImeUpdateRegisterUpdate\n");
+   #endif
+
+   buffer[0] = type;  // Normal Update
+   buffer[1] = 0;  // Flags, reserved
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA4;
+   req.msg.data = buffer;
+   req.msg.data_len = 2;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "ImeUpdateRegisterUpdate command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "ImeUpdateRegisterUpdate command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "ImeUpdateRegisterUpdate command succeed");
+   return IME_SUCCESS;
+}
+
+
+
+
+static int ImeUpdateShowStatus(struct ipmi_intf *intf)
+{
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   tImeStatus *pStatus;
+
+   printf("ImeUpdateGetStatus: ");
+
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = 0x30;  // OEM NetFn
+   req.msg.cmd = 0xA6;
+   req.msg.data_len = 0;
+
+   rsp = intf->sendrecv(intf, &req);
+   if (rsp == NULL) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed");
+      return IME_ERROR;
+   }
+   if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "UpdatePrepare command failed: %s",
+         val2str(rsp->ccode, completion_code_vals));
+      return IME_ERROR;
+   }
+
+   lprintf(LOG_DEBUG, "UpdatePrepare command succeed");
+
+   pStatus = (tImeStatus *) rsp->data ;
+
+   
+   printf("image_status: %x - ", pStatus->image_status);
+
+   printf("update_state: %x - ", pStatus->update_state);
+
+   switch( pStatus->update_state )
+   {
+      case IME_STATE_IDLE:
+         printf("IDLE\n");
+      break;
+      case IME_STATE_UPDATE_REQUESTED:
+         printf("Update Requested\n");
+      break;
+      case IME_STATE_UPDATE_IN_PROGRESS:
+         printf("Update in Progress\n");
+      break;
+      case IME_STATE_SUCCESS:
+         printf("Update Success\n");
+      break;
+      case IME_STATE_FAILED:
+         printf("Update Failed\n");
+      break;
+      case IME_STATE_ROLLED_BACK:
+         printf("Update Rolled Back\n");
+      break;
+      case IME_STATE_ABORTED:
+         printf("Update Aborted\n");
+      break;
+      case IME_STATE_INIT_FAILED:
+         printf("Update Init Failed\n");
+      break;
+      default:
+         printf("Unknown, reserved\n");
+      break;
+   }
+   printf("update_attempt_status  : %x\n", pStatus->update_attempt_status);
+   printf("rollback_attempt_status: %x\n", pStatus->rollback_attempt_status);
+   printf("update_type            : %x\n", pStatus->update_type);
+   printf("dependent_flag         : %x\n", pStatus->dependent_flag);
+   printf("free_area_size         : %x\n", pStatus->free_area_size[0]);
+   printf("                       : %x\n", pStatus->free_area_size[1]);
+   printf("                       : %x\n", pStatus->free_area_size[2]);
+   printf("                       : %x\n", pStatus->free_area_size[3]);
+
+   return IME_SUCCESS;
+}
+
+
+static int ImeImageCtxFromFile(
+                                 char* imageFilename, 
+                                 tImeUpdateImageCtx * pImageCtx
+                               )
+{
+   int rc = IME_SUCCESS;
+   FILE* pImageFile = fopen(imageFilename, "rb");
+   
+   if ( pImageFile == NULL )
+   {
+      lprintf(LOG_NOTICE,"Cannot open image file %s", imageFilename);
+      rc = IME_ERROR;
+   }
+   
+   if ( rc == IME_SUCCESS )
+   {
+      /* Get the raw data in file */
+      fseek(pImageFile, 0, SEEK_END);
+      pImageCtx->size  = ftell(pImageFile); 
+      if (pImageCtx->size <= 0) {
+         if (pImageCtx->size < 0)
+            lprintf(LOG_ERR, "Error seeking %s. %s\n", imageFilename, strerror(errno));
+         rc = IME_ERROR;
+         fclose(pImageFile);
+         return rc;
+      }
+      pImageCtx->pData = malloc(sizeof(unsigned char)*pImageCtx->size);
+      rewind(pImageFile);
+
+      if ( pImageCtx->pData != NULL )
+      {
+         if (pImageCtx->size < fread(pImageCtx->pData, sizeof(unsigned char), 
+                                                   pImageCtx->size, pImageFile))
+            rc = IME_ERROR;
+      }
+      else
+      {
+         rc = IME_ERROR;
+      }
+   }
+   
+   // Calculate checksum CRC8  
+   if ( rc == IME_SUCCESS )
+   {
+      pImageCtx->crc8 = ImeCrc8(pImageCtx->size, pImageCtx->pData);
+   }
+
+    
+   if( pImageFile != NULL)
+   {
+      fclose(pImageFile);
+   }
+    
+   return rc;
+}  
+
+static uint8_t ImeCrc8( uint32_t length, uint8_t * pBuf )
+{
+   uint8_t crc = 0;
+   uint32_t bufCount;
+
+   for ( bufCount = 0; bufCount < length; bufCount++ )
+   {
+      uint8_t count;
+
+      crc = crc ^ pBuf[bufCount];
+  
+      for ( count = 0; count < 8; count++ ) 
+      {
+         if (( crc & 0x80 ) != 0 )
+         {
+            crc <<= 1;
+            crc ^= 0x07;
+         }
+         else
+         {
+            crc <<= 1;
+         }
+      }
+   }
+
+   lprintf(LOG_DEBUG,"CRC8: %02xh\n", crc);
+   return crc;
+} 
+
+
+static int ImeManualRollback(struct ipmi_intf *intf)
+{
+   int rc = IME_SUCCESS;
+   tImeStatus imeStatus;
+
+   rc = ImeUpdateRegisterUpdate(intf, IME_UPDTYPE_MANUAL_ROLLBACK);
+   ImeUpdateGetStatus(intf,&imeStatus);
+
+
+   if(
+      (rc == IME_SUCCESS) &&
+      (imeStatus.update_state == IME_STATE_ROLLED_BACK) 
+     )
+   {
+      printf("Manual Rollback Succeed\n");
+      return IME_SUCCESS;
+   }
+   else
+   {
+      printf("Manual Rollback Completed With Error\n");
+      return IME_ERROR;
+   }
+}
+
+
+
+static void ImePrintUsage(void)
+{
+   lprintf(LOG_NOTICE,"help                    - This help menu");   
+   lprintf(LOG_NOTICE,"info                    - Information about the present Intel ME");   
+   lprintf(LOG_NOTICE,"update <file>           - Upgrade the ME firmware from received image <file>");
+   lprintf(LOG_NOTICE,"rollback                - Manual Rollback ME");
+//   lprintf(LOG_NOTICE,"rollback                - Rollback ME Firmware");
+}
+
+
+
+int ipmi_ime_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+   int rc = IME_SUCCESS;
+   
+   lprintf(LOG_DEBUG,"ipmi_ime_main()");
+   
+
+   if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
+   {
+      ImePrintUsage();
+   }
+   else if ( (argc == 0) || (strcmp(argv[0], "info") == 0) ) 
+   {
+      rc = ImeGetInfo(intf);
+   }
+   else if ( strcmp(argv[0], "update") == 0) 
+   {
+      if(argc == 2)
+      {
+         lprintf(LOG_NOTICE,"Update using file: %s", argv[1]);
+         rc = ImeUpgrade(intf, argv[1]);
+      }
+      else
+      {
+         lprintf(LOG_ERROR,"File must be provided with this option, see help\n");
+         rc = IME_ERROR;
+      }
+   }
+   else if ( (argc == 0) || (strcmp(argv[0], "rollback") == 0) ) 
+   {
+      rc = ImeManualRollback(intf);
+   }
+   else
+   {
+      ImePrintUsage(); 
+   }
+   
+   return rc;
+}
+
+
+
diff --git a/lib/ipmi_isol.c b/lib/ipmi_isol.c
new file mode 100644
index 0000000..bc0b08b
--- /dev/null
+++ b/lib/ipmi_isol.c
@@ -0,0 +1,828 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE
+
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <unistd.h>
+
+
+#include <termios.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_isol.h>
+
+static struct termios _saved_tio;
+static int            _in_raw_mode = 0;
+
+extern int verbose;
+
+#define ISOL_ESCAPE_CHARACTER                    '~'
+
+/*
+ * ipmi_get_isol_info
+ */
+static int ipmi_get_isol_info(struct ipmi_intf * intf,
+			      struct isol_config_parameters * params)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char data[6];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_ISOL;
+	req.msg.cmd = GET_ISOL_CONFIG;
+	req.msg.data = data;
+	req.msg.data_len = 4;
+
+	/* GET ISOL ENABLED CONFIG */
+	
+	memset(data, 0, 6);
+	data[0] = 0x00;
+	data[1] = ISOL_ENABLE_PARAM;
+	data[2] = 0x00;		/* block */
+	data[3] = 0x00;		/* selector */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command");
+		return -1;
+	}
+	if (rsp->ccode == 0xc1) {
+		lprintf(LOG_ERR, "IPMI v1.5 Serial Over Lan (ISOL) not supported!");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	params->enabled = rsp->data[1];
+
+	/* GET ISOL AUTHENTICATON CONFIG */
+	
+	memset(data, 0, 6);
+	data[0] = 0x00;
+	data[1] = ISOL_AUTHENTICATION_PARAM;
+	data[2] = 0x00;		/* block */
+	data[3] = 0x00;		/* selector */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	params->privilege_level = rsp->data[1];
+	
+	/* GET ISOL BAUD RATE CONFIG */
+	
+	memset(data, 0, 6);
+	data[0] = 0x00;
+	data[1] = ISOL_BAUD_RATE_PARAM;
+	data[2] = 0x00;		/* block */
+	data[3] = 0x00;		/* selector */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error in Get ISOL Config Command: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	params->bit_rate = rsp->data[1];
+
+	return 0;
+}
+
+static int ipmi_print_isol_info(struct ipmi_intf * intf)
+{
+	struct isol_config_parameters params = {0};
+	if (ipmi_get_isol_info(intf, &params))
+		return -1;
+
+	if (csv_output)
+	{
+		printf("%s,", (params.enabled & 0x1)?"true": "false");
+		printf("%s,",
+			   val2str((params.privilege_level & 0xf), ipmi_privlvl_vals));
+		printf("%s,",
+			   val2str((params.bit_rate & 0xf), ipmi_bit_rate_vals));
+	}
+	else
+	{
+		printf("Enabled                         : %s\n",
+		       (params.enabled & 0x1)?"true": "false");
+		printf("Privilege Level                 : %s\n",
+		       val2str((params.privilege_level & 0xf), ipmi_privlvl_vals));
+		printf("Bit Rate (kbps)                 : %s\n",
+		       val2str((params.bit_rate & 0xf), ipmi_bit_rate_vals));
+	}
+
+	return 0;
+}
+
+static int ipmi_isol_set_param(struct ipmi_intf * intf,
+			       const char *param,
+			       const char *value)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char data[6];	
+	struct isol_config_parameters params = {0};
+
+	/* We need other values to complete the request */
+	if (ipmi_get_isol_info(intf, &params))
+		return -1;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_ISOL;
+	req.msg.cmd = SET_ISOL_CONFIG;
+	req.msg.data = data;
+	req.msg.data_len = 3;
+
+	memset(data, 0, 6);
+	
+	/*
+	 * enabled
+	 */
+	if (strcmp(param, "enabled") == 0)
+	{
+		data[1] = ISOL_ENABLE_PARAM;
+		if (strcmp(value, "true") == 0)
+			data[2] = 0x01;
+		else if (strcmp(value, "false") == 0)
+			data[2] = 0x00;
+		else {
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are true and false");
+			return -1;
+		}
+	}
+
+	/*
+	 * privilege-level
+	 */
+	else if (strcmp(param, "privilege-level") == 0)
+	{
+		data[1] = ISOL_AUTHENTICATION_PARAM;
+		if (! strcmp(value, "user"))
+			data[2] = 0x02;
+		else if (! strcmp(value, "operator"))
+			data[2] = 0x03;
+		else if (! strcmp(value, "admin"))
+			data[2] = 0x04;
+		else if (! strcmp(value, "oem"))
+			data[2] = 0x05;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are user, operator, admin, and oem");
+			return -1;
+		}
+		/* We need to mask bit7 from the fetched value */
+		data[2] |= (params.privilege_level & 0x80) ? 0x80 : 0x00;
+	}
+
+	/*
+	 * bit-rate
+	 */
+	else if (strcmp(param, "bit-rate") == 0)
+	{
+		data[1] = ISOL_BAUD_RATE_PARAM;
+		if (strncmp(value, "9.6", 3) == 0) {
+			data[2] = 0x06;
+		}
+		else if (strncmp(value, "19.2", 4) == 0) {
+			data[2] = 0x07;
+		}
+		else if (strncmp(value, "38.4", 4) == 0) {
+			data[2] = 0x08;
+		}
+		else if (strncmp(value, "57.6", 4) == 0) {
+			data[2] = 0x09;
+		}
+		else if (strncmp(value, "115.2", 5) == 0) {
+			data[2] = 0x0A;
+		}
+		else {
+			lprintf(LOG_ERR, "ISOL - Unsupported baud rate: %s", value);
+			lprintf(LOG_ERR, "Valid values are 9.6, 19.2, 38.4, 57.6 and 115.2");
+			return -1;
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Error: invalid ISOL parameter %s", param);
+		return -1;
+	}
+	
+	
+	/*
+	 * Execute the request
+	 */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting ISOL parameter '%s'", param);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error setting ISOL parameter '%s': %s",
+			   param, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+static void
+leave_raw_mode(void)
+{
+	if (!_in_raw_mode)
+		return;
+	if (tcsetattr(fileno(stdin), TCSADRAIN, &_saved_tio) == -1)
+		perror("tcsetattr");
+	else
+		_in_raw_mode = 0;
+}
+
+
+
+static void
+enter_raw_mode(void)
+{
+	struct termios tio;
+	if (tcgetattr(fileno(stdin), &tio) == -1) {
+		perror("tcgetattr");
+		return;
+	}
+	_saved_tio = tio;
+	tio.c_iflag |= IGNPAR;
+	tio.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF)\
+		;
+	tio.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
+	//	#ifdef IEXTEN
+	tio.c_lflag &= ~IEXTEN;
+	//	#endif
+	tio.c_oflag &= ~OPOST;
+	tio.c_cc[VMIN] = 1;
+	tio.c_cc[VTIME] = 0;
+	if (tcsetattr(fileno(stdin), TCSADRAIN, &tio) == -1)
+		perror("tcsetattr");
+	else
+		_in_raw_mode = 1;
+}
+
+
+static void
+sendBreak(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload  v2_payload;
+
+	memset(&v2_payload, 0, sizeof(v2_payload));
+
+	v2_payload.payload.sol_packet.character_count = 0;
+	v2_payload.payload.sol_packet.generate_break  = 1;
+
+	intf->send_sol(intf, &v2_payload);
+}
+
+/*
+ * suspendSelf
+ *
+ * Put ourself in the background
+ *
+ * param bRestoreTty specifies whether we will put our self back
+ *       in raw mode when we resume
+ */
+static void
+suspendSelf(int bRestoreTty)
+{
+	leave_raw_mode();
+	kill(getpid(), SIGTSTP);
+
+	if (bRestoreTty)
+		enter_raw_mode();
+}
+
+
+
+/*
+ * printiSolEscapeSequences
+ *
+ * Send some useful documentation to the user
+ */
+static void
+printiSolEscapeSequences(void)
+{
+	printf(
+		   "%c?\n\
+	Supported escape sequences:\n\
+	%c.  - terminate connection\n\
+	%c^Z - suspend ipmitool\n\
+	%c^X - suspend ipmitool, but don't restore tty on restart\n\
+	%cB  - send break\n\
+	%c?  - this message\n\
+	%c%c  - send the escape character by typing it twice\n\
+	(Note that escapes are only recognized immediately after newline.)\n",
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER,
+		   ISOL_ESCAPE_CHARACTER);
+}
+
+
+
+/*
+ * output
+ *
+ * Send the specified data to stdout
+ */
+static void
+output(struct ipmi_rs * rsp)
+{
+	if (rsp)
+	{
+		int i;
+		for (i = 0; i < rsp->data_len; ++i)
+			putc(rsp->data[i], stdout);
+
+		fflush(stdout);
+	}
+}
+
+/*
+ * ipmi_isol_deactivate
+ */
+static int
+ipmi_isol_deactivate(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq   req;
+	uint8_t    data[6];	 
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_ISOL;
+	req.msg.cmd = ACTIVATE_ISOL;
+	req.msg.data = data;
+	req.msg.data_len = 5;
+
+	memset(data, 0, 6);
+	data[0] = 0x00; /* Deactivate */
+	data[1] = 0x00;
+	data[2] = 0x00;
+	data[3] = 0x00;
+	data[5] = 0x00;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error deactivating ISOL");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error deactivating ISOL: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	/* response contain 4 additional bytes : 80 00 32 ff
+	   Don't know what to use them for yet... */
+	return 0;
+}
+
+/*
+ * processiSolUserInput
+ *
+ * Act on user input into the ISOL session.  The only reason this
+ * is complicated is that we have to process escape sequences.
+ *
+ * return   0 on success
+ *          1 if we should exit
+ *        < 0 on error (BMC probably closed the session)
+ */
+static int
+processiSolUserInput(struct ipmi_intf * intf,
+		    uint8_t * input,
+		    uint16_t  buffer_length)
+{
+	static int escape_pending = 0;
+	static int last_was_cr    = 1;
+	struct ipmi_v2_payload v2_payload;
+	int  length               = 0;
+	int  retval               = 0;
+	char ch;
+	int  i;
+
+	memset(&v2_payload, 0, sizeof(v2_payload));
+	
+	/*
+	 * Our first order of business is to check the input for escape
+	 * sequences to act on.
+	 */
+	for (i = 0; i < buffer_length; ++i)
+	{
+		ch = input[i];
+
+		if (escape_pending){
+			escape_pending = 0;
+			
+			/*
+			 * Process a possible escape sequence.
+			 */
+			switch (ch) {
+			case '.':
+				printf("%c. [terminated ipmitool]\n", ISOL_ESCAPE_CHARACTER);
+				retval = 1;
+				break;
+			case 'Z' - 64:
+				printf("%c^Z [suspend ipmitool]\n", ISOL_ESCAPE_CHARACTER);
+				suspendSelf(1); /* Restore tty back to raw */
+				continue;
+
+			case 'X' - 64:
+				printf("%c^X [suspend ipmitool]\n", ISOL_ESCAPE_CHARACTER);
+				suspendSelf(0); /* Don't restore to raw mode */
+				continue;
+
+			case 'B':
+				printf("%cb [send break]\n", ISOL_ESCAPE_CHARACTER);
+				sendBreak(intf);
+				continue;
+
+			case '?':
+				printiSolEscapeSequences();
+				continue;
+			default:
+				if (ch != ISOL_ESCAPE_CHARACTER)
+					v2_payload.payload.sol_packet.data[length++] =
+						ISOL_ESCAPE_CHARACTER;
+				v2_payload.payload.sol_packet.data[length++] = ch;
+			}
+		}
+
+		else
+		{
+			if (last_was_cr && (ch == ISOL_ESCAPE_CHARACTER)) {
+				escape_pending = 1;
+				continue;
+			}
+
+			v2_payload.payload.sol_packet.data[length++] =	ch;
+		}
+
+
+		/*
+		 * Normal character.  Record whether it was a newline.
+		 */
+		last_was_cr = (ch == '\r' || ch == '\n');
+	}
+
+	/*
+	 * If there is anything left to process we dispatch it to the BMC,
+	 * send intf->session->sol_data.max_outbound_payload_size bytes
+	 * at a time.
+	 */
+	if (length)
+	{
+		struct ipmi_rs * rsp;
+
+		v2_payload.payload.sol_packet.flush_outbound = 1; /* Not sure if necessary ? */
+		v2_payload.payload.sol_packet.character_count = length;
+		rsp = intf->send_sol(intf, &v2_payload);
+
+		if (! rsp) {
+			lprintf(LOG_ERR, "Error sending SOL data");
+			retval = -1;
+		}
+
+		/* If the sequence number is set we know we have new data */
+		else if ((rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL)        &&
+			 (rsp->payload.sol_packet.packet_sequence_number))
+			output(rsp);
+	}
+	return retval;
+}
+
+/*
+ * ipmi_isol_red_pill
+ */
+static int
+ipmi_isol_red_pill(struct ipmi_intf * intf)
+{
+	char   * buffer;
+	int    numRead;
+	int    bShouldExit       = 0;
+	int    bBmcClosedSession = 0;
+	fd_set read_fds;
+	struct timeval tv;
+	int    retval;
+	int    buffer_size = 255;
+	int    timedout = 0;
+
+	buffer = (char*)malloc(buffer_size);
+	if (buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return -1;
+	}
+
+	enter_raw_mode();
+
+	while (! bShouldExit)
+	{
+		FD_ZERO(&read_fds);
+		FD_SET(0, &read_fds);
+		FD_SET(intf->fd, &read_fds);
+
+		/* Wait up to half a second */
+		tv.tv_sec =  0;
+		tv.tv_usec = 500000;
+
+		retval = select(intf->fd + 1, &read_fds, NULL, NULL, &tv);
+
+		if (retval)
+		{
+			if (retval == -1)
+			{
+				/* ERROR */
+				perror("select");
+				return -1;
+			}
+
+			timedout = 0;
+
+			/*
+			 * Process input from the user
+			 */
+			if (FD_ISSET(0, &read_fds))
+	 		{
+				memset(buffer, 0, buffer_size);
+				numRead = read(fileno(stdin),
+							   buffer,
+							   buffer_size);
+				
+				if (numRead > 0)
+				{
+					int rc = processiSolUserInput(intf, buffer, numRead);
+					
+					if (rc)
+					{
+						if (rc < 0)
+							bShouldExit = bBmcClosedSession = 1;
+						else
+							bShouldExit = 1;
+					}
+				}
+				else
+				{
+					bShouldExit = 1;
+				}
+			}
+
+
+			/*
+			 * Process input from the BMC
+			 */
+			else if (FD_ISSET(intf->fd, &read_fds))
+			{
+				struct ipmi_rs * rs = intf->recv_sol(intf);
+				if (! rs)
+				{
+					bShouldExit = bBmcClosedSession = 1;
+				}
+				else
+					output(rs);
+ 			}
+
+			
+			/*
+			 * ERROR in select
+			 */
+ 			else
+			{
+				lprintf(LOG_ERR, "Error: Select returned with nothing to read");
+				bShouldExit = 1;
+			}
+		}
+		else
+		{
+			if ((++timedout) == 20) /* Every 10 seconds we send a keepalive */
+			{
+				intf->keepalive(intf);
+				timedout = 0;
+			}
+		}
+	}		
+
+	leave_raw_mode();
+
+	if (bBmcClosedSession)
+	{
+		lprintf(LOG_ERR, "SOL session closed by BMC");
+	}
+	else
+		ipmi_isol_deactivate(intf);
+
+	return 0;
+}
+
+/*
+ * ipmi_isol_activate
+ */
+static int
+ipmi_isol_activate(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq   req;
+	uint8_t    data[6];	 
+	struct isol_config_parameters params;
+
+	if (ipmi_get_isol_info(intf, &params))
+		return -1;
+
+	if (!(params.enabled & 0x1)) {
+		lprintf(LOG_ERR, "ISOL is not enabled!");
+		return -1;
+	}
+
+	/*
+	 * Setup a callback so that the lanplus processing knows what
+	 * to do with packets that come unexpectedly (while waiting for
+	 * an ACK, perhaps.
+	 */
+	intf->session->sol_data.sol_input_handler = output;
+	
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_ISOL;
+	req.msg.cmd = ACTIVATE_ISOL;
+	req.msg.data = data;
+	req.msg.data_len = 5;
+
+	memset(data, 0, 6);
+	data[0] = 0x01;
+	data[1] = 0x00;
+	data[2] = 0x00;
+	data[3] = 0x00;
+	data[5] = 0x00;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (NULL != rsp) {
+		switch (rsp->ccode) {
+			case 0x00: 
+				if (rsp->data_len == 4) {
+					break;
+				} else {
+					lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						   "in ISOL activation response",
+						   rsp->data_len);
+					return -1;
+				}
+				break;
+			case 0x80:
+				lprintf(LOG_ERR, "Info: ISOL already active on another session");
+				return -1;
+			case 0x81:
+				lprintf(LOG_ERR, "Info: ISOL disabled");
+				return -1;
+			case 0x82:
+				lprintf(LOG_ERR, "Info: ISOL activation limit reached");
+				return -1;
+			default:
+				lprintf(LOG_ERR, "Error activating ISOL: %s",
+					val2str(rsp->ccode, completion_code_vals));
+				return -1;
+		}				
+	} else {
+		lprintf(LOG_ERR, "Error: No response activating ISOL");
+		return -1;
+	}
+
+	/* response contain 4 additional bytes : 80 01 32 ff
+	   Don't know what to use them for yet... */
+
+	printf("[SOL Session operational.  Use %c? for help]\n",
+	       ISOL_ESCAPE_CHARACTER);
+
+	/*
+	 * At this point we are good to go with our SOL session.  We
+	 * need to listen to
+	 * 1) STDIN for user input
+	 * 2) The FD for incoming SOL packets
+	 */
+	if (ipmi_isol_red_pill(intf)) {
+		lprintf(LOG_ERR, "Error in SOL session");
+		return -1;
+	}
+
+	return 0;
+}
+
+static void print_isol_set_usage(void) {
+	lprintf(LOG_NOTICE, "\nISOL set parameters and values: \n");
+	lprintf(LOG_NOTICE, "  enabled                     true | false");
+	lprintf(LOG_NOTICE, "  privilege-level             user | operator | admin | oem");
+	lprintf(LOG_NOTICE, "  bit-rate                    "
+		"9.6 | 19.2 | 38.4 | 57.6 | 115.2");
+	lprintf(LOG_NOTICE, "");
+}
+
+static void print_isol_usage(void) {
+	lprintf(LOG_NOTICE, "ISOL Commands: info");
+	lprintf(LOG_NOTICE, "               set <parameter> <setting>");
+	lprintf(LOG_NOTICE, "               activate");
+}
+
+int ipmi_isol_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int ret = 0;
+
+	/*
+	 * Help
+	 */
+	if (!argc || !strncmp(argv[0], "help", 4))
+		print_isol_usage();
+
+	/*
+	 * Info
+	 */
+	else if (!strncmp(argv[0], "info", 4)) {
+		ret = ipmi_print_isol_info(intf);
+	}
+
+	/*
+	 * Set a parameter value
+	 */
+	else if (!strncmp(argv[0], "set", 3)) {
+		if (argc < 3) {
+			print_isol_set_usage();
+			return -1;
+		}
+		ret = ipmi_isol_set_param(intf, argv[1], argv[2]);
+	}
+
+	/*
+	 * Activate
+	 */
+ 	else if (!strncmp(argv[0], "activate", 8)) {
+		ret = ipmi_isol_activate(intf);
+	}
+	
+	else {
+		print_isol_usage();
+		ret = -1;
+	}
+	
+	return ret;
+}
diff --git a/lib/ipmi_kontronoem.c b/lib/ipmi_kontronoem.c
new file mode 100644
index 0000000..64860be
--- /dev/null
+++ b/lib/ipmi_kontronoem.c
@@ -0,0 +1,702 @@
+/*
+ * Copyright (c) 2004 Kontron Canada, Inc.  All Rights Reserved.
+ *
+ * Base on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/*
+ * Tue Mar 7 14:36:12 2006
+ * <stephane.filion@ca.kontron.com>
+ *
+ * This code implements an Kontron OEM proprietary commands.
+ */
+#include <string.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_fru.h>
+
+extern int verbose;
+extern int read_fru_area(struct ipmi_intf *intf, struct fru_info *fru,
+		uint8_t id, uint32_t offset, uint32_t length,
+		uint8_t *frubuf);
+extern int write_fru_area(struct ipmi_intf * intf, struct fru_info *fru,
+		uint8_t id, uint16_t soffset,
+		uint16_t doffset,  uint16_t length,
+		uint8_t *pFrubuf);
+extern char *get_fru_area_str(uint8_t *data, uint32_t *offset);
+
+static void ipmi_kontron_help(void);
+static int ipmi_kontron_set_serial_number(struct ipmi_intf *intf);
+static int ipmi_kontron_set_mfg_date (struct ipmi_intf *intf);
+static void ipmi_kontron_nextboot_help(void);
+static int ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc,
+		char **argv);
+static int ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf *intf,
+		unsigned char channel, unsigned char size);
+
+static char *bootdev[] = {"BIOS", "FDD", "HDD", "CDROM", "network", 0};
+
+int
+ipmi_kontronoem_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+	if (argc == 0) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_kontron_help();
+		return (-1);
+	}
+	if (strncmp(argv[0], "help", 4) == 0) {
+		ipmi_kontron_help();
+		rc = 0;
+	} else if (!strncmp(argv[0], "setsn", 5)) {
+		if (argc < 1) {
+			printf("fru setsn\n");
+			return (-1);
+		}
+		if (ipmi_kontron_set_serial_number(intf) > 0) {
+			printf("FRU serial number setted successfully\n");
+		} else {
+			printf("FRU serial number set failed\n");
+			rc = (-1);
+		}
+	} else if (!strncmp(argv[0], "setmfgdate", 10)) {
+		if (argc < 1) {
+			printf("fru setmfgdate\n");
+			return (-1);
+		}
+		if (ipmi_kontron_set_mfg_date(intf) > 0) {
+			printf("FRU manufacturing date setted successfully\n");
+		} else {
+			printf("FRU manufacturing date set failed\n");
+			rc = (-1);
+		}
+	} else if (!strncmp(argv[0], "nextboot", 8)) {
+		if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			ipmi_kontron_nextboot_help();
+			return (-1);
+		}
+		rc = ipmi_kontron_nextboot_set(intf, (argc - 1), (argv + 1));
+		if (rc == 0) {
+			printf("Nextboot set successfully\n");
+		} else {
+			printf("Nextboot set failed\n");
+			rc = (-1);
+		}
+	} else  {
+		lprintf(LOG_ERR, "Invalid Kontron command: %s", argv[0]);
+		ipmi_kontron_help();
+		rc = (-1);
+	}
+	return rc;
+}
+
+static void
+ipmi_kontron_help(void)
+{
+	printf("Kontron Commands:  setsn setmfgdate nextboot\n");
+}
+
+int
+ipmi_kontronoem_set_large_buffer(struct ipmi_intf *intf, unsigned char size)
+{
+	uint8_t error_occurs = 0;
+	uint32_t prev_target_addr = intf->target_addr ;
+	if (intf->target_addr > 0 && (intf->target_addr != intf->my_addr)) {
+		intf->target_addr = intf->my_addr;
+		printf("Set local big buffer\n");
+		if (ipmi_kontronoem_send_set_large_buffer(intf, 0x0e, size) == 0) {
+			printf("Set local big buffer:success\n");
+		} else {
+			error_occurs = 1;
+		}
+		if (error_occurs == 0) {
+			if (ipmi_kontronoem_send_set_large_buffer(intf, 0x00, size) == 0) {
+				printf("IPMB was set\n");
+			} else {
+				/* Revert back the previous set large buffer */
+				error_occurs = 1;
+				ipmi_kontronoem_send_set_large_buffer( intf, 0x0e, 0 );
+			}
+		}
+		/* Restore target address */
+		intf->target_addr = prev_target_addr;
+	}
+	if (error_occurs == 0) {
+		if(ipmi_kontronoem_send_set_large_buffer(intf, 0x0e, size) == 0) {
+			/* printf("Set remote big buffer\n"); */
+		} else {
+			if (intf->target_addr > 0  && (intf->target_addr != intf->my_addr)) {
+				/* Error occurs revert back the previous set large buffer */
+				intf->target_addr = intf->my_addr;
+				/* ipmi_kontronoem_send_set_large_buffer(intf, 0x00, 0); */
+				ipmi_kontronoem_send_set_large_buffer(intf, 0x0e, 0);
+				intf->target_addr = prev_target_addr;
+			}
+		}
+	}
+	return error_occurs;
+}
+
+int
+ipmi_kontronoem_send_set_large_buffer(struct ipmi_intf *intf,
+		unsigned char channel, unsigned char size)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+	memset(msg_data, 0, sizeof(msg_data));
+	/* channel =~ 0x0e => Currently running interface */
+	msg_data[0] = channel;
+	msg_data[1] = size;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x3E;
+	/* Set Channel Buffer Length - OEM */
+	req.msg.cmd = 0x82;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+	req.msg.lun = 0x00;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL)  {
+		printf("Cannot send large buffer command\n");
+		return(-1);
+	} else if (rsp->ccode > 0)  {
+		printf("Invalid length for the selected interface (%s) %d\n",
+				val2str(rsp->ccode, completion_code_vals), rsp->ccode);
+		return(-1);
+	}
+	return 0;
+}
+
+/* ipmi_fru_set_serial_number -  Set the Serial Number in FRU
+ *
+ * @intf: ipmi interface
+ * @id: fru id
+ *
+ * returns -1 on error
+ * returns 1 if successful
+ */
+static int
+ipmi_kontron_set_serial_number(struct ipmi_intf *intf)
+{
+	struct fru_header header;
+	struct fru_info fru;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	char *sn;
+	char *fru_area;
+	uint8_t checksum;
+	uint8_t *fru_data;
+	uint8_t msg_data[4];
+	uint8_t sn_size;
+	uint32_t board_sec_len;
+	uint32_t fru_data_offset;
+	uint32_t fru_data_offset_tmp;
+	uint32_t i;
+	uint32_t prod_sec_len;
+
+	sn = NULL;
+	fru_data = NULL;
+
+	memset(msg_data, 0, 4);
+	msg_data[0] = 0xb4;
+	msg_data[1] = 0x90;
+	msg_data[2] = 0x91;
+	msg_data[3] = 0x8b;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x3E;
+	req.msg.cmd = 0x0C;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+	/* Set Lun, necessary for this oem command */
+	req.msg.lun = 0x03;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		printf(" This option is not implemented for this board\n");
+		return (-1);
+	}
+	sn_size = rsp->data_len;
+	sn = malloc(sn_size + 1);
+	if (sn == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return (-1);
+	}
+	memset(sn, 0, sn_size + 1);
+	memcpy(sn, rsp->data, sn_size);
+	if (verbose >= 1) {
+		printf("Original serial number is : [%s]\n", sn);
+	}
+	memset(msg_data, 0, 4);
+	msg_data[0] = 0;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		free(sn);
+		sn = NULL;
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		free(sn);
+		sn = NULL;
+		return (-1);
+	}
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+	if (fru.size < 1) {
+		printf(" Invalid FRU size %d", fru.size);
+		free(sn);
+		sn = NULL;
+		return (-1);
+	}
+	/* retrieve the FRU header */
+	msg_data[0] = 0;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		free(sn);
+		sn = NULL;
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		free(sn);
+		sn = NULL;
+		return (-1);
+	}
+	if (verbose > 1) {
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+	}
+	memcpy(&header, rsp->data + 1, 8);
+	if (header.version != 1) {
+		printf(" Unknown FRU header version 0x%02x",
+				header.version);
+		free(sn);
+		sn = NULL;
+		return(-1);
+	}
+	/* Set the Board Section */
+	board_sec_len = (header.offset.product * 8) - (header.offset.board * 8);
+	fru_data = malloc(fru.size);
+	if (fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		free(sn);
+		sn = NULL;
+		return (-1);
+	}
+	memset(fru_data, 0, fru.size);
+	if (read_fru_area(intf, &fru, 0, (header.offset.board * 8),
+				board_sec_len, fru_data) < 0) {
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		return (-1);
+	}
+	/* Position at Board Manufacturer */
+	fru_data_offset = (header.offset.board * 8) + 6;
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	/* Position at Board Product Name */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	fru_data_offset_tmp = fru_data_offset;
+	/* Position at Serial Number */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp);
+	if (fru_area == NULL) {
+		lprintf(LOG_ERR, "Failed to read FRU Area string.");
+		free(fru_data);
+		fru_data = NULL;
+		free(sn);
+		sn = NULL;
+		return (-1);
+	}
+
+	fru_data_offset++;
+	if (strlen(fru_area) != sn_size) {
+		printf("The length of the serial number in the FRU Board Area is wrong.\n");
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		free(fru_area);
+		fru_area = NULL;
+		return(-1);
+	} else {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	/* Copy the new serial number in the board section saved in memory*/
+	memcpy(fru_data + fru_data_offset, sn, sn_size);
+	checksum = 0;
+	/* Calculate Header Checksum */
+	for(i = (header.offset.board * 8);
+			i < (((header.offset.board * 8) + board_sec_len) - 2);
+			i++) {
+		checksum += fru_data[i];
+	}
+	checksum = (~checksum) + 1;
+	fru_data[(header.offset.board * 8) + board_sec_len - 1] = checksum;
+	/* Write the new FRU Board section */
+	if (write_fru_area(intf, &fru, 0, (header.offset.board * 8),
+				(header.offset.board * 8),
+				board_sec_len, fru_data) < 0) {
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		free(fru_area);
+		fru_area = NULL;
+		return(-1);
+	}
+	/* Set the Product Section */
+	prod_sec_len = (header.offset.multi * 8) - (header.offset.product * 8);
+	if (read_fru_area(intf, &fru, 0, (header.offset.product * 8),
+				prod_sec_len, fru_data) < 0) {
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		free(fru_area);
+		fru_area = NULL;
+		return(-1);
+	}
+	/* Position at Product Manufacturer */
+	fru_data_offset = (header.offset.product * 8) + 3;
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	/* Position at Product Name */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	/* Position at Product Part */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	/* Position at Product Version */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset);
+	if (fru_area != NULL) {
+		free(fru_area);
+		fru_area = NULL;
+	}
+	fru_data_offset_tmp = fru_data_offset;
+	/* Position at Serial Number */
+	fru_area = get_fru_area_str(fru_data, &fru_data_offset_tmp);
+	if (fru_area == NULL) {
+		lprintf(LOG_ERR, "Failed to read FRU Area string.");
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		return (-1);
+	}
+	fru_data_offset ++;
+	if (strlen(fru_area) != sn_size) {
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		free(fru_area);
+		fru_area = NULL;
+		printf("The length of the serial number in the FRU Product Area is wrong.\n");
+		return(-1);
+	}
+	/* Copy the new serial number in the product section saved in memory*/
+	memcpy(fru_data + fru_data_offset, sn, sn_size);
+	checksum = 0;
+	/* Calculate Header Checksum */
+	for (i = (header.offset.product * 8);
+			i < (((header.offset.product * 8) + prod_sec_len) - 2);
+			i ++) {
+		checksum += fru_data[i];
+	}
+	checksum = (~checksum) + 1;
+	fru_data[(header.offset.product * 8)+prod_sec_len - 1] = checksum;
+	/* Write the new FRU Board section */
+	if (write_fru_area(intf, &fru, 0, (header.offset.product * 8),
+				(header.offset.product * 8),
+				prod_sec_len, fru_data) < 0) {
+		free(sn);
+		sn = NULL;
+		free(fru_data);
+		fru_data = NULL;
+		free(fru_area);
+		fru_area = NULL;
+		return -1;
+	}
+	free(sn);
+	sn = NULL;
+	free(fru_data);
+	fru_data = NULL;
+	free(fru_area);
+	fru_area = NULL;
+	return(1);
+}
+
+/* ipmi_fru_set_mfg_date -  Set the Manufacturing Date in FRU
+ *
+ * @intf: ipmi interface
+ * @id: fru id
+ *
+ * returns -1 on error
+ * returns 1 if successful
+ */
+static int
+ipmi_kontron_set_mfg_date (struct ipmi_intf *intf)
+{
+	struct fru_header header;
+	struct fru_info fru;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t *fru_data;
+	uint8_t checksum;
+	uint8_t msg_data[4];
+	uint8_t mfg_date[3];
+	uint32_t board_sec_len;
+	uint32_t i;
+
+	memset(msg_data, 0, 4);
+	msg_data[0] = 0xb4;
+	msg_data[1] = 0x90;
+	msg_data[2] = 0x91;
+	msg_data[3] = 0x8b;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x3E;
+	req.msg.cmd = 0x0E;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+	/* Set Lun temporary, necessary for this oem command */
+	req.msg.lun = 0x03;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL)  {
+		printf("Device not present (No Response)\n");
+		return(-1);
+	} else if (rsp->ccode > 0) {
+		printf("This option is not implemented for this board\n");
+		return(-1);
+	}
+	if (rsp->data_len != 3) {
+		printf("Invalid response for the Manufacturing date\n");
+		return(-1);
+	}
+	memset(mfg_date, 0, 3);
+	memcpy(mfg_date, rsp->data, 3);
+	memset(msg_data, 0, 4);
+	msg_data[0] = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_INFO;
+	req.msg.data = msg_data;
+	req.msg.data_len = 1;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return(-1);
+	} else if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		return(-1);
+	}
+
+	memset(&fru, 0, sizeof(fru));
+	fru.size = (rsp->data[1] << 8) | rsp->data[0];
+	fru.access = rsp->data[2] & 0x1;
+	if (fru.size < 1) {
+		printf(" Invalid FRU size %d", fru.size);
+		return(-1);
+	}
+	/* retrieve the FRU header */
+	msg_data[0] = 0;
+	msg_data[1] = 0;
+	msg_data[2] = 0;
+	msg_data[3] = 8;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = GET_FRU_DATA;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf(" Device not present (No Response)\n");
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		printf(" Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+	if (verbose > 1) {
+		printbuf(rsp->data, rsp->data_len, "FRU DATA");
+	}
+	memcpy(&header, rsp->data + 1, 8);
+	if (header.version != 1) {
+		printf(" Unknown FRU header version 0x%02x",
+				header.version);
+		return(-1);
+	}
+	board_sec_len = (header.offset.product * 8) - (header.offset.board * 8);
+	fru_data = malloc(fru.size);
+	if(fru_data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return(-1);
+	}
+	memset(fru_data, 0, fru.size);
+	if (read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8),
+				board_sec_len ,fru_data) < 0) {
+		free(fru_data);
+		fru_data = NULL;
+		return(-1);
+	}
+	/* Copy the new manufacturing date in the board section saved in memory*/
+	memcpy(fru_data + (header.offset.board * 8) + 3, mfg_date, 3);
+	checksum = 0;
+	/* Calculate Header Checksum */
+	for (i = (header.offset.board * 8);
+			i < (((header.offset.board * 8) + board_sec_len) - 2);
+			i ++ ) {
+		checksum += fru_data[i];
+	}
+	checksum = (~checksum) + 1;
+	fru_data[(header.offset.board * 8)+board_sec_len - 1] = checksum;
+	/* Write the new FRU Board section */
+	if (write_fru_area(intf, &fru, 0, (header.offset.board * 8),
+				(header.offset.board * 8),
+				board_sec_len, fru_data) < 0) {
+		free(fru_data);
+		fru_data = NULL;
+		return (-1);
+	}
+	free(fru_data);
+	fru_data = NULL;
+	return (1);
+}
+
+static void
+ipmi_kontron_nextboot_help(void)
+{
+	int i;
+	printf("nextboot <device>\n"
+			"Supported devices:\n");
+	for (i = 0; bootdev[i] != 0; i++) {
+		printf("- %s\n", bootdev[i]);
+	}
+}
+
+/* ipmi_kontron_next_boot_set - Select the next boot order on CP6012
+ *
+ * @intf: ipmi interface
+ * @id: fru id
+ *
+ * returns -1 on error
+ * returns 1 if successful
+ */
+static int
+ipmi_kontron_nextboot_set(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[8];
+	int i;
+
+	memset(msg_data, 0, sizeof(msg_data));
+	msg_data[0] = 0xb4;
+	msg_data[1] = 0x90;
+	msg_data[2] = 0x91;
+	msg_data[3] = 0x8b;
+	msg_data[4] = 0x9d;
+	msg_data[5] = 0xFF;
+	msg_data[6] = 0xFF; /* any */
+	for (i = 0; bootdev[i] != 0; i++) {
+		if (strcmp(argv[0], bootdev[i]) == 0) {
+			msg_data[5] = i;
+			break;
+		}
+	}
+	/* Invalid device selected? */
+	if (msg_data[5] == 0xFF) {
+		printf("Unknown boot device: %s\n", argv[0]);
+		return (-1);
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x3E;
+	req.msg.cmd = 0x02;
+	req.msg.data = msg_data;
+	req.msg.data_len = 7;
+	/* Set Lun temporary, necessary for this oem command */
+	req.msg.lun = 0x03;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		printf("Device not present (No Response)\n");
+		return(-1);
+	} else if (rsp->ccode > 0) {
+		printf("Device not present (%s)\n",
+				val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+	return 0;
+}
diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
new file mode 100644
index 0000000..65d881b
--- /dev/null
+++ b/lib/ipmi_lanp.c
@@ -0,0 +1,2480 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <netdb.h>
+#include <limits.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_user.h>
+
+extern int verbose;
+
+static void print_lan_alert_print_usage(void);
+static void print_lan_alert_set_usage(void);
+static void print_lan_set_usage(void);
+static void print_lan_set_access_usage(void);
+static void print_lan_set_arp_usage(void);
+static void print_lan_set_auth_usage(void);
+static void print_lan_set_bakgw_usage(void);
+static void print_lan_set_cipher_privs_usage(void);
+static void print_lan_set_defgw_usage(void);
+static void print_lan_set_ipsrc_usage(void);
+static void print_lan_set_snmp_usage(void);
+static void print_lan_set_vlan_usage(void);
+static void print_lan_usage(void);
+
+/* is_lan_channel - Check if channel is LAN medium
+ *
+ * return 1 if channel is LAN
+ * return 0 if channel is not LAN
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    channel number to check
+ */
+static int
+is_lan_channel(struct ipmi_intf * intf, uint8_t chan)
+{
+	uint8_t medium;
+
+	if (chan < 1 || chan > IPMI_CHANNEL_NUMBER_MAX)
+		return 0;
+
+	medium = ipmi_get_channel_medium(intf, chan);
+
+	if (medium == IPMI_CHANNEL_MEDIUM_LAN ||
+	    medium == IPMI_CHANNEL_MEDIUM_LAN_OTHER)
+		return 1;
+
+	return 0;
+}
+
+/* find_lan_channel - Find first channel that is LAN
+ *
+ * return channel number if successful
+ * return 0 if no lan channel found, which is not a valid LAN channel
+ *
+ * @intf:    ipmi interface handle
+ * @start:   channel number to start searching from
+ */
+uint8_t
+find_lan_channel(struct ipmi_intf * intf, uint8_t start)
+{
+	uint8_t chan = 0;
+
+	for (chan = start; chan < IPMI_CHANNEL_NUMBER_MAX; chan++) {
+		if (is_lan_channel(intf, chan)) {
+			return chan;
+		}
+	}
+	return 0;
+}
+
+/* get_lan_param_select - Query BMC for LAN parameter data
+ *
+ * return pointer to lan_param if successful
+ * if parameter not supported then
+ *   return pointer to lan_param with
+ *   lan_param->data == NULL and lan_param->data_len == 0
+ * return NULL on error
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ * @select:  lan parameter set selector
+ */
+static struct lan_param *
+get_lan_param_select(struct ipmi_intf * intf, uint8_t chan, int param, int select)
+{
+	struct lan_param * p = NULL;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	int i = 0;
+	uint8_t msg_data[4];
+
+	for (i = 0; ipmi_lan_params[i].cmd != (-1); i++) {
+		if (ipmi_lan_params[i].cmd == param) {
+			p = &ipmi_lan_params[i];
+			break;
+		}
+	}
+
+	if (p == NULL) {
+		lprintf(LOG_INFO, "Get LAN Parameter failed: Unknown parameter.");
+		return NULL;
+	}
+
+	msg_data[0] = chan;
+	msg_data[1] = p->cmd;
+	msg_data[2] = select;
+	msg_data[3] = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = IPMI_LAN_GET_CONFIG;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed", p->desc);
+		return NULL;
+	}
+
+	switch (rsp->ccode)
+	{
+	case 0x00: /* successful */
+		break;
+
+	case 0x80: /* parameter not supported */
+	case 0xc9: /* parameter out of range */
+	case 0xcc: /* invalid data field in request */
+
+		/* these completion codes usually mean parameter not supported */
+		lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s",
+			p->desc, val2str(rsp->ccode, completion_code_vals));
+		p->data = NULL;
+		p->data_len = 0;
+		return p;
+
+	default:
+
+		/* other completion codes are treated as error */
+		lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s",
+			p->desc, val2str(rsp->ccode, completion_code_vals));
+		return NULL;
+	}
+
+	p->data = rsp->data + 1;
+	p->data_len = rsp->data_len - 1;
+
+	return p;
+}
+
+/* get_lan_param - Query BMC for LAN parameter data
+ *
+ * return pointer to lan_param if successful
+ * if parameter not supported then
+ *   return pointer to lan_param with
+ *   lan_param->data == NULL and lan_param->data_len == 0
+ * return NULL on error
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ */
+static struct lan_param *
+get_lan_param(struct ipmi_intf * intf, uint8_t chan, int param)
+{
+	return get_lan_param_select(intf, chan, param, 0);
+}
+
+/* set_lan_param_wait - Wait for Set LAN Parameter command to complete
+ *
+ * On some systems this can take unusually long so we wait for the write
+ * to take effect and verify that the data was written successfully
+ * before continuing or retrying.
+ *
+ * returns 0 on success
+ * returns -1 on error
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ * @data:    lan parameter data
+ * @len:     length of lan parameter data
+ */
+static int
+set_lan_param_wait(struct ipmi_intf * intf, uint8_t chan,
+		   int param, uint8_t * data, int len)
+{
+	struct lan_param * p;
+	int retry = 10;		/* 10 retries */
+
+	lprintf(LOG_DEBUG, "Waiting for Set LAN Parameter to complete...");
+	if (verbose > 1)
+		printbuf(data, len, "SET DATA");
+
+	for (;;) {
+		p = get_lan_param(intf, chan, param);
+		if (p == NULL) {
+			sleep(IPMI_LANP_TIMEOUT);
+			if (retry-- == 0)
+				return -1;
+			continue;
+		}
+		if (verbose > 1)
+			printbuf(p->data, p->data_len, "READ DATA");
+		if (p->data_len != len) {
+			sleep(IPMI_LANP_TIMEOUT);
+			if (retry-- == 0) {
+				lprintf(LOG_WARNING, "Mismatched data lengths: %d != %d",
+				       p->data_len, len);
+				return -1;
+			}
+			continue;
+		}
+		if (memcmp(data, p->data, len) != 0) {
+			sleep(IPMI_LANP_TIMEOUT);
+			if (retry-- == 0) {
+				lprintf(LOG_WARNING, "LAN Parameter Data does not match!  "
+				       "Write may have failed.");
+				return -1;
+			}
+			continue;
+		}
+		break;
+	}
+	return 0;
+}
+
+/* __set_lan_param - Write LAN Parameter data to BMC
+ *
+ * This function does the actual work of writing the LAN parameter
+ * to the BMC and calls set_lan_param_wait() if requested.
+ *
+ * returns 0 on success
+ * returns -1 on error
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ * @data:    lan parameter data
+ * @len:     length of lan parameter data
+ * @wait:    whether to wait for write completion
+ */
+static int
+__set_lan_param(struct ipmi_intf * intf, uint8_t chan,
+		int param, uint8_t * data, int len, int wait)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[32];
+
+	if (param < 0)
+		return -1;
+
+	msg_data[0] = chan;
+	msg_data[1] = param;
+
+	memcpy(&msg_data[2], data, len);
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_LAN_SET_CONFIG;
+	req.msg.data = msg_data;
+	req.msg.data_len = len+2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set LAN Parameter failed");
+		return -1;
+	}
+	if ((rsp->ccode > 0) && (wait != 0)) {
+		lprintf(LOG_DEBUG, "Warning: Set LAN Parameter failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		if (rsp->ccode == 0xcc) {
+			/* retry hack for invalid data field ccode */
+			int retry = 10;		/* 10 retries */
+			lprintf(LOG_DEBUG, "Retrying...");
+			for (;;) {
+				if (retry-- == 0)
+					break;
+				sleep(IPMI_LANP_TIMEOUT);
+				rsp = intf->sendrecv(intf, &req);
+				if (rsp == NULL)
+					continue;
+				if (rsp->ccode > 0)
+					continue;
+				return set_lan_param_wait(intf, chan, param, data, len);
+			}
+		}
+		else if (rsp->ccode != 0xff) {
+			/* let 0xff ccode continue */
+			return -1;
+		}
+	}
+
+	if (wait == 0)
+		return 0;
+	return set_lan_param_wait(intf, chan, param, data, len);
+}
+
+/* ipmi_lanp_lock_state - Retrieve set-in-progress status
+ *
+ * returns one of:
+ *  IPMI_LANP_WRITE_UNLOCK
+ *  IPMI_LANP_WRITE_LOCK
+ *  IPMI_LANP_WRITE_COMMIT
+ *  -1 on error/if not supported
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ */
+static int
+ipmi_lanp_lock_state(struct ipmi_intf * intf, uint8_t chan)
+{
+	struct lan_param * p;
+	p = get_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS);
+	if (p == NULL)
+		return -1;
+	if (p->data == NULL)
+		return -1;
+	return (p->data[0] & 3);
+}
+
+/* ipmi_lanp_lock - Lock set-in-progress bits for our use
+ *
+ * Write to the Set-In-Progress LAN parameter to indicate
+ * to other management software that we are modifying parameters.
+ *
+ * No meaningful return value because this is an optional
+ * requirement in IPMI spec and not found on many BMCs.
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ */
+static void
+ipmi_lanp_lock(struct ipmi_intf * intf, uint8_t chan)
+{
+	uint8_t val = IPMI_LANP_WRITE_LOCK;
+	int retry = 3;
+
+	for (;;) {
+		int state = ipmi_lanp_lock_state(intf, chan);
+		if (state == -1)
+			break;
+		if (state == val)
+			break;
+		if (retry-- == 0)
+			break;
+		__set_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS,
+				&val, 1, 0);
+	}
+}
+
+/* ipmi_lanp_unlock - Unlock set-in-progress bits
+ *
+ * Write to the Set-In-Progress LAN parameter, first with
+ * a "commit" instruction and then unlocking it.
+ *
+ * No meaningful return value because this is an optional
+ * requirement in IPMI spec and not found on many BMCs.
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ */
+static void
+ipmi_lanp_unlock(struct ipmi_intf * intf, uint8_t chan)
+{
+	uint8_t val = IPMI_LANP_WRITE_COMMIT;
+	int rc;
+
+	rc = __set_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS, &val, 1, 0);
+	if (rc < 0) {
+		lprintf(LOG_DEBUG, "LAN Parameter Commit not supported");
+	}
+
+	val = IPMI_LANP_WRITE_UNLOCK;
+	__set_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS, &val, 1, 0);
+}
+
+/* set_lan_param - Wrap LAN parameter write with set-in-progress lock
+ *
+ * Returns value from __set_lan_param()
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ * @data:    lan parameter data
+ * @len:     length of lan parameter data
+ */
+static int
+set_lan_param(struct ipmi_intf * intf, uint8_t chan,
+	      int param, uint8_t * data, int len)
+{
+	int rc;
+	ipmi_lanp_lock(intf, chan);
+	rc = __set_lan_param(intf, chan, param, data, len, 1);
+	ipmi_lanp_unlock(intf, chan);
+	return rc;
+}
+
+/* set_lan_param_nowait - Wrap LAN parameter write without set-in-progress lock
+ *
+ * Returns value from __set_lan_param()
+ *
+ * @intf:    ipmi interface handle
+ * @chan:    ipmi channel
+ * @param:   lan parameter id
+ * @data:    lan parameter data
+ * @len:     length of lan parameter data
+ */
+static int
+set_lan_param_nowait(struct ipmi_intf * intf, uint8_t chan,
+		     int param, uint8_t * data, int len)
+{
+	int rc;
+	ipmi_lanp_lock(intf, chan);
+	rc = __set_lan_param(intf, chan, param, data, len, 0);
+	ipmi_lanp_unlock(intf, chan);
+	return rc;
+}
+
+static int
+lan_set_arp_interval(struct ipmi_intf * intf, uint8_t chan, uint8_t ival)
+{
+	struct lan_param *lp;
+	uint8_t interval = 0;
+	int rc = 0;
+
+	lp = get_lan_param(intf, chan, IPMI_LANP_GRAT_ARP);
+	if (lp == NULL)
+		return -1;
+	if (lp->data == NULL)
+		return -1;
+
+	if (ival != 0) {
+		if (((UINT8_MAX - 1) / 2) < ival) {
+			lprintf(LOG_ERR, "Given ARP interval '%u' is too big.", ival);
+			return (-1);
+		}
+		interval = (ival * 2) - 1;
+		rc = set_lan_param(intf, chan, IPMI_LANP_GRAT_ARP, &interval, 1);
+	} else {
+		interval = lp->data[0];
+	}
+
+	printf("BMC-generated Gratuitous ARP interval:  %.1f seconds\n",
+	       (float)((interval + 1) / 2));
+
+	return rc;
+}
+
+static int
+lan_set_arp_generate(struct ipmi_intf * intf,
+		     uint8_t chan, uint8_t ctl)
+{
+	struct lan_param *lp;
+	uint8_t data;
+
+	lp = get_lan_param(intf, chan, IPMI_LANP_BMC_ARP);
+	if (lp == NULL)
+		return -1;
+	if (lp->data == NULL)
+		return -1;
+	data = lp->data[0];
+
+	/* set arp generate bitflag */
+	if (ctl == 0)
+		data &= ~0x1;
+	else
+		data |= 0x1;
+
+	printf("%sabling BMC-generated Gratuitous ARPs\n", ctl ? "En" : "Dis");
+	return set_lan_param(intf, chan, IPMI_LANP_BMC_ARP, &data, 1);
+}
+
+static int
+lan_set_arp_respond(struct ipmi_intf * intf,
+		    uint8_t chan, uint8_t ctl)
+{
+	struct lan_param *lp;
+	uint8_t data;
+
+	lp = get_lan_param(intf, chan, IPMI_LANP_BMC_ARP);
+	if (lp == NULL)
+		return -1;
+	if (lp->data == NULL)
+		return -1;
+	data = lp->data[0];
+
+	/* set arp response bitflag */
+	if (ctl == 0)
+		data &= ~0x2;
+	else
+		data |= 0x2;
+
+	printf("%sabling BMC-generated ARP responses\n", ctl ? "En" : "Dis");
+	return set_lan_param(intf, chan, IPMI_LANP_BMC_ARP, &data, 1);
+}
+
+/* TODO - probably move elsewhere */
+static char priv_level_to_char(unsigned char priv_level)
+{
+	char ret = 'X';
+
+	switch (priv_level)
+	{
+	case IPMI_SESSION_PRIV_CALLBACK:
+		ret = 'c';
+		break;
+	case IPMI_SESSION_PRIV_USER:
+		ret = 'u';
+		break;
+	case IPMI_SESSION_PRIV_OPERATOR:
+		ret = 'o';
+		break;
+	case IPMI_SESSION_PRIV_ADMIN:
+		ret = 'a';
+		break;
+	case IPMI_SESSION_PRIV_OEM:
+		ret = 'O';
+		break;
+	}
+
+ 	return ret;
+}
+
+
+static int
+ipmi_lan_print(struct ipmi_intf * intf, uint8_t chan)
+{
+	struct lan_param * p;
+
+	if (chan < 1 || chan > IPMI_CHANNEL_NUMBER_MAX) {
+		lprintf(LOG_ERR, "Invalid Channel %d", chan);
+		return -1;
+	}
+
+	/* find type of channel and only accept 802.3 LAN */
+	if (!is_lan_channel(intf, chan)) {
+		lprintf(LOG_ERR, "Channel %d is not a LAN channel", chan);
+		return -1;
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_SET_IN_PROGRESS);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL) {
+		printf("%-24s: ", p->desc);
+		p->data[0] &= 3;
+		switch (p->data[0]) {
+		case 0:
+			printf("Set Complete\n");
+			break;
+		case 1:
+			printf("Set In Progress\n");
+			break;
+		case 2:
+			printf("Commit Write\n");
+			break;
+		case 3:
+			printf("Reserved\n");
+			break;
+		default:
+			printf("Unknown\n");
+		}
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL) {
+		printf("%-24s: %s%s%s%s%s\n", p->desc,
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL) {
+		printf("%-24s: Callback : %s%s%s%s%s\n", p->desc,
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[0] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+		printf("%-24s: User     : %s%s%s%s%s\n", "",
+		       (p->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[1] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+		printf("%-24s: Operator : %s%s%s%s%s\n", "",
+		       (p->data[2] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[2] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[2] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[2] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[2] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+		printf("%-24s: Admin    : %s%s%s%s%s\n", "",
+		       (p->data[3] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[3] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[3] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[3] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[3] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+		printf("%-24s: OEM      : %s%s%s%s%s\n", "",
+		       (p->data[4] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		       (p->data[4] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		       (p->data[4] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		       (p->data[4] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		       (p->data[4] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_IP_ADDR_SRC);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL) {
+		printf("%-24s: ", p->desc);
+		p->data[0] &= 0xf;
+		switch (p->data[0]) {
+		case 0:
+			printf("Unspecified\n");
+			break;
+		case 1:
+			printf("Static Address\n");
+			break;
+		case 2:
+			printf("DHCP Address\n");
+			break;
+		case 3:
+			printf("BIOS Assigned Address\n");
+			break;
+		default:
+			printf("Other\n");
+			break;
+		}
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_IP_ADDR);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %d.%d.%d.%d\n", p->desc,
+		       p->data[0], p->data[1], p->data[2], p->data[3]);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %d.%d.%d.%d\n", p->desc,
+		       p->data[0], p->data[1], p->data[2], p->data[3]);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_MAC_ADDR);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %s\n", p->desc, mac2str(p->data));
+
+	p = get_lan_param(intf, chan, IPMI_LANP_SNMP_STRING);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %s\n", p->desc, p->data);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_IP_HEADER);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: TTL=0x%02x Flags=0x%02x Precedence=0x%02x TOS=0x%02x\n",
+		       p->desc, p->data[0], p->data[1] & 0xe0, p->data[2] & 0xe0, p->data[2] & 0x1e);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_BMC_ARP);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: ARP Responses %sabled, Gratuitous ARP %sabled\n", p->desc,
+		       (p->data[0] & 2) ? "En" : "Dis", (p->data[0] & 1) ? "En" : "Dis");
+
+	p = get_lan_param(intf, chan, IPMI_LANP_GRAT_ARP);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %.1f seconds\n", p->desc, (float)((p->data[0] + 1) / 2));
+
+	p = get_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_IP);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %d.%d.%d.%d\n", p->desc,
+		       p->data[0], p->data[1], p->data[2], p->data[3]);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_MAC);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %s\n", p->desc, mac2str(p->data));
+
+	p = get_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_IP);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %d.%d.%d.%d\n", p->desc,
+		       p->data[0], p->data[1], p->data[2], p->data[3]);
+
+	p = get_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_MAC);
+	if (p == NULL)
+		return -1;
+	if (p->data != NULL)
+		printf("%-24s: %s\n", p->desc, mac2str(p->data));
+
+	p = get_lan_param(intf, chan, IPMI_LANP_VLAN_ID);
+	if (p != NULL && p->data != NULL) {
+		int id = ((p->data[1] & 0x0f) << 8) + p->data[0];
+		if (p->data[1] & 0x80)
+			printf("%-24s: %d\n", p->desc, id);
+		else
+			printf("%-24s: Disabled\n", p->desc);
+	}
+
+	p = get_lan_param(intf, chan, IPMI_LANP_VLAN_PRIORITY);
+	if (p != NULL && p->data != NULL)
+		printf("%-24s: %d\n", p->desc, p->data[0] & 0x07);
+
+	/* Determine supported Cipher Suites -- Requires two calls */
+	p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHER_SUPPORT);
+	if (p == NULL)
+		return -1;
+	else if (p->data != NULL)
+	{
+		unsigned char cipher_suite_count = p->data[0];
+		p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHERS);
+		if (p == NULL)
+			return -1;
+
+		printf("%-24s: ", p->desc);
+
+		/* Now we're dangerous.  There are only 15 fixed cipher
+		   suite IDs, but the spec allows for 16 in the return data.*/
+		if ((p->data != NULL) && (p->data_len <= 17))
+		{
+			unsigned int i;
+			for (i = 0; (i < 16) && (i < cipher_suite_count); ++i)
+			{
+				printf("%s%d",
+				       (i > 0? ",": ""),
+				       p->data[i + 1]);
+			}
+			printf("\n");
+		}
+		else
+		{
+			printf("None\n");
+		}
+	}
+
+	/* RMCP+ Messaging Cipher Suite Privilege Levels */
+	/* These are the privilege levels for the 15 fixed cipher suites */
+	p = get_lan_param(intf, chan, IPMI_LANP_RMCP_PRIV_LEVELS);
+	if (p == NULL)
+		return -1;
+	if ((p->data != NULL) && (p->data_len == 9))
+	{
+		printf("%-24s: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", p->desc,
+		       priv_level_to_char(p->data[1] & 0x0F),
+		       priv_level_to_char(p->data[1] >> 4),
+		       priv_level_to_char(p->data[2] & 0x0F),
+		       priv_level_to_char(p->data[2] >> 4),
+		       priv_level_to_char(p->data[3] & 0x0F),
+		       priv_level_to_char(p->data[3] >> 4),
+		       priv_level_to_char(p->data[4] & 0x0F),
+		       priv_level_to_char(p->data[4] >> 4),
+		       priv_level_to_char(p->data[5] & 0x0F),
+		       priv_level_to_char(p->data[5] >> 4),
+		       priv_level_to_char(p->data[6] & 0x0F),
+		       priv_level_to_char(p->data[6] >> 4),
+		       priv_level_to_char(p->data[7] & 0x0F),
+		       priv_level_to_char(p->data[7] >> 4),
+		       priv_level_to_char(p->data[8] & 0x0F));
+
+		/* Now print a legend */
+		printf("%-24s: %s\n", "", "    X=Cipher Suite Unused");
+		printf("%-24s: %s\n", "", "    c=CALLBACK");
+		printf("%-24s: %s\n", "", "    u=USER");
+		printf("%-24s: %s\n", "", "    o=OPERATOR");
+		printf("%-24s: %s\n", "", "    a=ADMIN");
+		printf("%-24s: %s\n", "", "    O=OEM");
+	}
+	else
+		printf("%-24s: Not Available\n", p->desc);
+
+	/* Bad Password Threshold */
+	p = get_lan_param(intf, chan, IPMI_LANP_BAD_PASS_THRESH);
+	if (p == NULL)
+		return -1;
+	if ((p->data != NULL) && (p->data_len == 6)) {
+		int tmp;
+
+		printf("%-24s: %d\n", p->desc, p->data[1]);
+		printf("%-24s: %s\n", "Invalid password disable",
+				p->data[0] & 1 ? "yes" : "no" );
+		tmp = p->data[2] + (p->data[3] << 8);
+		printf("%-24s: %d\n", "Attempt Count Reset Int.", tmp * 10);
+		tmp = p->data[4] + (p->data[5] << 8);
+		printf("%-24s: %d\n", "User Lockout Interval", tmp * 10);
+	} else {
+		printf("%-24s: Not Available\n", p->desc);
+	}
+
+	return 0;
+}
+
+/* Configure Authentication Types */
+/* TODO - probably some code duplication going on ??? */
+static int
+ipmi_lan_set_auth(struct ipmi_intf * intf, uint8_t chan, char * level, char * types)
+{
+	uint8_t data[5];
+	uint8_t authtype = 0;
+	char * p;
+	struct lan_param * lp;
+
+	if (level == NULL || types == NULL)
+		return -1;
+
+	lp = get_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE);
+	if (lp == NULL)
+		return -1;
+	if (lp->data == NULL)
+		return -1;
+
+	lprintf(LOG_DEBUG, "%-24s: callback=0x%02x user=0x%02x operator=0x%02x admin=0x%02x oem=0x%02x",
+		lp->desc, lp->data[0], lp->data[1], lp->data[2], lp->data[3], lp->data[4]);
+
+	memset(data, 0, 5);
+	memcpy(data, lp->data, 5);
+
+	p = types;
+	while (p) {
+		if (strncasecmp(p, "none", 4) == 0)
+			authtype |= 1 << IPMI_SESSION_AUTHTYPE_NONE;
+		else if (strncasecmp(p, "md2", 3) == 0)
+			authtype |= 1 << IPMI_SESSION_AUTHTYPE_MD2;
+		else if (strncasecmp(p, "md5", 3) == 0)
+			authtype |= 1 << IPMI_SESSION_AUTHTYPE_MD5;
+		else if ((strncasecmp(p, "password", 8) == 0) ||
+			 (strncasecmp(p, "key", 3) == 0))
+			authtype |= 1 << IPMI_SESSION_AUTHTYPE_KEY;
+		else if (strncasecmp(p, "oem", 3) == 0)
+			authtype |= 1 << IPMI_SESSION_AUTHTYPE_OEM;
+		else
+			lprintf(LOG_WARNING, "Invalid authentication type: %s", p);
+		p = strchr(p, ',');
+		if (p)
+			p++;
+	}
+
+	p = level;
+	while (p) {
+		if (strncasecmp(p, "callback", 8) == 0)
+			data[0] = authtype;
+		else if (strncasecmp(p, "user", 4) == 0)
+			data[1] = authtype;
+		else if (strncasecmp(p, "operator", 8) == 0)
+			data[2] = authtype;
+		else if (strncasecmp(p, "admin", 5) == 0)
+			data[3] = authtype;
+		else
+			lprintf(LOG_WARNING, "Invalid authentication level: %s", p);
+		p = strchr(p, ',');
+		if (p)
+			p++;
+	}
+
+	if (verbose > 1)
+		printbuf(data, 5, "authtype data");
+
+	return set_lan_param(intf, chan, IPMI_LANP_AUTH_TYPE_ENABLE, data, 5);
+}
+
+static int
+ipmi_lan_set_password(struct ipmi_intf *intf,
+		uint8_t user_id, const char *password)
+{
+	int ccode = 0;
+	ccode = _ipmi_set_user_password(intf, user_id,
+			IPMI_PASSWORD_SET_PASSWORD, password, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Unable to Set LAN Password for user %d",
+				user_id);
+		return (-1);
+	}
+	/* adjust our session password
+	 * or we will no longer be able to communicate with BMC
+	 */
+	ipmi_intf_session_set_password(intf, (char *)password);
+	printf("Password %s for user %d\n",
+	       (password == NULL) ? "cleared" : "set", user_id);
+
+	return 0;
+}
+
+/* ipmi_set_alert_enable - enable/disable PEF alerting for given channel.
+ *
+ * @channel - IPMI channel
+ * @enable - whether to enable/disable PEF alerting for given channel
+ * 
+ * returns - 0 on success, (-1) on error.
+ */
+static int
+ipmi_set_alert_enable(struct ipmi_intf *intf, uint8_t channel, uint8_t enable)
+{
+	struct channel_access_t channel_access;
+	int ccode = 0;
+	memset(&channel_access, 0, sizeof(channel_access));
+	channel_access.channel = channel;
+	ccode = _ipmi_get_channel_access(intf, &channel_access, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Get Channel Access(non-volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+	if (enable != 0) {
+		channel_access.alerting = 1;
+	} else {
+		channel_access.alerting = 0;
+	}
+	/* non-volatile */
+	ccode = _ipmi_set_channel_access(intf, channel_access, 1, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Set Channel Access(non-volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+	/* volatile */
+	ccode = _ipmi_set_channel_access(intf, channel_access, 2, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Set Channel Access(volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+	printf("PEF alerts for channel %d %s.\n",
+			channel,
+			(enable) ? "enabled" : "disabled");
+	return 0;
+}
+
+/* ipmi_set_channel_access - enable/disable IPMI messaging for given channel and
+ * set Privilege Level to Administrator.
+ *
+ * @channel - IPMI channel
+ * @enable - whether to enable/disable IPMI messaging for given channel.
+ *
+ * returns - 0 on success, (-1) on error
+ */
+static int
+ipmi_set_channel_access(struct ipmi_intf *intf, uint8_t channel,
+		uint8_t enable)
+{
+	struct channel_access_t channel_access;
+	int ccode = 0;
+	memset(&channel_access, 0, sizeof(channel_access));
+	channel_access.channel = channel;
+	/* Get Non-Volatile Channel Access first */
+	ccode = _ipmi_get_channel_access(intf, &channel_access, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Get Channel Access(non-volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+
+	if (enable != 0) {
+		channel_access.access_mode = 2;
+	} else {
+		channel_access.access_mode = 0;
+	}
+	channel_access.privilege_limit = 0x04;
+	ccode = _ipmi_set_channel_access(intf, channel_access, 1, 1);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Set Channel Access(non-volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+
+	memset(&channel_access, 0, sizeof(channel_access));
+	channel_access.channel = channel;
+	/* Get Volatile Channel Access */
+	ccode = _ipmi_get_channel_access(intf, &channel_access, 1);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Get Channel Access(volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+
+	if (enable != 0) {
+		channel_access.access_mode = 2;
+	} else {
+		channel_access.access_mode = 0;
+	}
+	channel_access.privilege_limit = 0x04;
+	ccode = _ipmi_set_channel_access(intf, channel_access, 2, 2);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR,
+				"Unable to Set Channel Access(volatile) for channel %d",
+				channel);
+		return (-1);
+	}
+
+	/* can't send close session if access off so abort instead */
+	if (enable == 0) {
+		intf->abort = 1;
+	}
+	printf("Set Channel Access for channel %d was successful.\n",
+			channel);
+	return 0;
+}
+
+/* ipmi_set_user_access - set admin access for given user and channel.
+ *
+ * @intf - IPMI interface
+ * @channel - IPMI channel
+ * @user_id - IPMI User ID
+ *
+ * returns - 0 on success, (-1) on error.
+ */
+static int
+ipmi_set_user_access(struct ipmi_intf *intf, uint8_t channel, uint8_t user_id)
+{
+	struct user_access_t user_access;
+	int ccode = 0;
+	memset(&user_access, 0, sizeof(user_access));
+	user_access.channel = channel;
+	user_access.user_id = user_id;
+	user_access.privilege_limit = 0x04;
+
+	ccode = _ipmi_set_user_access(intf, &user_access, 1);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Set User Access for channel %d failed",
+				channel);
+		return (-1);
+	} else {
+		printf("Set User Access for channel %d was successful.",
+				channel);
+		return 0;
+	}
+}
+
+
+
+static int
+get_cmdline_cipher_suite_priv_data(char * arg, uint8_t * buf)
+{
+	int i, ret = 0;
+
+	if (strlen(arg) != 15)
+	{
+		lprintf(LOG_ERR, "Invalid privilege specification length: %d",
+			strlen(arg));
+		return -1;
+	}
+
+	/*
+	 * The first byte is reserved (0).  The rest of the buffer is setup
+	 * so that each nibble holds the maximum privilege level available for
+	 * that cipher suite number.  The number of nibbles (15) matches the number
+	 * of fixed cipher suite IDs.  This command documentation mentions 16 IDs
+	 * but table 22-19 shows that there are only 15 (0-14).
+	 *
+	 * data 1 - reserved
+	 * data 2 - maximum priv level for first (LSN) and second (MSN) ciphers
+	 * data 3 - maximum priv level for third (LSN) and fourth (MSN) ciphers
+	 * data 9 - maximum priv level for 15th (LSN) cipher.
+	 */
+	memset(buf, 0, 9);
+	for (i = 0; i < 15; ++i)
+	{
+		unsigned char priv_level = IPMI_SESSION_PRIV_ADMIN;
+
+		switch (arg[i])
+		{
+		case 'X':
+			priv_level = IPMI_SESSION_PRIV_UNSPECIFIED; /* 0 */
+			break;
+		case 'c':
+			priv_level = IPMI_SESSION_PRIV_CALLBACK;    /* 1 */
+			break;
+		case 'u':
+			priv_level = IPMI_SESSION_PRIV_USER;        /* 2 */
+			break;
+		case 'o':
+			priv_level = IPMI_SESSION_PRIV_OPERATOR;    /* 3 */
+			break;
+		case 'a':
+			priv_level = IPMI_SESSION_PRIV_ADMIN;       /* 4 */
+			break;
+		case 'O':
+			priv_level = IPMI_SESSION_PRIV_OEM;         /* 5 */
+			break;
+		default:
+			lprintf(LOG_ERR, "Invalid privilege specification char: %c",
+				arg[i]);
+			ret = -1;
+			break;
+		}
+
+		if (ret != 0)
+			break;
+		else
+		{
+			if ((i + 1) % 2)
+			{
+				// Odd number cipher suites will be in the LSN
+				buf[1 + (i / 2)] += priv_level;
+			}
+			else
+			{
+				// Even number cipher suites will be in the MSN
+				buf[1 + (i / 2)] += (priv_level << 4);
+			}
+		}
+	}
+
+	return ret;
+}
+
+
+static int
+get_cmdline_ipaddr(char * arg, uint8_t * buf)
+{
+	uint32_t ip1, ip2, ip3, ip4;
+	if (sscanf(arg,
+				"%" PRIu32 ".%" PRIu32 ".%" PRIu32 ".%" PRIu32,
+				&ip1, &ip2, &ip3, &ip4) != 4) {
+		lprintf(LOG_ERR, "Invalid IP address: %s", arg);
+		return (-1);
+	}
+	if (ip1 > UINT8_MAX || ip2 > UINT8_MAX
+			|| ip3 > UINT8_MAX || ip4 > UINT8_MAX) {
+		lprintf(LOG_ERR, "Invalid IP address: %s", arg);
+		return (-1);
+	}
+	buf[0] = (uint8_t)ip1;
+	buf[1] = (uint8_t)ip2;
+	buf[2] = (uint8_t)ip3;
+	buf[3] = (uint8_t)ip4;
+	return 0;
+}
+
+static int
+ipmi_lan_set_vlan_id(struct ipmi_intf *intf,  uint8_t chan, char *string)
+{
+	struct lan_param *p;
+	uint8_t data[2];
+	int rc;
+
+	if (string == NULL) {
+		lprintf(LOG_DEBUG, "Get current VLAN ID from BMC.");
+		p = get_lan_param(intf, chan, IPMI_LANP_VLAN_ID);
+		if (p != NULL && p->data != NULL && p->data_len > 1) {
+			int id = ((p->data[1] & 0x0f) << 8) + p->data[0];
+			if (id < 1 || id > 4094) {
+				lprintf(LOG_ERR,
+						"Retrieved VLAN ID %i is out of range <1..4094>.",
+						id);
+				return (-1);
+			}
+			data[0] = p->data[0];
+			data[1] = p->data[1] & 0x0F;
+		} else {
+			data[0] = 0;
+			data[1] = 0;
+		}
+	}
+	else {
+		int id = 0;
+		if (str2int(string, &id) != 0) {
+			lprintf(LOG_ERR, "Given VLAN ID '%s' is invalid.", string);
+			return (-1);
+		}
+
+		if (id < 1 || id > 4094) {
+			lprintf(LOG_NOTICE, "VLAN ID must be between 1 and 4094.");
+			return (-1);
+		}
+		else {
+			data[0] = (uint8_t)id;
+			data[1] = (uint8_t)(id >> 8) | 0x80;
+		}
+	}
+	rc = set_lan_param(intf, chan, IPMI_LANP_VLAN_ID, data, 2);
+	return rc;
+}
+
+static int
+ipmi_lan_set_vlan_priority(struct ipmi_intf *intf,  uint8_t chan, char *string)
+{
+	uint8_t data;
+	int rc;
+	int priority = 0;
+	if (str2int(string, &priority) != 0) {
+		lprintf(LOG_ERR, "Given VLAN priority '%s' is invalid.", string);
+		return (-1);
+	}
+
+	if (priority < 0 || priority > 7) {
+		lprintf(LOG_NOTICE, "VLAN priority must be between 0 and 7.");
+		return (-1);
+	}
+	data = (uint8_t)priority;
+	rc = set_lan_param(intf, chan, IPMI_LANP_VLAN_PRIORITY, &data, 1);
+	return rc;
+}
+
+static void
+print_lan_set_bad_pass_thresh_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <chanel> bad_pass_thresh <thresh_num> <1|0> <reset_interval> <lockout_interval>\n"
+"        <thresh_num>         Bad Pasword Threshold number.\n"
+"        <1|0>                1 = generate a Session Audit sensor event.\n"
+"                             0 = do not generate an event.\n"
+"        <reset_interval>     Attempt Count Reset Interval. In tens of seconds.\n"
+"        <lockount_interval>  User Lockout Interval. In tens of seconds.");
+}
+
+/* get_cmdline_bad_pass_thresh - parse-out bad password threshold from given
+ * string and store it into buffer.
+ *
+ * @arg: string to be parsed.
+ * @buf: buffer of 6 to hold parsed Bad Password Threshold.
+ *
+ * returns zero on success, (-1) on error.
+ */
+static int
+get_cmdline_bad_pass_thresh(char *argv[], uint8_t *buf)
+{
+	uint16_t reset, lockout;
+
+	if (str2uchar(argv[0], &buf[1])) {
+		return -1;
+	}
+
+	if (str2uchar(argv[1], &buf[0]) || buf[0] > 1) {
+		return -1;
+	}
+
+	if (str2ushort(argv[2], &reset)) {
+		return -1;
+	}
+
+	if (str2ushort(argv[3], &lockout)) {
+		return -1;
+	}
+
+	/* store parsed data */
+	buf[2] = reset & 0xFF;
+	buf[3] = reset >> 8;
+	buf[4] = lockout & 0xFF;
+	buf[5] = lockout >> 8;
+	return 0;
+}
+
+static int
+ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	uint8_t data[32];
+	uint8_t chan;
+	int rc = 0;
+
+	if (argc < 2) {
+		print_lan_set_usage();
+		return (-1);
+	}
+
+	if (strncmp(argv[0], "help", 4) == 0 ||
+	    strncmp(argv[1], "help", 4) == 0) {
+		print_lan_set_usage();
+		return 0;
+	}
+	
+	if (str2uchar(argv[0], &chan) != 0) {
+		lprintf(LOG_ERR, "Invalid channel: %s", argv[0]);
+		return (-1);
+	}
+
+	/* find type of channel and only accept 802.3 LAN */
+	if (!is_lan_channel(intf, chan)) {
+		lprintf(LOG_ERR, "Channel %d is not a LAN channel!", chan);
+		print_lan_set_usage();
+		return -1;
+	}
+
+	memset(&data, 0, sizeof(data));
+
+	/* set user access */
+	if (strncmp(argv[1], "user", 4) == 0) {
+		rc = ipmi_set_user_access(intf, chan, 1);
+	}
+	/* set channel access mode */
+	else if (strncmp(argv[1], "access", 6) == 0) {
+		if (argc < 3) {
+			print_lan_set_access_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_access_usage();
+			return 0;
+		}
+		else if (strncmp(argv[2], "on", 2) == 0) {
+			rc = ipmi_set_channel_access(intf, chan, 1);
+		}
+		else if (strncmp(argv[2], "off", 3) == 0) {
+			rc = ipmi_set_channel_access(intf, chan, 0);
+		}
+		else {
+			print_lan_set_access_usage();
+			return (-1);
+		}
+	}
+	/* set ARP control */
+	else if (strncmp(argv[1], "arp", 3) == 0) {
+		if (argc < 3) {
+			print_lan_set_arp_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_arp_usage();
+		}
+		else if (strncmp(argv[2], "interval", 8) == 0) {
+			uint8_t interval = 0;
+			if (str2uchar(argv[3], &interval) != 0) {
+				lprintf(LOG_ERR, "Given ARP interval '%s' is invalid.", argv[3]);
+				return (-1);
+			}
+			rc = lan_set_arp_interval(intf, chan, interval);
+		}
+		else if (strncmp(argv[2], "generate", 8) == 0) {
+			if (argc < 4) {
+				print_lan_set_arp_usage();
+				return (-1);
+			}
+			else if (strncmp(argv[3], "on", 2) == 0)
+				rc = lan_set_arp_generate(intf, chan, 1);
+			else if (strncmp(argv[3], "off", 3) == 0)
+				rc = lan_set_arp_generate(intf, chan, 0);
+			else {
+				print_lan_set_arp_usage();
+				return (-1);
+			}
+		}
+		else if (strncmp(argv[2], "respond", 7) == 0) {
+			if (argc < 4) {
+				print_lan_set_arp_usage();
+				return (-1);
+			}
+			else if (strncmp(argv[3], "on", 2) == 0)
+				rc = lan_set_arp_respond(intf, chan, 1);
+			else if (strncmp(argv[3], "off", 3) == 0)
+				rc = lan_set_arp_respond(intf, chan, 0);
+			else {
+				print_lan_set_arp_usage();
+				return (-1);
+			}
+		}
+		else {
+			print_lan_set_arp_usage();
+		}
+	}
+	/* set authentication types */
+	else if (strncmp(argv[1], "auth", 4) == 0) {
+		if (argc < 3) {
+			print_lan_set_auth_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_auth_usage();
+			return 0;
+		} else {
+			rc = ipmi_lan_set_auth(intf, chan, argv[2], argv[3]);
+		}
+	}
+	/* ip address source */
+	else if (strncmp(argv[1], "ipsrc", 5) == 0) {
+		if (argc < 3) {
+			print_lan_set_ipsrc_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_ipsrc_usage();
+			return 0;
+		}
+		else if (strncmp(argv[2], "none", 4) == 0)
+			data[0] = 0;
+		else if (strncmp(argv[2], "static", 5) == 0)
+			data[0] = 1;
+		else if (strncmp(argv[2], "dhcp", 4) == 0)
+			data[0] = 2;
+		else if (strncmp(argv[2], "bios", 4) == 0)
+			data[0] = 3;
+		else {
+			print_lan_set_ipsrc_usage();
+			return -1;
+		}
+		rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR_SRC, data, 1);
+	}
+	/* session password
+	 * not strictly a lan setting, but its used for lan connections */
+	else if (strncmp(argv[1], "password", 8) == 0) {
+		rc = ipmi_lan_set_password(intf, 1, argv[2]);
+	}
+	/* snmp community string */
+	else if (strncmp(argv[1], "snmp", 4) == 0) {
+		if (argc < 3) {
+			print_lan_set_snmp_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_snmp_usage();
+			return 0;
+		} else {
+			memcpy(data, argv[2], __min(strlen(argv[2]), 18));
+			printf("Setting LAN %s to %s\n",
+			       ipmi_lan_params[IPMI_LANP_SNMP_STRING].desc, data);
+			rc = set_lan_param(intf, chan, IPMI_LANP_SNMP_STRING, data, 18);
+		}
+	}
+	/* ip address */
+	else if (strncmp(argv[1], "ipaddr", 6) == 0) {
+		if(argc != 3)
+		{
+			print_lan_set_usage();
+			return -1;
+		}
+		rc = get_cmdline_ipaddr(argv[2], data);
+		if (rc == 0) {
+			printf("Setting LAN %s to %d.%d.%d.%d\n",
+				ipmi_lan_params[IPMI_LANP_IP_ADDR].desc,
+				data[0], data[1], data[2], data[3]);
+			rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4);
+		}
+	}
+	/* network mask */
+	else if (strncmp(argv[1], "netmask", 7) == 0) {
+		if(argc != 3)
+		{
+			print_lan_set_usage();
+			return -1;
+		}
+		rc = get_cmdline_ipaddr(argv[2], data);
+		if (rc == 0) {
+			printf("Setting LAN %s to %d.%d.%d.%d\n",
+		       		ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc,
+		       		data[0], data[1], data[2], data[3]);
+			rc = set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4);
+		}
+	}
+	/* mac address */
+	else if (strncmp(argv[1], "macaddr", 7) == 0) {
+		if(argc != 3)
+		{
+			print_lan_set_usage();
+			return -1;
+		}
+		rc = str2mac(argv[2], data);
+		if (rc == 0) {
+			printf("Setting LAN %s to %s\n",
+				ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc,
+				mac2str(data));
+			rc = set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6);
+		}
+	}
+	/* default gateway settings */
+	else if (strncmp(argv[1], "defgw", 5) == 0) {
+		if (argc < 4) {
+			print_lan_set_defgw_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_defgw_usage();
+			return 0;
+		}
+		else if ((strncmp(argv[2], "ipaddr", 5) == 0) &&
+			 (get_cmdline_ipaddr(argv[3], data) == 0)) {
+			printf("Setting LAN %s to %d.%d.%d.%d\n",
+			       ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_IP].desc,
+			       data[0], data[1], data[2], data[3]);
+			rc = set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_IP, data, 4);
+		}
+		else if ((strncmp(argv[2], "macaddr", 7) == 0) &&
+			 (str2mac(argv[3], data) == 0)) {
+			printf("Setting LAN %s to %s\n",
+				ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_MAC].desc,
+				mac2str(data));
+			rc = set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_MAC, data, 6);
+		}
+		else {
+			print_lan_set_usage();
+			return -1;
+		}
+	}
+	/* backup gateway settings */
+	else if (strncmp(argv[1], "bakgw", 5) == 0) {
+		if (argc < 4) {
+			print_lan_set_bakgw_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_bakgw_usage();
+			return 0;
+		}
+		else if ((strncmp(argv[2], "ipaddr", 5) == 0) &&
+			 (get_cmdline_ipaddr(argv[3], data) == 0)) {
+			printf("Setting LAN %s to %d.%d.%d.%d\n",
+			       ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_IP].desc,
+			       data[0], data[1], data[2], data[3]);
+			rc = set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_IP, data, 4);
+		}
+		else if ((strncmp(argv[2], "macaddr", 7) == 0) &&
+			 (str2mac(argv[3], data) == 0)) {
+			printf("Setting LAN %s to %s\n",
+				ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_MAC].desc,
+				mac2str(data));
+			rc = set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_MAC, data, 6);
+		}
+		else {
+			print_lan_set_usage();
+			return -1;
+		}
+	}
+	else if (strncasecmp(argv[1], "vlan", 4) == 0) {
+		if (argc < 4) {
+			print_lan_set_vlan_usage();
+			return (-1);
+		}
+		else if (strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_vlan_usage();
+			return 0;
+		}
+		else if (strncasecmp(argv[2], "id", 2) == 0) {
+			if (strncasecmp(argv[3], "off", 3) == 0) {
+				ipmi_lan_set_vlan_id(intf, chan, NULL);
+			}
+			else {
+				ipmi_lan_set_vlan_id(intf, chan, argv[3]);
+			}
+		}
+		else if (strncasecmp(argv[2], "priority", 8) == 0) {
+			ipmi_lan_set_vlan_priority(intf, chan, argv[3]);
+		}
+		else {
+			print_lan_set_vlan_usage();
+			return (-1);
+		}
+	}
+	/* set PEF alerting on or off */
+	else if (strncasecmp(argv[1], "alert", 5) == 0) {
+		if (argc < 3) {
+			lprintf(LOG_NOTICE, "LAN set alert must be 'on' or 'off'");
+			return (-1);
+		}
+		else if (strncasecmp(argv[2], "on", 2) == 0 ||
+			 strncasecmp(argv[2], "enable", 6) == 0) {
+			printf("Enabling PEF alerts for LAN channel %d\n", chan);
+			rc = ipmi_set_alert_enable(intf, chan, 1);
+		}
+		else if (strncasecmp(argv[2], "off", 3) == 0 ||
+			 strncasecmp(argv[2], "disable", 7) == 0) {
+			printf("Disabling PEF alerts for LAN channel %d\n", chan);
+			rc = ipmi_set_alert_enable(intf, chan, 0);
+		}
+		else {
+			lprintf(LOG_NOTICE, "LAN set alert must be 'on' or 'off'");
+			return 0;
+		}
+	}
+	/* RMCP+ cipher suite privilege levels */
+	else if (strncmp(argv[1], "cipher_privs", 12) == 0)
+	{
+		if (argc != 3) {
+			print_lan_set_cipher_privs_usage();
+			return (-1);
+		}
+		else if ((strncmp(argv[2], "help", 4) == 0) ||
+		    get_cmdline_cipher_suite_priv_data(argv[2], data))
+		{
+			print_lan_set_cipher_privs_usage();
+			return 0;
+		}
+		else
+		{
+			rc = set_lan_param(intf, chan, IPMI_LANP_RMCP_PRIV_LEVELS, data, 9);
+		}
+	}
+	else if (strncmp(argv[1], "bad_pass_thresh", 15) == 0)
+	{
+		if (argc == 3 && strncmp(argv[2], "help", 4) == 0) {
+			print_lan_set_bad_pass_thresh_usage();
+			return 0;
+		}
+		if (argc < 6 || get_cmdline_bad_pass_thresh(&argv[2], data)) {
+			print_lan_set_bad_pass_thresh_usage();
+			return (-1);
+		}
+		rc = set_lan_param(intf, chan, IPMI_LANP_BAD_PASS_THRESH, data, 6);
+	}
+	else {
+		print_lan_set_usage();
+		return (-1);
+	}
+
+	return rc;
+}
+
+
+static int
+is_alert_destination(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
+{
+	struct lan_param * p;
+
+	p = get_lan_param(intf, channel, IPMI_LANP_NUM_DEST);
+	if (p == NULL)
+		return 0;
+	if (p->data == NULL)
+		return 0;
+
+	if (alert <= (p->data[0] & 0xf))
+		return 1;
+	else
+		return 0;
+}
+
+static int
+ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
+{
+# define PTYPE_LEN	4
+# define PADDR_LEN	13
+	struct lan_param *lp_ptr = NULL;
+	int isack = 0;
+	uint8_t ptype[PTYPE_LEN];
+	uint8_t paddr[PADDR_LEN];
+
+	lp_ptr = get_lan_param_select(intf, channel, IPMI_LANP_DEST_TYPE, alert);
+	if (lp_ptr == NULL || lp_ptr->data == NULL
+			|| lp_ptr->data_len < PTYPE_LEN) {
+		return (-1);
+	}
+	memcpy(ptype, lp_ptr->data, PTYPE_LEN);
+
+	lp_ptr = get_lan_param_select(intf, channel, IPMI_LANP_DEST_ADDR, alert);
+	if (lp_ptr == NULL || lp_ptr->data == NULL
+			|| lp_ptr->data_len < PADDR_LEN) {
+		return (-1);
+	}
+	memcpy(paddr, lp_ptr->data, PADDR_LEN);
+
+	printf("%-24s: %d\n", "Alert Destination",
+			ptype[0]);
+
+	if (ptype[1] & 0x80) {
+		isack = 1;
+	}
+	printf("%-24s: %s\n", "Alert Acknowledge",
+			isack ? "Acknowledged" : "Unacknowledged");
+
+	printf("%-24s: ", "Destination Type");
+	switch (ptype[1] & 0x7) {
+	case 0:
+		printf("PET Trap\n");
+		break;
+	case 6:
+		printf("OEM 1\n");
+		break;
+	case 7:
+		printf("OEM 2\n");
+		break;
+	default:
+		printf("Unknown\n");
+		break;
+	}
+
+	printf("%-24s: %d\n",
+			isack ? "Acknowledge Timeout" : "Retry Interval",
+			ptype[2]);
+
+	printf("%-24s: %d\n", "Number of Retries",
+			ptype[3] & 0x7);
+
+	if ((paddr[1] & 0xf0) != 0) {
+		/* unknown address format */
+		printf("\n");
+		return 0;
+	}
+
+	printf("%-24s: %s\n", "Alert Gateway",
+			(paddr[2] & 1) ? "Backup" : "Default");
+
+	printf("%-24s: %d.%d.%d.%d\n", "Alert IP Address",
+			paddr[3], paddr[4], paddr[5], paddr[6]);
+
+	printf("%-24s: %s\n", "Alert MAC Address",
+			mac2str(&paddr[7]));
+
+	printf("\n");
+	return 0;
+}
+
+static int
+ipmi_lan_alert_print_all(struct ipmi_intf * intf, uint8_t channel)
+{
+	int j, ndest;
+	struct lan_param * p;
+
+	p = get_lan_param(intf, channel, IPMI_LANP_NUM_DEST);
+	if (p == NULL)
+		return -1;
+	if (p->data == NULL)
+		return -1;
+	ndest = p->data[0] & 0xf;
+
+	for (j=0; j<=ndest; j++) {
+		ipmi_lan_alert_print(intf, channel, j);
+	}
+
+	return 0;
+}
+
+static int
+ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+		   int argc, char ** argv)
+{
+	struct lan_param * p;
+	uint8_t data[32], temp[32];
+	int rc = 0;
+
+	if (argc < 2) {
+		print_lan_alert_set_usage();
+		return (-1);
+	}
+
+	if (strncmp(argv[0], "help", 4) == 0 ||
+	    strncmp(argv[1], "help", 4) == 0) {
+		print_lan_alert_set_usage();
+		return 0;
+	}
+
+	memset(data, 0, sizeof(data));
+	memset(temp, 0, sizeof(temp));
+
+	/* alert destination ip address */
+	if (strncasecmp(argv[0], "ipaddr", 6) == 0 &&
+	    (get_cmdline_ipaddr(argv[1], temp) == 0)) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_ADDR, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+		/* set new ipaddr */
+		memcpy(data+3, temp, 4);
+		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
+		       data[3], data[4], data[5], data[6]);
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_ADDR, data, p->data_len);
+	}
+	/* alert destination mac address */
+	else if (strncasecmp(argv[0], "macaddr", 7) == 0 &&
+		 (str2mac(argv[1], temp) == 0)) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_ADDR, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+		/* set new macaddr */
+		memcpy(data+7, temp, 6);
+		printf("Setting LAN Alert %d MAC Address to "
+		       "%s\n", alert, mac2str(&data[7]));
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_ADDR, data, p->data_len);
+	}
+	/* alert destination gateway selector */
+	else if (strncasecmp(argv[0], "gateway", 7) == 0) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_ADDR, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+
+		if (strncasecmp(argv[1], "def", 3) == 0 ||
+		    strncasecmp(argv[1], "default", 7) == 0) {
+			printf("Setting LAN Alert %d to use Default Gateway\n", alert);
+			data[2] = 0;
+		}
+		else if (strncasecmp(argv[1], "bak", 3) == 0 ||
+			 strncasecmp(argv[1], "backup", 6) == 0) {
+			printf("Setting LAN Alert %d to use Backup Gateway\n", alert);
+			data[2] = 1;
+		}
+		else {
+			print_lan_alert_set_usage();
+			return -1;
+		}
+
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_ADDR, data, p->data_len);
+	}
+	/* alert acknowledgement */
+	else if (strncasecmp(argv[0], "ack", 3) == 0) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_TYPE, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+
+		if (strncasecmp(argv[1], "on", 2) == 0 ||
+		    strncasecmp(argv[1], "yes", 3) == 0) {
+			printf("Setting LAN Alert %d to Acknowledged\n", alert);
+			data[1] |= 0x80;
+		}
+		else if (strncasecmp(argv[1], "off", 3) == 0 ||
+			 strncasecmp(argv[1], "no", 2) == 0) {
+			printf("Setting LAN Alert %d to Unacknowledged\n", alert);
+			data[1] &= ~0x80;
+		}
+		else {
+			print_lan_alert_set_usage();
+			return -1;
+		}
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_TYPE, data, p->data_len);
+	}
+	/* alert destination type */
+	else if (strncasecmp(argv[0], "type", 4) == 0) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_TYPE, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+
+		if (strncasecmp(argv[1], "pet", 3) == 0) {
+			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
+			data[1] &= ~0x07;
+		}
+		else if (strncasecmp(argv[1], "oem1", 4) == 0) {
+			printf("Setting LAN Alert %d destination to OEM 1\n", alert);
+			data[1] &= ~0x07;
+			data[1] |= 0x06;
+		}
+		else if (strncasecmp(argv[1], "oem2", 4) == 0) {
+			printf("Setting LAN Alert %d destination to OEM 2\n", alert);
+			data[1] |= 0x07;
+		}
+		else {
+			print_lan_alert_set_usage();
+			return -1;
+		}
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_TYPE, data, p->data_len);
+	}
+	/* alert acknowledge timeout or retry interval */
+	else if (strncasecmp(argv[0], "time", 4) == 0) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_TYPE, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+
+		if (str2uchar(argv[1], &data[2]) != 0) {
+			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
+			return (-1);
+		}
+		printf("Setting LAN Alert %d timeout/retry to %d seconds\n", alert, data[2]);
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_TYPE, data, p->data_len);
+	}
+	/* number of retries */
+	else if (strncasecmp(argv[0], "retry", 5) == 0) {
+		/* get current parameter */
+		p = get_lan_param_select(intf, chan, IPMI_LANP_DEST_TYPE, alert);
+		if (p == NULL) {
+			return (-1);
+		}
+		memcpy(data, p->data, p->data_len);
+
+		if (str2uchar(argv[1], &data[3]) != 0) {
+			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
+			return (-1);
+		}
+		data[3] = data[3] & 0x7;
+		printf("Setting LAN Alert %d number of retries to %d\n", alert, data[3]);
+		rc = set_lan_param_nowait(intf, chan, IPMI_LANP_DEST_TYPE, data, p->data_len);
+	}
+	else {
+		print_lan_alert_set_usage();
+		return -1;
+	}
+
+	return rc;
+}
+
+static int
+ipmi_lan_alert(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	uint8_t alert;
+	uint8_t channel = 1;
+
+	if (argc < 1) {
+		print_lan_alert_print_usage();
+		print_lan_alert_set_usage();
+		return (-1);
+	}
+	else if (strncasecmp(argv[0], "help", 4) == 0) {
+		print_lan_alert_print_usage();
+		print_lan_alert_set_usage();
+		return 0;
+	}
+
+	/* alert print [channel] [alert] */
+	if (strncasecmp(argv[0], "print", 5) == 0) {
+		if (argc < 2) {
+			channel = find_lan_channel(intf, 1);
+			if (!is_lan_channel(intf, channel)) {
+				lprintf(LOG_ERR, "Channel %d is not a LAN channel", channel);
+				return -1;
+			}
+			return ipmi_lan_alert_print_all(intf, channel);
+		}
+
+		if (strncasecmp(argv[1], "help", 4) == 0) {
+			print_lan_alert_print_usage();
+			return 0;
+		}
+
+		if (str2uchar(argv[1], &channel) != 0) {
+			lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
+			return (-1);
+		}
+		if (!is_lan_channel(intf, channel)) {
+			lprintf(LOG_ERR, "Channel %d is not a LAN channel", channel);
+			return -1;
+		}
+
+		if (argc < 3)
+			return ipmi_lan_alert_print_all(intf, channel);
+
+		if (str2uchar(argv[2], &alert) != 0) {
+			lprintf(LOG_ERR, "Invalid alert: %s", argv[2]);
+			return (-1);
+		}
+		if (is_alert_destination(intf, channel, alert) == 0) {
+			lprintf(LOG_ERR, "Alert %d is not a valid destination", alert);
+			return -1;
+		}
+		return ipmi_lan_alert_print(intf, channel, alert);
+	}
+
+	/* alert set <channel> <alert> [option] */
+	if (strncasecmp(argv[0], "set", 3) == 0) {
+		if (argc < 5) {
+			print_lan_alert_set_usage();
+			return (-1);
+		}
+		else if (strncasecmp(argv[1], "help", 4) == 0) {
+			print_lan_alert_set_usage();
+			return 0;
+		}
+
+		if (str2uchar(argv[1], &channel) != 0) {
+			lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
+			return (-1);
+		}
+		if (!is_lan_channel(intf, channel)) {
+			lprintf(LOG_ERR, "Channel %d is not a LAN channel", channel);
+			return -1;
+		}
+
+		if (str2uchar(argv[2], &alert) != 0) {
+			lprintf(LOG_ERR, "Invalid alert: %s", argv[2]);
+			return (-1);
+		}
+		if (is_alert_destination(intf, channel, alert) == 0) {
+			lprintf(LOG_ERR, "Alert %d is not a valid destination", alert);
+			return -1;
+		}
+
+		return ipmi_lan_alert_set(intf, channel, alert, argc-3, &(argv[3]));
+	}
+
+	return 0;
+}
+
+
+static int
+ipmi_lan_stats_get(struct ipmi_intf * intf, uint8_t chan)
+{
+	int rc = 0;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+	uint16_t statsTemp;
+
+	if (!is_lan_channel(intf, chan)) {
+		lprintf(LOG_ERR, "Channel %d is not a LAN channel", chan);
+		return -1;
+	}
+
+	/* From here, we are ready to get the stats */
+
+	msg_data[0] = chan;
+	msg_data[1] = 0;   /* Don't clear */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = IPMI_LAN_GET_STAT;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get LAN Stats command failed");
+		return (-1);
+	}
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get LAN Stats command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+
+	if (verbose > 1) {
+		uint8_t counter;
+		printf("--- Rx Stats ---\n");
+		for (counter=0; counter<18; counter+=2) {
+			printf("%02X", *(rsp->data + counter));
+			printf(" %02X - ", *(rsp->data + counter+1));
+		}
+		printf("\n");
+	}
+
+	statsTemp = ((*(rsp->data + 0)) << 8) | (*(rsp->data + 1));
+	printf("IP Rx Packet              : %d\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 2)) << 8) | (*(rsp->data + 3));
+	printf("IP Rx Header Errors       : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 4)) << 8) | (*(rsp->data + 5));
+	printf("IP Rx Address Errors      : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 6)) << 8) | (*(rsp->data + 7));
+	printf("IP Rx Fragmented          : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 8)) << 8) | (*(rsp->data + 9));
+	printf("IP Tx Packet              : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data +10)) << 8) | (*(rsp->data +11));
+	printf("UDP Rx Packet             : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 12)) << 8) | (*(rsp->data + 13));
+	printf("RMCP Rx Valid             : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 14)) << 8) | (*(rsp->data + 15));
+	printf("UDP Proxy Packet Received : %u\n", statsTemp);
+
+	statsTemp = ((*(rsp->data + 16)) << 8) | (*(rsp->data + 17));
+	printf("UDP Proxy Packet Dropped  : %u\n", statsTemp);
+
+	return rc;
+}
+
+
+static int
+ipmi_lan_stats_clear(struct ipmi_intf * intf, uint8_t chan)
+{
+	int rc = 0;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+
+	if (!is_lan_channel(intf, chan)) {
+		lprintf(LOG_ERR, "Channel %d is not a LAN channel", chan);
+		return -1;
+	}
+
+	/* From here, we are ready to get the stats */
+	msg_data[0] = chan;
+	msg_data[1] = 1;   /* Clear */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = IPMI_LAN_GET_STAT;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_INFO, "Get LAN Stats command failed");
+		return (-1);
+	}
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_INFO, "Get LAN Stats command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+
+	return rc;
+}
+
+static void
+print_lan_alert_print_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"usage: lan alert print [channel number] [alert destination]");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"Default will print all alerts for the first found LAN channel");
+}
+
+static void
+print_lan_alert_set_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"usage: lan alert set <channel number> <alert destination> <command> <parameter>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"    Command/parameter options:");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"    ipaddr <x.x.x.x>               Set alert IP address");
+	lprintf(LOG_NOTICE,
+"    macaddr <x:x:x:x:x:x>          Set alert MAC address");
+	lprintf(LOG_NOTICE,
+"    gateway <default|backup>       Set channel gateway to use for alerts");
+	lprintf(LOG_NOTICE,
+"    ack <on|off>                   Set Alert Acknowledge on or off");
+	lprintf(LOG_NOTICE,
+"    type <pet|oem1|oem2>           Set destination type as PET or OEM");
+	lprintf(LOG_NOTICE,
+"    time <seconds>                 Set ack timeout or unack retry interval");
+	lprintf(LOG_NOTICE,
+"    retry <number>                 Set number of alert retries");
+	lprintf(LOG_NOTICE,
+"");
+}
+
+static void
+print_lan_set_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"usage: lan set <channel> <command> <parameter>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"LAN set command/parameter options:");
+	lprintf(LOG_NOTICE,
+"  ipaddr <x.x.x.x>               Set channel IP address");
+	lprintf(LOG_NOTICE,
+"  netmask <x.x.x.x>              Set channel IP netmask");
+	lprintf(LOG_NOTICE,
+"  macaddr <x:x:x:x:x:x>          Set channel MAC address");
+	lprintf(LOG_NOTICE,
+"  defgw ipaddr <x.x.x.x>         Set default gateway IP address");
+	lprintf(LOG_NOTICE,
+"  defgw macaddr <x:x:x:x:x:x>    Set default gateway MAC address");
+	lprintf(LOG_NOTICE,
+"  bakgw ipaddr <x.x.x.x>         Set backup gateway IP address");
+	lprintf(LOG_NOTICE,
+"  bakgw macaddr <x:x:x:x:x:x>    Set backup gateway MAC address");
+	lprintf(LOG_NOTICE,
+"  password <password>            Set session password for this channel");
+	lprintf(LOG_NOTICE,
+"  snmp <community string>        Set SNMP public community string");
+	lprintf(LOG_NOTICE,
+"  user                           Enable default user for this channel");
+	lprintf(LOG_NOTICE,
+"  access <on|off>                Enable or disable access to this channel");
+	lprintf(LOG_NOTICE,
+"  alert <on|off>                 Enable or disable PEF alerting for this channel");
+	lprintf(LOG_NOTICE,
+"  arp respond <on|off>           Enable or disable BMC ARP responding");
+	lprintf(LOG_NOTICE,
+"  arp generate <on|off>          Enable or disable BMC gratuitous ARP generation");
+	lprintf(LOG_NOTICE,
+"  arp interval <seconds>         Set gratuitous ARP generation interval");
+	lprintf(LOG_NOTICE,
+"  vlan id <off|<id>>             Disable or enable VLAN and set ID (1-4094)");
+	lprintf(LOG_NOTICE,
+"  vlan priority <priority>       Set vlan priority (0-7)");
+	lprintf(LOG_NOTICE,
+"  auth <level> <type,..>         Set channel authentication types");
+	lprintf(LOG_NOTICE,
+"    level  = CALLBACK, USER, OPERATOR, ADMIN");
+	lprintf(LOG_NOTICE,
+"    type   = NONE, MD2, MD5, PASSWORD, OEM");
+	lprintf(LOG_NOTICE,
+"  ipsrc <source>                 Set IP Address source");
+	lprintf(LOG_NOTICE,
+"    none   = unspecified source");
+	lprintf(LOG_NOTICE,
+"    static = address manually configured to be static");
+	lprintf(LOG_NOTICE,
+"    dhcp   = address obtained by BMC running DHCP");
+	lprintf(LOG_NOTICE,
+"    bios   = address loaded by BIOS or system software");
+	lprintf(LOG_NOTICE,
+"  cipher_privs XXXXXXXXXXXXXXX   Set RMCP+ cipher suite privilege levels");
+	lprintf(LOG_NOTICE,
+"    X = Cipher Suite Unused");
+	lprintf(LOG_NOTICE,
+"    c = CALLBACK");
+	lprintf(LOG_NOTICE,
+"    u = USER");
+	lprintf(LOG_NOTICE,
+"    o = OPERATOR");
+	lprintf(LOG_NOTICE,
+"    a = ADMIN");
+	lprintf(LOG_NOTICE,
+"    O = OEM");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"  bad_pass_thresh <thresh_num> <1|0> <reset_interval> <lockout_interval>\n"
+"                                Set bad password threshold");
+}
+
+static void
+print_lan_set_access_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set access <on|off>");
+}
+
+static void
+print_lan_set_arp_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> arp respond <on|off>");
+	lprintf(LOG_NOTICE,
+"lan set <channel> arp generate <on|off>");
+	lprintf(LOG_NOTICE,
+"lan set <channel> arp interval <seconds>");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"example: lan set 7 arp gratuitous off");
+}
+
+static void
+print_lan_set_auth_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> auth <level> <type,type,...>");
+	lprintf(LOG_NOTICE,
+"  level = CALLBACK, USER, OPERATOR, ADMIN");
+	lprintf(LOG_NOTICE,
+"  types = NONE, MD2, MD5, PASSWORD, OEM");
+	lprintf(LOG_NOTICE,
+"example: lan set 7 auth ADMIN PASSWORD,MD5");
+}
+
+static void
+print_lan_set_bakgw_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"LAN set backup gateway commands: ipaddr, macaddr");
+}
+
+static void
+print_lan_set_cipher_privs_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> cipher_privs XXXXXXXXXXXXXXX");
+	lprintf(LOG_NOTICE,
+"    X = Cipher Suite Unused");
+	lprintf(LOG_NOTICE,
+"    c = CALLBACK");
+	lprintf(LOG_NOTICE,
+"    u = USER");
+	lprintf(LOG_NOTICE,
+"    o = OPERATOR");
+	lprintf(LOG_NOTICE,
+"    a = ADMIN");
+	lprintf(LOG_NOTICE,
+"    O = OEM");
+	lprintf(LOG_NOTICE,
+"");
+}
+
+static void
+print_lan_set_defgw_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"LAN set default gateway Commands: ipaddr, macaddr");
+}
+
+static void
+print_lan_set_ipsrc_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> ipsrc <source>");
+	lprintf(LOG_NOTICE,
+"  none   = unspecified");
+	lprintf(LOG_NOTICE,
+"  static = static address (manually configured)");
+	lprintf(LOG_NOTICE,
+"  dhcp   = address obtained by BMC running DHCP");
+	lprintf(LOG_NOTICE,
+"  bios   = address loaded by BIOS or system software");
+}
+
+static void
+print_lan_set_snmp_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> snmp <community string>");
+}
+
+static void
+print_lan_set_vlan_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"lan set <channel> vlan id <id>");
+	lprintf(LOG_NOTICE,
+"lan set <channel> vlan id off");
+	lprintf(LOG_NOTICE,
+"lan set <channel> vlan priority <priority>");
+}
+
+/*
+ * print_lan_usage
+ */
+static void
+print_lan_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"LAN Commands:");
+	lprintf(LOG_NOTICE,
+"		   print [<channel number>]");
+	lprintf(LOG_NOTICE,
+"		   set <channel number> <command> <parameter>");
+	lprintf(LOG_NOTICE,
+"		   alert print <channel number> <alert destination>");
+	lprintf(LOG_NOTICE,
+"		   alert set <channel number> <alert destination> <command> <parameter>");
+	lprintf(LOG_NOTICE,
+"		   stats get [<channel number>]");
+	lprintf(LOG_NOTICE,
+"		   stats clear [<channel number>]");
+}
+
+
+int
+ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	uint8_t chan = 0;
+
+	if (argc == 0) {
+		print_lan_usage();
+		return (-1);
+	} else if (strncmp(argv[0], "help", 4) == 0) {
+		print_lan_usage();
+		return 0;
+	}
+
+	if (strncmp(argv[0], "printconf", 9) == 0 ||
+			strncmp(argv[0], "print", 5) == 0) 
+	{
+		if (argc > 2) {
+			print_lan_usage();
+			return (-1);
+		} else if (argc == 2) {
+			if (str2uchar(argv[1], &chan) != 0) {
+				lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
+				return (-1);
+			}
+		} else {
+			chan = find_lan_channel(intf, 1);
+		}
+		if (!is_lan_channel(intf, chan)) {
+			lprintf(LOG_ERR, "Invalid channel: %d", chan);
+			return (-1);
+		}
+		rc = ipmi_lan_print(intf, chan);
+	} else if (strncmp(argv[0], "set", 3) == 0) {
+		rc = ipmi_lan_set(intf, argc-1, &(argv[1]));
+	} else if (strncmp(argv[0], "alert", 5) == 0) {
+		rc = ipmi_lan_alert(intf, argc-1, &(argv[1]));
+	} else if (strncmp(argv[0], "stats", 5) == 0) {
+		if (argc < 2) {
+			print_lan_usage();
+			return (-1);
+		} else if (argc == 3) {
+			if (str2uchar(argv[2], &chan) != 0) {
+				lprintf(LOG_ERR, "Invalid channel: %s", argv[2]);
+				return (-1);
+			}
+		} else {
+			chan = find_lan_channel(intf, 1);
+		}
+		if (!is_lan_channel(intf, chan)) {
+			lprintf(LOG_ERR, "Invalid channel: %d", chan);
+			return (-1);
+		}
+		if (strncmp(argv[1], "get", 3) == 0) {
+			rc = ipmi_lan_stats_get(intf, chan);
+		} else if (strncmp(argv[1], "clear", 5) == 0) {
+			rc = ipmi_lan_stats_clear(intf, chan);
+		} else {
+			print_lan_usage();
+			return (-1);
+		}
+	} else {
+		lprintf(LOG_NOTICE, "Invalid LAN command: %s", argv[0]);
+		return (-1);
+	}
+	return rc;
+}
diff --git a/lib/ipmi_lanp6.c b/lib/ipmi_lanp6.c
new file mode 100644
index 0000000..bbffb89
--- /dev/null
+++ b/lib/ipmi_lanp6.c
@@ -0,0 +1,1240 @@
+/*
+ * Copyright (c) 2016 Pentair Technical Products. All right reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pentair Technical Products or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * PENTAIR TECHNICAL SOLUTIONS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_cc.h>
+#include <ipmitool/ipmi_cfgp.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_lanp6.h>
+#include <ipmitool/log.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <arpa/inet.h>
+
+/*
+ * LAN6 command values.
+ */
+enum {
+	LANP_CMD_SAVE,
+	LANP_CMD_SET,
+	LANP_CMD_PRINT,
+	LANP_CMD_LOCK,
+	LANP_CMD_COMMIT,
+	LANP_CMD_DISCARD,
+	LANP_CMD_HELP,
+	LANP_CMD_ANY = 0xFF
+};
+
+/*
+ * Generic LAN configuration parameters.
+ */
+const struct ipmi_lanp generic_lanp6[] = {
+	{ 0,	"Set In Progress", 1 },
+	{ 50,	"IPv6/IPv4 Support", 1 },
+	{ 51,	"IPv6/IPv4 Addressing Enables", 1 },
+	{ 52,	"IPv6 Header Traffic Class", 1 },
+	{ 53,	"IPv6 Header Static Hop Limit", 1 },
+	{ 54,	"IPv6 Header Flow Label", 3 },
+	{ 55,	"IPv6 Status", 3 },
+	{ 56,	"IPv6 Static Address", 20 },
+	{ 57,	"IPv6 DHCPv6 Static DUID Storage Length", 1 },
+	{ 58,	"IPv6 DHCPv6 Static DUID", 18 },
+	{ 59,	"IPv6 Dynamic Address", 20 },
+	{ 60,	"IPv6 DHCPv6 Dynamic DUID Storage Length", 1 },
+	{ 61,	"IPv6 DHCPv6 Dynamic DUID", 18 },
+	{ 62,	"IPv6 DHCPv6 Timing Configuration Support", 1 },
+	{ 63,	"IPv6 DHCPv6 Timing Configuration", 18 },
+	{ 64,	"IPv6 Router Address Configuration Control", 1 },
+	{ 65,	"IPv6 Static Router 1 IP Address", 16 },
+	{ 66,	"IPv6 Static Router 1 MAC Address", 6 },
+	{ 67,	"IPv6 Static Router 1 Prefix Length", 1 },
+	{ 68,	"IPv6 Static Router 1 Prefix Value", 16 },
+	{ 69,	"IPv6 Static Router 2 IP Address", 16 },
+	{ 70,	"IPv6 Static Router 2 MAC Address", 6 },
+	{ 71,	"IPv6 Static Router 2 Prefix Length", 1 },
+	{ 72,	"IPv6 Static Router 2 Prefix Value", 16 },
+	{ 73,	"IPv6 Number of Dynamic Router Info Sets", 1 },
+	{ 74,	"IPv6 Dynamic Router Info IP Address", 17 },
+	{ 75,	"IPv6 Dynamic Router Info MAC Address", 7 },
+	{ 76,	"IPv6 Dynamic Router Info Prefix Length", 2 },
+	{ 77,	"IPv6 Dynamic Router Info Prefix Value", 17 },
+	{ 78,	"IPv6 Dynamic Router Received Hop Limit", 1 },
+	{ 79,	"IPv6 ND/SLAAC Timing Configuration Support", 1 },
+	{ 80,	"IPv6 ND/SLAAC Timing Configuration", 18 },
+	{ 0,	NULL, 0 }
+};
+
+/*
+ * Set/Get LAN Configuration Parameters
+ * command-specific completion codes.
+ */
+const struct valstr lanp_cc_vals[] = {
+	{ 0x80, "Parameter not supported" },
+	{ 0x81, "Set already in progress" },
+	{ 0x82, "Parameter is read-only" },
+	{ 0x83, "Write-only parameter" },
+	{ 0x00, NULL }
+};
+
+/*
+ * IPv6/IPv4 Addressing Enables.
+ */
+const struct valstr ip6_enable_vals[] = {
+	{ 0, "ipv4" },
+	{ 1, "ipv6" },
+	{ 2, "both" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * Enable/Disable a static address.
+ */
+const struct valstr ip6_addr_enable_vals[] = {
+	{ 0x00, "disable" },
+	{ 0x80, "enable" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * IPv6 address source values.
+ */
+const struct valstr ip6_addr_sources[] = {
+	{ 0, "static" },
+	{ 1, "SLAAC" },
+	{ 2, "DHCPv6" },
+	{ 0, NULL }
+};
+
+/*
+ * IPv6 address status values.
+ */
+const struct valstr ip6_addr_statuses[] = {
+	{ 0, "active" },
+	{ 1, "disabled" },
+	{ 2, "pending" },
+	{ 3, "failed" },
+	{ 4, "deprecated" },
+	{ 5, "invalid" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * DHCPv6 DUID type values.
+ */
+const struct valstr ip6_duid_types[] = {
+	{ 0, "unknown" },
+	{ 1, "DUID-LLT" },
+	{ 2, "DUID-EN" },
+	{ 3, "DUID-LL" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * Timing Configuration support values.
+ */
+const struct valstr ip6_cfg_sup_vals[] = {
+	{ 0, "not supported" },
+	{ 1, "global" },
+	{ 2, "per interface" },
+	{ 0xFF, NULL }
+};
+
+/*
+ * Router Address Configuration Control values.
+ */
+const struct valstr ip6_rtr_configs[] = {
+	{ 1, "static" },
+	{ 2, "dynamic" },
+	{ 3, "both" },
+	{ 0xFF, NULL }
+};
+
+
+const struct valstr ip6_command_vals[] = {
+	{ LANP_CMD_SET,		"set" },
+	{ LANP_CMD_SAVE,	"save" },
+	{ LANP_CMD_PRINT,	"print" },
+	{ LANP_CMD_LOCK,	"lock" },
+	{ LANP_CMD_COMMIT,	"commit" },
+	{ LANP_CMD_DISCARD,	"discard" },
+	{ LANP_CMD_HELP,	"help" },
+	{ LANP_CMD_ANY,		NULL }
+};
+
+static const struct ipmi_cfgp lan_cfgp[] = {
+	{ .name = "support", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_SUPPORT
+	},
+	{ .name = "enables", .format = "{ipv4|ipv6|both}", .size = 1,
+		.access = CFGP_RDWR,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_ENABLES
+	},
+	{ .name = "traffic_class", .format = "<value>", .size = 1,
+		.access = CFGP_RDWR,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_TRAFFIC_CLASS
+	},
+	{ .name = "static_hops", .format = "<value>", .size = 1,
+		.access = CFGP_RDWR,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATIC_HOPS
+	},
+	{ .name = "flow_label", .format = "<value>", .size = 3,
+		.access = CFGP_RDWR,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_FLOW_LABEL
+	},
+	{ .name = "status", .format = NULL, .size = 3,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATUS
+	},
+	{ .name = "static_addr",
+		.format = "{enable|disable} <addr> <pfx_len>", .size = 20,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATIC_ADDR
+	},
+	{ .name = "static_duid_stg", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATIC_DUID_STG
+	},
+	{ .name = "static_duid", .format = "<data>", .size = 18,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 0, .has_blocks = 1, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATIC_DUID
+	},
+	{ .name = "dynamic_addr", .format = NULL, .size = 20,
+		.access = CFGP_RDONLY,
+		.is_set = 1, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DYNAMIC_ADDR
+	},
+	{ .name = "dynamic_duid_stg", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DYNAMIC_DUID_STG
+	},
+	{ .name = "dynamic_duid", .format = "<data>", .size = 18,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 0, .has_blocks = 1, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DYNAMIC_DUID
+	},
+	{ .name = "dhcp6_cfg_sup", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DHCP6_CFG_SUP
+	},
+	{ .name = "dhcp6_cfg", .format = "<data> <data>", .size = 36,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DHCP6_CFG
+	},
+	{ .name = "rtr_cfg", .format = "{static|dynamic|both}", .size = 1,
+		.access = CFGP_RDWR,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_ROUTER_CFG
+	},
+	{ .name = "static_rtr",
+		.format = "<addr> <macaddr> <prefix> <prefix_len>", .size = 43,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 1, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_STATIC_RTR1_ADDR
+	},
+	{ .name = "num_dynamic_rtrs", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_NUM_DYNAMIC_RTRS
+	},
+	{ .name = "dynamic_rtr", .format = NULL, .size = 43,
+		.access = CFGP_RDONLY,
+		.is_set = 1, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DYNAMIC_RTR_ADDR
+	},
+	{ .name = "dynamic_hops", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_DYNAMIC_HOPS
+	},
+	{ .name = "ndslaac_cfg_sup", .format = NULL, .size = 1,
+		.access = CFGP_RDONLY,
+		.is_set = 0, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_NDSLAAC_CFG_SUP
+	},
+	{ .name = "ndslaac_cfg", .format = "<data>", .size = 18,
+		.access = CFGP_RDWR,
+		.is_set = 1, .first_set = 0, .has_blocks = 0, .first_block = 0,
+		.specific = IPMI_LANP_IP6_NDSLAAC_CFG
+	}
+};
+
+/*
+ * Lookup LAN parameter descriptor by parameter selector.
+ */
+const struct ipmi_lanp *
+lookup_lanp(int param)
+{
+	const struct ipmi_lanp *p = generic_lanp6;
+
+	while (p->name) {
+		if (p->selector == param) {
+			return p;
+		}
+
+		p++;
+	}
+
+	return NULL;
+}
+
+/*
+ * Print request error.
+ */
+static int
+ipmi_lanp_err(const struct ipmi_rs *rsp, const struct ipmi_lanp *p,
+		const char *action, int quiet)
+{
+	const char *reason;
+	char cc_msg[10];
+	int log_level = LOG_ERR;
+	int err;
+
+	if (rsp == NULL) {
+		reason = "No response";
+		err = -1;
+	} else {
+		err = rsp->ccode;
+		if (quiet == 1
+			&& (rsp->ccode == 0x80
+			|| rsp->ccode == IPMI_CC_PARAM_OUT_OF_RANGE
+			|| rsp->ccode == IPMI_CC_INV_DATA_FIELD_IN_REQ)) {
+			/* be quiet */
+			return err;
+		}
+
+		if (rsp->ccode >= 0xC0) {
+			/* browse for generic completion codes */
+			reason = val2str(rsp->ccode, completion_code_vals);
+		} else {
+			/* browse for command-specific completion codes first */
+			reason = val2str(rsp->ccode, lanp_cc_vals);
+		}
+
+		if (reason == NULL) {
+			/* print completion code value */
+			snprintf(cc_msg, sizeof(cc_msg), "CC=%02x", rsp->ccode);
+			reason = cc_msg;
+		}
+
+		if (rsp->ccode == IPMI_CC_OK) {
+			log_level = LOG_DEBUG;
+		}
+	}
+
+	lprintf(log_level, "Failed to %s %s: %s", action, p->name, reason);
+	return err;
+}
+
+/*
+ * Get dynamic OEM LAN configuration parameter from BMC.
+ * Dynamic in this context is when the base for OEM LAN parameters
+ * is not known apriori.
+ */
+int
+ipmi_get_dynamic_oem_lanp(void *priv, const struct ipmi_lanp *param,
+		int oem_base, int set_selector, int block_selector,
+		void *data, int quiet)
+{
+	struct ipmi_lanp_priv *lp = priv;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t req_data[4];
+	int length;
+
+	if (!priv || !param || !data) {
+		return -1;
+	}
+	req_data[0] = lp->channel;
+	req_data[1] = param->selector + oem_base;
+	req_data[2] = set_selector;
+	req_data[3] = block_selector;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = 2;
+	req.msg.data     = req_data;
+	req.msg.data_len = 4;
+
+	lprintf(LOG_INFO, "Getting parameter '%s' set %d block %d",
+		param->name, set_selector, block_selector);
+
+	rsp = lp->intf->sendrecv(lp->intf, &req);
+	if (rsp == NULL || rsp->ccode) {
+		return ipmi_lanp_err(rsp, param, "get", quiet);
+	}
+
+	memset(data, 0, param->size);
+
+	if (rsp->data_len - 1 < param->size) {
+		length = rsp->data_len - 1;
+	} else {
+		length = param->size;
+	}
+
+	if (length) {
+		memcpy(data, rsp->data + 1, length);
+	}
+
+	return 0;
+}
+
+/*
+ * Get generic LAN configuration parameter.
+ */
+int
+ipmi_get_lanp(void *priv, int param_selector, int set_selector,
+		int block_selector, void *data, int quiet)
+{
+	return ipmi_get_dynamic_oem_lanp(priv, lookup_lanp(param_selector), 0,
+			set_selector, block_selector, data, quiet);
+}
+
+/*
+ * Set dynamic OEM LAN configuration parameter to BMC.
+ * Dynamic in this context is when the base for OEM LAN parameters
+ * is not known apriori.
+ */
+int
+ipmi_set_dynamic_oem_lanp(void *priv, const struct ipmi_lanp *param,
+		int base, const void *data)
+{
+	struct ipmi_lanp_priv *lp = priv;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t req_data[32];
+
+	if (!priv || !param || !data) {
+		return -1;
+	}
+	/* fill the first two bytes */
+	req_data[0] = lp->channel;
+	req_data[1] = param->selector + base;
+
+	/* fill the rest data */
+	memcpy(&req_data[2], data, param->size);
+
+	/* fill request */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = 1;
+	req.msg.data     = req_data;
+	req.msg.data_len = param->size + 2;
+
+	lprintf(LOG_INFO, "Setting parameter '%s'", param->name);
+
+	rsp = lp->intf->sendrecv(lp->intf, &req);
+	if (rsp == NULL || rsp->ccode) {
+		return ipmi_lanp_err(rsp, param, "set", 0);
+	}
+
+	return 0;
+}
+
+/*
+ * Set generic LAN configuration parameter.
+ */
+int
+ipmi_set_lanp(void *priv, int param_selector, const void *data)
+{
+	return ipmi_set_dynamic_oem_lanp(priv, lookup_lanp(param_selector),
+		0, data);
+}
+
+static int
+lanp_parse_cfgp(const struct ipmi_cfgp *p, int set, int block,
+		int argc, const char *argv[], unsigned char *data)
+{
+	unsigned int v;
+
+	if (argc == 0) {
+		return -1;
+	}
+
+	switch(p->specific) {
+	case IPMI_LANP_IP6_ENABLES:
+		data[0] = str2val(argv[0], ip6_enable_vals);
+		if (data[0] == 0xFF) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	case IPMI_LANP_IP6_FLOW_LABEL:
+		if (str2uint(argv[0], &v)) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+
+		data[0] = (v >> 16) & 0x0F;
+		data[1] = (v >> 8) & 0xFF;
+		data[2] = v & 0xFF;
+		break;
+
+	case IPMI_LANP_IP6_STATUS:
+		if (argc < 3) {
+			return -1;
+		}
+
+		if (str2uchar(argv[0], &data[0])
+				|| str2uchar(argv[1], &data[1])
+				|| str2uchar(argv[2], &data[2])) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	case IPMI_LANP_IP6_STATIC_ADDR:
+	case IPMI_LANP_IP6_DYNAMIC_ADDR:
+		if (argc < 3) {
+			return -1;
+		}
+
+		data[0] = set;
+		if (p->specific == IPMI_LANP_IP6_STATIC_ADDR) {
+			data[1] = str2val(argv[0], ip6_addr_enable_vals);
+		} else {
+			data[1] = str2val(argv[0], ip6_addr_sources);
+		}
+		if (data[1] == 0xFF) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+
+		if (inet_pton(AF_INET6, argv[1], &data[2]) != 1) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+
+		if (str2uchar(argv[2], &data[18])) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+
+		if (argc >= 4) {
+			data[19] = str2val(argv[3], ip6_addr_statuses);
+		}
+		break;
+
+	case IPMI_LANP_IP6_STATIC_DUID:
+	case IPMI_LANP_IP6_DYNAMIC_DUID:
+	case IPMI_LANP_IP6_NDSLAAC_CFG:
+		data[0] = set;
+		data[1] = block;
+		if (ipmi_parse_hex(argv[0], &data[2], 16) < 0) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	case IPMI_LANP_IP6_DHCP6_CFG:
+		data[0] = set;
+		data[1] = 0;
+		data[18] = set;
+		data[19] = 1;
+
+		if (ipmi_parse_hex(argv[0], &data[2], 16) < 0
+			|| (argc > 1 &&
+			    ipmi_parse_hex(argv[1], &data[20], 6) < 0)) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	case IPMI_LANP_IP6_ROUTER_CFG:
+		data[0] = str2val(argv[0], ip6_rtr_configs);
+		if (data[0] == 0xFF) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	case IPMI_LANP_IP6_STATIC_RTR1_ADDR:
+		if (set > 2) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+
+	case IPMI_LANP_IP6_DYNAMIC_RTR_ADDR:
+		if (argc < 4) {
+			return -1;
+		}
+
+		/*
+		 * Data is stored in the following way:
+		 *  0: <set> <addr1>...<addr16>
+		 * 17: <set> <mac1>...<mac6>
+		 * 24: <set> <pfxlen>
+		 * 26: <set> <pfx1>...<pfx16>
+		 */
+		data[0] = data[17] = data[24] = data[26] = set;
+
+		if (inet_pton(AF_INET6, argv[0], &data[1]) != 1
+				|| str2mac(argv[1], &data[18])
+				|| inet_pton(AF_INET6, argv[2], &data[27]) != 1
+				|| str2uchar(argv[3], &data[25])) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+		break;
+
+	default:
+		if (str2uchar(argv[0], &data[0])) {
+			lprintf(LOG_ERR, "invalid value");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int
+lanp_set_cfgp(void *priv, const struct ipmi_cfgp *p, const unsigned char *data)
+{
+	int ret;
+	int param = p->specific;
+	int off = 0;
+
+	switch(param) {
+	case IPMI_LANP_IP6_DHCP6_CFG:
+		ret = ipmi_set_lanp(priv, param, &data[0]);
+		if (ret == 0) {
+			ret = ipmi_set_lanp(priv, param, &data[18]);
+		}
+		break;
+
+	case IPMI_LANP_IP6_STATIC_RTR1_ADDR:
+		if (data[0] == 2) {
+			param = IPMI_LANP_IP6_STATIC_RTR2_ADDR;
+		}
+		off = 1;
+
+	case IPMI_LANP_IP6_DYNAMIC_RTR_ADDR:
+		ret = ipmi_set_lanp(priv, param, &data[0 + off]);
+		if (ret == 0) {
+			ret = ipmi_set_lanp(priv, param + 1, &data[17 + off]);
+		}
+		if (ret == 0) {
+			ret = ipmi_set_lanp(priv, param + 2, &data[24 + off]);
+		}
+		if (ret == 0) {
+			ret = ipmi_set_lanp(priv, param + 3, &data[26 + off]);
+		}
+		break;
+
+
+	default:
+		ret = ipmi_set_lanp(priv, param, data);
+	}
+
+	return ret;
+}
+
+static int
+lanp_get_cfgp(void *priv, const struct ipmi_cfgp *p,
+		int set, int block,  unsigned char *data, int quiet)
+{
+	int ret;
+	int param = p->specific;
+	int off = 0;
+
+	switch(param) {
+	case IPMI_LANP_IP6_DHCP6_CFG:
+		ret = ipmi_get_lanp(priv, param, set, 0, &data[0], quiet);
+		if (ret == 0) {
+			ret = ipmi_get_lanp(priv, param, set,
+				1, &data[18], quiet);
+		}
+		break;
+
+	case IPMI_LANP_IP6_STATIC_RTR1_ADDR:
+		if (set > 2) {
+			return -1;
+		}
+
+		if (set == 2) {
+			param = IPMI_LANP_IP6_STATIC_RTR2_ADDR;
+		}
+		set = 0;
+		off = 1;
+		data[0] = data[17] = data[24] = data[26] = set;
+
+	case IPMI_LANP_IP6_DYNAMIC_RTR_ADDR:
+		ret = ipmi_get_lanp(priv, param, set, block,
+			&data[0 + off], quiet);
+		if (ret == 0) {
+			ret = ipmi_get_lanp(priv, param + 1, set, block,
+				&data[17 + off], 0);
+		}
+		if (ret == 0) {
+			ret = ipmi_get_lanp(priv, param + 2, set, block,
+				&data[24 + off], 0);
+		}
+		if (ret == 0) {
+			ret = ipmi_get_lanp(priv, param + 3, set, block,
+				&data[26 + off], 0);
+		}
+		break;
+
+	default:
+		ret = ipmi_get_lanp(priv, param, set, block, data, quiet);
+	}
+
+	return ret;
+}
+
+static int
+lanp_save_cfgp(const struct ipmi_cfgp *p, const unsigned char *data, FILE *file)
+{
+	char addr[INET6_ADDRSTRLEN];
+	char pfx[INET6_ADDRSTRLEN];
+	const char *src;
+
+	switch(p->specific) {
+	case IPMI_LANP_IP6_ENABLES:
+		fputs(val2str(data[0], ip6_enable_vals), file);
+		break;
+
+	case IPMI_LANP_IP6_FLOW_LABEL:
+		fprintf(file, "0x%xd", (data[0] << 16 ) | (data[1] << 8) | data[2]);
+		break;
+
+	case IPMI_LANP_IP6_STATUS:
+		fprintf(file, "%d %d %d", data[0], data[1], data[2]);
+		break;
+
+	case IPMI_LANP_IP6_STATIC_ADDR:
+	case IPMI_LANP_IP6_DYNAMIC_ADDR:
+		if (p->specific == IPMI_LANP_IP6_STATIC_ADDR) {
+			src = val2str(data[1], ip6_addr_enable_vals);
+		} else {
+			src = val2str(data[1], ip6_addr_sources);
+		}
+
+		fprintf(file, "%s %s %d %s", src,
+				inet_ntop(AF_INET6, &data[2], addr, sizeof(addr)),
+				data[18], val2str(data[19], ip6_addr_statuses));
+		break;
+
+	case IPMI_LANP_IP6_STATIC_DUID:
+	case IPMI_LANP_IP6_DYNAMIC_DUID:
+	case IPMI_LANP_IP6_NDSLAAC_CFG:
+		fprintf(file, "%s", buf2str(&data[2], 16));
+		break;
+
+	case IPMI_LANP_IP6_DHCP6_CFG:
+		fprintf(file, "%s", buf2str(&data[2], 16));
+		fprintf(file, " %s", buf2str(&data[20], 6));
+		break;
+
+	case IPMI_LANP_IP6_ROUTER_CFG:
+		fputs(val2str(data[0], ip6_rtr_configs), file);
+		break;
+
+	case IPMI_LANP_IP6_STATIC_RTR1_ADDR:
+	case IPMI_LANP_IP6_DYNAMIC_RTR_ADDR:
+		fprintf(file, "%s %s %s %d",
+				inet_ntop(AF_INET6, &data[1], addr, sizeof(addr)),
+				mac2str(&data[18]),
+				inet_ntop(AF_INET6, &data[27], pfx, sizeof(pfx)), data[25]);
+		break;
+
+	default:
+		fprintf(file, "%d", data[0]);
+	}
+
+	return 0;
+}
+
+
+static int
+lanp_print_cfgp(const struct ipmi_cfgp *p,
+		int set, int block, const unsigned char *data, FILE *file)
+{
+	char addr[INET6_ADDRSTRLEN];
+	char pfx[INET6_ADDRSTRLEN];
+	const char *pname;
+	const struct ipmi_lanp *lanp = lookup_lanp(p->specific);
+
+	if (!lanp || !p || !file || !data || !lanp->name) {
+		return -1;
+	}
+	pname = lanp->name;
+
+	switch(p->specific) {
+	case IPMI_LANP_IP6_SUPPORT:
+		fprintf(file, "%s:\n"
+				"    IPv6 only: %s\n"
+				"    IPv4 and IPv6: %s\n"
+				"    IPv6 Destination Addresses for LAN alerting: %s\n",
+				pname,
+				data[0] & 1 ? "yes" : "no",
+				data[0] & 2 ? "yes" : "no",
+				data[0] & 4 ? "yes" : "no");
+		break;
+
+	case IPMI_LANP_IP6_ENABLES:
+		fprintf(file, "%s: %s\n",
+				pname, val2str(data[0], ip6_enable_vals));
+		break;
+
+	case IPMI_LANP_IP6_FLOW_LABEL:
+		fprintf(file, "%s: %d\n",
+				pname, (data[0] << 16 ) | (data[1] << 8) | data[2]);
+		break;
+
+	case IPMI_LANP_IP6_STATUS:
+		fprintf(file, "%s:\n"
+				"    Static address max:  %d\n"
+				"    Dynamic address max: %d\n"
+				"    DHCPv6 support:      %s\n"
+				"    SLAAC support:       %s\n",
+				pname,
+				data[0], data[1],
+				(data[2] & 1) ? "yes" : "no",
+				(data[2] & 2) ? "yes" : "no");
+		break;
+
+	case IPMI_LANP_IP6_STATIC_ADDR:
+		fprintf(file, "%s %d:\n"
+				"    Enabled:        %s\n"
+				"    Address:        %s/%d\n"
+				"    Status:         %s\n",
+				pname, set,
+				(data[1] & 0x80) ? "yes" : "no",
+				inet_ntop(AF_INET6, &data[2], addr, sizeof(addr)),
+				data[18], val2str(data[19] & 0xF, ip6_addr_statuses));
+		break;
+
+	case IPMI_LANP_IP6_DYNAMIC_ADDR:
+		fprintf(file, "%s %d:\n"
+				"    Source/Type:    %s\n"
+				"    Address:        %s/%d\n"
+				"    Status:         %s\n",
+				pname, set,
+				val2str(data[1] & 0xF, ip6_addr_sources),
+				inet_ntop(AF_INET6, &data[2], addr, sizeof(addr)),
+				data[18], val2str(data[19] & 0xF, ip6_addr_statuses));
+		break;
+
+	case IPMI_LANP_IP6_STATIC_DUID:
+	case IPMI_LANP_IP6_DYNAMIC_DUID:
+		if (block == 0) {
+			fprintf(file, "%s %d:\n"
+				"    Length:   %d\n"
+				"    Type:     %s\n",
+				pname, set, data[2],
+				val2str((data[3] << 8) + data[4], ip6_duid_types));
+		}
+		fprintf(file, "    %s\n", buf2str(&data[2], 16));
+		break;
+
+	case IPMI_LANP_IP6_DHCP6_CFG_SUP:
+	case IPMI_LANP_IP6_NDSLAAC_CFG_SUP:
+		fprintf(file, "%s: %s\n",
+				pname, val2str(data[0], ip6_cfg_sup_vals));
+		break;
+
+	case IPMI_LANP_IP6_DHCP6_CFG:
+		fprintf(file, "%s %d:\n", pname, set);
+
+		fprintf(file,
+				"    SOL_MAX_DELAY:   %d\n"
+				"    SOL_TIMEOUT:     %d\n"
+				"    SOL_MAX_RT:      %d\n"
+				"    REQ_TIMEOUT:     %d\n"
+				"    REQ_MAX_RT:      %d\n"
+				"    REQ_MAX_RC:      %d\n"
+				"    CNF_MAX_DELAY:   %d\n"
+				"    CNF_TIMEOUT:     %d\n"
+				"    CNF_MAX_RT:      %d\n"
+				"    CNF_MAX_RD:      %d\n"
+				"    REN_TIMEOUT:     %d\n"
+				"    REN_MAX_RT:      %d\n"
+				"    REB_TIMEOUT:     %d\n"
+				"    REB_MAX_RT:      %d\n"
+				"    INF_MAX_DELAY:   %d\n"
+				"    INF_TIMEOUT:     %d\n"
+				"    INF_MAX_RT:      %d\n"
+				"    REL_TIMEOUT:     %d\n"
+				"    REL_MAX_RC:      %d\n"
+				"    DEC_TIMEOUT:     %d\n"
+				"    DEC_MAX_RC:      %d\n"
+				"    HOP_COUNT_LIMIT: %d\n",
+				data[2], data[3], data[4], data[5],
+				data[6], data[7], data[8], data[9],
+				data[10], data[11], data[12], data[13],
+				data[14], data[15], data[16], data[17],
+				data[20], data[21], data[22], data[23],
+				data[24], data[25]);
+		break;
+
+	case IPMI_LANP_IP6_ROUTER_CFG:
+		fprintf(file, "%s:\n"
+				"    Enable static router address:  %s\n"
+				"    Enable dynamic router address: %s\n",
+				pname,
+				(data[0] & 1) ? "yes" : "no",
+				(data[0] & 2) ? "yes" : "no");
+		break;
+
+	case IPMI_LANP_IP6_STATIC_RTR1_ADDR:
+	case IPMI_LANP_IP6_DYNAMIC_RTR_ADDR:
+		if (p->specific == IPMI_LANP_IP6_STATIC_RTR1_ADDR) {
+			pname = "IPv6 Static Router";
+		} else {
+			pname = "IPv6 Dynamic Router";
+		}
+
+		fprintf(file, "%s %d:\n"
+				"    Address: %s\n"
+				"    MAC:     %s\n"
+				"    Prefix:  %s/%d\n",
+				pname, set,
+				inet_ntop(AF_INET6, &data[1], addr, sizeof(addr)),
+				mac2str(&data[18]),
+				inet_ntop(AF_INET6, &data[27], pfx, sizeof(pfx)), data[25]);
+		break;
+
+	case IPMI_LANP_IP6_NDSLAAC_CFG:
+		fprintf(file, "%s %d:\n"
+				"    MAX_RTR_SOLICITATION_DELAY: %d\n"
+				"    RTR_SOLICITATION_INTERVAL:  %d\n"
+				"    MAX_RTR_SOLICITATIONS:      %d\n"
+				"    DupAddrDetectTransmits:     %d\n"
+				"    MAX_MULTICAST_SOLICIT:      %d\n"
+				"    MAX_UNICAST_SOLICIT:        %d\n"
+				"    MAX_ANYCAST_DELAY_TIME:     %d\n"
+				"    MAX_NEIGHBOR_ADVERTISEMENT: %d\n"
+				"    REACHABLE_TIME:             %d\n"
+				"    RETRANS_TIMER:              %d\n"
+				"    DELAY_FIRST_PROBE_TIME:     %d\n"
+				"    MAX_RANDOM_FACTOR:          %d\n"
+				"    MIN_RANDOM_FACTOR:          %d\n",
+				pname, set,
+				data[2], data[3], data[4], data[5],
+				data[6], data[7], data[8], data[9],
+				data[10], data[11], data[12], data[13],
+				data[14]);
+		break;
+
+	default:
+		fprintf(file, "%s: %d\n", pname, data[0]);
+	}
+
+	return 0;
+}
+
+static int
+lanp_ip6_cfgp(void *priv, const struct ipmi_cfgp *p,
+		const struct ipmi_cfgp_action *action, unsigned char *data)
+{
+	switch (action->type) {
+	case CFGP_PARSE:
+		return lanp_parse_cfgp(p, action->set, action->block,
+				action->argc, action->argv, data);
+
+	case CFGP_GET:
+		return lanp_get_cfgp(priv, p, action->set, action->block,
+				data, action->quiet);
+
+	case CFGP_SET:
+		return lanp_set_cfgp(priv, p, data);
+
+	case CFGP_SAVE:
+		return lanp_save_cfgp(p, data, action->file);
+
+	case CFGP_PRINT:
+		return lanp_print_cfgp(p, action->set, action->block,
+				data, action->file);
+
+	default:
+		return -1;
+	}
+
+	return 0;
+}
+
+static void lanp_print_usage(int cmd)
+{
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_HELP) {
+		printf("  help [command]\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_SAVE) {
+		printf("  save <channel> [<parameter> [<set_sel> [<block_sel>]]]\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_SET) {
+		printf("  set <channel> [nolock] <parameter> [<set_sel> [<block_sel>]] <values...>\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_PRINT) {
+		printf("  print <channel> [<parameter> [<set_sel> [<block_sel>]]]\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_LOCK) {
+		printf("  lock <channel>\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_COMMIT) {
+		printf("  commit <channel>\n");
+	}
+	if (cmd == LANP_CMD_ANY || cmd == LANP_CMD_DISCARD) {
+		printf("  discard <channel>\n");
+	}
+	if (cmd == LANP_CMD_SAVE
+		|| cmd == LANP_CMD_PRINT
+		|| cmd == LANP_CMD_SET) {
+		printf("\n   available parameters:\n");
+		/* 'save' shall use 'write' filter, since it outputs a block
+		 * of 'set's */
+		ipmi_cfgp_usage(lan_cfgp,
+			sizeof(lan_cfgp)/sizeof(lan_cfgp[0]),
+			cmd != LANP_CMD_PRINT);
+	}
+}
+
+static int
+lanp_lock(struct ipmi_lanp_priv *lp)
+{
+	unsigned char byte = 1;
+
+	return ipmi_set_lanp(lp, 0, &byte);
+}
+
+static int
+lanp_discard(struct ipmi_lanp_priv *lp)
+{
+	unsigned char byte = 0;
+
+	return ipmi_set_lanp(lp, 0, &byte);
+}
+
+static int
+lanp_commit(struct ipmi_lanp_priv *lp)
+{
+	unsigned char byte = 2;
+	int ret;
+
+	ret = ipmi_set_lanp(lp, 0, &byte);
+	if (ret == 0) {
+		ret = lanp_discard(lp);
+	}
+
+	return ret;
+}
+
+int
+ipmi_lan6_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct ipmi_cfgp_ctx ctx;
+	struct ipmi_cfgp_sel sel;
+	struct ipmi_lanp_priv lp;
+	int cmd;
+	int chan;
+	int nolock = 0;
+	int ret;
+
+	if (argc == 0) {
+		lanp_print_usage(LANP_CMD_ANY);
+		return 0;
+	}
+
+	cmd = str2val(argv[0], ip6_command_vals);
+	if (cmd == LANP_CMD_ANY) {
+		lanp_print_usage(cmd);
+		return -1;
+	}
+
+	if (cmd == LANP_CMD_HELP) {
+		if (argc == 1) {
+			cmd = LANP_CMD_ANY;
+		} else {
+			cmd = str2val(argv[1], ip6_command_vals);
+		}
+
+		lanp_print_usage(cmd);
+		return 0;
+	}
+
+	/*
+	 * the rest commands expect channel number
+	 * with the exception of 'get' and 'print'
+	 */
+	if (argc == 1) {
+		if (cmd == LANP_CMD_SAVE || cmd == LANP_CMD_PRINT) {
+			chan = find_lan_channel(intf, 1);
+			if (chan == 0) {
+				lprintf(LOG_ERR, "No LAN channel found");
+				return -1;
+			}
+		} else {
+			lanp_print_usage(cmd);
+			return -1;
+		}
+
+		argc -= 1;
+		argv += 1;
+	} else {
+		if (str2int(argv[1], &chan) != 0) {
+			lprintf(LOG_ERR, "Invalid channel: %s", argv[1]);
+			return -1;
+		}
+
+		argc -= 2;
+		argv += 2;
+
+		if (cmd == LANP_CMD_SET) {
+			if (argc && !strcasecmp(argv[0], "nolock")) {
+				nolock = 1;
+
+				argc -= 1;
+				argv += 1;
+			}
+		}
+
+	}
+
+	lp.intf = intf;
+	lp.channel = chan;
+
+	/*
+	 * lock/commit/discard commands do not require parsing
+	 * of parameter selection
+	 */
+
+	switch (cmd) {
+	case LANP_CMD_LOCK:
+		lprintf(LOG_NOTICE, "Lock parameter(s)...");
+		return lanp_lock(&lp);
+
+	case LANP_CMD_COMMIT:
+		lprintf(LOG_NOTICE, "Commit parameter(s)...");
+		return lanp_commit(&lp);
+
+	case LANP_CMD_DISCARD:
+		lprintf(LOG_NOTICE, "Discard parameter(s)...");
+		return lanp_discard(&lp);
+	}
+
+	/*
+	 * initialize configuration context and parse parameter selection
+	 */
+
+	ipmi_cfgp_init(&ctx, lan_cfgp,
+		sizeof(lan_cfgp)/sizeof(lan_cfgp[0]), "lan6 set nolock",
+		lanp_ip6_cfgp, &lp);
+
+	ret = ipmi_cfgp_parse_sel(&ctx, argc, (const char **)argv, &sel);
+	if (ret == -1) {
+		lanp_print_usage(cmd);
+		ipmi_cfgp_uninit(&ctx);
+		return -1;
+	}
+
+	argc -= ret;
+	argv += ret;
+
+	/*
+	 * handle the rest commands
+	 */
+
+	switch (cmd) {
+	case LANP_CMD_SAVE:
+	case LANP_CMD_PRINT:
+		lprintf(LOG_NOTICE, "Getting parameter(s)...");
+
+		ret = ipmi_cfgp_get(&ctx, &sel);
+		if (ret != 0) {
+			break;
+		}
+
+		if (cmd == LANP_CMD_SAVE) {
+			static char cmd[20];
+			FILE *out = stdout;
+			snprintf(cmd, sizeof(cmd) - 1, "lan6 set %d nolock",
+				lp.channel);
+			cmd[sizeof(cmd) - 1] = '\0';
+			ctx.cmdname = cmd;
+			fprintf(out, "lan6 lock %d\n", lp.channel);
+			ret = ipmi_cfgp_save(&ctx, &sel, out);
+			fprintf(out, "lan6 commit %d\nlan6 discard %d\nexit\n",
+				lp.channel, lp.channel);
+		} else {
+			ret = ipmi_cfgp_print(&ctx, &sel, stdout);
+		}
+		break;
+
+	case LANP_CMD_SET:
+		ret = ipmi_cfgp_parse_data(&ctx, &sel, argc,
+			(const char **)argv);
+		if (ret != 0) {
+			break;
+		}
+
+		lprintf(LOG_NOTICE, "Setting parameter(s)...");
+
+		if (!nolock) {
+			ret = lanp_lock(&lp);
+			if (ret != 0) {
+				break;
+			}
+		}
+
+		ret = ipmi_cfgp_set(&ctx, &sel);
+		if (!nolock) {
+			if (ret == 0) {
+				ret = lanp_commit(&lp);
+			} else {
+				lanp_discard(&lp);
+			}
+		}
+		break;
+	}
+
+	/*
+	 * free allocated memory
+	 */
+	ipmi_cfgp_uninit(&ctx);
+
+	return ret;
+}
diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c
new file mode 100644
index 0000000..811c80b
--- /dev/null
+++ b/lib/ipmi_main.c
@@ -0,0 +1,1061 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE 700
+#define _BSD_SOURCE || \
+	(_XOPEN_SOURCE >= 500 || \
+	_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+	!(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <signal.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_session.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_gendev.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sol.h>
+#include <ipmitool/ipmi_isol.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_chassis.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_firewall.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_session.h>
+#include <ipmitool/ipmi_event.h>
+#include <ipmitool/ipmi_user.h>
+#include <ipmitool/ipmi_raw.h>
+#include <ipmitool/ipmi_pef.h>
+#include <ipmitool/ipmi_oem.h>
+#include <ipmitool/ipmi_ekanalyzer.h>
+#include <ipmitool/ipmi_picmg.h>
+#include <ipmitool/ipmi_kontronoem.h>
+#include <ipmitool/ipmi_vita.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef ENABLE_ALL_OPTIONS
+# define OPTION_STRING	"I:46hVvcgsEKYao:H:d:P:f:U:p:C:L:A:t:T:m:z:S:l:b:B:e:k:y:O:R:N:D:"
+#else
+# define OPTION_STRING	"I:46hVvcH:f:U:p:d:S:D:"
+#endif
+
+/* From src/plugins/ipmi_intf.c: */
+void
+ipmi_intf_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size);
+
+extern int verbose;
+extern int csv_output;
+extern const struct valstr ipmi_privlvl_vals[];
+extern const struct valstr ipmi_authtype_session_vals[];
+
+static struct ipmi_intf * ipmi_main_intf = NULL;
+
+/* ipmi_password_file_read  -  Open file and read password from it
+ *
+ * @filename:	file name to read from
+ *
+ * returns pointer to allocated buffer containing password
+ *   (caller is expected to free when finished)
+ * returns NULL on error
+ */
+static char *
+ipmi_password_file_read(char * filename)
+{
+	FILE * fp;
+	char * pass = NULL;
+	int l;
+
+	pass = malloc(21);
+	if (pass == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+
+	memset(pass, 0, 21);
+	fp = ipmi_open_file_read((const char *)filename);
+	if (fp == NULL) {
+		lprintf(LOG_ERR, "Unable to open password file %s",
+				filename);
+		free(pass);
+		return NULL;
+	}
+
+	/* read in id */
+	if (fgets(pass, 21, fp) == NULL) {
+		lprintf(LOG_ERR, "Unable to read password from file %s",
+				filename);
+		free(pass);
+		fclose(fp);
+		return NULL;
+	}
+
+        /* remove traling <cr><nl><tab> */
+	l = strcspn(pass, "\r\n\t");
+	if (l > 0) {
+		pass[l] = '\0';
+	}
+
+	fclose(fp);
+	return pass;
+}
+
+
+/*
+ * Print all the commands in the above table to stderr
+ * used for help text on command line and shell
+ */
+void
+ipmi_cmd_print(struct ipmi_cmd * cmdlist)
+{
+	struct ipmi_cmd * cmd;
+	int hdr = 0;
+
+	if (cmdlist == NULL)
+		return;
+	for (cmd=cmdlist; cmd->func != NULL; cmd++) {
+		if (cmd->desc == NULL)
+			continue;
+		if (hdr == 0) {
+			lprintf(LOG_NOTICE, "Commands:");
+			hdr = 1;
+		}
+		lprintf(LOG_NOTICE, "\t%-12s  %s", cmd->name, cmd->desc);
+	}
+	lprintf(LOG_NOTICE, "");
+}
+
+/* ipmi_cmd_run - run a command from list based on parameters
+ *                called from main()
+ *
+ *                1. iterate through ipmi_cmd_list matching on name
+ *                2. call func() for that command
+ *
+ * @intf:	ipmi interface
+ * @name:	command name
+ * @argc:	command argument count
+ * @argv:	command argument list
+ *
+ * returns value from func() of that commnad if found
+ * returns -1 if command is not found
+ */
+int
+ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv)
+{
+	struct ipmi_cmd * cmd = intf->cmdlist;
+
+	/* hook to run a default command if nothing specified */
+	if (name == NULL) {
+		if (cmd->func == NULL || cmd->name == NULL)
+			return -1;
+		else if (strncmp(cmd->name, "default", 7) == 0)
+			return cmd->func(intf, 0, NULL);
+		else {
+			lprintf(LOG_ERR, "No command provided!");
+			ipmi_cmd_print(intf->cmdlist);
+			return -1;
+		}
+	}
+
+	for (cmd=intf->cmdlist; cmd->func != NULL; cmd++) {
+		if (strncmp(name, cmd->name, __maxlen(cmd->name, name)) == 0)
+			break;
+	}
+	if (cmd->func == NULL) {
+		cmd = intf->cmdlist;
+		if (strncmp(cmd->name, "default", 7) == 0)
+			return cmd->func(intf, argc+1, argv-1);
+
+		lprintf(LOG_ERR, "Invalid command: %s", name);
+		ipmi_cmd_print(intf->cmdlist);
+		return -1;
+	}
+	return cmd->func(intf, argc, argv);
+}
+
+static void
+ipmi_option_usage(const char * progname, struct ipmi_cmd * cmdlist, struct ipmi_intf_support * intflist)
+{
+	lprintf(LOG_NOTICE, "%s version %s\n", progname, VERSION);
+	lprintf(LOG_NOTICE, "usage: %s [options...] <command>\n", progname);
+	lprintf(LOG_NOTICE, "       -h             This help");
+	lprintf(LOG_NOTICE, "       -V             Show version information");
+	lprintf(LOG_NOTICE, "       -v             Verbose (can use multiple times)");
+	lprintf(LOG_NOTICE, "       -c             Display output in comma separated format");
+	lprintf(LOG_NOTICE, "       -d N           Specify a /dev/ipmiN device to use (default=0)");
+	lprintf(LOG_NOTICE, "       -I intf        Interface to use");
+	lprintf(LOG_NOTICE, "       -H hostname    Remote host name for LAN interface");
+	lprintf(LOG_NOTICE, "       -p port        Remote RMCP port [default=623]");
+	lprintf(LOG_NOTICE, "       -U username    Remote session username");
+	lprintf(LOG_NOTICE, "       -f file        Read remote session password from file");
+	lprintf(LOG_NOTICE, "       -z size        Change Size of Communication Channel (OEM)");
+	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
+	lprintf(LOG_NOTICE, "       -D tty:b[:s]   Specify the serial device, baud rate to use");
+	lprintf(LOG_NOTICE, "                      and, optionally, specify that interface is the system one");
+	lprintf(LOG_NOTICE, "       -4             Use only IPv4");
+	lprintf(LOG_NOTICE, "       -6             Use only IPv6");
+#ifdef ENABLE_ALL_OPTIONS
+	lprintf(LOG_NOTICE, "       -a             Prompt for remote password");
+	lprintf(LOG_NOTICE, "       -Y             Prompt for the Kg key for IPMIv2 authentication");
+	lprintf(LOG_NOTICE, "       -e char        Set SOL escape character");
+	lprintf(LOG_NOTICE, "       -C ciphersuite Cipher suite to be used by lanplus interface");
+	lprintf(LOG_NOTICE, "       -k key         Use Kg key for IPMIv2 authentication");
+	lprintf(LOG_NOTICE, "       -y hex_key     Use hexadecimal-encoded Kg key for IPMIv2 authentication");
+	lprintf(LOG_NOTICE, "       -L level       Remote session privilege level [default=ADMINISTRATOR]");
+	lprintf(LOG_NOTICE, "                      Append a '+' to use name/privilege lookup in RAKP1");
+	lprintf(LOG_NOTICE, "       -A authtype    Force use of auth type NONE, PASSWORD, MD2, MD5 or OEM");
+	lprintf(LOG_NOTICE, "       -P password    Remote session password");
+	lprintf(LOG_NOTICE, "       -E             Read password from IPMI_PASSWORD environment variable");
+	lprintf(LOG_NOTICE, "       -K             Read kgkey from IPMI_KGKEY environment variable");
+	lprintf(LOG_NOTICE, "       -m address     Set local IPMB address");
+	lprintf(LOG_NOTICE, "       -b channel     Set destination channel for bridged request");
+	lprintf(LOG_NOTICE, "       -t address     Bridge request to remote target address");
+	lprintf(LOG_NOTICE, "       -B channel     Set transit channel for bridged request (dual bridge)");
+	lprintf(LOG_NOTICE, "       -T address     Set transit address for bridge request (dual bridge)");
+	lprintf(LOG_NOTICE, "       -l lun         Set destination lun for raw commands");
+	lprintf(LOG_NOTICE, "       -o oemtype     Setup for OEM (use 'list' to see available OEM types)");
+	lprintf(LOG_NOTICE, "       -O seloem      Use file for OEM SEL event descriptions");
+	lprintf(LOG_NOTICE, "       -N seconds     Specify timeout for lan [default=2] / lanplus [default=1] interface");
+	lprintf(LOG_NOTICE, "       -R retry       Set the number of retries for lan/lanplus interface [default=4]");
+#endif
+	lprintf(LOG_NOTICE, "");
+
+	ipmi_intf_print(intflist);
+
+	if (cmdlist != NULL)
+		ipmi_cmd_print(cmdlist);
+}
+/* ipmi_catch_sigint  -  Handle the interrupt signal (Ctrl-C), close the
+ *                       interface, and exit ipmitool with error (-1)
+ *
+ *                       This insures that the IOL session gets freed
+ *                       for other callers.
+ *
+ * returns -1
+ */
+void ipmi_catch_sigint()
+{
+	if (ipmi_main_intf != NULL) {
+		printf("\nSIGN INT: Close Interface %s\n",ipmi_main_intf->desc);
+		/* reduce retry count to a single retry */
+		ipmi_main_intf->ssn_params.retry = 1;
+		/* close interface */
+		ipmi_main_intf->close(ipmi_main_intf);
+	}
+	exit(-1);
+}
+
+static uint8_t
+ipmi_acquire_ipmb_address(struct ipmi_intf * intf)
+{
+	if (intf->picmg_avail) {
+		return ipmi_picmg_ipmb_address(intf);
+	} else if (intf->vita_avail) {
+		return ipmi_vita_ipmb_address(intf);
+	} else {
+		return 0;
+    }
+}
+
+/* ipmi_parse_options  -  helper function to handle parsing command line options
+ *
+ * @argc:	count of options
+ * @argv:	list of options
+ * @cmdlist:	list of supported commands
+ * @intflist:	list of supported interfaces
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_main(int argc, char ** argv,
+		struct ipmi_cmd * cmdlist,
+		struct ipmi_intf_support * intflist)
+{
+	struct ipmi_intf_support * sup;
+	int privlvl = 0;
+	uint8_t target_addr = 0;
+	uint8_t target_channel = 0;
+
+	uint8_t transit_addr = 0;
+	uint8_t transit_channel = 0;
+	uint8_t target_lun     = 0;
+	uint8_t arg_addr = 0;
+	uint8_t addr = 0;
+	uint16_t my_long_packet_size=0;
+	uint8_t my_long_packet_set=0;
+	uint8_t lookupbit = 0x10;	/* use name-only lookup by default */
+	int retry = 0;
+	uint32_t timeout = 0;
+	int authtype = -1;
+	char * tmp_pass = NULL;
+	char * tmp_env = NULL;
+	char * hostname = NULL;
+	char * username = NULL;
+	char * password = NULL;
+	char * intfname = NULL;
+	char * progname = NULL;
+	char * oemtype  = NULL;
+	char * sdrcache = NULL;
+	uint8_t kgkey[IPMI_KG_BUFFER_SIZE];
+	char * seloem   = NULL;
+	int port = 0;
+	int devnum = 0;
+	int cipher_suite_id = 3; /* See table 22-19 of the IPMIv2 spec */
+	int argflag, i, found;
+	int rc = -1;
+	int ai_family = AF_UNSPEC;
+	char sol_escape_char = SOL_ESCAPE_CHARACTER_DEFAULT;
+	char * devfile  = NULL;
+
+	/* save program name */
+	progname = strrchr(argv[0], '/');
+	progname = ((progname == NULL) ? argv[0] : progname+1);
+	signal(SIGINT, ipmi_catch_sigint);
+	memset(kgkey, 0, sizeof(kgkey));
+
+	while ((argflag = getopt(argc, (char **)argv, OPTION_STRING)) != -1)
+	{
+		switch (argflag) {
+		case 'I':
+			if (intfname) {
+				free(intfname);
+				intfname = NULL;
+			}
+			intfname = strdup(optarg);
+			if (intfname == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			if (intflist != NULL) {
+				found = 0;
+				for (sup=intflist; sup->name != NULL; sup++) {
+					if (strncmp(sup->name, intfname, strlen(intfname)) == 0 &&
+							strncmp(sup->name, intfname, strlen(sup->name)) == 0 &&
+							sup->supported == 1)
+						found = 1;
+				}
+				if (!found) {
+					lprintf(LOG_ERR, "Interface %s not supported", intfname);
+					goto out_free;
+				}
+			}
+			break;
+		case 'h':
+			ipmi_option_usage(progname, cmdlist, intflist);
+			rc = 0;
+			goto out_free;
+			break;
+		case 'V':
+			printf("%s version %s\n", progname, VERSION);
+			rc = 0;
+			goto out_free;
+			break;
+		case 'd':
+			if (str2int(optarg, &devnum) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-d'.");
+				rc = -1;
+				goto out_free;
+			}
+			/* Check if device number is -gt 0; I couldn't find limit for
+			 * kernels > 2.6, thus right side is unlimited.
+			 */
+			if (devnum < 0) {
+				lprintf(LOG_ERR, "Device number %i is out of range.", devnum);
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'p':
+			if (str2int(optarg, &port) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-p'.");
+				rc = -1;
+				goto out_free;
+			}
+			/* Check if port is -gt 0 && port is -lt 65535 */
+			if (port < 0 || port > 65535) {
+				lprintf(LOG_ERR, "Port number %i is out of range.", port);
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'C':
+			if (str2int(optarg, &cipher_suite_id) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-C'.");
+				rc = -1;
+				goto out_free;
+			}
+			/* add check Cipher is -gt 0 */
+			if (cipher_suite_id < 0) {
+				lprintf(LOG_ERR, "Cipher suite ID %i is invalid.", cipher_suite_id);
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'c':
+			csv_output = 1;
+			break;
+		case 'H':
+			if (hostname) {
+				free(hostname);
+				hostname = NULL;
+			}
+			hostname = strdup(optarg);
+			if (hostname == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			break;
+		case 'f':
+			if (password) {
+				free(password);
+				password = NULL;
+			}
+			password = ipmi_password_file_read(optarg);
+			if (password == NULL)
+				lprintf(LOG_ERR, "Unable to read password "
+						"from file %s", optarg);
+			break;
+		case 'a':
+#ifdef HAVE_GETPASSPHRASE
+			tmp_pass = getpassphrase("Password: ");
+#else
+			tmp_pass = getpass("Password: ");
+#endif
+			if (tmp_pass != NULL) {
+				if (password) {
+					free(password);
+					password = NULL;
+				}
+				password = strdup(tmp_pass);
+				tmp_pass = NULL;
+				if (password == NULL) {
+					lprintf(LOG_ERR, "%s: malloc failure", progname);
+					goto out_free;
+				}
+			}
+			break;
+		case 'k':
+			memset(kgkey, 0, sizeof(kgkey));
+			strncpy((char *)kgkey, optarg, sizeof(kgkey) - 1);
+			break;
+		case 'K':
+			if ((tmp_env = getenv("IPMI_KGKEY"))) {
+				memset(kgkey, 0, sizeof(kgkey));
+				strncpy((char *)kgkey, tmp_env,
+					sizeof(kgkey) - 1);
+			} else {
+				lprintf(LOG_WARN, "Unable to read kgkey from environment");
+			}
+			break;
+		case 'y':
+			memset(kgkey, 0, sizeof(kgkey));
+
+			rc = ipmi_parse_hex(optarg, kgkey, sizeof(kgkey) - 1);
+			if (rc == -1) {
+				lprintf(LOG_ERR, "Number of Kg key characters is not even");
+				goto out_free;
+			} else if (rc == -3) {
+				lprintf(LOG_ERR, "Kg key is not hexadecimal number");
+				goto out_free;
+			} else if (rc > (IPMI_KG_BUFFER_SIZE-1)) {
+				lprintf(LOG_ERR, "Kg key is too long");
+				goto out_free;
+			}
+			break;
+		case 'Y':
+#ifdef HAVE_GETPASSPHRASE
+			tmp_pass = getpassphrase("Key: ");
+#else
+			tmp_pass = getpass("Key: ");
+#endif
+			if (tmp_pass != NULL) {
+				memset(kgkey, 0, sizeof(kgkey));
+				strncpy((char *)kgkey, tmp_pass,
+					sizeof(kgkey) - 1);
+				tmp_pass = NULL;
+			}
+			break;
+		case 'U':
+			if (username) {
+				free(username);
+				username = NULL;
+			}
+			if (strlen(optarg) > 16) {
+				lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
+				goto out_free;
+			}
+			username = strdup(optarg);
+			if (username == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			break;
+		case 'S':
+			if (sdrcache) {
+				free(sdrcache);
+				sdrcache = NULL;
+			}
+			sdrcache = strdup(optarg);
+			if (sdrcache == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			break;
+		case 'D':
+			/* check for subsequent instance of -D */
+			if (devfile) {
+				/* free memory for previous string */
+				free(devfile);
+			}
+			devfile = strdup(optarg);
+			if (devfile == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			break;
+		case '4':
+			/* IPv4 only */
+			if (ai_family == AF_UNSPEC) {
+				ai_family = AF_INET;
+			} else {
+				if (ai_family == AF_INET6) {
+					lprintf(LOG_ERR,
+						"Parameter is mutually exclusive with -6.");
+				} else {
+					lprintf(LOG_ERR,
+						"Multiple -4 parameters given.");
+				}
+				rc = (-1);
+				goto out_free;
+			}
+			break;
+		case '6':
+			/* IPv6 only */
+			if (ai_family == AF_UNSPEC) {
+				ai_family = AF_INET6;
+			} else {
+				if (ai_family == AF_INET) {
+					lprintf(LOG_ERR,
+						"Parameter is mutually exclusive with -4.");
+				} else {
+					lprintf(LOG_ERR,
+						"Multiple -6 parameters given.");
+				}
+				rc = (-1);
+				goto out_free;
+			}
+			break;
+#ifdef ENABLE_ALL_OPTIONS
+		case 'o':
+			if (oemtype) {
+				free(oemtype);
+				oemtype = NULL;
+			}
+			oemtype = strdup(optarg);
+			if (oemtype == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			if (strncmp(oemtype, "list", 4) == 0 ||
+					strncmp(oemtype, "help", 4) == 0) {
+				ipmi_oem_print();
+				rc = 0;
+				goto out_free;
+			}
+			break;
+		case 'g':
+			/* backwards compatible oem hack */
+			if (oemtype) {
+				free(oemtype);
+				oemtype = NULL;
+			}
+			oemtype = strdup("intelwv2");
+			break;
+		case 's':
+			/* backwards compatible oem hack */
+			if (oemtype) {
+				free(oemtype);
+				oemtype = NULL;
+			}
+			oemtype = strdup("supermicro");
+			break;
+		case 'P':
+			if (password) {
+				free(password);
+				password = NULL;
+			}
+			password = strdup(optarg);
+			if (password == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+
+			/* Prevent password snooping with ps */
+			i = strlen(optarg);
+			memset(optarg, 'X', i);
+			break;
+		case 'E':
+			if ((tmp_env = getenv("IPMITOOL_PASSWORD"))) {
+				if (password) {
+					free(password);
+					password = NULL;
+				}
+				password = strdup(tmp_env);
+				if (password == NULL) {
+					lprintf(LOG_ERR, "%s: malloc failure", progname);
+					goto out_free;
+				}
+			}
+			else if ((tmp_env = getenv("IPMI_PASSWORD"))) {
+				if (password) {
+					free(password);
+					password = NULL;
+				}
+				password = strdup(tmp_env);
+				if (password == NULL) {
+					lprintf(LOG_ERR, "%s: malloc failure", progname);
+					goto out_free;
+				}
+			}
+			else {
+				lprintf(LOG_WARN, "Unable to read password from environment");
+			}
+			break;
+		case 'L':
+			i = strlen(optarg);
+			if ((i > 0) && (optarg[i-1] == '+')) {
+				lookupbit = 0;
+				optarg[i-1] = 0;
+			}
+			privlvl = str2val(optarg, ipmi_privlvl_vals);
+			if (privlvl == 0xFF) {
+				lprintf(LOG_WARN, "Invalid privilege level %s", optarg);
+			}
+			break;
+		case 'A':
+			authtype = str2val(optarg, ipmi_authtype_session_vals);
+			break;
+		case 't':
+			if (str2uchar(optarg, &target_addr) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-t'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'b':
+			if (str2uchar(optarg, &target_channel) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-b'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'T':
+			if (str2uchar(optarg, &transit_addr) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-T'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'B':
+			if (str2uchar(optarg, &transit_channel) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-B'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'l':
+			if (str2uchar(optarg, &target_lun) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-l'.");
+				rc = 1;
+				goto out_free;
+			}
+			break;
+		case 'm':
+			if (str2uchar(optarg, &arg_addr) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-m'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'e':
+			sol_escape_char = optarg[0];
+			break;
+		case 'O':
+			if (seloem) {
+				free(seloem);
+				seloem = NULL;
+			}
+			seloem = strdup(optarg);
+			if (seloem == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+			break;
+		case 'z':
+			if (str2ushort(optarg, &my_long_packet_size) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-z'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		/* Retry and Timeout */
+		case 'R':
+			if (str2int(optarg, &retry) != 0 || retry < 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-R'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+		case 'N':
+			if (str2uint(optarg, &timeout) != 0) {
+				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-N'.");
+				rc = -1;
+				goto out_free;
+			}
+			break;
+#endif
+		default:
+			ipmi_option_usage(progname, cmdlist, intflist);
+			goto out_free;
+		}
+	}
+
+	/* check for command before doing anything */
+	if (argc-optind > 0 &&
+			strncmp(argv[optind], "help", 4) == 0) {
+		ipmi_cmd_print(cmdlist);
+		rc = 0;
+		goto out_free;
+	}
+
+	/*
+	 * If the user has specified a hostname (-H option)
+	 * then this is a remote access session.
+	 *
+	 * If no password was specified by any other method
+	 * and the authtype was not explicitly set to NONE
+	 * then prompt the user.
+	 */
+	if (hostname != NULL && password == NULL &&
+			(authtype != IPMI_SESSION_AUTHTYPE_NONE || authtype < 0)) {
+#ifdef HAVE_GETPASSPHRASE
+		tmp_pass = getpassphrase("Password: ");
+#else
+		tmp_pass = getpass("Password: ");
+#endif
+		if (tmp_pass != NULL) {
+			password = strdup(tmp_pass);
+			tmp_pass = NULL;
+			if (password == NULL) {
+				lprintf(LOG_ERR, "%s: malloc failure", progname);
+				goto out_free;
+			}
+		}
+	}
+
+	/* if no interface was specified but a
+	 * hostname was then use LAN by default
+	 * otherwise the default is hardcoded
+	 * to use the first entry in the list
+	 */
+	if (intfname == NULL && hostname != NULL) {
+		intfname = strdup("lan");
+		if (intfname == NULL) {
+			lprintf(LOG_ERR, "%s: malloc failure", progname);
+			goto out_free;
+		}
+	}
+
+	if (password != NULL && intfname != NULL) {
+		if (strcmp(intfname, "lan") == 0 && strlen(password) > 16) {
+			lprintf(LOG_ERR, "%s: password is longer than 16 bytes.", intfname);
+			rc = -1;
+			goto out_free;
+		} else if (strcmp(intfname, "lanplus") == 0 && strlen(password) > 20) {
+			lprintf(LOG_ERR, "%s: password is longer than 20 bytes.", intfname);
+			rc = -1;
+			goto out_free;
+		}
+	} /* if (password != NULL && intfname != NULL) */
+
+	/* load interface */
+	ipmi_main_intf = ipmi_intf_load(intfname);
+	if (ipmi_main_intf == NULL) {
+		lprintf(LOG_ERR, "Error loading interface %s", intfname);
+		goto out_free;
+	}
+
+	/* setup log */
+	log_init(progname, 0, verbose);
+
+	/* run OEM setup if found */
+	if (oemtype != NULL &&
+	    ipmi_oem_setup(ipmi_main_intf, oemtype) < 0) {
+		lprintf(LOG_ERR, "OEM setup for \"%s\" failed", oemtype);
+		goto out_free;
+	}
+
+	/* set session variables */
+	if (hostname != NULL)
+		ipmi_intf_session_set_hostname(ipmi_main_intf, hostname);
+	if (username != NULL)
+		ipmi_intf_session_set_username(ipmi_main_intf, username);
+	if (password != NULL)
+		ipmi_intf_session_set_password(ipmi_main_intf, password);
+	ipmi_intf_session_set_kgkey(ipmi_main_intf, kgkey);
+	if (port > 0)
+		ipmi_intf_session_set_port(ipmi_main_intf, port);
+	if (authtype >= 0)
+		ipmi_intf_session_set_authtype(ipmi_main_intf, (uint8_t)authtype);
+	if (privlvl > 0)
+		ipmi_intf_session_set_privlvl(ipmi_main_intf, (uint8_t)privlvl);
+	else
+		ipmi_intf_session_set_privlvl(ipmi_main_intf,
+				IPMI_SESSION_PRIV_ADMIN);	/* default */
+	/* Adding retry and timeout for interface that support it */
+	if (retry > 0)
+		ipmi_intf_session_set_retry(ipmi_main_intf, retry);
+	if (timeout > 0)
+		ipmi_intf_session_set_timeout(ipmi_main_intf, timeout);
+
+	ipmi_intf_session_set_lookupbit(ipmi_main_intf, lookupbit);
+	ipmi_intf_session_set_sol_escape_char(ipmi_main_intf, sol_escape_char);
+	ipmi_intf_session_set_cipher_suite_id(ipmi_main_intf, cipher_suite_id);
+
+	ipmi_main_intf->devnum = devnum;
+
+	/* setup device file if given */
+	ipmi_main_intf->devfile = devfile;
+
+	ipmi_main_intf->ai_family = ai_family;
+	/* Open the interface with the specified or default IPMB address */
+	ipmi_main_intf->my_addr = arg_addr ? arg_addr : IPMI_BMC_SLAVE_ADDR;
+	if (ipmi_main_intf->open != NULL) {
+		if (ipmi_main_intf->open(ipmi_main_intf) < 0) {
+			goto out_free;
+		}
+	}
+
+	if (!ipmi_oem_active(ipmi_main_intf, "i82571spt")) {
+		/*
+		 * Attempt picmg/vita discovery of the actual interface
+		 * address, unless the users specified an address.
+		 * Address specification always overrides discovery
+		 */
+		if (picmg_discover(ipmi_main_intf)) {
+			ipmi_main_intf->picmg_avail = 1;
+		} else if (vita_discover(ipmi_main_intf)) {
+			ipmi_main_intf->vita_avail = 1;
+		}
+	}
+
+	if (arg_addr) {
+		addr = arg_addr;
+	} else if (!ipmi_oem_active(ipmi_main_intf, "i82571spt")) {
+		lprintf(LOG_DEBUG, "Acquire IPMB address");
+		addr = ipmi_acquire_ipmb_address(ipmi_main_intf);
+		lprintf(LOG_INFO,  "Discovered IPMB address 0x%x", addr);
+	}
+
+	/*
+	 * If we discovered the ipmb address and it is not the same as what we
+	 * used for open, Set the discovered IPMB address as my address if the
+	 * interface supports it.
+	 */
+	if (addr != 0 && addr != ipmi_main_intf->my_addr) {
+		if (ipmi_main_intf->set_my_addr) {
+			/*
+			 * Some interfaces need special handling
+			 * when changing local address
+			 */
+			(void)ipmi_main_intf->set_my_addr(ipmi_main_intf, addr);
+		}
+
+		/* set local address */
+		ipmi_main_intf->my_addr = addr;
+	}
+
+	ipmi_main_intf->target_addr = ipmi_main_intf->my_addr;
+
+	/* If bridging addresses are specified, handle them */
+	if (transit_addr > 0 || target_addr > 0) {
+		/* sanity check, transit makes no sense without a target */
+		if ((transit_addr != 0 || transit_channel != 0) &&
+			target_addr == 0) {
+			lprintf(LOG_ERR,
+				"Transit address/channel %#x/%#x ignored. "
+				"Target address must be specified!",
+				transit_addr, transit_channel);
+			goto out_free;
+		}
+		ipmi_main_intf->target_addr = target_addr;
+		ipmi_main_intf->target_channel = target_channel ;
+
+		ipmi_main_intf->transit_addr    = transit_addr;
+		ipmi_main_intf->transit_channel = transit_channel;
+
+
+		/* must be admin level to do this over lan */
+		ipmi_intf_session_set_privlvl(ipmi_main_intf, IPMI_SESSION_PRIV_ADMIN);
+		/* Get the ipmb address of the targeted entity */
+		ipmi_main_intf->target_ipmb_addr =
+					ipmi_acquire_ipmb_address(ipmi_main_intf);
+		lprintf(LOG_DEBUG, "Specified addressing     Target  %#x:%#x Transit %#x:%#x",
+					   ipmi_main_intf->target_addr,
+					   ipmi_main_intf->target_channel,
+					   ipmi_main_intf->transit_addr,
+					   ipmi_main_intf->transit_channel);
+		if (ipmi_main_intf->target_ipmb_addr) {
+			lprintf(LOG_INFO, "Discovered Target IPMB-0 address %#x",
+					   ipmi_main_intf->target_ipmb_addr);
+		}
+	}
+
+	/* set target LUN (for RAW command) */
+	ipmi_main_intf->target_lun = target_lun ;
+
+	lprintf(LOG_DEBUG, "Interface address: my_addr %#x "
+			   "transit %#x:%#x target %#x:%#x "
+			   "ipmb_target %#x\n",
+			ipmi_main_intf->my_addr,
+			ipmi_main_intf->transit_addr,
+			ipmi_main_intf->transit_channel,
+			ipmi_main_intf->target_addr,
+			ipmi_main_intf->target_channel,
+			ipmi_main_intf->target_ipmb_addr);
+
+	/* parse local SDR cache if given */
+	if (sdrcache != NULL) {
+		ipmi_sdr_list_cache_fromfile(ipmi_main_intf, sdrcache);
+	}
+	/* Parse SEL OEM file if given */
+	if (seloem != NULL) {
+		ipmi_sel_oem_init(seloem);
+	}
+
+	/* Enable Big Buffer when requested */
+	if ( my_long_packet_size != 0 ) {
+		/* Enable Big Buffer when requested */
+		if (!ipmi_oem_active(ipmi_main_intf, "kontron") ||
+			ipmi_kontronoem_set_large_buffer(ipmi_main_intf,
+					my_long_packet_size ) == 0) {
+			printf("Setting large buffer to %i\n", my_long_packet_size);
+			my_long_packet_set = 1;
+			ipmi_intf_set_max_request_data_size(ipmi_main_intf,
+					my_long_packet_size);
+		}
+	}
+
+	ipmi_main_intf->cmdlist = cmdlist;
+
+	/* now we finally run the command */
+	if (argc-optind > 0)
+		rc = ipmi_cmd_run(ipmi_main_intf, argv[optind], argc-optind-1,
+				&(argv[optind+1]));
+	else
+		rc = ipmi_cmd_run(ipmi_main_intf, NULL, 0, NULL);
+
+	if (my_long_packet_set == 1) {
+		if (ipmi_oem_active(ipmi_main_intf, "kontron")) {
+			/* Restore defaults */
+			ipmi_kontronoem_set_large_buffer( ipmi_main_intf, 0 );
+		}
+	}
+
+	/* clean repository caches */
+	ipmi_cleanup(ipmi_main_intf);
+
+	/* call interface close function if available */
+	if (ipmi_main_intf->opened > 0 && ipmi_main_intf->close != NULL)
+		ipmi_main_intf->close(ipmi_main_intf);
+
+	out_free:
+	log_halt();
+
+	if (intfname != NULL) {
+		free(intfname);
+		intfname = NULL;
+	}
+	if (hostname != NULL) {
+		free(hostname);
+		hostname = NULL;
+	}
+	if (username != NULL) {
+		free(username);
+		username = NULL;
+	}
+	if (password != NULL) {
+		free(password);
+		password = NULL;
+	}
+	if (oemtype != NULL) {
+		free(oemtype);
+		oemtype = NULL;
+	}
+	if (seloem != NULL) {
+		free(seloem);
+		seloem = NULL;
+	}
+	if (sdrcache != NULL) {
+		free(sdrcache);
+		sdrcache = NULL;
+	}
+	if (devfile) {
+		free(devfile);
+		devfile = NULL;
+	}
+
+	return rc;
+}
+
+
diff --git a/lib/ipmi_mc.c b/lib/ipmi_mc.c
new file mode 100644
index 0000000..4580bfb
--- /dev/null
+++ b/lib/ipmi_mc.c
@@ -0,0 +1,1115 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_strings.h>
+
+extern int verbose;
+
+static int ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv,
+		int is_set);
+static void printf_sysinfo_usage(int full_help);
+
+/* ipmi_mc_reset  -  attempt to reset an MC
+ *
+ * @intf:	ipmi interface
+ * @cmd:	reset command to send
+ *              BMC_WARM_RESET or
+ *              BMC_COLD_RESET
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_reset(struct ipmi_intf * intf, int cmd)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	if( !intf->opened )
+	intf->open(intf);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = cmd;
+	req.msg.data_len = 0;
+
+	if (cmd == BMC_COLD_RESET)
+		intf->noanswer = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (cmd == BMC_COLD_RESET)
+		intf->abort = 1;
+
+	if (cmd == BMC_COLD_RESET && rsp == NULL) {
+		/* This is expected. See 20.2 Cold Reset Command, p.243, IPMIv2.0 rev1.0 */
+	} else if (rsp == NULL) {
+		lprintf(LOG_ERR, "MC reset command failed.");
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "MC reset command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+
+	printf("Sent %s reset command to MC\n",
+	       (cmd == BMC_WARM_RESET) ? "warm" : "cold");
+
+	return 0;
+}
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct bmc_enables_data {
+#if WORDS_BIGENDIAN
+	uint8_t oem2		: 1;
+	uint8_t oem1		: 1;
+	uint8_t oem0		: 1;
+	uint8_t __reserved	: 1;
+	uint8_t system_event_log	: 1;
+	uint8_t event_msgbuf	: 1;
+	uint8_t event_msgbuf_intr	: 1;
+	uint8_t receive_msg_intr	: 1;
+#else
+	uint8_t receive_msg_intr	: 1;
+	uint8_t event_msgbuf_intr	: 1;
+	uint8_t event_msgbuf	: 1;
+	uint8_t system_event_log	: 1;
+	uint8_t __reserved	: 1;
+	uint8_t oem0		: 1;
+	uint8_t oem1		: 1;
+	uint8_t oem2		: 1;
+#endif
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+struct bitfield_data {
+	const char * name;
+	const char * desc;
+	uint32_t mask;
+} mc_enables_bf[] = {
+	{
+		.name = "recv_msg_intr",
+		.desc = "Receive Message Queue Interrupt",
+		.mask = 1<<0,
+	},
+	{
+		.name = "event_msg_intr",
+		.desc = "Event Message Buffer Full Interrupt",
+		.mask = 1<<1,
+	},
+	{
+		.name = "event_msg",
+		.desc = "Event Message Buffer",
+		.mask = 1<<2,
+	},
+	{
+		.name = "system_event_log",
+		.desc = "System Event Logging",
+		.mask = 1<<3,
+	},
+	{
+		.name = "oem0",
+		.desc = "OEM 0",
+		.mask = 1<<5,
+	},
+	{
+		.name = "oem1",
+		.desc = "OEM 1",
+		.mask = 1<<6,
+	},
+	{
+		.name = "oem2",
+		.desc = "OEM 2",
+		.mask = 1<<7,
+	},
+	{ NULL },
+};
+
+static void
+printf_mc_reset_usage(void)
+{
+	lprintf(LOG_NOTICE, "usage: mc reset <warm|cold>");
+} /* printf_mc_reset_usage(void) */
+
+static void
+printf_mc_usage(void)
+{
+	struct bitfield_data * bf;
+	lprintf(LOG_NOTICE, "MC Commands:");
+	lprintf(LOG_NOTICE, "  reset <warm|cold>");
+	lprintf(LOG_NOTICE, "  guid");
+	lprintf(LOG_NOTICE, "  info");
+	lprintf(LOG_NOTICE, "  watchdog <get|reset|off>");
+	lprintf(LOG_NOTICE, "  selftest");
+	lprintf(LOG_NOTICE, "  getenables");
+	lprintf(LOG_NOTICE, "  setenables <option=on|off> ...");
+	for (bf = mc_enables_bf; bf->name != NULL; bf++) {
+		lprintf(LOG_NOTICE, "    %-20s  %s", bf->name, bf->desc);
+	}
+	printf_sysinfo_usage(0);
+}
+
+static void
+printf_sysinfo_usage(int full_help)
+{
+	if (full_help != 0)
+		lprintf(LOG_NOTICE, "usage:");
+
+	lprintf(LOG_NOTICE, "  getsysinfo <argument>");
+
+	if (full_help != 0) {
+		lprintf(LOG_NOTICE,
+				"    Retrieves system info from BMC for given argument");
+	}
+
+	lprintf(LOG_NOTICE, "  setsysinfo <argument> <string>");
+
+	if (full_help != 0) {
+		lprintf(LOG_NOTICE,
+				"    Stores system info string for given argument to BMC");
+		lprintf(LOG_NOTICE, "");
+		lprintf(LOG_NOTICE, "  Valid arguments are:");
+	}
+	lprintf(LOG_NOTICE,
+			"    system_fw_version   System firmware (e.g. BIOS) version");
+	lprintf(LOG_NOTICE,
+			"    primary_os_name     Primary operating system name");
+	lprintf(LOG_NOTICE, "    os_name             Operating system name");
+	lprintf(LOG_NOTICE,
+			"    system_name         System Name of server(vendor dependent)");
+	lprintf(LOG_NOTICE,
+			"    delloem_os_version  Running version of operating system");
+	lprintf(LOG_NOTICE, "    delloem_url         URL of BMC webserver");
+	lprintf(LOG_NOTICE, "");
+}
+
+static void
+print_watchdog_usage(void)
+{
+	lprintf(LOG_NOTICE, "usage: watchdog <command>:");
+	lprintf(LOG_NOTICE, "   get    :  Get Current Watchdog settings");
+	lprintf(LOG_NOTICE, "   reset  :  Restart Watchdog timer based on most recent settings");
+	lprintf(LOG_NOTICE, "   off    :  Shut off a running Watchdog timer");
+}
+
+/* ipmi_mc_get_enables  -  print out MC enables
+ *
+ * @intf:	ipmi inteface
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_get_enables(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct bitfield_data * bf;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_GLOBAL_ENABLES;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Global Enables command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Global Enables command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	for (bf = mc_enables_bf; bf->name != NULL; bf++) {
+		printf("%-40s : %sabled\n", bf->desc,
+		       rsp->data[0] & bf->mask ? "en" : "dis");
+	}
+
+	return 0;
+}
+
+/* ipmi_mc_set_enables  -  set MC enable flags
+ *
+ * @intf:	ipmi inteface
+ * @argc:	argument count
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_set_enables(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct bitfield_data * bf;
+	uint8_t en;
+	int i;
+
+	if (argc < 1) {
+		printf_mc_usage();
+		return (-1);
+	}
+	else if (strncmp(argv[0], "help", 4) == 0) {
+		printf_mc_usage();
+		return 0;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_GLOBAL_ENABLES;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Global Enables command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Global Enables command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	en = rsp->data[0];
+
+	for (i = 0; i < argc; i++) {
+		for (bf = mc_enables_bf; bf->name != NULL; bf++) {
+			int nl = strlen(bf->name);
+			if (strncmp(argv[i], bf->name, nl) != 0)
+				continue;
+			if (strncmp(argv[i]+nl+1, "off", 3) == 0) {
+					printf("Disabling %s\n", bf->desc);
+					en &= ~bf->mask;
+			}
+			else if (strncmp(argv[i]+nl+1, "on", 2) == 0) {
+					printf("Enabling %s\n", bf->desc);
+					en |= bf->mask;
+			}
+			else {
+				lprintf(LOG_ERR, "Unrecognized option: %s", argv[i]);
+			}
+		}
+	}
+
+	if (en == rsp->data[0]) {
+		printf("\nNothing to change...\n");
+		ipmi_mc_get_enables(intf);
+		return 0;
+	}
+
+	req.msg.cmd = BMC_SET_GLOBAL_ENABLES;
+	req.msg.data = &en;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Global Enables command failed");
+		return -1;
+	}
+	else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Global Enables command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("\nVerifying...\n");
+	ipmi_mc_get_enables(intf);
+
+	return 0;
+}
+
+/* IPM Device, Get Device ID Command - Additional Device Support */
+const char *ipm_dev_adtl_dev_support[8] = {
+	"Sensor Device",         /* bit 0 */
+	"SDR Repository Device", /* bit 1 */
+	"SEL Device",            /* bit 2 */
+	"FRU Inventory Device",  /*  ...  */
+	"IPMB Event Receiver",
+	"IPMB Event Generator",
+	"Bridge",
+	"Chassis Device"         /* bit 7 */
+};
+
+/* ipmi_mc_get_deviceid  -  print information about this MC
+ *
+ * @intf:	ipmi interface
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_get_deviceid(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipm_devid_rsp *devid;
+	int i;
+	const char *product=NULL;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Device ID command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Device ID command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	devid = (struct ipm_devid_rsp *) rsp->data;
+	printf("Device ID                 : %i\n",
+		devid->device_id);
+	printf("Device Revision           : %i\n",
+		devid->device_revision & IPM_DEV_DEVICE_ID_REV_MASK);
+	printf("Firmware Revision         : %u.%02x\n",
+		devid->fw_rev1 & IPM_DEV_FWREV1_MAJOR_MASK,
+		devid->fw_rev2);
+	printf("IPMI Version              : %x.%x\n",
+		IPM_DEV_IPMI_VERSION_MAJOR(devid->ipmi_version),
+		IPM_DEV_IPMI_VERSION_MINOR(devid->ipmi_version));
+	printf("Manufacturer ID           : %lu\n",
+		(long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id));
+	printf("Manufacturer Name         : %s\n",
+			val2str( (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id),
+				ipmi_oem_info) );
+
+	printf("Product ID                : %u (0x%02x%02x)\n",
+		buf2short((uint8_t *)(devid->product_id)),
+		devid->product_id[1], devid->product_id[0]);
+
+	product=oemval2str(IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id),
+							 (devid->product_id[1]<<8)+devid->product_id[0],
+							 ipmi_oem_product_info);
+
+	if (product!=NULL) {
+		printf("Product Name              : %s\n", product);
+	}
+
+	printf("Device Available          : %s\n",
+		(devid->fw_rev1 & IPM_DEV_FWREV1_AVAIL_MASK) ?
+		"no" : "yes");
+	printf("Provides Device SDRs      : %s\n",
+		(devid->device_revision & IPM_DEV_DEVICE_ID_SDR_MASK) ?
+		"yes" : "no");
+	printf("Additional Device Support :\n");
+	for (i = 0; i < IPM_DEV_ADTL_SUPPORT_BITS; i++) {
+		if (devid->adtl_device_support & (1 << i)) {
+			printf("    %s\n", ipm_dev_adtl_dev_support[i]);
+		}
+	}
+	if (rsp->data_len == sizeof(*devid)) {
+		printf("Aux Firmware Rev Info     : \n");
+		/* These values could be looked-up by vendor if documented,
+		 * so we put them on individual lines for better treatment later
+		 */
+		printf("    0x%02x\n    0x%02x\n    0x%02x\n    0x%02x\n",
+			devid->aux_fw_rev[0],
+			devid->aux_fw_rev[1],
+			devid->aux_fw_rev[2],
+			devid->aux_fw_rev[3]);
+	}
+	return 0;
+}
+
+/* _ipmi_mc_get_guid - Gets BMCs GUID according to (22.14)
+ *
+ * @intf:	ipmi interface
+ * @guid:       pointer where to store BMC GUID
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_mc_get_guid(struct ipmi_intf *intf, struct ipmi_guid_t *guid)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	if (guid == NULL) {
+		return (-3);
+	}
+
+	memset(guid, 0, sizeof(struct ipmi_guid_t));
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_GUID;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 16
+			|| rsp->data_len != sizeof(struct ipmi_guid_t)) {
+		return (-2);
+	}
+	memcpy(guid, &rsp->data[0], sizeof(struct ipmi_guid_t));
+	return 0;
+}
+
+/* ipmi_mc_print_guid - print-out given BMC GUID
+ *
+ * @guid - struct with GUID.
+ *
+ * returns 0
+ */
+static int
+ipmi_mc_print_guid(struct ipmi_guid_t guid)
+{
+	char tbuf[40];
+	time_t s;
+	memset(tbuf, 0, 40);
+	/* Kipp - changed order of last field (node) to follow specification */
+	printf("System GUID  : %08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x\n",
+	       guid.time_low, guid.time_mid, guid.time_hi_and_version,
+	       guid.clock_seq_hi_variant << 8 | guid.clock_seq_low,
+	       guid.node[0], guid.node[1], guid.node[2],
+	       guid.node[3], guid.node[4], guid.node[5]);
+
+	s = (time_t)guid.time_low; /* Kipp - removed the BSWAP_32, it was not needed here */
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", localtime(&s));
+	printf("Timestamp    : %s\n", tbuf);
+	return 0;
+}
+
+/* ipmi_mc_get_guid - Gets and prints-out System GUID */
+int
+ipmi_mc_get_guid(struct ipmi_intf *intf)
+{
+	struct ipmi_guid_t guid;
+	int rc;
+	rc = _ipmi_mc_get_guid(intf, &guid);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	}
+	rc = ipmi_mc_print_guid(guid);
+	return rc;
+}
+
+/* ipmi_mc_get_selftest -  returns and print selftest results
+ *
+ * @intf:	ipmi interface
+ */
+static int ipmi_mc_get_selftest(struct ipmi_intf * intf)
+{
+   int rv = 0;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipm_selftest_rsp *sft_res;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_SELF_TEST;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp) {
+		lprintf(LOG_ERR, "No response from devices\n");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Bad response: (%s)",
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	sft_res = (struct ipm_selftest_rsp *) rsp->data;
+
+	if (sft_res->code == IPM_SFT_CODE_OK) {
+		printf("Selftest: passed\n");
+		rv = 0;
+	}
+
+	else if (sft_res->code == IPM_SFT_CODE_NOT_IMPLEMENTED) {
+		printf("Selftest: not implemented\n");
+		rv = -1;
+	}
+
+	else if (sft_res->code == IPM_SFT_CODE_DEV_CORRUPTED) {
+		printf("Selftest: device corrupted\n");
+		rv = -1;
+
+		if (sft_res->test & IPM_SELFTEST_SEL_ERROR) {
+			printf(" -> SEL device not accessible\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_SDR_ERROR) {
+			printf(" -> SDR repository not accesible\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_FRU_ERROR) {
+			printf("FRU device not accessible\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_IPMB_ERROR) {
+			printf("IPMB signal lines do not respond\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_SDRR_EMPTY) {
+			printf("SDR repository empty\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_INTERNAL_USE) {
+			printf("Internal Use Area corrupted\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_FW_BOOTBLOCK) {
+			printf("Controller update boot block corrupted\n");
+		}
+		if (sft_res->test & IPM_SELFTEST_FW_CORRUPTED) {
+			printf("controller operational firmware corrupted\n");
+		}
+	}
+
+	else if (sft_res->code == IPM_SFT_CODE_FATAL_ERROR) {
+		printf("Selftest     : fatal error\n");
+		printf("Failure code : %02x\n", sft_res->test);
+		rv = -1;
+	}
+
+	else if (sft_res->code == IPM_SFT_CODE_RESERVED) {
+		printf("Selftest: N/A");
+		rv = -1;
+	}
+
+	else {
+		printf("Selftest     : device specific (%02Xh)\n", sft_res->code);
+		printf("Failure code : %02Xh\n", sft_res->test);
+		rv = 0;
+	}
+
+	return rv;
+}
+
+/* ipmi_mc_get_watchdog
+ *
+ * @intf:	ipmi interface
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+
+const char *wdt_use_string[8] = {
+	"Reserved",
+	"BIOS FRB2",
+	"BIOS/POST",
+	"OS Load",
+	"SMS/OS",
+	"OEM",
+	"Reserved",
+	"Reserved"
+};
+
+const char *wdt_action_string[8] = {
+	"No action",
+	"Hard Reset",
+	"Power Down",
+	"Power Cycle",
+	"Reserved",
+	"Reserved",
+	"Reserved",
+	"Reserved"
+};
+
+static int
+ipmi_mc_get_watchdog(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipm_get_watchdog_rsp * wdt_res;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_WATCHDOG_TIMER;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Watchdog Timer command failed");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Get Watchdog Timer command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	wdt_res = (struct ipm_get_watchdog_rsp *) rsp->data;
+
+	printf("Watchdog Timer Use:     %s (0x%02x)\n",
+			wdt_use_string[(wdt_res->timer_use & 0x07 )], wdt_res->timer_use);
+	printf("Watchdog Timer Is:      %s\n",
+		wdt_res->timer_use & 0x40 ? "Started/Running" : "Stopped");
+	printf("Watchdog Timer Actions: %s (0x%02x)\n",
+		 wdt_action_string[(wdt_res->timer_actions&0x07)], wdt_res->timer_actions);
+	printf("Pre-timeout interval:   %d seconds\n", wdt_res->pre_timeout);
+	printf("Timer Expiration Flags: 0x%02x\n", wdt_res->timer_use_exp);
+	printf("Initial Countdown:      %i sec\n",
+			((wdt_res->initial_countdown_msb << 8) | wdt_res->initial_countdown_lsb)/10);
+	printf("Present Countdown:      %i sec\n",
+			(((wdt_res->present_countdown_msb << 8) | wdt_res->present_countdown_lsb)) / 10);
+
+	return 0;
+}
+
+/* ipmi_mc_shutoff_watchdog
+ *
+ * @intf:	ipmi interface
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_shutoff_watchdog(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd   = BMC_SET_WATCHDOG_TIMER;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 6;
+
+	/*
+	 * The only set cmd we're allowing is to shut off the timer.
+	 * Turning on the timer should be the job of the ipmi watchdog driver.
+	 * See 'modinfo ipmi_watchdog' for more info. (NOTE: the reset
+	 * command will restart the timer if it's already been initialized.)
+	 *
+	 * Out-of-band watchdog set commands can still be sent via the raw
+	 * command interface but this is a very dangerous thing to do since
+	 * a periodic "poke"/reset over a network is unreliable.  This is
+	 * not a recommended way to use the IPMI watchdog commands.
+	 */
+
+	msg_data[0] = IPM_WATCHDOG_SMS_OS;
+	msg_data[1] = IPM_WATCHDOG_NO_ACTION;
+	msg_data[2] = 0x00;  /* pretimeout interval */
+	msg_data[3] = IPM_WATCHDOG_CLEAR_SMS_OS;
+	msg_data[4] = 0xb8;  /* countdown lsb (100 ms/count) */
+	msg_data[5] = 0x0b;  /* countdown msb - 5 mins */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Watchdog Timer Shutoff command failed!");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Watchdog Timer Shutoff command failed! %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("Watchdog Timer Shutoff successful -- timer stopped\n");
+	return 0;
+}
+
+
+/* ipmi_mc_rst_watchdog
+ *
+ * @intf:	ipmi interface
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_mc_rst_watchdog(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd   = BMC_RESET_WATCHDOG_TIMER;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Reset Watchdog Timer command failed!");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Reset Watchdog Timer command failed: %s",
+			(rsp->ccode == IPM_WATCHDOG_RESET_ERROR) ?
+				"Attempt to reset uninitialized watchdog" :
+				val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("IPMI Watchdog Timer Reset -  countdown restarted!\n");
+	return 0;
+}
+
+/* ipmi_mc_main  -  top-level handler for MC functions
+ *
+ * @intf:	ipmi interface
+ * @argc:	number of arguments
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_mc_usage();
+		rc = (-1);
+	}
+	else if (strncmp(argv[0], "help", 4) == 0) {
+		printf_mc_usage();
+		rc = 0;
+	}
+	else if (strncmp(argv[0], "reset", 5) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			printf_mc_reset_usage();
+			rc = (-1);
+		}
+		else if (strncmp(argv[1], "help", 4) == 0) {
+			printf_mc_reset_usage();
+			rc = 0;
+		}
+		else if (strncmp(argv[1], "cold", 4) == 0) {
+			rc = ipmi_mc_reset(intf, BMC_COLD_RESET);
+		}
+		else if (strncmp(argv[1], "warm", 4) == 0) {
+			rc = ipmi_mc_reset(intf, BMC_WARM_RESET);
+		}
+		else {
+			lprintf(LOG_ERR, "Invalid mc/bmc %s command: %s", argv[0], argv[1]);
+			printf_mc_reset_usage();
+			rc = (-1);
+		}
+	}
+	else if (strncmp(argv[0], "info", 4) == 0) {
+		rc = ipmi_mc_get_deviceid(intf);
+	}
+	else if (strncmp(argv[0], "guid", 4) == 0) {
+		rc = ipmi_mc_get_guid(intf);
+	}
+	else if (strncmp(argv[0], "getenables", 10) == 0) {
+		rc = ipmi_mc_get_enables(intf);
+	}
+	else if (strncmp(argv[0], "setenables", 10) == 0) {
+		rc = ipmi_mc_set_enables(intf, argc-1, &(argv[1]));
+	}
+	else if (!strncmp(argv[0], "selftest", 8)) {
+		rc = ipmi_mc_get_selftest(intf);
+	}
+	else if (!strncmp(argv[0], "watchdog", 8)) {
+		if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			print_watchdog_usage();
+			rc = (-1);
+		}
+		else if (strncmp(argv[1], "help", 4) == 0) {
+			print_watchdog_usage();
+			rc = 0;
+		}
+		else if (strncmp(argv[1], "get", 3) == 0) {
+			rc = ipmi_mc_get_watchdog(intf);
+		}
+		else if(strncmp(argv[1], "off", 3) == 0) {
+			rc = ipmi_mc_shutoff_watchdog(intf);
+		}
+		else if(strncmp(argv[1], "reset", 5) == 0) {
+			rc = ipmi_mc_rst_watchdog(intf);
+		}
+		else {
+			lprintf(LOG_ERR, "Invalid mc/bmc %s command: %s", argv[0], argv[1]);
+			print_watchdog_usage();
+			rc = (-1);
+		}
+	}
+	else if (strncmp(argv[0], "getsysinfo", 10) == 0) {
+		rc = ipmi_sysinfo_main(intf, argc, argv, 0);
+	}
+	else if (strncmp(argv[0], "setsysinfo", 10) == 0) {
+		rc = ipmi_sysinfo_main(intf, argc, argv, 1);
+	}
+	else {
+		lprintf(LOG_ERR, "Invalid mc/bmc command: %s", argv[0]);
+		printf_mc_usage();
+		rc = (-1);
+	}
+	return rc;
+}
+
+/*
+ * sysinfo_param() - function converts sysinfo param to int
+ *
+ * @str - user input string
+ * @maxset - ?
+ *
+ * returns (-1) on error
+ * returns > 0  on success
+ */
+static int
+sysinfo_param(const char *str, int *maxset)
+{
+	if (!str || !maxset)
+		return (-1);
+
+	*maxset = 4;
+	if (!strcmp(str, "system_name"))
+		return IPMI_SYSINFO_HOSTNAME;
+	else if (!strcmp(str, "primary_os_name"))
+		return IPMI_SYSINFO_PRIMARY_OS_NAME;
+	else if (!strcmp(str, "os_name"))
+		return IPMI_SYSINFO_OS_NAME;
+	else if (!strcmp(str, "delloem_os_version"))
+		return IPMI_SYSINFO_DELL_OS_VERSION;
+	else if (!strcmp(str, "delloem_url")) {
+		*maxset = 2;
+		return IPMI_SYSINFO_DELL_URL;
+	} else if (!strcmp(str, "system_fw_version")) {
+		return IPMI_SYSINFO_SYSTEM_FW_VERSION;
+	}
+
+	return (-1);
+}
+
+/*
+ * ipmi_mc_getsysinfo() - function processes the IPMI Get System Info command
+ *
+ * @intf - ipmi interface
+ * @param - parameter eg. 0xC0..0xFF = OEM
+ * @block - number of block parameters
+ * @set - number of set parameters
+ * @len - length of buffer
+ * @buffer - pointer to buffer
+ *
+ * returns (-1) on failure
+ * returns   0  on success 
+ * returns > 0  IPMI code
+ */
+int
+ipmi_mc_getsysinfo(struct ipmi_intf * intf, int param, int block, int set,
+		int len, void *buffer)
+{
+	uint8_t data[4];
+	struct ipmi_rs *rsp = NULL;
+	struct ipmi_rq req = {0};
+
+	memset(buffer, 0, len);
+	memset(data, 0, 4);
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_GET_SYS_INFO;
+	req.msg.data_len = 4;
+	req.msg.data = data;
+
+	if (verbose > 1)
+		printf("getsysinfo: %.2x/%.2x/%.2x\n", param, block, set);
+
+	data[0] = 0; /* get/set */
+	data[1] = param;
+	data[2] = block;
+	data[3] = set;
+
+	/*
+	 * Format of get output is: 
+	 *   u8 param_rev
+	 *   u8 selector
+	 *   u8 encoding  bit[0-3];
+	 *   u8 length
+	 *   u8 data0[14]
+	 */
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL)
+		return (-1);
+
+	if (rsp->ccode == 0) {
+		if (len > rsp->data_len)
+			len = rsp->data_len;
+		if (len && buffer)
+			memcpy(buffer, rsp->data, len);
+	}
+	return rsp->ccode;
+}
+
+/*
+ * ipmi_mc_setsysinfo() - function processes the IPMI Set System Info command
+ *
+ * @intf - ipmi interface
+ * @len - length of buffer
+ * @buffer - pointer to buffer
+ *
+ * returns (-1) on failure
+ * returns   0  on success 
+ * returns > 0  IPMI code
+ */
+int
+ipmi_mc_setsysinfo(struct ipmi_intf * intf, int len, void *buffer)
+{
+	struct ipmi_rs *rsp = NULL;
+	struct ipmi_rq req = {0};
+
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.lun = 0;
+	req.msg.cmd = IPMI_SET_SYS_INFO;
+	req.msg.data_len = len;
+	req.msg.data = buffer;
+
+	/*
+	 * Format of set input:
+	 *   u8 param rev
+	 *   u8 selector
+	 *   u8 data1[16]
+	 */
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp != NULL) {
+		return rsp->ccode;
+	}
+	return -1;
+}
+
+static int
+ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv, int is_set)
+{
+	char *str;
+	unsigned char  infostr[256];
+	unsigned char  paramdata[18];
+	int len, maxset, param, pos, rc, set;
+
+	if (argc == 2 && strcmp(argv[1], "help") == 0) {
+		printf_sysinfo_usage(1);
+		return 0;
+	}
+	else if (argc < 2 || (is_set == 1 && argc < 3)) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		printf_sysinfo_usage(1);
+		return (-1);
+	}
+
+	/* Get Parameters */
+	if ((param = sysinfo_param(argv[1], &maxset)) < 0) {
+		lprintf(LOG_ERR, "Invalid mc/bmc %s command: %s", argv[0], argv[1]);
+		printf_sysinfo_usage(1);
+		return (-1);
+	}
+
+	rc = 0;
+	if (is_set != 0) {
+		str = argv[2];
+		set = pos = 0;
+		len = strlen(str);
+
+		/* first block holds 14 bytes, all others hold 16 */
+		if ((len + 2 + 15) / 16 >= maxset)
+			len = (maxset * 16) - 2;
+
+		do {
+			memset(paramdata, 0, sizeof(paramdata));
+			paramdata[0] = param;
+			paramdata[1] = set;
+			if (set == 0) {
+				/* First block is special case */
+				paramdata[2] = 0;   /* ascii encoding */
+				paramdata[3] = len; /* length */
+				strncpy(paramdata + 4, str + pos, IPMI_SYSINFO_SET0_SIZE);
+				pos += IPMI_SYSINFO_SET0_SIZE;
+			}
+			else {
+				strncpy(paramdata + 2, str + pos, IPMI_SYSINFO_SETN_SIZE);
+				pos += IPMI_SYSINFO_SETN_SIZE;
+			}
+			rc = ipmi_mc_setsysinfo(intf, 18, paramdata);
+
+			if (rc)
+				break;
+
+			set++;
+		} while (pos < len);
+	}
+	else {
+		memset(infostr, 0, sizeof(infostr));
+		/* Read blocks of data */
+		pos = 0;
+		for (set = 0; set < maxset; set++) {
+			rc = ipmi_mc_getsysinfo(intf, param, set, 0, 18, paramdata);
+
+			if (rc)
+				break;
+
+			if (set == 0) {
+				/* First block is special case */
+				if ((paramdata[2] & 0xF) == 0) {
+					/* Determine max number of blocks to read */
+					maxset = ((paramdata[3] + 2) + 15) / 16;
+				}
+				memcpy(infostr + pos, paramdata + 4, IPMI_SYSINFO_SET0_SIZE);
+				pos += IPMI_SYSINFO_SET0_SIZE;
+			}
+			else {
+				memcpy(infostr + pos, paramdata + 2, IPMI_SYSINFO_SETN_SIZE);
+				pos += IPMI_SYSINFO_SETN_SIZE;
+			}
+		}
+		printf("%s\n", infostr);
+	}
+	if (rc < 0) {
+		lprintf(LOG_ERR, "%s %s set %d command failed", argv[0], argv[1], set);
+	}
+	else if (rc == 0x80) {
+		lprintf(LOG_ERR, "%s %s parameter not supported", argv[0], argv[1]);
+	}
+	else if (rc > 0) {
+		lprintf(LOG_ERR, "%s command failed: %s", argv[0],
+				val2str(rc, completion_code_vals));
+	}
+	return rc;
+}
diff --git a/lib/ipmi_oem.c b/lib/ipmi_oem.c
new file mode 100644
index 0000000..96db2ea
--- /dev/null
+++ b/lib/ipmi_oem.c
@@ -0,0 +1,168 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_sel.h>
+
+static int ipmi_oem_supermicro(struct ipmi_intf * intf);
+static int ipmi_oem_ibm(struct ipmi_intf * intf);
+
+static struct ipmi_oem_handle ipmi_oem_list[] = {
+	{
+		.name = "supermicro",
+		.desc = "Supermicro IPMIv1.5 BMC with OEM LAN authentication support",
+		.setup = ipmi_oem_supermicro,
+	},
+	{
+		.name = "intelwv2",
+		.desc = "Intel SE7501WV2 IPMIv1.5 BMC with extra LAN communication support",
+	},
+	{
+		.name = "intelplus",
+		.desc = "Intel IPMI 2.0 BMC with RMCP+ communication support",
+	},
+	{
+		.name = "icts",
+		.desc = "IPMI 2.0 ICTS compliance support",
+	},
+	{
+		.name = "ibm",
+		.desc = "IBM OEM support",
+		.setup = ipmi_oem_ibm,
+	},
+	{
+		.name = "i82571spt",
+		.desc = "Intel 82571 MAC with integrated RMCP+ support in super pass-through mode",
+	},
+	{
+		.name = "kontron",
+		.desc = "Kontron OEM big buffer support"
+	},
+	{ 0 }
+};
+
+/* Supermicro IPMIv2 BMCs use OEM authtype */
+static int
+ipmi_oem_supermicro(struct ipmi_intf * intf)
+{
+	ipmi_intf_session_set_authtype(intf, IPMI_SESSION_AUTHTYPE_OEM);
+	return 0;
+}
+
+static int
+ipmi_oem_ibm(struct ipmi_intf * intf)
+{
+	char * filename;
+	if ((filename = getenv("IPMI_OEM_IBM_DATAFILE")) == NULL) {
+		lprintf(LOG_ERR, "Unable to read IPMI_OEM_IBM_DATAFILE from environment");
+		return -1;
+	}
+	return ipmi_sel_oem_init((const char *)filename);
+}
+
+/* ipmi_oem_print  -  print list of OEM handles
+ */
+void
+ipmi_oem_print(void)
+{
+	struct ipmi_oem_handle * oem;
+	lprintf(LOG_NOTICE, "\nOEM Support:");
+	for (oem=ipmi_oem_list; oem->name != NULL && oem->desc != NULL; oem++) {
+		lprintf(LOG_NOTICE, "\t%-12s %s", oem->name, oem->desc);
+	}
+	lprintf(LOG_NOTICE, "");
+}
+
+/* ipmi_oem_setup  -  do initial setup of OEM handle
+ *
+ * @intf:	ipmi interface
+ * @oemtype:	OEM handle name
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype)
+{
+	struct ipmi_oem_handle * oem;
+	int rc = 0;
+
+	if (oemtype == NULL ||
+			strncmp(oemtype, "help", 4) == 0 ||
+			strncmp(oemtype, "list", 4) == 0) {
+		ipmi_oem_print();
+		return -1;
+	}
+
+	for (oem=ipmi_oem_list; oem->name != NULL; oem++) {
+		if (strncmp(oemtype, oem->name, strlen(oem->name)) == 0)
+			break;
+	}
+
+	if (oem->name == NULL)
+		return -1;
+
+	/* save pointer for later use */
+	intf->oem = oem;
+
+	/* run optional setup function if it is defined */
+	if (oem->setup != NULL) {
+		lprintf(LOG_DEBUG, "Running OEM setup for \"%s\"", oem->desc);
+		rc = oem->setup(intf);
+	}
+
+	return rc;
+}
+
+/* ipmi_oem_active  -  used to determine if a particular OEM type is set
+ *
+ * @intf:	ipmi interface
+ * @oemtype:	string containing name of ipmi handle to check
+ *
+ * returns 1 if requested ipmi handle is active
+ * returns 0 otherwise
+ */
+int
+ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype)
+{
+	if (intf->oem == NULL)
+		return 0;
+
+	if (strncmp(intf->oem->name, oemtype, strlen(oemtype)) == 0)
+		return 1;
+
+	return 0;
+}
diff --git a/lib/ipmi_pef.c b/lib/ipmi_pef.c
new file mode 100644
index 0000000..bbf25f2
--- /dev/null
+++ b/lib/ipmi_pef.c
@@ -0,0 +1,1550 @@
+/*
+ * Copyright (c) 2004 Dell Computers.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Dell Computers, or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * DELL COMPUTERS ("DELL") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * DELL OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+#include <math.h>
+#include <time.h>
+
+#include <ipmitool/bswap.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_pef.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/log.h>
+
+extern int verbose;
+/*
+// common kywd/value printf() templates
+*/
+static const char * pef_fld_fmts[][2] = {
+	{"%-*s : %u\n",          " | %u"},			/* F_DEC: unsigned value */
+	{"%-*s : %d\n",          " | %d"},			/* F_INT: signed value   */
+	{"%-*s : %s\n",          " | %s"},			/* F_STR: string value   */
+	{"%-*s : 0x%x\n",        " | 0x%x"},		/* F_HEX: "N hex digits" */
+	{"%-*s : 0x%04x\n",      " | 0x%04x"},		/* F_2XD: "2 hex digits" */
+	{"%-*s : 0x%02x\n",      " | 0x%02x"},		/* F_1XD: "1 hex digit"  */
+	{"%-*s : %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+	     " | %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"},
+};
+typedef enum {
+	F_DEC,
+	F_INT,
+	F_STR,
+	F_HEX,
+	F_2XD,
+	F_1XD,
+	F_UID,
+} fmt_e;
+#define KYWD_LENGTH 24
+static int first_field = 1;
+
+static const char * pef_flag_fmts[][3] = {
+	{"",          "false",  "true"},
+	{"supported", "un",         ""},
+	{"active",    "in",         ""},
+	{"abled",     "dis",      "en"},
+};
+static const char * listitem[] =	{" | %s", ",%s", "%s"};
+
+static int ipmi_pef2_list_filters(struct ipmi_intf *);
+
+const char * 
+ipmi_pef_bit_desc(struct bit_desc_map * map, uint32_t value)
+{	/*
+	// return description/text label(s) for the given value.
+	//  NB: uses a static buffer
+	*/
+	static char buf[128];
+	char * p;
+	struct desc_map * pmap;
+	uint32_t match, index;
+	
+	*(p = buf) = '\0';
+	index = 2;
+	for (pmap=map->desc_maps; pmap && pmap->desc; pmap++) {
+		if (map->desc_map_type == BIT_DESC_MAP_LIST)
+			match = (value == pmap->mask);
+		else
+			match = ((value & pmap->mask) == pmap->mask);
+
+		if (match) {
+			sprintf(p, listitem[index], pmap->desc);
+			p = strchr(p, '\0');
+			if (map->desc_map_type != BIT_DESC_MAP_ALL)
+				break;
+			index = 1;
+		}
+	}
+	if (p == buf)
+		return("None");
+
+	return((const char *)buf);
+}
+
+void
+ipmi_pef_print_flags(struct bit_desc_map * map, flg_e type, uint32_t val)
+{	/*
+	// print features/flags, using val (a bitmask), according to map.
+	// observe the verbose flag, and print any labels, etc. based on type
+	*/
+	struct desc_map * pmap;
+	uint32_t maskval, index;
+
+	index = 0;
+	for (pmap=map->desc_maps; pmap && pmap->desc; pmap++) {
+		maskval = (val & pmap->mask);
+		if (verbose)
+			printf("%-*s : %s%s\n", KYWD_LENGTH, 
+				ipmi_pef_bit_desc(map, pmap->mask),
+				pef_flag_fmts[type][1 + (maskval != 0)],
+				pef_flag_fmts[type][0]);
+		else if (maskval != 0) {
+			printf(listitem[index], ipmi_pef_bit_desc(map, maskval));
+			index = 1;
+		}
+	}
+}
+
+static void
+ipmi_pef_print_field(const char * fmt[2], const char * label, unsigned long val)
+{	/*
+	// print a 'field' (observes 'verbose' flag)
+	*/
+	if (verbose)
+		printf(fmt[0], KYWD_LENGTH, label, val);
+	else if (first_field)
+		printf(&fmt[1][2], val);	/* skip field separator */
+	else
+		printf(fmt[1], val);
+
+	first_field = 0;
+}
+
+void
+ipmi_pef_print_dec(const char * text, uint32_t val)
+{	/* unsigned */
+	ipmi_pef_print_field(pef_fld_fmts[F_DEC], text, val);
+}
+
+void
+ipmi_pef_print_int(const char * text, uint32_t val)
+{	/* signed */
+	ipmi_pef_print_field(pef_fld_fmts[F_INT], text, val);
+}
+
+void
+ipmi_pef_print_hex(const char * text, uint32_t val)
+{	/* hex */
+	ipmi_pef_print_field(pef_fld_fmts[F_HEX], text, val);
+}
+
+void 
+ipmi_pef_print_str(const char * text, const char * val)
+{	/* string */
+	ipmi_pef_print_field(pef_fld_fmts[F_STR], text, (unsigned long)val);
+}
+
+void 
+ipmi_pef_print_2xd(const char * text, uint8_t u1, uint8_t u2)
+{	/* 2 hex digits */
+	uint32_t val = ((u1 << 8) + u2) & 0xffff;
+	ipmi_pef_print_field(pef_fld_fmts[F_2XD], text, val);
+}
+
+void 
+ipmi_pef_print_1xd(const char * text, uint32_t val)
+{	/* 1 hex digit */
+	ipmi_pef_print_field(pef_fld_fmts[F_1XD], text, val);
+}
+
+/* ipmi_pef_print_guid - print-out GUID. */
+static int
+ipmi_pef_print_guid(uint8_t *guid)
+{
+	if (guid == NULL) {
+		return (-1);
+	}
+
+	if (verbose) {
+		printf("%-*s : %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+				KYWD_LENGTH, "System GUID",
+				guid[0], guid[1], guid[2], guid[3], guid[4],
+				guid[5], guid[6], guid[7], guid[8], guid[9],
+				guid[10],guid[11], guid[12], guid[13], guid[14],
+				guid[15]);
+	} else {
+		printf(" | %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+				guid[0], guid[1], guid[2], guid[3], guid[4],
+				guid[5], guid[6], guid[7], guid[8], guid[9],
+				guid[10], guid[11], guid[12], guid[13], guid[14],
+				guid[15]);
+	}
+	return 0;
+}
+
+static struct ipmi_rs * 
+ipmi_pef_msg_exchange(struct ipmi_intf * intf, struct ipmi_rq * req, char * txt)
+{	/*
+	// common IPMItool rqst/resp handling
+	*/
+	struct ipmi_rs * rsp = intf->sendrecv(intf, req);
+	if (!rsp) {
+		return(NULL);
+	} else if (rsp->ccode == 0x80)	{
+		return(NULL);   /* Do not output error, just unsupported parameters */
+	} else if (rsp->ccode) {
+		lprintf(LOG_ERR, " **Error %x in '%s' command", rsp->ccode, txt);
+		return(NULL);
+	}
+	if (verbose > 2) {
+		printbuf(rsp->data, rsp->data_len, txt);
+	}
+	return(rsp);
+}
+
+/* _ipmi_get_pef_capabilities - Requests and returns result of (30.1) Get PEF
+ * Capabilities.
+ *
+ * @pcap - pointer where to store results.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_get_pef_capabilities(struct ipmi_intf *intf,
+		struct pef_capabilities *pcap)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	if (pcap == NULL) {
+		return (-3);
+	}
+
+	memset(pcap, 0, sizeof(struct pef_capabilities));
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CAPABILITIES;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 3) {
+		return (-2);
+	}
+	pcap->version = rsp->data[0];
+	pcap->actions = rsp->data[1];
+	pcap->event_filter_count = rsp->data[2];
+	return 0;
+}
+
+/* _ipmi_get_pef_filter_entry - Fetches one Entry from Event Filter Table
+ * identified by Filter ID.
+ *
+ * @filter_id - Filter ID of Entry in Event Filter Table.
+ * @filter_entry - Pointer where to copy Filter Entry data.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_get_pef_filter_entry(struct ipmi_intf *intf, uint8_t filter_id,
+		struct pef_cfgparm_filter_table_entry *filter_entry)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t data[3];
+	uint8_t data_len = 3 * sizeof(uint8_t);
+	int dest_size;
+	if (filter_entry == NULL) {
+		return (-3);
+	}
+
+	dest_size = (int)sizeof(struct pef_cfgparm_filter_table_entry);
+	memset(filter_entry, 0, dest_size);
+	memset(&data, 0, data_len);
+	data[0] = PEF_CFGPARM_ID_PEF_FILTER_TABLE_ENTRY;
+	data[1] = filter_id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&data;
+	req.msg.data_len = data_len;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 22 || (rsp->data_len - 1) != dest_size) {
+		return (-2);
+	}
+	memcpy(filter_entry, &rsp->data[1], dest_size);
+	return 0;
+}
+
+/* _ipmi_get_pef_filter_entry_cfg - Fetches configuration of one Entry from
+ * Event Filter Table identified by Filter ID.
+ *
+ * @filter_id - Filter ID of Entry in Event Filter Table.
+ * @filter_entry_cfg - Pointer where to copy Filter Entry configuration.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_get_pef_filter_entry_cfg(struct ipmi_intf *intf, uint8_t filter_id,
+		struct pef_cfgparm_filter_table_data_1 *filter_cfg)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t data[3];
+	uint8_t data_len = 3 * sizeof(uint8_t);
+	int dest_size;
+	if (filter_cfg == NULL) {
+		return (-3);
+	}
+
+	dest_size = (int)sizeof(struct pef_cfgparm_filter_table_data_1);
+	memset(filter_cfg, 0, dest_size);
+	memset(&data, 0, data_len);
+	data[0] = PEF_CFGPARM_ID_PEF_FILTER_TABLE_DATA_1;
+	data[1] = filter_id;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&data;
+	req.msg.data_len = data_len;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 3 || (rsp->data_len - 1) != dest_size) {
+		return (-2);
+	}
+	memcpy(filter_cfg, &rsp->data[1], dest_size);
+	return 0;
+}
+
+/* _ipmi_get_pef_policy_entry - Fetches one Entry from Alert Policy Table
+ * identified by Policy ID.
+ *
+ * @policy_id - Policy ID of Entry in Alert Policy Table.
+ * @policy_entry - Pointer where to copy Policy Entry data.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_get_pef_policy_entry(struct ipmi_intf *intf, uint8_t policy_id,
+		struct pef_cfgparm_policy_table_entry *policy_entry)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t data[3];
+	uint8_t data_len = 3 * sizeof(uint8_t);
+	int dest_size;
+	if (policy_entry == NULL) {
+		return (-3);
+	}
+
+	dest_size = (int)sizeof(struct pef_cfgparm_policy_table_entry);
+	memset(policy_entry, 0, dest_size);
+	memset(&data, 0, data_len);
+	data[0] = PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_ENTRY;
+	data[1] = policy_id & PEF_POLICY_TABLE_ID_MASK;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&data;
+	req.msg.data_len = data_len;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 5 || (rsp->data_len - 1) != dest_size) {
+		return (-2);
+	}
+	memcpy(policy_entry, &rsp->data[1], dest_size);
+	return 0;
+}
+
+/* _ipmi_get_pef_filter_table_size - Fetch the Number of Event Filter Entries.
+ * If the number is 0, it means feature is not supported.
+ *
+ * @table_size - ptr to where to store number of entries.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_get_pef_filter_table_size(struct ipmi_intf *intf, uint8_t *table_size)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct pef_cfgparm_selector psel;
+
+	if (table_size == NULL) {
+		return (-3);
+	}
+
+	*table_size = 0;
+	memset(&psel, 0, sizeof(psel));
+	psel.id = PEF_CFGPARM_ID_PEF_FILTER_TABLE_SIZE;
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&psel;
+	req.msg.data_len = sizeof(psel);
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 2) {
+		return (-2);
+	}
+	*table_size = rsp->data[1] & 0x7F;
+	return 0;
+}
+
+/* _ipmi_get_pef_policy_table_size - Fetch the Number of Alert Policy Entries. If the
+ * number is 0, it means feature is not supported.
+ *
+ * @table_size - ptr to where to store number of entries.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_get_pef_policy_table_size(struct ipmi_intf *intf, uint8_t *table_size)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct pef_cfgparm_selector psel;
+
+	if (table_size == NULL) {
+		return (-3);
+	}
+
+	*table_size = 0;
+	memset(&psel, 0, sizeof(psel));
+	psel.id = PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_SIZE;
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&psel;
+	req.msg.data_len = sizeof(psel);
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 2) {
+		return (-2);
+	}
+	*table_size = rsp->data[1] & 0x7F;
+	return 0;
+}
+
+/* _ipmi_get_pef_system_guid - Fetches System GUID from PEF. This configuration
+ * parameter is optional. If data1 is 0x0, then this GUID is ignored by BMC.
+ *
+ * @system_guid - pointer where to store received data.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+int
+_ipmi_get_pef_system_guid(struct ipmi_intf *intf,
+		struct pef_cfgparm_system_guid *system_guid)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct pef_cfgparm_selector psel;
+	if (system_guid == NULL) {
+		return (-3);
+	}
+
+	memset(system_guid, 0, sizeof(struct pef_cfgparm_system_guid));
+	memset(&psel, 0, sizeof(psel));
+	psel.id = PEF_CFGPARM_ID_SYSTEM_GUID;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&psel;
+	req.msg.data_len = sizeof(psel);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 18
+			|| (rsp->data_len - 2) != sizeof(system_guid->guid)) {
+		return (-2);
+	}
+	system_guid->data1 = rsp->data[1] & 0x1;
+	memcpy(system_guid->guid, &rsp->data[2], sizeof(system_guid->guid));
+	return 0;
+}
+
+/* _ipmi_set_pef_filter_entry_cfg - Sets/updates configuration of Entry in Event
+ * Filter Table identified by Filter ID.
+ *
+ * @filter_id - ID of Entry in Event Filter Table to be updated
+ * @filter_cfg - Pointer to configuration data.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_set_pef_filter_entry_cfg(struct ipmi_intf *intf, uint8_t filter_id,
+		struct pef_cfgparm_filter_table_data_1 *filter_cfg)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	uint8_t data[3];
+	uint8_t data_len = 3 * sizeof(uint8_t);
+	if (filter_cfg == NULL) {
+		return (-3);
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_SET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&data;
+	req.msg.data_len = data_len;
+
+	memset(&data, 0, data_len);
+	data[0] = PEF_CFGPARM_ID_PEF_FILTER_TABLE_DATA_1;
+	data[1] = filter_id;
+	data[2] = filter_cfg->cfg;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	}
+	return 0;
+}
+
+/* _ipmi_set_pef_policy_entry - Sets/updates Entry in Alert Policy Table identified by
+ * Policy ID.
+ *
+ * @policy_id - Policy ID of Entry in Alert Policy Table to be updated
+ * @policy_entry - Pointer to data.
+ *
+ * returns - negative number means error, positive is a ccode.
+ */
+static int
+_ipmi_set_pef_policy_entry(struct ipmi_intf *intf, uint8_t policy_id,
+		struct pef_cfgparm_policy_table_entry *policy_entry)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct pef_cfgparm_set_policy_table_entry payload;
+	if (policy_entry == NULL) {
+		return (-3);
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_SET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&payload;
+	req.msg.data_len = sizeof(payload);
+
+	memset(&payload, 0, sizeof(payload));
+	payload.param_selector = PEF_CFGPARM_ID_PEF_ALERT_POLICY_TABLE_ENTRY;
+	payload.policy_id = policy_id & PEF_POLICY_TABLE_ID_MASK;
+	memcpy(&payload.entry, &policy_entry->entry,
+			sizeof(policy_entry->entry));
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	}
+	return 0;
+}
+
+static void
+ipmi_pef_print_oem_lan_dest(struct ipmi_intf *intf, uint8_t ch, uint8_t dest)
+{
+	char address[128];
+	int len;
+	int rc;
+	int rlen;
+	int set;
+	uint8_t data[32];
+
+	if (ipmi_get_oem(intf) != IPMI_OEM_DELL) {
+		return;
+	}
+	/* Get # of IPV6 trap destinations */
+	rc = ipmi_mc_getsysinfo(intf, IPMI_SYSINFO_DELL_IPV6_COUNT, 0x00, 0x00, 4, data);
+	if (rc != 0 || dest > data[0]) {
+		return;
+	}
+	ipmi_pef_print_str("Alert destination type", "xxx");
+	ipmi_pef_print_str("PET Community", "xxx");
+	ipmi_pef_print_dec("ACK timeout/retry (secs)", 0);
+	ipmi_pef_print_dec("Retries", 0);
+
+	/* Get IPv6 destination string (may be in multiple sets) */
+	memset(address, 0, sizeof(address));
+	memset(data, 0, sizeof(data));
+	rc = ipmi_mc_getsysinfo(intf, IPMI_SYSINFO_DELL_IPV6_DESTADDR, 0x00, dest, 19, data);
+	if (rc != 0) {
+		return;
+	}
+	/* Total length of IPv6 string */
+	len = data[4];
+	if ((rlen = len) > (IPMI_SYSINFO_SET0_SIZE-3)) {
+		/* First set has 11 bytes */
+		rlen = IPMI_SYSINFO_SET0_SIZE - 3;
+	}
+	memcpy(address, data + 8, rlen);
+	for (set = 1; len > 11; set++) {
+		rc = ipmi_mc_getsysinfo(intf, IPMI_SYSINFO_DELL_IPV6_DESTADDR, set, dest, 19, data);
+		if ((rlen = len - 11) >= (IPMI_SYSINFO_SETN_SIZE - 2)) {
+			/* Remaining sets have 14 bytes */
+			rlen = IPMI_SYSINFO_SETN_SIZE - 2;
+		}
+		memcpy(address + (set * 11), data + 3, rlen);
+		len -= rlen+3;
+	}
+	ipmi_pef_print_str("IPv6 Address", address);
+}
+
+/* TODO - rewrite */
+static void
+ipmi_pef_print_lan_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
+{	/*
+	// print LAN alert destination info
+	*/
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct pef_lan_cfgparm_selector lsel;
+	struct pef_lan_cfgparm_dest_type * ptype;
+	struct pef_lan_cfgparm_dest_info * pinfo;
+	char buf[32];
+	uint8_t dsttype, timeout, retries;
+
+	memset(&lsel, 0, sizeof(lsel));
+	lsel.id = PEF_LAN_CFGPARM_ID_DEST_COUNT;
+	lsel.ch = ch;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_CMD_LAN_GET_CONFIG;
+	req.msg.data = (uint8_t *)&lsel;
+	req.msg.data_len = sizeof(lsel);
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count");
+	if (!rsp) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Alert destination count");
+		return;
+	}
+
+	lsel.id = PEF_LAN_CFGPARM_ID_DESTTYPE;
+	lsel.set = dest;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination type");
+	if (!rsp || rsp->data[1] != lsel.set) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Alert destination type");
+		return;
+	}
+	ptype = (struct pef_lan_cfgparm_dest_type *)&rsp->data[1];
+	dsttype = (ptype->dest_type & PEF_LAN_DEST_TYPE_MASK);
+	timeout = ptype->alert_timeout;
+	retries = (ptype->retries & PEF_LAN_RETRIES_MASK);
+	ipmi_pef_print_str("Alert destination type", 
+				ipmi_pef_bit_desc(&pef_b2s_lan_desttype, dsttype));
+	if (dsttype == PEF_LAN_DEST_TYPE_PET) {
+		lsel.id = PEF_LAN_CFGPARM_ID_PET_COMMUNITY;
+		lsel.set = 0;
+		rsp = ipmi_pef_msg_exchange(intf, &req, "PET community");
+		if (!rsp)
+			lprintf(LOG_ERR, " **Error retrieving %s",
+				"PET community");
+		else {
+			rsp->data[19] = '\0';
+			ipmi_pef_print_str("PET Community", (const char *)&rsp->data[1]);
+		}
+	}
+	ipmi_pef_print_dec("ACK timeout/retry (secs)", timeout);
+	ipmi_pef_print_dec("Retries", retries);
+
+	lsel.id = PEF_LAN_CFGPARM_ID_DESTADDR;
+	lsel.set = dest;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info");
+	if (!rsp || rsp->data[1] != lsel.set)
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Alert destination info");
+	else {
+		pinfo = (struct pef_lan_cfgparm_dest_info *)&rsp->data[1];
+		sprintf(buf, "%u.%u.%u.%u", 
+					pinfo->ip[0], pinfo->ip[1], pinfo->ip[2], pinfo->ip[3]);
+		ipmi_pef_print_str("IP address", buf);
+
+		ipmi_pef_print_str("MAC address", mac2str(pinfo->mac));
+	}
+}
+
+static void
+ipmi_pef_print_serial_dest_dial(struct ipmi_intf *intf, char *label,
+		struct pef_serial_cfgparm_selector *ssel)
+{	/*
+	// print a dial string
+	*/
+#define BLOCK_SIZE 16
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct pef_serial_cfgparm_selector tmp;
+	char * p, strval[(6 * BLOCK_SIZE) + 1];
+
+	memset(&tmp, 0, sizeof(tmp));
+	tmp.id = PEF_SERIAL_CFGPARM_ID_DEST_DIAL_STRING_COUNT;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_CMD_SERIAL_GET_CONFIG;
+	req.msg.data = (uint8_t *)&tmp;
+	req.msg.data_len = sizeof(tmp);
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Dial string count");
+	if (!rsp || (rsp->data[1] & PEF_SERIAL_DIAL_STRING_COUNT_MASK) == 0)
+		return;	/* sssh, not supported */
+
+	memcpy(&tmp, ssel, sizeof(tmp));
+	tmp.id = PEF_SERIAL_CFGPARM_ID_DEST_DIAL_STRING;
+	tmp.block = 1;
+	memset(strval, 0, sizeof(strval));
+	p = strval;
+	for (;;) {
+		rsp = ipmi_pef_msg_exchange(intf, &req, label);
+		if (!rsp
+		|| (rsp->data[1] != ssel->id)
+		|| (rsp->data[2] != tmp.block)) {
+			lprintf(LOG_ERR, " **Error retrieving %s", label);
+			return;
+		}
+		memcpy(p, &rsp->data[3], BLOCK_SIZE);
+		if (strchr(p, '\0') <= (p + BLOCK_SIZE))
+			break;
+		if ((p += BLOCK_SIZE) >= &strval[sizeof(strval)-1])
+			break;
+		tmp.block++;
+	}
+
+	ipmi_pef_print_str(label, strval);
+#undef BLOCK_SIZE
+}
+
+static void
+ipmi_pef_print_serial_dest_tap(struct ipmi_intf *intf,
+		struct pef_serial_cfgparm_selector *ssel)
+{	/*
+	// print TAP destination info
+	*/
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct pef_serial_cfgparm_selector tmp;
+	struct pef_serial_cfgparm_tap_svc_settings * pset;
+	uint8_t dialstr_id, setting_id;
+
+	memset(&tmp, 0, sizeof(tmp));
+	tmp.id = PEF_SERIAL_CFGPARM_ID_TAP_ACCT_COUNT;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_CMD_SERIAL_GET_CONFIG;
+	req.msg.data = (uint8_t *)&tmp;
+	req.msg.data_len = sizeof(tmp);
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Number of TAP accounts");
+	if (!rsp || (rsp->data[1] & PEF_SERIAL_TAP_ACCT_COUNT_MASK) == 0)
+		return;	/* sssh, not supported */
+
+	memcpy(&tmp, ssel, sizeof(tmp));
+	tmp.id = PEF_SERIAL_CFGPARM_ID_TAP_ACCT_INFO;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "TAP account info");
+	if (!rsp || (rsp->data[1] != tmp.set)) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"TAP account info");
+		return;
+	}
+	dialstr_id = (rsp->data[2] & PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_MASK);
+	dialstr_id >>= PEF_SERIAL_TAP_ACCT_INFO_DIAL_STRING_ID_SHIFT;
+	setting_id = (rsp->data[2] & PEF_SERIAL_TAP_ACCT_INFO_SVC_SETTINGS_ID_MASK);
+	tmp.set = dialstr_id;
+	ipmi_pef_print_serial_dest_dial(intf, "TAP Dial string", &tmp);
+
+	tmp.set = setting_id;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "TAP service settings");
+	if (!rsp || (rsp->data[1] != tmp.set)) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"TAP service settings");
+		return;
+	}
+	pset = (struct pef_serial_cfgparm_tap_svc_settings *)&rsp->data[1];
+	ipmi_pef_print_str("TAP confirmation",  
+		ipmi_pef_bit_desc(&pef_b2s_tap_svc_confirm, pset->confirmation_flags));
+
+	/* TODO : additional TAP settings? */
+}
+
+/*
+static void
+ipmi_pef_print_serial_dest_ppp(struct ipmi_intf *intf,
+		struct pef_serial_cfgparm_selector *ssel)
+{
+}
+
+static void
+ipmi_pef_print_serial_dest_callback(struct ipmi_intf *intf,
+		struct pef_serial_cfgparm_selector *ssel)
+}
+*/
+
+static void
+ipmi_pef_print_serial_dest(struct ipmi_intf *intf, uint8_t ch, uint8_t dest)
+{	/*
+	// print Serial/PPP alert destination info
+	*/
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct pef_serial_cfgparm_selector ssel;
+	uint8_t tbl_size, wrk;
+	struct pef_serial_cfgparm_dest_info * pinfo;
+
+	memset(&ssel, 0, sizeof(ssel));
+	ssel.id = PEF_SERIAL_CFGPARM_ID_DEST_COUNT;
+	ssel.ch = ch;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd = IPMI_CMD_SERIAL_GET_CONFIG;
+	req.msg.data = (uint8_t *)&ssel;
+	req.msg.data_len = sizeof(ssel);
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination count");
+	if (!rsp) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Alert destination count");
+		return;
+	}
+	tbl_size = (rsp->data[1] & PEF_SERIAL_DEST_TABLE_SIZE_MASK);
+	if (!dest || tbl_size == 0)	/* Page alerting not supported */
+		return;
+	if (dest > tbl_size) {
+		ipmi_pef_print_oem_lan_dest(intf, ch, dest - tbl_size);
+		return;
+	}
+
+	ssel.id = PEF_SERIAL_CFGPARM_ID_DESTINFO;
+	ssel.set = dest;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Alert destination info");
+	if (!rsp || rsp->data[1] != ssel.set)
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Alert destination info");
+	else {
+		pinfo = (struct pef_serial_cfgparm_dest_info *)rsp->data;
+		wrk = (pinfo->dest_type & PEF_SERIAL_DEST_TYPE_MASK);
+		ipmi_pef_print_str("Alert destination type", 
+					ipmi_pef_bit_desc(&pef_b2s_serial_desttype, wrk));
+		ipmi_pef_print_dec("ACK timeout (secs)",
+					pinfo->alert_timeout);
+		ipmi_pef_print_dec("Retries",
+					(pinfo->retries & PEF_SERIAL_RETRIES_MASK));
+		switch (wrk) {
+			case PEF_SERIAL_DEST_TYPE_DIAL:
+				ipmi_pef_print_serial_dest_dial(intf, "Serial dial string", &ssel);
+				break;
+			case PEF_SERIAL_DEST_TYPE_TAP:
+				ipmi_pef_print_serial_dest_tap(intf, &ssel);
+				break;
+			case PEF_SERIAL_DEST_TYPE_PPP:
+				/* ipmi_pef_print_serial_dest_ppp(intf, &ssel); */
+				break;
+			case PEF_SERIAL_DEST_TYPE_BASIC_CALLBACK:
+			case PEF_SERIAL_DEST_TYPE_PPP_CALLBACK:
+				/* ipmi_pef_print_serial_dest_callback(intf, &ssel); */
+				break;
+		}
+	}
+}
+
+static void
+ipmi_pef_print_dest(struct ipmi_intf * intf, uint8_t ch, uint8_t dest)
+{	/*
+	// print generic alert destination info
+	*/
+	ipmi_pef_print_dec("Destination ID", dest);
+}
+
+void
+ipmi_pef_print_event_info(struct pef_cfgparm_filter_table_entry * pef, char * buf)
+{	/*
+	//  print PEF entry Event info: class, severity, trigger, etc.
+	*/
+	static char * classes[] = {"Discrete", "Threshold", "OEM"};
+	uint16_t offmask;
+	char * p;
+	unsigned int i;
+	uint8_t t;
+
+	ipmi_pef_print_str("Event severity", 
+				ipmi_pef_bit_desc(&pef_b2s_severities, pef->entry.severity));
+
+	t = pef->entry.event_trigger;
+	if (t == PEF_EVENT_TRIGGER_THRESHOLD)
+		i = 1;
+	else if (t > PEF_EVENT_TRIGGER_SENSOR_SPECIFIC)
+		i = 2;
+	else
+		i = 0;
+	ipmi_pef_print_str("Event class", classes[i]);
+
+	offmask = ((pef->entry.event_data_1_offset_mask[1] << 8)
+	          + pef->entry.event_data_1_offset_mask[0]);
+
+	if (offmask == 0xffff || t == PEF_EVENT_TRIGGER_MATCH_ANY)
+		strcpy(buf, "Any");
+	else if (t == PEF_EVENT_TRIGGER_UNSPECIFIED)
+		strcpy(buf, "Unspecified");
+	else if (t == PEF_EVENT_TRIGGER_SENSOR_SPECIFIC)
+		strcpy(buf, "Sensor-specific");
+	else if (t > PEF_EVENT_TRIGGER_SENSOR_SPECIFIC)
+		strcpy(buf, "OEM");
+	else {
+		sprintf(buf, "(0x%02x/0x%04x)", t, offmask);
+		p = strchr(buf, '\0');
+		for (i=0; i<PEF_B2S_GENERIC_ER_ENTRIES; i++) {
+			if (offmask & 1) {
+				if ((t-1) >= PEF_B2S_GENERIC_ER_ENTRIES) {
+					sprintf(p, ", Unrecognized event trigger");
+				} else {
+					sprintf(p, ",%s", ipmi_pef_bit_desc(pef_b2s_generic_ER[t-1], i));
+				}
+				p = strchr(p, '\0');
+			}
+			offmask >>= 1;
+		}
+	}
+
+	ipmi_pef_print_str("Event trigger(s)", buf);
+}
+
+/* ipmi_pef_print_filter_entry - Print-out Entry of Event Filter Table. */
+static void
+ipmi_pef_print_filter_entry(struct pef_cfgparm_filter_table_entry *filter_entry)
+{
+	char buf[128];
+	uint8_t filter_enabled;
+	uint8_t set;
+
+	ipmi_pef_print_dec("PEF Filter Table entry", filter_entry->data1);
+
+	filter_enabled = filter_entry->entry.config & PEF_CONFIG_ENABLED;
+	sprintf(buf, "%sabled", (filter_enabled ? "en" : "dis"));
+
+	switch (filter_entry->entry.config & 0x60) {
+	case 0x40:
+		strcat(buf, ", pre-configured");
+		break;
+	case 0x00:
+		strcat(buf, ", configurable");
+		break;
+	default:
+		/* Covers 0x60 and 0x20 which are reserved */
+		strcat(buf, ", reserved");
+		break;
+	}
+	ipmi_pef_print_str("Status", buf);
+
+	if (!filter_enabled) {
+		return;
+	}
+
+	ipmi_pef_print_str("Sensor type",
+				ipmi_pef_bit_desc(&pef_b2s_sensortypes,
+					filter_entry->entry.sensor_type));
+
+	if (filter_entry->entry.sensor_number == PEF_SENSOR_NUMBER_MATCH_ANY) {
+		ipmi_pef_print_str("Sensor number", "Any");
+	} else {
+		ipmi_pef_print_dec("Sensor number",
+				filter_entry->entry.sensor_number);
+	}
+
+	ipmi_pef_print_event_info(filter_entry, buf);
+	ipmi_pef_print_str("Action",
+				ipmi_pef_bit_desc(&pef_b2s_actions,
+					filter_entry->entry.action));
+
+	if (filter_entry->entry.action & PEF_ACTION_ALERT) {
+		set = (filter_entry->entry.policy_number & PEF_POLICY_NUMBER_MASK);
+		ipmi_pef_print_int("Policy set", set);
+	}
+}
+
+/* ipmi_pef2_filter_enable - Enable/Disable specific PEF Event Filter.
+ *
+ * @enable - enable(1) or disable(0) PEF Event Filter.
+ * @filter_id - Filter ID of Entry in Event Filter Table.
+ *
+ * returns - 0 on success, any other value means error.
+ */
+static int
+ipmi_pef2_filter_enable(struct ipmi_intf *intf, uint8_t enable, uint8_t filter_id)
+{
+	struct pef_cfgparm_filter_table_data_1 filter_cfg;
+	int rc;
+	uint8_t filter_table_size;
+
+	rc = _ipmi_get_pef_filter_table_size(intf, &filter_table_size);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	} else if (filter_table_size == 0) {
+		lprintf(LOG_ERR, "PEF Filter isn't supported.");
+		return (-1);
+	} else if (filter_id > filter_table_size) {
+		lprintf(LOG_ERR,
+				"PEF Filter ID out of range. Valid range is (1..%d).",
+				filter_table_size);
+		return (-1);
+	}
+
+	memset(&filter_cfg, 0, sizeof(filter_cfg));
+	rc = _ipmi_set_pef_filter_entry_cfg(intf, filter_id, &filter_cfg);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	}
+
+	if (enable != 0) {
+		/* Enable */
+		filter_cfg.cfg |= PEF_FILTER_ENABLED;
+	} else {
+		/* Disable */
+		filter_cfg.cfg &= PEF_FILTER_DISABLED;
+	}
+	rc = _ipmi_set_pef_filter_entry_cfg(intf, filter_id, &filter_cfg);
+	if (eval_ccode(rc) != 0) {
+		lprintf(LOG_ERR, "Failed to %s PEF Filter ID %d.",
+				enable ? "enable" : "disable",
+				filter_id);
+		return (-1);
+	}
+	printf("PEF Filter ID %" PRIu8 " is %s now.\n", filter_id,
+			enable ? "enabled" : "disabled");
+	return rc;
+}
+
+void
+ipmi_pef2_filter_help(void)
+{
+	lprintf(LOG_NOTICE,
+"usage: pef filter help");
+	lprintf(LOG_NOTICE,
+"	pef filter list");
+	lprintf(LOG_NOTICE,
+"       pef filter enable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef filter disable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef filter create <id = 1..n> <params>");
+	lprintf(LOG_NOTICE,
+"       pef filter delete <id = 1..n>");
+}
+
+/* ipmi_pef2_filter - Handle processing of "filter" CLI args. */
+int
+ipmi_pef2_filter(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_pef2_filter_help();
+		rc = (-1);
+	} else if (!strncmp(argv[0], "help\0", 5)) {
+		ipmi_pef2_filter_help();
+		rc = 0;
+	} else if (!strncmp(argv[0], "list\0", 5)) {
+		rc = ipmi_pef2_list_filters(intf);
+	} else if (!strncmp(argv[0], "enable\0", 7)
+			||(!strncmp(argv[0], "disable\0", 8))) {
+		uint8_t enable;
+		uint8_t filter_id;
+		if (argc != 2) {
+			lprintf(LOG_ERR, "Not enough arguments given.");
+			ipmi_pef2_filter_help();
+			return (-1);
+		}
+		if (str2uchar(argv[1], &filter_id) != 0) {
+			lprintf(LOG_ERR, "Invalid PEF Event Filter ID given: %s", argv[1]);
+			return (-1);
+		} else if (filter_id < 1) {
+			lprintf(LOG_ERR, "PEF Event Filter ID out of range. "
+					"Valid range is <1..255>.");
+			return (-1);
+		}
+		if (!strncmp(argv[0], "enable\0", 7)) {
+			enable = 1;
+		} else {
+			enable = 0;
+		}
+		rc = ipmi_pef2_filter_enable(intf, enable, filter_id);
+	} else if (!strncmp(argv[0], "create\0", 7)) {
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else if (!strncmp(argv[0], "delete\0", 7)) {
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else {
+		lprintf(LOG_ERR, "Invalid PEF Filter command: %s", argv[0]);
+		ipmi_pef2_filter_help();
+		rc = 1;
+	}
+	return rc;
+}
+
+/* ipmi_pef2_get_info - Reports PEF capabilities + System GUID */
+static int
+ipmi_pef2_get_info(struct ipmi_intf *intf)
+{
+	struct pef_capabilities pcap;
+	struct pef_cfgparm_system_guid psys_guid;
+	struct ipmi_guid_t guid;
+	int rc;
+	uint8_t *guid_ptr = NULL;
+	uint8_t policy_table_size;
+
+	rc = _ipmi_get_pef_policy_table_size(intf, &policy_table_size);
+	if (eval_ccode(rc) != 0) {
+		lprintf(LOG_WARN, "Failed to get size of PEF Policy Table.");
+		policy_table_size = 0;
+	}
+	rc = _ipmi_get_pef_capabilities(intf, &pcap);
+	if (eval_ccode(rc) != 0) {
+		lprintf(LOG_ERR, "Failed to get PEF Capabilities.");
+		return (-1);
+	}
+
+	ipmi_pef_print_1xd("Version", pcap.version);
+	ipmi_pef_print_dec("PEF Event Filter count",
+			pcap.event_filter_count);
+	ipmi_pef_print_dec("PEF Alert Policy Table size",
+			policy_table_size);
+
+	rc = _ipmi_get_pef_system_guid(intf, &psys_guid);
+	if (rc != 0x80 && eval_ccode(rc) != 0) {
+		lprintf(LOG_ERR, "Failed to get PEF System GUID. %i", rc);
+		return (-1);
+	} else if (psys_guid.data1 == 0x1) {
+		/* IPMI_CMD_GET_SYSTEM_GUID */
+		guid_ptr = &psys_guid.guid[0];
+	} else {
+		rc = _ipmi_mc_get_guid(intf, &guid);
+		if (rc == 0) {
+			guid_ptr = (uint8_t *)&guid;
+		}
+	}
+	/* Got GUID? */
+	if (guid_ptr) {
+		ipmi_pef_print_guid(guid_ptr);
+	}
+	ipmi_pef_print_flags(&pef_b2s_actions, P_SUPP, pcap.actions);
+	return 0;
+}
+
+/* ipmi_pef2_get_status - TODO rewrite - report the PEF status */
+static int
+ipmi_pef2_get_status(struct ipmi_intf *intf)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	struct pef_cfgparm_selector psel;
+	char tbuf[40];
+	uint32_t timei;
+	time_t ts;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_LAST_PROCESSED_EVT_ID;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "Last S/W processed ID");
+	if (!rsp) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"Last S/W processed ID");
+		return (-1);
+	}
+	memcpy(&timei, rsp->data, sizeof(timei));
+#if WORDS_BIGENDIAN
+	timei = BSWAP_32(timei);
+#endif
+	ts = (time_t)timei;
+
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", gmtime(&ts));
+
+	ipmi_pef_print_str("Last SEL addition", tbuf);
+	ipmi_pef_print_2xd("Last SEL record ID", rsp->data[5], rsp->data[4]);
+	ipmi_pef_print_2xd("Last S/W processed ID", rsp->data[7], rsp->data[6]);
+	ipmi_pef_print_2xd("Last BMC processed ID", rsp->data[9], rsp->data[8]);
+
+	memset(&psel, 0, sizeof(psel));
+	psel.id = PEF_CFGPARM_ID_PEF_CONTROL;
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = IPMI_CMD_GET_PEF_CONFIG_PARMS;
+	req.msg.data = (uint8_t *)&psel;
+	req.msg.data_len = sizeof(psel);
+	rsp = ipmi_pef_msg_exchange(intf, &req, "PEF control");
+	if (!rsp) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"PEF control");
+		return (-1);
+	}
+	ipmi_pef_print_flags(&pef_b2s_control, P_ABLE, rsp->data[1]);
+
+	psel.id = PEF_CFGPARM_ID_PEF_ACTION;
+	rsp = ipmi_pef_msg_exchange(intf, &req, "PEF action");
+	if (!rsp) {
+		lprintf(LOG_ERR, " **Error retrieving %s",
+			"PEF action");
+		return (-1);
+	}
+	ipmi_pef_print_flags(&pef_b2s_actions, P_ACTV, rsp->data[1]);
+	return 0;
+}
+
+/* ipmi_pef2_list_filters - List all entries in PEF Event Filter Table. */
+static int
+ipmi_pef2_list_filters(struct ipmi_intf *intf)
+{
+	struct pef_capabilities pcap;
+	struct pef_cfgparm_filter_table_entry filter_entry;
+	int rc;
+	uint8_t i;
+
+	rc = _ipmi_get_pef_capabilities(intf, &pcap);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	} else if (pcap.event_filter_count == 0) {
+		lprintf(LOG_ERR, "PEF Event Filtering isn't supported.");
+		return (-1);
+	}
+
+	for (i = 1; i <= pcap.event_filter_count; i++) {
+		first_field = 1;
+		rc = _ipmi_get_pef_filter_entry(intf, i, &filter_entry);
+		if (eval_ccode(rc) != 0) {
+			lprintf(LOG_ERR, "Failed to get PEF Event Filter Entry %i.",
+					i);
+			continue;
+		}
+		ipmi_pef_print_filter_entry(&filter_entry);
+		printf("\n");
+	}
+	return 0;
+}
+
+/* ipmi_pef2_list_policies - List Entries in PEF Alert Policy Table. */
+static int
+ipmi_pef2_list_policies(struct ipmi_intf *intf)
+{
+	struct channel_info_t channel_info;
+	struct pef_cfgparm_policy_table_entry entry;
+	int rc;
+	uint8_t dest;
+	uint8_t i;
+	uint8_t policy_table_size;
+
+	rc = _ipmi_get_pef_policy_table_size(intf, &policy_table_size);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	} else if (policy_table_size == 0) {
+		lprintf(LOG_ERR, "PEF Alert Policy isn't supported.");
+		return (-1);
+	}
+
+	for (i = 1; i <= policy_table_size; i++) {
+		first_field = 1;
+		rc = _ipmi_get_pef_policy_entry(intf, i, &entry);
+		if (eval_ccode(rc) != 0) {
+			continue;
+		}
+
+		ipmi_pef_print_dec("Alert policy table entry",
+				   (entry.data1 & PEF_POLICY_TABLE_ID_MASK));
+		ipmi_pef_print_dec("Policy set",
+				   (entry.entry.policy & PEF_POLICY_ID_MASK) >> PEF_POLICY_ID_SHIFT);
+		ipmi_pef_print_str("State",
+				   entry.entry.policy & PEF_POLICY_ENABLED ? "enabled" : "disabled");
+		ipmi_pef_print_str("Policy entry rule",
+				   ipmi_pef_bit_desc(&pef_b2s_policies,
+					   (entry.entry.policy & PEF_POLICY_FLAGS_MASK)));
+
+		if (entry.entry.alert_string_key & PEF_POLICY_EVENT_SPECIFIC) {
+			ipmi_pef_print_str("Event-specific", "true");
+		}
+		channel_info.channel = ((entry.entry.chan_dest &
+					PEF_POLICY_CHANNEL_MASK) >>
+					PEF_POLICY_CHANNEL_SHIFT);
+		rc = _ipmi_get_channel_info(intf, &channel_info);
+		if (eval_ccode(rc) != 0) {
+			continue;
+		}
+		ipmi_pef_print_dec("Channel number", channel_info.channel);
+		ipmi_pef_print_str("Channel medium",
+				   ipmi_pef_bit_desc(&pef_b2s_ch_medium,
+					   channel_info.medium));
+		dest = entry.entry.chan_dest & PEF_POLICY_DESTINATION_MASK;
+		switch (channel_info.medium) {
+		case PEF_CH_MEDIUM_TYPE_LAN:
+			ipmi_pef_print_lan_dest(intf, channel_info.channel,
+					dest);
+			break;
+		case PEF_CH_MEDIUM_TYPE_SERIAL:
+			ipmi_pef_print_serial_dest(intf, channel_info.channel,
+					dest);
+			break;
+		default:
+			ipmi_pef_print_dest(intf, channel_info.channel, dest);
+			break;
+		}
+		printf("\n");
+	}
+	return 0;
+}
+
+void
+ipmi_pef2_policy_help(void)
+{
+	lprintf(LOG_NOTICE,
+"usage: pef policy help");
+	lprintf(LOG_NOTICE,
+"       pef policy list");
+	lprintf(LOG_NOTICE,
+"       pef policy enable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef policy disable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef policy create <id = 1..n> <params>");
+	lprintf(LOG_NOTICE,
+"       pef policy delete <id = 1..n>");
+}
+
+/* ipmi_pef2_policy_enable - Enable/Disable specific PEF policy
+ *
+ * @enable - enable(1) or disable(0) PEF Alert Policy
+ * @policy_id - Policy ID of Entry in Alert Policy Table.
+ *
+ * returns - 0 on success, any other value means error.
+ */
+static int
+ipmi_pef2_policy_enable(struct ipmi_intf *intf, int enable, uint8_t policy_id)
+{
+	struct pef_cfgparm_policy_table_entry policy_entry;
+	int rc;
+	uint8_t policy_table_size;
+
+	rc = _ipmi_get_pef_policy_table_size(intf, &policy_table_size);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	} else if (policy_table_size == 0) {
+		lprintf(LOG_ERR, "PEF Policy isn't supported.");
+		return (-1);
+	} else if (policy_id > policy_table_size) {
+		lprintf(LOG_ERR,
+				"PEF Policy ID out of range. Valid range is (1..%d).",
+				policy_table_size);
+		return (-1);
+	}
+
+	memset(&policy_entry, 0, sizeof(policy_entry));
+	rc = _ipmi_get_pef_policy_entry(intf, policy_id, &policy_entry);
+	if (eval_ccode(rc) != 0) {
+		return (-1);
+	}
+
+	if (enable != 0) {
+		/* Enable */
+		policy_entry.entry.policy |= PEF_POLICY_ENABLED;
+	} else {
+		/* Disable */
+		policy_entry.entry.policy &= PEF_POLICY_DISABLED;
+	}
+	rc = _ipmi_set_pef_policy_entry(intf, policy_id, &policy_entry);
+	if (eval_ccode(rc) != 0) {
+		lprintf(LOG_ERR, "Failed to %s PEF Policy ID %d.",
+				enable ? "enable" : "disable",
+				policy_id);
+		return (-1);
+	}
+	printf("PEF Policy ID %" PRIu8 " is %s now.\n", policy_id,
+			enable ? "enabled" : "disabled");
+	return rc;
+}
+
+/* ipmi_pef2_policy - Handle processing of "policy" CLI args. */
+int
+ipmi_pef2_policy(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_pef2_policy_help();
+		rc = (-1);
+	} else if (!strncmp(argv[0], "help\0", 5)) {
+		ipmi_pef2_policy_help();
+		rc = 0;
+	} else if (!strncmp(argv[0], "list\0", 5)) {
+		rc = ipmi_pef2_list_policies(intf);
+	} else if (!strncmp(argv[0], "enable\0", 7)
+			|| !strncmp(argv[0], "disable\0", 8)) {
+		uint8_t enable;
+		uint8_t policy_id;
+		if (argc != 2) {
+			lprintf(LOG_ERR, "Not enough arguments given.");
+			ipmi_pef2_policy_help();
+			return (-1);
+		}
+		if (str2uchar(argv[1], &policy_id) != 0) {
+			lprintf(LOG_ERR, "Invalid PEF Policy ID given: %s", argv[1]);
+			return (-1);
+		} else if (policy_id < 1 || policy_id > 127) {
+			lprintf(LOG_ERR, "PEF Policy ID out of range. Valid range is <1..127>.");
+			return (-1);
+		}
+		if (!strncmp(argv[0], "enable\0", 7)) {
+			enable = 1;
+		} else {
+			enable = 0;
+		}
+		rc = ipmi_pef2_policy_enable(intf, enable, policy_id);
+	} else if (!strncmp(argv[0], "create\0", 7)) {
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else if (!strncmp(argv[0], "delete\0", 7)) {
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else {
+		lprintf(LOG_ERR, "Invalid PEF Policy command: %s", argv[0]);
+		ipmi_pef2_policy_help();
+		rc = 1;
+	}
+	return rc;
+}
+
+/* ipmi_pef2_help - print-out help text. */
+void
+ipmi_pef2_help(void)
+{
+	lprintf(LOG_NOTICE,
+"usage: pef help");
+	lprintf(LOG_NOTICE,
+"       pef capabilities");
+	lprintf(LOG_NOTICE,
+"       pef event <params>");
+	lprintf(LOG_NOTICE,
+"       pef filter list");
+	lprintf(LOG_NOTICE,
+"       pef filter enable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef filter disable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef filter create <id = 1..n> <params>");
+	lprintf(LOG_NOTICE,
+"       pef filter delete <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef info");
+	lprintf(LOG_NOTICE,
+"       pef policy list");
+	lprintf(LOG_NOTICE,
+"       pef policy enable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef policy disable <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef policy create <id = 1..n> <params>");
+	lprintf(LOG_NOTICE,
+"       pef policy delete <id = 1..n>");
+	lprintf(LOG_NOTICE,
+"       pef pet ack <params>");
+	lprintf(LOG_NOTICE,
+"       pef status");
+	lprintf(LOG_NOTICE,
+"       pef timer get");
+	lprintf(LOG_NOTICE,
+"       pef timer set <0x00-0xFF>");
+}
+
+int ipmi_pef_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_pef2_help();
+		rc = (-1);
+	} else if (!strncmp(argv[0], "help\0", 5)) {
+		ipmi_pef2_help();
+		rc = 0;
+	} else if (!strncmp(argv[0], "capabilities\0", 13)) {
+		/* rc = ipmi_pef2_get_capabilities(intf); */
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else if (!strncmp(argv[0], "event\0", 6)) {
+		/* rc = ipmi_pef2_event(intf, (argc - 1), ++argv); */
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else if (!strncmp(argv[0], "filter\0", 7)) {
+		rc = ipmi_pef2_filter(intf, (argc - 1), ++argv);
+	} else if (!strncmp(argv[0], "info\0", 5)) {
+		rc = ipmi_pef2_get_info(intf);
+	} else if (!strncmp(argv[0], "pet\0", 4)) {
+		/* rc = ipmi_pef2_pet(intf, (argc - 1), ++argv); */
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else if (!strncmp(argv[0], "policy\0", 7)) {
+		rc = ipmi_pef2_policy(intf, (argc - 1), ++argv);
+	} else if (!strncmp(argv[0], "status\0", 7)) {
+		rc = ipmi_pef2_get_status(intf);
+	} else if (!strncmp(argv[0], "timer\0", 6)) {
+		/* rc = ipmi_pef2_timer(intf, (argc - 1), ++argv); */
+		lprintf(LOG_ERR, "Not implemented.");
+		rc = 1;
+	} else {
+		lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
+		rc = (-1);
+	}
+	return rc;
+}
diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c
new file mode 100644
index 0000000..c7d9c8e
--- /dev/null
+++ b/lib/ipmi_picmg.c
@@ -0,0 +1,2382 @@
+/*
+  Copyright (c) Kontron. All right reserved
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Kontron, or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * DELL COMPUTERS ("DELL") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * DELL OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF DELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_picmg.h>
+#include <ipmitool/ipmi_fru.h>		/* for access to link descriptor defines */
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/log.h>
+
+#define PICMG_EXTENSION_ATCA_MAJOR_VERSION  2
+#define PICMG_EXTENSION_AMC0_MAJOR_VERSION  4
+#define PICMG_EXTENSION_UTCA_MAJOR_VERSION  5
+
+
+#define PICMG_EKEY_MODE_QUERY          0
+#define PICMG_EKEY_MODE_PRINT_ALL      1
+#define PICMG_EKEY_MODE_PRINT_ENABLED  2
+#define PICMG_EKEY_MODE_PRINT_DISABLED 3
+
+#define PICMG_EKEY_MAX_CHANNEL          16
+#define PICMG_EKEY_MAX_FABRIC_CHANNEL   15
+#define PICMG_EKEY_MAX_INTERFACE 3
+
+#define PICMG_EKEY_AMC_MAX_CHANNEL  16
+#define PICMG_EKEY_AMC_MAX_DEVICE   15 /* 4 bits */
+
+
+typedef enum picmg_bused_resource_mode {
+	PICMG_BUSED_RESOURCE_SUMMARY,
+} t_picmg_bused_resource_mode ;
+
+
+typedef enum picmg_card_type {
+	PICMG_CARD_TYPE_CPCI,
+	PICMG_CARD_TYPE_ATCA,
+	PICMG_CARD_TYPE_AMC,
+	PICMG_CARD_TYPE_RESERVED
+} t_picmg_card_type ;
+
+/* This is the version of the PICMG Extenstion */
+static t_picmg_card_type PicmgCardType = PICMG_CARD_TYPE_RESERVED;
+
+void
+ipmi_picmg_help (void)
+{
+	lprintf(LOG_NOTICE, "PICMG commands:");
+	lprintf(LOG_NOTICE, " properties           - get PICMG properties");
+	lprintf(LOG_NOTICE, " frucontrol           - FRU control");
+	lprintf(LOG_NOTICE, " addrinfo             - get address information");
+	lprintf(LOG_NOTICE, " activate             - activate a FRU");
+	lprintf(LOG_NOTICE, " deactivate           - deactivate a FRU");
+	lprintf(LOG_NOTICE, " policy get           - get the FRU activation policy");
+	lprintf(LOG_NOTICE, " policy set           - set the FRU activation policy");
+	lprintf(LOG_NOTICE, " portstate get        - get port state");
+	lprintf(LOG_NOTICE,
+			" portstate getdenied  - get all denied[disabled] port description");
+	lprintf(LOG_NOTICE,
+			" portstate getgranted - get all granted[enabled] port description");
+	lprintf(LOG_NOTICE,
+			" portstate getall     - get all port state description");
+	lprintf(LOG_NOTICE, " portstate set        - set port state");
+	lprintf(LOG_NOTICE, " amcportstate get     - get port state");
+	lprintf(LOG_NOTICE, " amcportstate set     - set port state");
+	lprintf(LOG_NOTICE, " led prop             - get led properties");
+	lprintf(LOG_NOTICE, " led cap              - get led color capabilities");
+	lprintf(LOG_NOTICE, " led get              - get led state");
+	lprintf(LOG_NOTICE, " led set              - set led state");
+	lprintf(LOG_NOTICE, " power get            - get power level info");
+	lprintf(LOG_NOTICE, " power set            - set power level");
+	lprintf(LOG_NOTICE, " clk get              - get clk state");
+	lprintf(LOG_NOTICE,
+			" clk getdenied        - get all(up to 16) denied[disabled] clock descriptions");
+	lprintf(LOG_NOTICE,
+			" clk getgranted       - get all(up to 16) granted[enabled] clock descriptions");
+	lprintf(LOG_NOTICE,
+			" clk getall           - get all(up to 16) clock descriptions");
+	lprintf(LOG_NOTICE, " clk set              - set clk state");
+	lprintf(LOG_NOTICE,
+			" busres summary       - display brief bused resource status info");
+}
+
+
+struct sAmcAddrMap {
+	unsigned char ipmbLAddr;
+	char*         amcBayId;
+	unsigned char siteNum;
+} amcAddrMap[] = {
+	{0xFF, "reserved", 0},
+	{0x72, "A1"      , 1},
+	{0x74, "A2"      , 2},
+	{0x76, "A3"      , 3},
+	{0x78, "A4"      , 4},
+	{0x7A, "B1"      , 5},
+	{0x7C, "B2"      , 6},
+	{0x7E, "B3"      , 7},
+	{0x80, "B4"      , 8},
+	{0x82, "reserved", 0},
+	{0x84, "reserved", 0},
+	{0x86, "reserved", 0},
+	{0x88, "reserved", 0},
+};
+
+/* is_amc_channel - wrapper to convert user input into integer
+ * AMC Channel range seems to be <0..255>, bits [7:0]
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @amc_chan_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_amc_channel(const char *argv_ptr, uint8_t *amc_chan_ptr)
+{
+	if (!argv_ptr || !amc_chan_ptr) {
+		lprintf(LOG_ERR, "is_amc_channel(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, amc_chan_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given AMC Channel '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_amc_dev - wrapper to convert user input into integer.
+ * AMC Dev ID limits are uknown.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @amc_dev_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_amc_dev(const char *argv_ptr, int32_t *amc_dev_ptr)
+{
+	if (!argv_ptr || !amc_dev_ptr) {
+		lprintf(LOG_ERR, "is_amc_dev(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2int(argv_ptr, amc_dev_ptr) == 0 && *amc_dev_ptr >= 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given PICMG Device '%s' is invalid.",
+			argv_ptr);
+	return (-1);
+}
+/* is_amc_intf - wrapper to convert user input into integer.
+ * AMC Interface (ID) limits are uknown.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @amc_intf_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_amc_intf(const char *argv_ptr, int32_t *amc_intf_ptr)
+{
+	if (!argv_ptr || !amc_intf_ptr) {
+		lprintf(LOG_ERR, "is_amc_intf(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2int(argv_ptr, amc_intf_ptr) == 0 && *amc_intf_ptr >= 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given PICMG Interface '%s' is invalid.",
+			argv_ptr);
+	return (-1);
+}
+/* is_amc_port - wrapper to convert user input into integer.
+ * AMC Port limits are uknown.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @amc_port_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_amc_port(const char *argv_ptr, int32_t *amc_port_ptr)
+{
+	if (!argv_ptr || !amc_port_ptr) {
+		lprintf(LOG_ERR, "is_amc_port(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2int(argv_ptr, amc_port_ptr) == 0 && *amc_port_ptr >= 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given PICMG Port '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_clk_acc - wrapper to convert user input into integer.
+ * Clock Accuracy limits are uknown[1byte by spec].
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_acc_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_acc(const char *argv_ptr, uint8_t *clk_acc_ptr)
+{
+	if (!argv_ptr || !clk_acc_ptr) {
+		lprintf(LOG_ERR, "is_clk_acc(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, clk_acc_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Clock Accuracy '%s' is invalid.",
+			argv_ptr);
+	return (-1);
+}
+/* is_clk_family - wrapper to convert user input into integer.
+ * Clock Family limits are uknown[1byte by spec].
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_family_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_family(const char *argv_ptr, uint8_t *clk_family_ptr)
+{
+	if (!argv_ptr || !clk_family_ptr) {
+		lprintf(LOG_ERR, "is_clk_family(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, clk_family_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Clock Family '%s' is invalid.",
+			argv_ptr);
+	return (-1);
+}
+/* is_clk_freq - wrapper to convert user input into integer.
+ * Clock Frequency limits are uknown, but specification says
+ * 3Bytes + 1B checksum
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_freq_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_freq(const char *argv_ptr, uint32_t *clk_freq_ptr)
+{
+	if (!argv_ptr || !clk_freq_ptr) {
+		lprintf(LOG_ERR, "is_clk_freq(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uint(argv_ptr, clk_freq_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Clock Frequency '%s' is invalid.",
+			argv_ptr);
+	return (-1);
+}
+/* is_clk_id - wrapper to convert user input into integer.
+ * Clock ID limits are uknown, however it's 1B by specification and I've
+ * found two ranges: <1..5> or <0..15>
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_id_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_id(const char *argv_ptr, uint8_t *clk_id_ptr)
+{
+	if (!argv_ptr || !clk_id_ptr) {
+		lprintf(LOG_ERR, "is_clk_id(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, clk_id_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Clock ID '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_clk_index - wrapper to convert user input into integer.
+ * Clock Index limits are uknown[1B by spec]
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_index_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_index(const char *argv_ptr, uint8_t *clk_index_ptr)
+{
+	if (!argv_ptr || !clk_index_ptr) {
+		lprintf(LOG_ERR, "is_clk_index(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, clk_index_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Clock Index '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_clk_resid - wrapper to convert user input into integer.
+ * Clock Resource Index(?) limits are uknown, but maximum seems to be 15.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_resid_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_resid(const char *argv_ptr, int8_t *clk_resid_ptr)
+{
+	if (!argv_ptr || !clk_resid_ptr) {
+		lprintf(LOG_ERR, "is_clk_resid(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2char(argv_ptr, clk_resid_ptr) == 0
+			&& *clk_resid_ptr > (-1)) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Resource ID '%s' is invalid.",
+			clk_resid_ptr);
+	return (-1);
+}
+/* is_clk_setting - wrapper to convert user input into integer.
+ * Clock Setting is a 1B bitfield:
+ * x [7:4] - reserved
+ * x [3] - state - 0/1
+ * x [2] - direction - 0/1
+ * x [1:0] - PLL ctrl - 00/01/10/11[Reserved]
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @clk_setting_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_clk_setting(const char *argv_ptr, uint8_t *clk_setting_ptr)
+{
+	if (!argv_ptr || !clk_setting_ptr) {
+		lprintf(LOG_ERR, "is_clk_setting(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, clk_setting_ptr) == 0) {
+		return 0;
+	}
+	/* FIXME - validate bits 4-7 are 0 ? */
+	lprintf(LOG_ERR, "Given Clock Setting '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_enable - wrapper to convert user input into integer.
+ * Valid input range for Enable is <0..1>.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @enable_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_enable(const char *argv_ptr, uint8_t *enable_ptr)
+{
+	if (!argv_ptr || !enable_ptr) {
+		lprintf(LOG_ERR, "is_enable(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, enable_ptr) == 0
+			&& (*enable_ptr == 0 || *enable_ptr == 1)) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Enable '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_enable - wrapper to convert user input into integer.
+ * LED colors: 
+ * - valid <1..6>, <0xE..0xF>
+ * - reserved [0, 7]
+ * - undefined <8..D>
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @enable_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_led_color(const char *argv_ptr, uint8_t *led_color_ptr)
+{
+	if (!argv_ptr || !led_color_ptr) {
+		lprintf(LOG_ERR, "is_led_color(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, led_color_ptr) != 0) {
+		lprintf(LOG_ERR, "Given LED Color '%s' is invalid.",
+				argv_ptr);
+		lprintf(LOG_ERR,
+				"LED Color must be from ranges: <1..6>, <0xE..0xF>");
+		return (-1);
+	}
+	if ((*led_color_ptr >= 1 && *led_color_ptr <= 6)
+			|| (*led_color_ptr >= 0xE && *led_color_ptr <= 0xF)) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given LED Color '%s' is out of range.", argv_ptr);
+	lprintf(LOG_ERR, "LED Color must be from ranges: <1..6>, <0xE..0xF>");
+	return (-1);
+}
+/* is_led_function - wrapper to convert user input into integer.
+ * LED functions, however, might differ by OEM:
+ * - 0x00 - off override
+ * - <0x01..0xFA> - blinking override
+ * - 0xFB - lamp test state
+ * - 0xFC - state restored to local ctrl state
+ * - <0xFD..0xFE> - reserved
+ * - 0xFF - on override
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @led_fn_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_led_function(const char *argv_ptr, uint8_t *led_fn_ptr)
+{
+	if (!argv_ptr || !led_fn_ptr) {
+		lprintf(LOG_ERR, "is_led_function(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, led_fn_ptr) == 0
+			&& (*led_fn_ptr < 0xFD || *led_fn_ptr > 0xFE)) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given LED Function '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_led_id - wrapper to convert user input into integer.
+ * LED ID range seems to be <0..255>
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @led_id_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_led_id(const char *argv_ptr, uint8_t *led_id_ptr)
+{
+	if (!argv_ptr || !led_id_ptr) {
+		lprintf(LOG_ERR, "is_led_id(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, led_id_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given LED ID '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_link_group - wrapper to convert user input into integer.
+ * Link Grouping ID limis are unknown, bits [31:24] by spec.
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @link_grp_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_link_group(const char *argv_ptr, uint8_t *link_grp_ptr)
+{
+	if (!argv_ptr || !link_grp_ptr) {
+		lprintf(LOG_ERR, "is_link_group(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, link_grp_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Link Group '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_link_type - wrapper to convert user input into integer.
+ * Link Type limits are unknown, bits [19:12]
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @link_type_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_link_type(const char *argv_ptr, uint8_t *link_type_ptr)
+{
+	if (!argv_ptr || !link_type_ptr) {
+		lprintf(LOG_ERR, "is_link_type(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, link_type_ptr) == 0) {
+		return 0;
+	}
+	lprintf(LOG_ERR, "Given Link Type '%s' is invalid.", argv_ptr);
+	return (-1);
+}
+/* is_link_type_ext - wrapper to convert user input into integer.
+ * Link Type Extension limits are unknown, bits [23:20] => <0..15> ?
+ *
+ * @argv_ptr: source string to convert from; usually argv
+ * @link_type_ext_ptr: pointer where to store result
+ * returns: zero on success, other values mean error
+ */
+int
+is_link_type_ext(const char *argv_ptr, uint8_t *link_type_ext_ptr)
+{
+	if (!argv_ptr || !link_type_ext_ptr) {
+		lprintf(LOG_ERR, "is_link_type_ext(): invalid argument(s).");
+		return (-1);
+	}
+	if (str2uchar(argv_ptr, link_type_ext_ptr) != 0
+			|| *link_type_ext_ptr > 15) {
+		lprintf(LOG_ERR,
+				"Given Link Type Extension '%s' is invalid.",
+				argv_ptr);
+		return (-1);
+	}
+	return 0;
+}
+
+int
+ipmi_picmg_getaddr(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[5];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = PICMG_GET_ADDRESS_INFO_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+	msg_data[0] = 0;   /* picmg identifier */
+	msg_data[1] = 0;   /* default fru id */
+
+	if(argc > 0) {
+		if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+			return (-1);
+		}
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp) {
+		lprintf(LOG_ERR, "Error. No valid response received.");
+		return (-1);
+	} else if (rsp->ccode) {
+		lprintf(LOG_ERR, "Error getting address information CC: 0x%02x",
+				rsp->ccode);
+		return (-1);
+	}
+
+	printf("Hardware Address : 0x%02x\n", rsp->data[1]);
+	printf("IPMB-0 Address   : 0x%02x\n", rsp->data[2]);
+	printf("FRU ID           : 0x%02x\n", rsp->data[4]);
+	printf("Site ID          : 0x%02x\n", rsp->data[5]);
+
+	printf("Site Type        : ");
+	switch (rsp->data[6]) {
+	case PICMG_ATCA_BOARD:
+		printf("ATCA board\n");
+		break;
+	case PICMG_POWER_ENTRY:
+		printf("Power Entry Module\n");
+		break;
+	case PICMG_SHELF_FRU:
+		printf("Shelf FRU\n");
+		break;
+	case PICMG_DEDICATED_SHMC:
+		printf("Dedicated Shelf Manager\n");
+		break;
+	case PICMG_FAN_TRAY:
+		printf("Fan Tray\n");
+		break;
+	case PICMG_FAN_FILTER_TRAY:
+		printf("Fan Filter Tray\n");
+		break;
+	case PICMG_ALARM:
+		printf("Alarm module\n");
+		break;
+	case PICMG_AMC:
+		printf("AMC");
+		printf("  -> IPMB-L Address: 0x%02x\n", amcAddrMap[rsp->data[5]].ipmbLAddr);
+		break;
+	case PICMG_PMC:
+		printf("PMC\n");
+		break;
+	 case PICMG_RTM:
+		printf("RTM\n");
+		break;
+	default:
+		if (rsp->data[6] >= 0xc0 && rsp->data[6] <= 0xcf) {
+			printf("OEM\n");
+		} else {
+			printf("unknown\n");
+		}
+	}
+
+	return 0;
+}
+
+int
+ipmi_picmg_properties(struct ipmi_intf * intf, int show )
+{
+	unsigned char PicmgExtMajorVersion;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_GET_PICMG_PROPERTIES_CMD;
+	req.msg.data     = &msg_data;
+	req.msg.data_len = 1;
+	msg_data = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp  || rsp->ccode) {
+		lprintf(LOG_ERR, "Error getting address information.");
+		return -1;
+	}
+
+	if( show )
+	{
+		printf("PICMG identifier	: 0x%02x\n", rsp->data[0]);
+		printf("PICMG Ext. Version : %i.%i\n",	 rsp->data[1]&0x0f,
+															 (rsp->data[1]&0xf0) >> 4);
+		printf("Max FRU Device ID	: 0x%02x\n", rsp->data[2]);
+		printf("FRU Device ID		: 0x%02x\n", rsp->data[3]);
+	}
+
+   /* We cache the major extension version ...
+      to know how to format some commands */
+	PicmgExtMajorVersion = rsp->data[1]&0x0f;
+
+	if( PicmgExtMajorVersion == PICMG_CPCI_MAJOR_VERSION  ) { 
+		PicmgCardType = PICMG_CARD_TYPE_CPCI;
+   }
+	else if(  PicmgExtMajorVersion == PICMG_ATCA_MAJOR_VERSION) {
+		PicmgCardType = PICMG_CARD_TYPE_ATCA;
+   }
+	else if(  PicmgExtMajorVersion == PICMG_AMC_MAJOR_VERSION) {
+		PicmgCardType = PICMG_CARD_TYPE_AMC;
+   }
+    
+	return 0;
+}
+
+
+
+#define PICMG_FRU_DEACTIVATE	(unsigned char) 0x00
+#define PICMG_FRU_ACTIVATE	(unsigned char) 0x01
+
+int
+ipmi_picmg_fru_activation(struct ipmi_intf * intf, int argc, char ** argv, unsigned char state)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	struct picmg_set_fru_activation_cmd cmd;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_FRU_ACTIVATION_CMD;
+	req.msg.data     = (unsigned char*) &cmd;
+	req.msg.data_len = 3;
+
+	cmd.picmg_id  = 0;						/* PICMG identifier */
+	if (is_fru_id(argv[0], &(cmd.fru_id)) != 0) {
+		return (-1);
+	}
+	cmd.fru_state = state;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp  || rsp->ccode) {
+		lprintf(LOG_ERR, "Error activation/deactivation of FRU.");
+		return -1;
+	}
+	if (rsp->data[0] != 0x00) {
+		lprintf(LOG_ERR, "Error activation/deactivation of FRU.");
+	}
+
+	return 0;
+}
+
+
+int
+ipmi_picmg_fru_activation_policy_get(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[4];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_GET_FRU_POLICY_CMD;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = 0;								/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "FRU activation policy get failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	printf(" %s\n", ((rsp->data[1] & 0x01) == 0x01) ?
+	                           "activation locked" : "activation not locked");
+	printf(" %s\n", ((rsp->data[1] & 0x02) == 0x02) ?
+	                            "deactivation locked" : "deactivation not locked");
+
+	return 0;
+}
+
+int
+ipmi_picmg_fru_activation_policy_set(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[4];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_SET_FRU_POLICY_CMD;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 4;
+
+	msg_data[0] = 0;								            /* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0 || msg_data[2] > 3) {
+		/* FRU Lock Mask */
+		lprintf(LOG_ERR, "Given FRU Lock Mask '%s' is invalid.",
+				argv[1]);
+		return (-1);
+	}
+	if (str2uchar(argv[2], &msg_data[3]) != 0 || msg_data[3] > 3) {
+		/* FRU Act Policy */
+		lprintf(LOG_ERR,
+				"Given FRU Activation Policy '%s' is invalid.",
+				argv[2]);
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "FRU activation policy set failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	return 0;
+}
+
+#define PICMG_MAX_LINK_PER_CHANNEL 4
+
+int
+ipmi_picmg_portstate_get(struct ipmi_intf * intf, int32_t interface,
+		uint8_t channel, int mode)
+{
+	struct ipmi_rs * rsp = NULL;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[4];
+
+	struct fru_picmgext_link_desc* d; /* descriptor pointer for rec. data */
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_GET_PORT_STATE_CMD;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = 0x00;						/* PICMG identifier */
+	msg_data[1] = (interface & 0x3)<<6;	/* interface      */
+	msg_data[1] |= (channel & 0x3F);	/* channel number */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		if( mode == PICMG_EKEY_MODE_QUERY ){
+			lprintf(LOG_ERR, "FRU portstate get failed with CC code 0x%02x",
+					rsp->ccode);
+		}
+		return -1;
+	}
+
+	if (rsp->data_len >= 6) {
+		int index;
+		/* add support for more than one link per channel */
+		for(index=0;index<PICMG_MAX_LINK_PER_CHANNEL;index++){
+			if( rsp->data_len > (1+ (index*5))){
+				d = (struct fru_picmgext_link_desc *) &(rsp->data[1 + (index*5)]);
+
+				if
+				(
+					mode == PICMG_EKEY_MODE_PRINT_ALL
+					||
+					mode == PICMG_EKEY_MODE_QUERY
+					||
+					(
+						mode == PICMG_EKEY_MODE_PRINT_ENABLED
+						&&
+						rsp->data[5 + (index*5) ] == 0x01
+					)
+					||
+					(
+						mode == PICMG_EKEY_MODE_PRINT_DISABLED
+						&&
+						rsp->data[5 + (index*5) ] == 0x00
+					)
+				)
+				{
+					printf("      Link Grouping ID:     0x%02x\n", d->grouping);
+					printf("      Link Type Extension:  0x%02x\n", d->ext);
+					printf("      Link Type:            0x%02x  ", d->type);
+					if (d->type == 0 || d->type == 0xff)
+					{
+						printf("Reserved %d\n",d->type);
+					}
+					else if (d->type >= 0x06 && d->type <= 0xef)
+					{
+						printf("Reserved\n");
+					}
+					else if (d->type >= 0xf0 && d->type <= 0xfe)
+					{
+						printf("OEM GUID Definition\n");
+					}
+					else
+					{
+						switch (d->type)
+						{
+							case FRU_PICMGEXT_LINK_TYPE_BASE:
+								printf("PICMG 3.0 Base Interface 10/100/1000\n");
+							break;
+							case FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET:
+								printf("PICMG 3.1 Ethernet Fabric Interface\n");
+							break;
+							case FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND:
+								printf("PICMG 3.2 Infiniband Fabric Interface\n");
+							break;
+							case FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR:
+								printf("PICMG 3.3 Star Fabric Interface\n");
+							break;
+							case  FRU_PICMGEXT_LINK_TYPE_PCIE:
+								printf("PCI Express Fabric Interface\n");
+							break;
+							default:
+							printf("Invalid\n");
+							break;
+						}
+					}
+					printf("      Link Designator: \n");
+					printf("        Port Flag:          0x%02x\n", d->desig_port);
+					printf("        Interface:          0x%02x - ", d->desig_if);
+					switch (d->desig_if)
+					{
+						case FRU_PICMGEXT_DESIGN_IF_BASE:
+							printf("Base Interface\n");
+						break;
+						case FRU_PICMGEXT_DESIGN_IF_FABRIC:
+							printf("Fabric Interface\n");
+						break;
+						case FRU_PICMGEXT_DESIGN_IF_UPDATE_CHANNEL:
+							printf("Update Channel\n");
+						break;
+						case FRU_PICMGEXT_DESIGN_IF_RESERVED:
+							printf("Reserved\n");
+						break;
+						default:
+							printf("Invalid");
+						break;
+					}
+					printf("        Channel Number:     0x%02x\n", d->desig_channel);
+					printf("      STATE:                %s\n",
+							( rsp->data[5 +(index*5)] == 0x01) ?"enabled":"disabled");
+					printf("\n");
+				}
+			}
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Unexpected answer, can't print result.");
+	}
+
+	return 0;
+}
+
+
+int
+ipmi_picmg_portstate_set(struct ipmi_intf * intf, int32_t interface,
+		uint8_t channel, int32_t port, uint8_t type,
+		uint8_t typeext, uint8_t group, uint8_t enable)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = PICMG_SET_PORT_STATE_CMD;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 6;
+
+	msg_data[0] = 0x00;												/* PICMG identifier */
+	msg_data[1] = (channel & 0x3f) | ((interface & 3) << 6);
+	msg_data[2] = (port & 0xf) | ((type & 0xf) << 4);
+	msg_data[3] = ((type >> 4) & 0xf) | ((typeext & 0xf) << 4);
+	msg_data[4] = group & 0xff;
+	msg_data[5] = (enable & 0x01); /* enable/disable */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Picmg portstate set failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+
+/* AMC.0 commands */
+
+#define PICMG_AMC_MAX_LINK_PER_CHANNEL 4
+
+int
+ipmi_picmg_amc_portstate_get(struct ipmi_intf * intf, int32_t device,
+		uint8_t channel, int mode)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[4];
+
+	struct fru_picmgext_amc_link_info* d; /* descriptor pointer for rec. data */
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn	  = IPMI_NETFN_PICMG;
+	req.msg.cmd		  = PICMG_AMC_GET_PORT_STATE_CMD;
+	req.msg.data	  = msg_data;
+
+	/* FIXME : add check for AMC or carrier device */
+	if(device == -1 || PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+		req.msg.data_len = 2;	/* for amc only channel */
+	}else{
+		req.msg.data_len = 3;	/* for carrier channel and device */
+	}
+
+	msg_data[0] = 0x00;						/* PICMG identifier */
+	msg_data[1] = channel ;
+	msg_data[2] = device ;
+
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		if( mode == PICMG_EKEY_MODE_QUERY ){
+			lprintf(LOG_ERR, "Amc portstate get failed with CC code 0x%02x",
+					rsp->ccode);
+		}
+		return -1;
+	}
+
+	if (rsp->data_len >= 5) {
+		int index;
+
+		/* add support for more than one link per channel */
+		for(index=0;index<PICMG_AMC_MAX_LINK_PER_CHANNEL;index++){
+
+			if( rsp->data_len > (1+ (index*4))){
+				unsigned char type;
+				unsigned char ext;
+				unsigned char grouping;
+				unsigned char port;
+				unsigned char enabled;
+				d = (struct fru_picmgext_amc_link_info *)&(rsp->data[1 + (index*4)]);
+
+
+				/* Removed endianness check here, probably not required
+					as we dont use bitfields  */
+				port = d->linkInfo[0] & 0x0F;
+				type = ((d->linkInfo[0] & 0xF0) >> 4 )|(d->linkInfo[1] & 0x0F );
+				ext  = ((d->linkInfo[1] & 0xF0) >> 4 );
+				grouping = d->linkInfo[2];
+
+
+				enabled =  rsp->data[4 + (index*4) ];
+
+				if
+				(
+					mode == PICMG_EKEY_MODE_PRINT_ALL
+					||
+					mode == PICMG_EKEY_MODE_QUERY
+					||
+					(
+						mode == PICMG_EKEY_MODE_PRINT_ENABLED
+						&&
+						enabled == 0x01
+					)
+					||
+					(
+						mode == PICMG_EKEY_MODE_PRINT_DISABLED
+						&&
+						enabled	== 0x00
+					)
+				)
+				{
+					if(device == -1 || PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+						printf("   Link device :         AMC\n");
+					}else{
+                  printf("   Link device :         0x%02x\n", device );
+					}
+
+					printf("   Link Grouping ID:     0x%02x\n", grouping);
+
+					if (type == 0 || type == 1 ||type == 0xff)
+					{
+						printf("   Link Type Extension:  0x%02x\n", ext);
+						printf("   Link Type:            Reserved\n");
+					}
+					else if (type >= 0xf0 && type <= 0xfe)
+					{
+						printf("   Link Type Extension:  0x%02x\n", ext);
+						printf("   Link Type:            OEM GUID Definition\n");
+					}
+					else
+					{
+						if (type <= FRU_PICMGEXT_AMC_LINK_TYPE_STORAGE )
+						{
+							printf("   Link Type Extension:  %s\n",
+                                      amc_link_type_ext_str[type][ext]);
+							printf("   Link Type:            %s\n",
+                                      amc_link_type_str[type]);
+						}
+						else{
+							printf("   Link Type Extension:  0x%02x\n", ext);
+							printf("   Link Type:            undefined\n");
+						}
+					}
+					printf("   Link Designator: \n");
+					printf("      Channel Number:    0x%02x\n", channel);
+					printf("      Port Flag:         0x%02x\n", port );
+					printf("   STATE:                %s\n",
+                              ( enabled == 0x01 )?"enabled":"disabled");
+					printf("\n");
+				}
+			}
+		}
+	}
+	else
+	{
+		lprintf(LOG_NOTICE,"ipmi_picmg_amc_portstate_get"\
+							"Unexpected answer, can't print result");
+	}
+
+	return 0;
+}
+
+
+int
+ipmi_picmg_amc_portstate_set(struct ipmi_intf * intf, uint8_t channel,
+		int32_t port, uint8_t type, uint8_t typeext,
+		uint8_t group, uint8_t enable, int32_t device)
+{
+	struct ipmi_rs	 * rsp;
+	struct ipmi_rq	 req;
+	unsigned char	 msg_data[7];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn	  = IPMI_NETFN_PICMG;
+	req.msg.cmd		  = PICMG_AMC_SET_PORT_STATE_CMD;
+	req.msg.data	  = msg_data;
+
+	msg_data[0]	 = 0x00;						 /* PICMG identifier*/
+	msg_data[1]	 = channel;					 /* channel id */
+	msg_data[2]	 = port & 0xF;				 /* port flags */
+	msg_data[2] |= (type & 0x0F)<<4;		 /* type	 */
+	msg_data[3]	 = (type & 0xF0)>>4;		 /* type */
+	msg_data[3] |= (typeext & 0x0F)<<4;	 /* extension */
+	msg_data[4]	 = (group & 0xFF);		 /* group */
+	msg_data[5]	 = (enable & 0x01);		 /* state */
+	req.msg.data_len = 6;
+
+	/* device id - only for carrier needed */
+	if (device >= 0) {
+		msg_data[6]	 = device;
+		req.msg.data_len = 7;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Amc portstate set failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+int
+ipmi_picmg_get_led_properties(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_GET_FRU_LED_PROPERTIES_CMD;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = 0x00;									/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "LED get properties failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	printf("General Status LED Properties:  0x%2x\n", rsp->data[1] );
+	printf("App. Specific  LED Count:       0x%2x\n", rsp->data[2] );
+
+	return 0;
+}
+
+int
+ipmi_picmg_get_led_capabilities(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int i;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_GET_LED_COLOR_CAPABILITIES_CMD;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = 0x00;									/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0
+			|| is_led_id(argv[1], &msg_data[2]) != 0) {
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "LED get capabilities failed with CC code 0x%02x",
+				rsp->ccode);
+		return -1;
+	}
+
+	printf("LED Color Capabilities: ");
+	for ( i=0 ; i<8 ; i++ ) {
+		if ( rsp->data[1] & (0x01 << i) ) {
+			printf("%s, ", led_color_str[ i ]);
+		}
+	}
+	printf("\n");
+
+	printf("Default LED Color in\n");
+	printf("      LOCAL control:  %s\n", led_color_str[ rsp->data[2] ] );
+	printf("      OVERRIDE state: %s\n", led_color_str[ rsp->data[3] ] );
+
+	return 0;
+}
+
+int
+ipmi_picmg_get_led_state(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_GET_FRU_LED_STATE_CMD;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = 0x00;									/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0
+			|| is_led_id(argv[1], &msg_data[2]) != 0) {
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "LED get state failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+	printf("LED states:						  %x	", rsp->data[1] );
+
+	if (!(rsp->data[1] & 0x1)) {
+		printf("[NO LOCAL CONTROL]\n");
+		return 0;
+	}
+
+	printf("[LOCAL CONTROL");
+
+	if (rsp->data[1] & 0x2) {
+		printf("|OVERRIDE");
+	}
+
+	if (rsp->data[1] & 0x4) {
+		printf("|LAMPTEST");
+	}
+
+	printf("]\n");
+
+	printf("  Local Control function:     %x  ", rsp->data[2] );
+	if (rsp->data[2] == 0x0) {
+		printf("[OFF]\n");
+	} else if (rsp->data[2] == 0xff) {
+		printf("[ON]\n");
+	} else {
+		printf("[BLINKING]\n");
+	}
+
+	printf("  Local Control On-Duration:  %x\n", rsp->data[3] );
+	printf("  Local Control Color:        %x  [%s]\n", rsp->data[4], led_color_str[ rsp->data[4] ]);
+
+	/* override state or lamp test */
+	if (rsp->data[1] & 0x02) {
+		printf("  Override function:     %x  ", rsp->data[5] );
+		if (rsp->data[2] == 0x0) {
+			printf("[OFF]\n");
+		} else if (rsp->data[2] == 0xff) {
+			printf("[ON]\n");
+		} else {
+			printf("[BLINKING]\n");
+		}
+
+		printf("  Override On-Duration:  %x\n", rsp->data[6] );
+		printf("  Override Color:        %x  [%s]\n", rsp->data[7], led_color_str[ rsp->data[7] ]);
+
+	}
+
+	if (rsp->data[1] & 0x04) {
+		printf("  Lamp test duration:    %x\n", rsp->data[8] );
+	}
+
+	return 0;
+}
+
+int
+ipmi_picmg_set_led_state(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = PICMG_SET_FRU_LED_STATE_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+
+	msg_data[0] = 0x00;									/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0
+			|| is_led_id(argv[1], &msg_data[2]) != 0
+			|| is_led_function(argv[2], &msg_data[3]) != 0
+			|| is_led_color(argv[4], &msg_data[5]) != 0) {
+		return (-1);
+	}
+
+	/* Validating the LED duration is not as simple as the other arguments, as
+	 * the range of valid durations depends on the LED function.  From the spec:
+	 *
+	 * ``On-duration: LED on-time in tens of milliseconds if (1 <= Byte 4 <= FAh)
+	 * Lamp Test time in hundreds of milliseconds if (Byte 4 = FBh). Lamp Test
+	 * time value must be less than 128. Other values when Byte 4 = FBh are
+	 * reserved. Otherwise, this field is ignored and shall be set to 0h.''
+	 *
+	 * If we're doing a lamp test, then the allowed values are 0 -> 127.
+	 * Otherwise, the allowed values are 0 -> 255.  However, if the function is
+	 * not a lamp test (0xFB) and outside the range 0x01 -> 0xFA then the value
+	 * should be set to 0.
+	 *
+	 * Start by checking we have a parameter.
+	 */
+	if (!argv[3]) {
+		lprintf(LOG_ERR, "LED Duration: invalid argument(s).");
+		return (-1);
+	}
+	/* Next check we have a number. */
+	if (str2uchar(argv[3], &msg_data[4]) != 0) {
+		lprintf(LOG_ERR, "Given LED Duration '%s' is invalid", argv[3]);
+		return (-1);
+	}
+	/* If we have a lamp test, ensure it's not too long a duration. */
+	if (msg_data[3] == 0xFB && msg_data[4] > 127) {
+		lprintf(LOG_ERR, "Given LED Duration '%s' is invalid", argv[3]);
+		return (-1);
+	}
+	/* If we're outside the range that allows durations, set the duration to 0.
+	 * Warn the user that we're doing this.
+	 */
+	if (msg_data[4] != 0 && (msg_data[3] == 0 || msg_data[3] > 0xFB)) {
+		lprintf(LOG_WARN, "Setting LED Duration '%s' to '0'", argv[3]);
+		msg_data[4] = 0;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "LED set state failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+
+	return 0;
+}
+
+int
+ipmi_picmg_get_power_level(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int i;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_GET_POWER_LEVEL_CMD;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = 0x00;									/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+	/* PICMG Power Type - <0..3> */
+	if (str2uchar(argv[1], &msg_data[2]) != 0 || msg_data[2] > 3) {
+		lprintf(LOG_ERR, "Given Power Type '%s' is invalid",
+				argv[1]);
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Power level get failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+	printf("Dynamic Power Configuration: %s\n", (rsp->data[1]&0x80)==0x80?"enabled":"disabled" );
+	printf("Actual Power Level:          %i\n", (rsp->data[1] & 0xf));
+	printf("Delay to stable Power:       %i\n", rsp->data[2]);
+	printf("Power Multiplier:            %i\n", rsp->data[3]);
+
+
+	for ( i = 1; i+3 < rsp->data_len ; i++ ) {
+		printf("   Power Draw %i:            %i\n", i, (rsp->data[i+3]) * rsp->data[3] / 10);
+	}
+	return 0;
+}
+
+int
+ipmi_picmg_set_power_level(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_SET_POWER_LEVEL_CMD;
+	req.msg.data  = msg_data;
+	req.msg.data_len = 4;
+
+	msg_data[0] = 0x00;					/* PICMG identifier	 */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+	/* PICMG Power Level - <0x00..0x14>, [0xFF] */
+	if (str2uchar(argv[1], &msg_data[2]) != 0
+			|| (msg_data[2] > 0x14 && msg_data[2] != 0xFF)) {
+		lprintf(LOG_ERR,
+				"Given PICMG Power Level '%s' is invalid.",
+				argv[1]);
+		return (-1);
+	}
+	/* PICMG Present-to-desired - <0..1> */
+	if (str2uchar(argv[2], &msg_data[3]) != 0 || msg_data[3] > 1) {
+		lprintf(LOG_ERR,
+				"Given PICMG Present-to-desired '%s' is invalid.",
+				argv[2]);
+		return (-1);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Power level set failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+	return 0;
+}
+
+int
+ipmi_picmg_bused_resource(struct ipmi_intf * intf, t_picmg_bused_resource_mode mode)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+	memset(&req, 0, sizeof(req));
+
+   int status = 0;
+   switch ( mode ) {
+      case PICMG_BUSED_RESOURCE_SUMMARY:
+      {
+         t_picmg_busres_resource_id resource;
+         t_picmg_busres_board_cmd_types cmd =PICMG_BUSRES_BOARD_CMD_QUERY;
+
+         req.msg.netfn	  = IPMI_NETFN_PICMG;
+         req.msg.cmd	     = PICMG_BUSED_RESOURCE_CMD;
+         req.msg.data	  = msg_data;
+         req.msg.data_len = 3;
+
+         /* IF BOARD
+            query for all resources
+         */
+         for( resource=PICMG_BUSRES_METAL_TEST_BUS_1;resource<=PICMG_BUSRES_SYNC_CLOCK_GROUP_3;resource+=(t_picmg_busres_resource_id)1 ) {
+            msg_data[0] = 0x00;					/* PICMG identifier */
+            msg_data[1] = (unsigned char) cmd;
+            msg_data[2] = (unsigned char) resource;
+            rsp = intf->sendrecv(intf, &req);
+
+            if (!rsp) {
+               printf("bused resource control: no response\n");
+               return -1;
+            }
+
+            if (rsp->ccode) {
+               printf("bused resource control: returned CC code 0x%02x\n", rsp->ccode);
+               return -1;
+            } else {
+               printf("Resource 0x%02x '%-26s' : 0x%02x [%s] \n" , 
+                       resource, val2str(resource,picmg_busres_id_vals),
+                       rsp->data[1], oemval2str(cmd,rsp->data[1],
+                      picmg_busres_board_status_vals));
+            }
+         }
+      }
+      break;
+      default :
+      break;
+   }
+
+   return status;
+}
+
+int
+ipmi_picmg_fru_control(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn	  = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_FRU_CONTROL_CMD;
+	req.msg.data	  = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = 0x00;					/* PICMG identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+		return (-1);
+	}
+	/* FRU Control Option, valid range: <0..4> */
+	if (str2uchar(argv[1], &msg_data[2]) != 0 || msg_data[2] > 4) {
+		lprintf(LOG_ERR,
+				"Given FRU Control Option '%s' is invalid.",
+				argv[1]);
+		return (-1);
+	}
+
+	printf("FRU Device Id: %d FRU Control Option: %s\n", msg_data[1],  \
+				val2str( msg_data[2], picmg_frucontrol_vals));
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "frucontrol failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	} else {
+      printf("frucontrol: ok\n");
+	}
+
+
+
+	return 0;
+}
+
+
+int
+ipmi_picmg_clk_get(struct ipmi_intf * intf, uint8_t clk_id, int8_t clk_res,
+		int mode)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char enabled;
+	unsigned char direction;
+
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd   = PICMG_AMC_GET_CLK_STATE_CMD;
+	req.msg.data  = msg_data;
+
+	msg_data[0] = 0x00;									/* PICMG identifier	 */
+	msg_data[1] = clk_id;
+
+	if(clk_res == -1 || PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+		req.msg.data_len = 2;	/* for amc only channel */
+	}else{
+		req.msg.data_len = 3;	/* for carrier channel and device */
+      msg_data[2] = clk_res;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode && (mode == PICMG_EKEY_MODE_QUERY) ) {
+		lprintf(LOG_ERR, "Clk get failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+	if (rsp->ccode == 0 ) {
+		enabled	 = (rsp->data[1]&0x8)!=0;
+		direction = (rsp->data[1]&0x4)!=0;
+
+		if
+		( 
+			mode == PICMG_EKEY_MODE_QUERY
+ 			||
+ 			mode == PICMG_EKEY_MODE_PRINT_ALL
+ 			||
+ 			(
+ 				mode == PICMG_EKEY_MODE_PRINT_DISABLED
+ 				&&
+ 				enabled == 0
+ 			)
+ 			||
+ 			(
+ 				mode == PICMG_EKEY_MODE_PRINT_ENABLED
+ 				&&
+ 				enabled == 1
+         )	
+		) {
+			if( PicmgCardType != PICMG_CARD_TYPE_AMC ) {
+				printf("CLK resource id   : %3d [ %s ]\n", clk_res ,
+					oemval2str( ((clk_res>>6)&0x03), (clk_res&0x0F),
+														picmg_clk_resource_vals));				
+			} else {
+				printf("CLK resource id   : N/A [ AMC Module ]\n");
+				clk_res = 0x40; /* Set */
+			} 
+         printf("CLK id            : %3d [ %s ]\n", clk_id,
+					oemval2str( ((clk_res>>6)&0x03), clk_id ,
+														picmg_clk_id_vals));				
+
+
+			printf("CLK setting       : 0x%02x\n", rsp->data[1]);
+			printf(" - state:     %s\n", (enabled)?"enabled":"disabled");
+			printf(" - direction: %s\n", (direction)?"Source":"Receiver");
+			printf(" - PLL ctrl:  0x%x\n", rsp->data[1]&0x3);
+
+		   if(enabled){
+		      unsigned long freq = 0;
+		      freq = (  rsp->data[5] <<  0
+		              | rsp->data[6] <<  8
+		              | rsp->data[7] << 16
+		              | rsp->data[8] << 24 );
+		      printf("  - Index:  %3d\n", rsp->data[2]);
+		      printf("  - Family: %3d [ %s ] \n", rsp->data[3], 
+						val2str( rsp->data[3], picmg_clk_family_vals));
+		      printf("  - AccLVL: %3d [ %s ] \n", rsp->data[4], 
+						oemval2str( rsp->data[3], rsp->data[4],
+											picmg_clk_accuracy_vals));
+		
+		      printf("  - Freq:   %ld\n", freq);
+		   }
+		}
+	}
+	return 0;
+}
+
+
+int
+ipmi_picmg_clk_set(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	unsigned char msg_data[11] = {0};
+	uint32_t freq = 0;
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd	  = PICMG_AMC_SET_CLK_STATE_CMD;
+	req.msg.data  = msg_data;
+
+	msg_data[0] = 0x00;									/* PICMG identifier	 */
+	if (is_clk_id(argv[0], &msg_data[1]) != 0
+			|| is_clk_index(argv[1], &msg_data[2]) != 0
+			|| is_clk_setting(argv[2], &msg_data[3]) != 0
+			|| is_clk_family(argv[3], &msg_data[4]) != 0
+			|| is_clk_acc(argv[4], &msg_data[5]) != 0
+			|| is_clk_freq(argv[5], &freq) != 0) {
+		return (-1);
+	}
+
+	msg_data[6] = (freq >> 0)& 0xFF;		/* freq					 */
+	msg_data[7] = (freq >> 8)& 0xFF;		/* freq					 */
+	msg_data[8] = (freq >>16)& 0xFF;		/* freq					 */
+	msg_data[9] = (freq >>24)& 0xFF;		/* freq					 */
+
+	req.msg.data_len = 10;
+   if( PicmgCardType == PICMG_CARD_TYPE_ATCA  )
+   {
+      if( argc > 7)
+      {
+         req.msg.data_len = 11;
+		 if (is_clk_resid(argv[6], &msg_data[10]) != 0) {
+			 return (-1);
+		 }
+      }
+      else
+      {
+         lprintf(LOG_ERR, "Missing resource id for atca board.");
+         return -1;
+      }
+   }
+
+
+	rsp = intf->sendrecv(intf, &req);
+	if (!rsp) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	}
+
+	if (rsp->ccode) {
+		lprintf(LOG_ERR, "Clk set failed with CC code 0x%02x", rsp->ccode);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+
+int
+ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+	int showProperties = 0;
+
+	if (argc == 0 || (!strncmp(argv[0], "help", 4))) {
+		ipmi_picmg_help();
+		return 0;
+	}
+
+	/* Get PICMG properties is called to obtain version information */
+	if (argc !=0 && !strncmp(argv[0], "properties", 10)) {
+		showProperties =1;
+	}
+	rc = ipmi_picmg_properties(intf,showProperties);
+
+	/* address info command */
+	if (!strncmp(argv[0], "addrinfo", 8)) {
+		rc = ipmi_picmg_getaddr(intf, argc-1, &argv[1]);
+	}
+	else if (!strncmp(argv[0], "busres", 6)) {
+		if (argc > 1) {
+			if (!strncmp(argv[1], "summary", 7)) {
+				ipmi_picmg_bused_resource(intf, PICMG_BUSED_RESOURCE_SUMMARY );
+			}
+		} else {
+			lprintf(LOG_NOTICE, "usage: busres summary");
+      }
+	}
+	/* fru control command */
+	else if (!strncmp(argv[0], "frucontrol", 10)) {
+		if (argc > 2) {
+			rc = ipmi_picmg_fru_control(intf, argc-1, &(argv[1]));
+		}
+		else {
+			lprintf(LOG_NOTICE, "usage: frucontrol <FRU-ID> <OPTION>");
+			lprintf(LOG_NOTICE, "   OPTION:");
+			lprintf(LOG_NOTICE, "      0      - Cold Reset");
+			lprintf(LOG_NOTICE, "      1      - Warm Reset");
+			lprintf(LOG_NOTICE, "      2      - Graceful Reboot");
+			lprintf(LOG_NOTICE, "      3      - Issue Diagnostic Interrupt");
+			lprintf(LOG_NOTICE, "      4      - Quiesce [AMC only]");
+			lprintf(LOG_NOTICE, "      5-255  - Reserved");
+
+			return -1;
+		}
+
+	}
+
+	/* fru activation command */
+	else if (!strncmp(argv[0], "activate", 8)) {
+		if (argc > 1) {
+			rc = ipmi_picmg_fru_activation(intf, argc-1, &(argv[1]), PICMG_FRU_ACTIVATE);
+		}
+		else {
+			lprintf(LOG_ERR, "Specify the FRU to activate.");
+			return -1;
+		}
+	}
+
+	/* fru deactivation command */
+	else if (!strncmp(argv[0], "deactivate", 10)) {
+		if (argc > 1) {
+			rc = ipmi_picmg_fru_activation(intf, argc-1, &(argv[1]), PICMG_FRU_DEACTIVATE);
+		}else {
+			lprintf(LOG_ERR, "Specify the FRU to deactivate.");
+			return -1;
+		}
+	}
+
+	/* activation policy command */
+	else if (!strncmp(argv[0], "policy", 6)) {
+		if (argc > 1) {
+			if (!strncmp(argv[1], "get", 3)) {
+				if (argc > 2) {
+					rc = ipmi_picmg_fru_activation_policy_get(intf, argc-1, &(argv[2]));
+				} else {
+					lprintf(LOG_NOTICE, "usage: get <fruid>");
+				}
+			} else if (!strncmp(argv[1], "set", 3)) {
+				if (argc > 4) {
+					rc = ipmi_picmg_fru_activation_policy_set(intf, argc-1, &(argv[2]));
+				} else {
+					lprintf(LOG_NOTICE, "usage: set <fruid> <lockmask> <lock>");
+					lprintf(LOG_NOTICE,
+							"    lockmask:  [1] affect the deactivation locked bit");
+					lprintf(LOG_NOTICE,
+							"               [0] affect the activation locked bit");
+					lprintf(LOG_NOTICE,
+							"    lock:      [1] set/clear deactivation locked");
+					lprintf(LOG_NOTICE, "               [0] set/clear locked");
+				}
+			}
+			else {
+				lprintf(LOG_ERR, "Specify FRU.");
+				return -1;
+			}
+		} else {
+			lprintf(LOG_ERR, "Wrong parameters.");
+			return -1;
+		}
+	}
+
+	/* portstate command */
+	else if (!strncmp(argv[0], "portstate", 9)) {
+
+		lprintf(LOG_DEBUG,"PICMG: portstate API");
+
+		if (argc > 1) {
+			if (!strncmp(argv[1], "get", 3)) {
+				int32_t iface;
+				uint8_t channel = 0;
+
+				lprintf(LOG_DEBUG,"PICMG: get");
+
+				if(!strncmp(argv[1], "getall", 6)) {
+					for(iface=0;iface<=PICMG_EKEY_MAX_INTERFACE;iface++) {
+						for(channel=1;channel<=PICMG_EKEY_MAX_CHANNEL;channel++) {
+							if(!(( iface == FRU_PICMGEXT_DESIGN_IF_FABRIC ) &&
+							      ( channel > PICMG_EKEY_MAX_FABRIC_CHANNEL ) ))
+							{
+								rc = ipmi_picmg_portstate_get(intf,iface,channel,
+								        PICMG_EKEY_MODE_PRINT_ALL);
+							}
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getgranted", 10)) {
+					for(iface=0;iface<=PICMG_EKEY_MAX_INTERFACE;iface++) {
+						for(channel=1;channel<=PICMG_EKEY_MAX_CHANNEL;channel++) {
+							rc = ipmi_picmg_portstate_get(intf,iface,channel,
+							            PICMG_EKEY_MODE_PRINT_ENABLED);
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getdenied", 9)){
+					for(iface=0;iface<=PICMG_EKEY_MAX_INTERFACE;iface++) {
+						for(channel=1;channel<=PICMG_EKEY_MAX_CHANNEL;channel++) {
+							rc = ipmi_picmg_portstate_get(intf,iface,channel,
+							           PICMG_EKEY_MODE_PRINT_DISABLED);
+						}
+					}
+				}
+				else if (argc > 3){
+					if (is_amc_intf(argv[2], &iface) != 0
+							|| is_amc_channel(argv[3], &channel) != 0) {
+						return (-1);
+					}
+					lprintf(LOG_DEBUG,"PICMG: requesting interface %d",iface);
+					lprintf(LOG_DEBUG,"PICMG: requesting channel %d",channel);
+
+					rc = ipmi_picmg_portstate_get(intf,iface,channel,
+					            PICMG_EKEY_MODE_QUERY );
+				}
+				else {
+					lprintf(LOG_NOTICE, "<intf> <chn>|getall|getgranted|getdenied");
+				}
+			}
+			else if (!strncmp(argv[1], "set", 3)) {
+					if (argc == 9) {
+						int32_t interface = 0;
+						int32_t port = 0;
+						uint8_t channel = 0;
+						uint8_t enable = 0;
+						uint8_t group = 0;
+						uint8_t type = 0;
+						uint8_t typeext = 0;
+						if (is_amc_intf(argv[2], &interface) != 0
+								|| is_amc_channel(argv[3], &channel) != 0
+								|| is_amc_port(argv[4], &port) != 0
+								|| is_link_type(argv[5], &type) != 0
+								|| is_link_type_ext(argv[6], &typeext) != 0
+								|| is_link_group(argv[7], &group) != 0
+								|| is_enable(argv[8], &enable) != 0) {
+							return (-1);
+						}
+
+						lprintf(LOG_DEBUG,"PICMG: interface %d",interface);
+						lprintf(LOG_DEBUG,"PICMG: channel %d",channel);
+						lprintf(LOG_DEBUG,"PICMG: port %d",port);
+						lprintf(LOG_DEBUG,"PICMG: type %d",type);
+						lprintf(LOG_DEBUG,"PICMG: typeext %d",typeext);
+						lprintf(LOG_DEBUG,"PICMG: group %d",group);
+						lprintf(LOG_DEBUG,"PICMG: enable %d",enable);
+
+						rc = ipmi_picmg_portstate_set(intf, interface,
+						    channel, port, type, typeext  ,group ,enable);
+					}
+					else {
+						lprintf(LOG_NOTICE,
+								"<intf> <chn> <port> <type> <ext> <group> <1|0>");
+						return -1;
+					}
+			}
+		}
+		else {
+			lprintf(LOG_NOTICE, "<set>|<getall>|<getgranted>|<getdenied>");
+			return -1;
+		}
+	}
+	/* amc portstate command */
+	else if (!strncmp(argv[0], "amcportstate", 12)) {
+
+		lprintf(LOG_DEBUG,"PICMG: amcportstate API");
+
+		if (argc > 1) {
+			if (!strncmp(argv[1], "get", 3)){
+				int32_t device;
+				uint8_t channel;
+
+				lprintf(LOG_DEBUG,"PICMG: get");
+
+				if(!strncmp(argv[1], "getall", 6)){
+					int maxDevice = PICMG_EKEY_AMC_MAX_DEVICE;
+					if( PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+						maxDevice = 0;
+					}
+					for(device=0;device<=maxDevice;device++){
+						for(channel=0;channel<=PICMG_EKEY_AMC_MAX_CHANNEL;channel++){
+							rc = ipmi_picmg_amc_portstate_get(intf,device,channel,
+																	PICMG_EKEY_MODE_PRINT_ALL);
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getgranted", 10)){
+					int maxDevice = PICMG_EKEY_AMC_MAX_DEVICE;
+					if( PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+						maxDevice = 0;
+					}
+					for(device=0;device<=maxDevice;device++){
+						for(channel=0;channel<=PICMG_EKEY_AMC_MAX_CHANNEL;channel++){
+							rc = ipmi_picmg_amc_portstate_get(intf,device,channel,
+																  PICMG_EKEY_MODE_PRINT_ENABLED);
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getdenied", 9)){
+					int maxDevice = PICMG_EKEY_AMC_MAX_DEVICE;
+					if( PicmgCardType != PICMG_CARD_TYPE_ATCA ){
+						maxDevice = 0;
+					}
+					for(device=0;device<=maxDevice;device++){
+						for(channel=0;channel<=PICMG_EKEY_AMC_MAX_CHANNEL;channel++){
+							rc = ipmi_picmg_amc_portstate_get(intf,device,channel,
+                                                 PICMG_EKEY_MODE_PRINT_DISABLED);
+						}
+					}
+				}
+				else if (argc > 2){
+					if (is_amc_channel(argv[2], &channel) != 0) {
+						return (-1);
+					}
+					if (argc > 3){
+						if (is_amc_dev(argv[3], &device) != 0) {
+							return (-1);
+						}
+					}else{
+					   device = -1;
+				    }
+					lprintf(LOG_DEBUG,"PICMG: requesting device %d",device);
+					lprintf(LOG_DEBUG,"PICMG: requesting channel %d",channel);
+
+					rc = ipmi_picmg_amc_portstate_get(intf,device,channel,
+                                             PICMG_EKEY_MODE_QUERY );
+				}
+				else {
+					lprintf(LOG_NOTICE, "<chn> <device>|getall|getgranted|getdenied");
+				}
+			}
+			else if (!strncmp(argv[1], "set", 3)) {
+				if (argc > 7) {
+					int32_t device = -1;
+					int32_t port = 0;
+					uint8_t channel = 0;
+					uint8_t enable = 0;
+					uint8_t group = 0;
+					uint8_t type = 0;
+					uint8_t typeext = 0;
+					if (is_amc_channel(argv[2], &channel) != 0
+							|| is_amc_port(argv[3], &port) != 0
+							|| is_link_type(argv[4], &type) !=0
+							|| is_link_type_ext(argv[5], &typeext) != 0
+							|| is_link_group(argv[6], &group) != 0
+							|| is_enable(argv[7], &enable) != 0) {
+						return (-1);
+					}
+					if(argc > 8){
+						if (is_amc_dev(argv[8], &device) != 0) {
+							return (-1);
+						}
+					}
+
+					lprintf(LOG_DEBUG,"PICMG: channel %d",channel);
+					lprintf(LOG_DEBUG,"PICMG: portflags %d",port);
+					lprintf(LOG_DEBUG,"PICMG: type %d",type);
+					lprintf(LOG_DEBUG,"PICMG: typeext %d",typeext);
+					lprintf(LOG_DEBUG,"PICMG: group %d",group);
+					lprintf(LOG_DEBUG,"PICMG: enable %d",enable);
+					lprintf(LOG_DEBUG,"PICMG: device %d",device);
+
+					rc = ipmi_picmg_amc_portstate_set(intf, channel, port, type,
+                                               typeext, group, enable, device);
+				}
+				else {
+					lprintf(LOG_NOTICE,
+							"<chn> <portflags> <type> <ext> <group> <1|0> [<device>]");
+					return -1;
+				}
+			}
+		}
+		else {
+			lprintf(LOG_NOTICE, "<set>|<get>|<getall>|<getgranted>|<getdenied>");
+			return -1;
+		}
+	}
+	/* ATCA led commands */
+	else if (!strncmp(argv[0], "led", 3)) {
+		if (argc > 1) {
+			if (!strncmp(argv[1], "prop", 4)) {
+				if (argc > 2) {
+					rc = ipmi_picmg_get_led_properties(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE, "led prop <FRU-ID>");
+				}
+			}
+			else if (!strncmp(argv[1], "cap", 3)) {
+				if (argc > 3) {
+					rc = ipmi_picmg_get_led_capabilities(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE, "led cap <FRU-ID> <LED-ID>");
+				}
+			}
+			else if (!strncmp(argv[1], "get", 3)) {
+				if (argc > 3) {
+					rc = ipmi_picmg_get_led_state(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE, "led get <FRU-ID> <LED-ID>");
+				}
+			}
+			else if (!strncmp(argv[1], "set", 3)) {
+				if (argc > 6) {
+					rc = ipmi_picmg_set_led_state(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE,
+							"led set <FRU-ID> <LED-ID> <function> <duration> <color>");
+					lprintf(LOG_NOTICE, "   <FRU-ID>");
+					lprintf(LOG_NOTICE, "   <LED-ID>    0:         Blue LED");
+					lprintf(LOG_NOTICE, "               1:         LED 1");
+					lprintf(LOG_NOTICE, "               2:         LED 2");
+					lprintf(LOG_NOTICE, "               3:         LED 3");
+					lprintf(LOG_NOTICE, "               0x04-0xFE: OEM defined");
+					lprintf(LOG_NOTICE,
+							"               0xFF:      All LEDs under management control");
+					lprintf(LOG_NOTICE, "   <function>  0:       LED OFF override");
+					lprintf(LOG_NOTICE,
+							"               1 - 250: LED blinking override (off duration)");
+					lprintf(LOG_NOTICE, "               251:     LED Lamp Test");
+					lprintf(LOG_NOTICE,
+							"               252:     LED restore to local control");
+					lprintf(LOG_NOTICE, "               255:     LED ON override");
+					lprintf(LOG_NOTICE, "   <duration>  0 - 127: LED Lamp Test duration");
+					lprintf(LOG_NOTICE, "               0 - 255: LED Lamp ON duration");
+					lprintf(LOG_NOTICE, "   <color>     0:   reserved");
+					lprintf(LOG_NOTICE, "               1:   BLUE");
+					lprintf(LOG_NOTICE, "               2:   RED");
+					lprintf(LOG_NOTICE, "               3:   GREEN");
+					lprintf(LOG_NOTICE, "               4:   AMBER");
+					lprintf(LOG_NOTICE, "               5:   ORANGE");
+					lprintf(LOG_NOTICE, "               6:   WHITE");
+					lprintf(LOG_NOTICE, "               7:   reserved");
+					lprintf(LOG_NOTICE, "               0xE: do not change");
+					lprintf(LOG_NOTICE, "               0xF: use default color");
+				}
+			}
+			else {
+				lprintf(LOG_NOTICE, "prop | cap | get | set");
+			}
+		}
+	}
+	/* power commands */
+	else if (!strncmp(argv[0], "power", 5)) {
+		if (argc > 1) {
+			if (!strncmp(argv[1], "get", 3)) {
+				if (argc > 3) {
+					rc = ipmi_picmg_get_power_level(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE, "power get <FRU-ID> <type>");
+					lprintf(LOG_NOTICE, "   <type>   0 : steady state power draw levels");
+					lprintf(LOG_NOTICE,
+							"            1 : desired steady state draw levels");
+					lprintf(LOG_NOTICE, "            2 : early power draw levels");
+					lprintf(LOG_NOTICE, "            3 : desired early levels");
+
+					return -1;
+				}
+			}
+			else if (!strncmp(argv[1], "set", 3)) {
+				if (argc > 4) {
+					rc = ipmi_picmg_set_power_level(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE, "power set <FRU-ID> <level> <present-desired>");
+					lprintf(LOG_NOTICE, "   <level>  0 :        Power Off");
+					lprintf(LOG_NOTICE, "            0x1-0x14 : Power level");
+					lprintf(LOG_NOTICE, "            0xFF :     do not change");
+					lprintf(LOG_NOTICE,
+							"\n   <present-desired> 0: do not change present levels");
+					lprintf(LOG_NOTICE,
+							"                     1: copy desired to present level");
+
+					return -1;
+				}
+			}
+			else {
+				lprintf(LOG_NOTICE, "<set>|<get>");
+				return -1;
+			}
+		}
+		else {
+			lprintf(LOG_NOTICE, "<set>|<get>");
+			return -1;
+		}
+	}/* clk commands*/
+	else if (!strncmp(argv[0], "clk", 3)) {
+		if (argc > 1) {
+			if (!strncmp(argv[1], "get", 3)) {
+				int8_t clk_res = -1;            
+				uint8_t clk_id;
+				uint8_t max_res = 15;
+
+				if( PicmgCardType == PICMG_CARD_TYPE_AMC ) {
+					max_res = 0;
+				}
+
+				if(!strncmp(argv[1], "getall", 6)) {
+					if( verbose ) { printf("Getting all clock state\n") ;}	
+					for(clk_res=0;clk_res<=max_res;clk_res++) {
+						for(clk_id=0;clk_id<=15;clk_id++) {
+								rc = ipmi_picmg_clk_get(intf,clk_id,clk_res,
+								        PICMG_EKEY_MODE_PRINT_ALL);
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getdenied", 6)) {
+					if( verbose ) { printf("Getting disabled clocks\n") ;}	
+					for(clk_res=0;clk_res<=max_res;clk_res++) {
+						for(clk_id=0;clk_id<=15;clk_id++) {
+								rc = ipmi_picmg_clk_get(intf,clk_id,clk_res,
+								        PICMG_EKEY_MODE_PRINT_DISABLED);
+						}
+					}
+				}
+				else if(!strncmp(argv[1], "getgranted", 6)) {
+					if( verbose ) { printf("Getting enabled clocks\n") ;}	
+					for(clk_res=0;clk_res<=max_res;clk_res++) {
+						for(clk_id=0;clk_id<=15;clk_id++) {
+								rc = ipmi_picmg_clk_get(intf,clk_id,clk_res,
+								        PICMG_EKEY_MODE_PRINT_ENABLED);
+						}
+					}
+				}
+				else if (argc > 2) {
+					if (is_clk_id(argv[2], &clk_id) != 0) {
+						return (-1);
+					}
+					if (argc > 3) {
+						if (is_clk_resid(argv[3], &clk_res) != 0) {
+							return (-1);
+						}
+					}
+
+					rc = ipmi_picmg_clk_get(intf, clk_id, clk_res,
+							PICMG_EKEY_MODE_QUERY );
+				}
+				else {
+					lprintf(LOG_NOTICE, "clk get");
+					lprintf(LOG_NOTICE,
+							"<CLK-ID> [<DEV-ID>] |getall|getgranted|getdenied");
+					return -1;
+				}
+			}
+			else if (!strncmp(argv[1], "set", 3)) {
+				if (argc > 7) {
+					rc = ipmi_picmg_clk_set(intf, argc-1, &(argv[2]));
+				}
+				else {
+					lprintf(LOG_NOTICE,
+							"clk set <CLK-ID> <index> <setting> <family> <acc-lvl> <freq> [<DEV-ID>]");
+
+					return -1;
+				}
+			}
+			else {
+				lprintf(LOG_NOTICE, "<set>|<get>|<getall>|<getgranted>|<getdenied>");
+				return -1;
+			}
+		}
+		else {
+			lprintf(LOG_NOTICE, "<set>|<get>|<getall>|<getgranted>|<getdenied>");
+			return -1;
+		}
+	}
+
+	else if(showProperties == 0 ){
+
+		ipmi_picmg_help();
+		return -1;
+	}
+
+	return rc;
+}
+
+uint8_t
+ipmi_picmg_ipmb_address(struct ipmi_intf *intf) {
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t msg_data;
+
+	if (!intf->picmg_avail) {
+		return 0;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = PICMG_GET_ADDRESS_INFO_CMD;
+	msg_data    = 0x00;
+	req.msg.data = &msg_data;
+	req.msg.data_len = 1;
+	msg_data = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp && !rsp->ccode) {
+		return rsp->data[2];
+	}
+	if (rsp) {
+		lprintf(LOG_DEBUG, "Get Address Info failed: %#x %s",
+			rsp->ccode, val2str(rsp->ccode, completion_code_vals));
+	} else {
+		lprintf(LOG_DEBUG, "Get Address Info failed: No Response");
+	}
+	return 0;
+}
+
+uint8_t
+picmg_discover(struct ipmi_intf *intf) {
+	/* Check if PICMG extension is available to use the function 
+	 * GetDeviceLocator to retreive i2c address PICMG hack to set 
+	 * right IPMB address, If extension is not supported, should 
+	 * not give any problems
+	 *  PICMG Extension Version 2.0 (PICMG 3.0 Revision 1.0 ATCA) to
+	 *  PICMG Extension Version 2.3 (PICMG 3.0 Revision 3.0 ATCA)
+	 *  PICMG Extension Version 4.1 (PICMG 3.0 Revision 3.0 AMC)
+	 *  PICMG Extension Version 5.0 (MTCA.0 R1.0)
+	 */
+
+	/* First, check if PICMG extension is available and supported */
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t msg_data;
+	uint8_t picmg_avail = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = PICMG_GET_PICMG_PROPERTIES_CMD;
+	msg_data    = 0x00;
+	req.msg.data = &msg_data;
+	req.msg.data_len = 1;
+	msg_data = 0;
+
+	lprintf(LOG_INFO, "Running Get PICMG Properties my_addr %#x, transit %#x, target %#x",
+		intf->my_addr, intf->transit_addr, intf->target_addr);
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+	    lprintf(LOG_INFO,"No response from Get PICMG Properties");
+	} else if (rsp->ccode != 0) {
+	    lprintf(LOG_INFO,"Error response %#x from Get PICMG Properities",
+		    rsp->ccode);
+	} else if (rsp->data_len < 4) {
+	    lprintf(LOG_INFO,"Invalid Get PICMG Properties response length %d",
+		    rsp->data_len);
+	} else if (rsp->data[0] != 0) {
+	    lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x",
+		    rsp->data[0]);
+	} else if ((rsp->data[1] & 0x0F) != PICMG_EXTENSION_ATCA_MAJOR_VERSION
+		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_AMC0_MAJOR_VERSION
+		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_UTCA_MAJOR_VERSION) {
+	    lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d",
+		    (rsp->data[1] & 0x0F), (rsp->data[1] >> 4));
+	} else {
+	    picmg_avail = 1;
+	    lprintf(LOG_INFO, "Discovered PICMG Extension Version %d.%d",
+		    (rsp->data[1] & 0x0f), (rsp->data[1] >> 4));
+	}
+
+	return picmg_avail;
+}
diff --git a/lib/ipmi_raw.c b/lib/ipmi_raw.c
new file mode 100644
index 0000000..92c0177
--- /dev/null
+++ b/lib/ipmi_raw.c
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_raw.h>
+#include <ipmitool/ipmi_strings.h>
+
+#define IPMI_I2C_MASTER_MAX_SIZE	0x40 /* 64 bytes */
+
+static int is_valid_param(const char *input_param, uint8_t *uchr_ptr,
+		const char *label);
+int ipmi_spd_print(uint8_t *, int);
+
+/* ipmi_master_write_read  -  Perform I2C write/read transactions
+ *
+ * This function performs an I2C master write-read function through
+ * IPMI interface.  It has a maximum transfer size of 32 bytes.
+ *
+ * @intf:	ipmi interface
+ * @bus:	channel number, i2c bus id and type
+ * @addr:	i2c slave address
+ * @wdata:	data to write
+ * @wsize:	length of data to write (max 64 bytes)
+ * @rsize:	length of data to read (max 64 bytes)
+ *
+ * Returns pointer to IPMI Response
+ */
+struct ipmi_rs *
+ipmi_master_write_read(struct ipmi_intf * intf, uint8_t bus, uint8_t addr,
+		       uint8_t * wdata, uint8_t wsize, uint8_t rsize)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	uint8_t rqdata[IPMI_I2C_MASTER_MAX_SIZE + 3];
+
+	if (rsize > IPMI_I2C_MASTER_MAX_SIZE) {
+		lprintf(LOG_ERR, "Master Write-Read: Too many bytes (%d) to read", rsize);
+		return NULL;
+	}
+	if (wsize > IPMI_I2C_MASTER_MAX_SIZE) {
+		lprintf(LOG_ERR, "Master Write-Read: Too many bytes (%d) to write", wsize);
+		return NULL;
+	}
+
+	memset(&req, 0, sizeof(struct ipmi_rq));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = 0x52;	/* master write-read */
+	req.msg.data = rqdata;
+	req.msg.data_len = 3;
+
+	memset(rqdata, 0, IPMI_I2C_MASTER_MAX_SIZE + 3);
+	rqdata[0] = bus;	/* channel number, bus id, bus type */
+	rqdata[1] = addr;	/* slave address */
+	rqdata[2] = rsize;      /* number of bytes to read */
+
+	if (wsize > 0) {
+		/* copy in data to write */
+		memcpy(rqdata+3, wdata, wsize);
+		req.msg.data_len += wsize;
+		lprintf(LOG_DEBUG, "Writing %d bytes to i2cdev %02Xh", wsize, addr);
+	}
+
+	if (rsize > 0) {
+		lprintf(LOG_DEBUG, "Reading %d bytes from i2cdev %02Xh", rsize, addr);
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "I2C Master Write-Read command failed");
+		return NULL;
+	}
+	else if (rsp->ccode > 0) {
+		switch (rsp->ccode) {
+		case 0x81:
+			lprintf(LOG_ERR, "I2C Master Write-Read command failed: Lost Arbitration");
+			break;
+		case 0x82:
+			lprintf(LOG_ERR, "I2C Master Write-Read command failed: Bus Error");
+			break;
+		case 0x83:
+			lprintf(LOG_ERR, "I2C Master Write-Read command failed: NAK on Write");
+			break;
+		case 0x84:
+			lprintf(LOG_ERR, "I2C Master Write-Read command failed: Truncated Read");
+			break;
+		default:
+			lprintf(LOG_ERR, "I2C Master Write-Read command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			break;
+		}
+		return NULL;
+	}
+
+	return rsp;
+}
+
+#define RAW_SPD_SIZE	512
+
+int
+ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs *rsp;
+	uint8_t msize = IPMI_I2C_MASTER_MAX_SIZE; /* allow to override default */
+	uint8_t channel = 0;
+	uint8_t i2cbus = 0;
+	uint8_t i2caddr = 0;
+	uint8_t spd_data[RAW_SPD_SIZE];
+	int i;
+
+	memset(spd_data, 0, RAW_SPD_SIZE);
+
+	if (argc < 2 || strncmp(argv[0], "help", 4) == 0) {
+		lprintf(LOG_NOTICE, "usage: spd <i2cbus> <i2caddr> [channel] [maxread]");
+		return 0;
+	}
+
+	if (is_valid_param(argv[0], &i2cbus, "i2cbus") != 0)
+		return (-1);
+
+	if (is_valid_param(argv[1], &i2caddr, "i2caddr") != 0)
+		return (-1);
+
+	if (argc >= 3) {
+		if (is_valid_param(argv[2], &channel, "channel") != 0)
+			return (-1);
+	}
+
+	if (argc >= 4) {
+		if (is_valid_param(argv[3], &msize, "maxread") != 0)
+			return (-1);
+	}
+
+	i2cbus = ((channel & 0xF) << 4) | ((i2cbus & 7) << 1) | 1;
+
+	for (i = 0; i < RAW_SPD_SIZE; i+= msize) {
+		rsp = ipmi_master_write_read(intf, i2cbus, i2caddr,
+					     (uint8_t *)&i, 1, msize );
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Unable to perform I2C Master Write-Read");
+			return -1;
+		}
+
+		memcpy(spd_data+i, rsp->data, msize);
+	}
+
+	ipmi_spd_print(spd_data, i);
+	return 0;
+}
+
+static void rawi2c_usage(void)
+{
+	lprintf(LOG_NOTICE, "usage: i2c [bus=public|# [chan=#] <i2caddr> <read bytes> [write data]");
+	lprintf(LOG_NOTICE, "            bus=public is default");
+	lprintf(LOG_NOTICE, "            chan=0 is default, bus= must be specified to use chan=");
+}
+
+int
+ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	uint8_t wdata[IPMI_I2C_MASTER_MAX_SIZE];
+	uint8_t i2caddr = 0;
+	uint8_t rsize = 0;
+	uint8_t wsize = 0;
+	unsigned int rbus = 0;
+	uint8_t bus = 0;
+	int i = 0;
+
+	/* handle bus= argument */
+	if (argc > 2 && strncmp(argv[0], "bus=", 4) == 0) {
+		i = 1;
+		if (strncmp(argv[0], "bus=public", 10) == 0)
+			bus = 0;
+		else if (sscanf(argv[0], "bus=%u", &rbus) == 1)
+			bus = ((rbus & 7) << 1) | 1;
+		else
+			bus = 0;
+
+		/* handle channel= argument
+		 * the bus= argument must be supplied first on command line */
+		if (argc > 3 && strncmp(argv[1], "chan=", 5) == 0) {
+			i = 2;
+			if (sscanf(argv[1], "chan=%u", &rbus) == 1)
+				bus |= rbus << 4;
+		}
+	}
+
+	if ((argc-i) < 2 || strncmp(argv[0], "help", 4) == 0) {
+		rawi2c_usage();
+		return 0;
+	}
+	else if (argc-i-2 > IPMI_I2C_MASTER_MAX_SIZE) {
+		lprintf(LOG_ERR, "Raw command input limit (%d bytes) exceeded",
+			IPMI_I2C_MASTER_MAX_SIZE);
+		return -1;
+	}
+
+	if (is_valid_param(argv[i++], &i2caddr, "i2caddr") != 0)
+		return (-1);
+
+	if (is_valid_param(argv[i++], &rsize, "read size") != 0)
+		return (-1);
+
+	if (i2caddr == 0) {
+		lprintf(LOG_ERR, "Invalid I2C address 0");
+		rawi2c_usage();
+		return -1;
+	}
+
+	memset(wdata, 0, IPMI_I2C_MASTER_MAX_SIZE);
+	for (; i < argc; i++) {
+		uint8_t val = 0;
+
+		if (is_valid_param(argv[i], &val, "parameter") != 0)
+			return (-1);
+
+		wdata[wsize] = val;
+		wsize++;
+	}
+
+	lprintf(LOG_INFO, "RAW I2C REQ (i2caddr=%x readbytes=%d writebytes=%d)",
+		i2caddr, rsize, wsize);
+	printbuf(wdata, wsize, "WRITE DATA");
+
+	rsp = ipmi_master_write_read(intf, bus, i2caddr, wdata, wsize, rsize);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to perform I2C Master Write-Read");
+		return -1;
+	}
+
+	if (wsize > 0) {
+		if (verbose || rsize == 0)
+			printf("Wrote %d bytes to I2C device %02Xh\n", wsize, i2caddr);
+	}
+
+	if (rsize > 0) {
+		if (verbose || wsize == 0)
+			printf("Read %d bytes from I2C device %02Xh\n", rsp->data_len, i2caddr);
+
+		if (rsp->data_len < rsize)
+			return -1;
+
+		/* print the raw response buffer */
+		for (i=0; i<rsp->data_len; i++) {
+			if (((i%16) == 0) && (i != 0))
+				printf("\n");
+			printf(" %2.2x", rsp->data[i]);
+		}
+		printf("\n");
+
+		if (rsp->data_len <= 4) {
+			uint32_t bit;
+			int j;
+			for (i = 0; i < rsp->data_len; i++) {
+				for (j = 1, bit = 0x80; bit > 0; bit /= 2, j++) {
+					printf("%s", (rsp->data[i] & bit) ? "1" : "0");
+				}
+				printf(" ");
+			}
+			printf("\n");
+		}
+	}
+
+	return 0;
+}
+
+/* ipmi_raw_help() - print 'raw' help text
+ *
+ * returns void
+ */
+void
+ipmi_raw_help()
+{
+	lprintf(LOG_NOTICE, "RAW Commands:  raw <netfn> <cmd> [data]");
+	print_valstr(ipmi_netfn_vals, "Network Function Codes", LOG_NOTICE);
+	lprintf(LOG_NOTICE, "(can also use raw hex values)");
+} /* ipmi_raw_help() */
+
+int
+ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t netfn, cmd, lun;
+	uint16_t netfn_tmp = 0;
+	int i;
+	uint8_t data[256];
+
+	if (argc == 1 && strncmp(argv[0], "help", 4) == 0) {
+		ipmi_raw_help();
+		return 0;
+	}
+	else if (argc < 2) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		ipmi_raw_help();
+		return (-1);
+	}
+	else if (argc > sizeof(data))
+	{
+		lprintf(LOG_NOTICE, "Raw command input limit (256 bytes) exceeded");
+		return -1;
+	}
+
+	lun = intf->target_lun;
+	netfn_tmp = str2val(argv[0], ipmi_netfn_vals);
+	if (netfn_tmp == 0xff) {
+		if (is_valid_param(argv[0], &netfn, "netfn") != 0)
+			return (-1);
+	} else {
+		if (netfn_tmp >= UINT8_MAX) {
+			lprintf(LOG_ERR, "Given netfn \"%s\" is out of range.", argv[0]);
+			return (-1);
+		}
+		netfn = netfn_tmp;
+	}
+
+	if (is_valid_param(argv[1], &cmd, "command") != 0)
+		return (-1);
+
+	memset(data, 0, sizeof(data));
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = netfn;
+	req.msg.lun = lun;
+	req.msg.cmd = cmd;
+	req.msg.data = data;
+
+	for (i=2; i<argc; i++) {
+		uint8_t val = 0;
+
+		if (is_valid_param(argv[i], &val, "data") != 0)
+			return (-1);
+
+		req.msg.data[i-2] = val;
+		req.msg.data_len++;
+	}
+
+	lprintf(LOG_INFO, 
+           "RAW REQ (channel=0x%x netfn=0x%x lun=0x%x cmd=0x%x data_len=%d)",
+           intf->target_channel & 0x0f, req.msg.netfn,req.msg.lun , 
+           req.msg.cmd, req.msg.data_len);
+
+	printbuf(req.msg.data, req.msg.data_len, "RAW REQUEST");
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to send RAW command "
+			"(channel=0x%x netfn=0x%x lun=0x%x cmd=0x%x)",
+			intf->target_channel & 0x0f, req.msg.netfn, req.msg.lun, req.msg.cmd);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Unable to send RAW command "
+			"(channel=0x%x netfn=0x%x lun=0x%x cmd=0x%x rsp=0x%x): %s",
+			intf->target_channel & 0x0f, req.msg.netfn, req.msg.lun, req.msg.cmd, rsp->ccode,
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_INFO, "RAW RSP (%d bytes)", rsp->data_len);
+
+	/* print the raw response buffer */
+	for (i=0; i<rsp->data_len; i++) {
+		if (((i%16) == 0) && (i != 0))
+			printf("\n");
+		printf(" %2.2x", rsp->data[i]);
+	}
+	printf("\n");
+
+	return 0;
+}
+
+/* is_valid_param - 
+ *
+ * @input_param: string to convert from
+ * @uchr_ptr: pointer where to store converted value
+ * @label: string used in error message
+ *
+ * returns   0  if parameter is valid
+ * returns (-1) if parameter is invalid/on error
+ */
+int
+is_valid_param(const char *input_param, uint8_t *uchr_ptr, const char *label) {
+	if (input_param == NULL || label == NULL) {
+		lprintf(LOG_ERROR, "ERROR: NULL pointer passed.");
+		return (-1);
+	}
+	if (str2uchar(input_param, uchr_ptr) == 0)
+		return 0;
+
+	lprintf(LOG_ERR, "Given %s \"%s\" is invalid.", label, input_param);
+	return (-1);
+}
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
new file mode 100644
index 0000000..2a9cbe3
--- /dev/null
+++ b/lib/ipmi_sdr.c
@@ -0,0 +1,4806 @@
+/*
+ * Copyright (c) 2012 Hewlett-Packard Development Company, L.P.
+ *
+ * Based on code from
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _BSD_SOURCE
+
+#include <string.h>
+
+#include <math.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <time.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_sdradd.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_entity.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_strings.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+extern int verbose;
+static int use_built_in;	/* Uses DeviceSDRs instead of SDRR */
+static int sdr_max_read_len = 0;
+static int sdr_extended = 0;
+static long sdriana = 0;
+
+static struct sdr_record_list *sdr_list_head = NULL;
+static struct sdr_record_list *sdr_list_tail = NULL;
+static struct ipmi_sdr_iterator *sdr_list_itr = NULL;
+
+void printf_sdr_usage();
+
+/* From src/plugins/ipmi_intf.c: */
+uint16_t
+ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf);
+
+/* ipmi_sdr_get_unit_string  -  return units for base/modifier
+ *
+ * @pct:	units are a percentage
+ * @type:	unit type
+ * @base:	base
+ * @modifier:	modifier
+ *
+ * returns pointer to static string
+ */
+const char *
+ipmi_sdr_get_unit_string(uint8_t pct, uint8_t type, uint8_t base, uint8_t modifier)
+{
+	static char unitstr[16];
+	/*
+	 * By default, if units are supposed to be percent, we will pre-pend
+	 * the percent string  to the textual representation of the units.
+	 */
+	char *pctstr = pct ? "% " : "";
+	memset(unitstr, 0, sizeof (unitstr));
+	switch (type) {
+	case 2:
+		snprintf(unitstr, sizeof (unitstr), "%s%s * %s",
+			 pctstr, unit_desc[base], unit_desc[modifier]);
+		break;
+	case 1:
+		snprintf(unitstr, sizeof (unitstr), "%s%s/%s",
+			 pctstr, unit_desc[base], unit_desc[modifier]);
+		break;
+	case 0:
+	default:
+		/*
+		 * Display the text "percent" only when the Base unit is
+		 * "unspecified" and the caller specified to print percent.
+		 */
+		if (base == 0 && pct) {
+			snprintf(unitstr, sizeof(unitstr), "percent");
+		} else {
+			snprintf(unitstr, sizeof (unitstr), "%s%s", 
+				pctstr, unit_desc[base]);
+		}
+		break;
+	}
+	return unitstr;
+}
+
+/* sdr_sensor_has_analog_reading  -  Determine if sensor has an analog reading
+ *
+ */
+static int
+sdr_sensor_has_analog_reading(struct ipmi_intf *intf,
+			    struct sensor_reading *sr)
+{
+	/* Compact sensors can't return analog values so we false */
+	if (!sr->full) {
+		return 0;
+	}
+	/*
+	 * Per the IPMI Specification:
+	 *	Only Full Threshold sensors are identified as providing
+	 *	analog readings.
+	 *
+	 * But... HP didn't interpret this as meaning that "Only Threshold
+	 *        Sensors" can provide analog readings.  So, HP packed analog
+	 *        readings into some of their non-Threshold Sensor.   There is
+	 *	  nothing that explictly prohibits this in the spec, so if
+	 *	  an Analog reading is available in a Non-Threshod sensor and
+	 *	  there are units specified for identifying the reading then
+	 *	  we do an analog conversion even though the sensor is
+	 *	  non-Threshold.   To be safe, we provide this extension for
+	 *	  HP.
+	 *
+	 */
+	if ( UNITS_ARE_DISCRETE(&sr->full->cmn) ) {
+		return 0;/* Sensor specified as not having Analog Units */
+	}
+	if ( !IS_THRESHOLD_SENSOR(&sr->full->cmn) ) {
+		/* Non-Threshold Sensors are not defined as having analog */
+		/* But.. We have one with defined with Analog Units */
+		if ( (sr->full->cmn.unit.pct | sr->full->cmn.unit.modifier |
+			 sr->full->cmn.unit.type.base |
+			 sr->full->cmn.unit.type.modifier)) {
+			 /* And it does have the necessary units specs */
+			 if ( !(intf->manufacturer_id == IPMI_OEM_HP) ) {
+				/* But to be safe we only do this for HP */
+				return 0;
+			 }
+		} else {
+			return 0;
+		}
+	}
+	/*
+	 * If sensor has linearization, then we should be able to update the
+	 * reading factors and if we cannot fail the conversion.
+	 */
+	if (sr->full->linearization >= SDR_SENSOR_L_NONLINEAR &&
+	    sr->full->linearization <= 0x7F) {
+		if (ipmi_sensor_get_sensor_reading_factors(intf, sr->full, sr->s_reading) < 0){
+			sr->s_reading_valid = 0;
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
+/* sdr_convert_sensor_reading  -  convert raw sensor reading
+ *
+ * @sensor:	sensor record
+ * @val:	raw sensor reading
+ *
+ * returns floating-point sensor reading
+ */
+double
+sdr_convert_sensor_reading(struct sdr_record_full_sensor *sensor, uint8_t val)
+{
+	int m, b, k1, k2;
+	double result;
+
+	m = __TO_M(sensor->mtol);
+	b = __TO_B(sensor->bacc);
+	k1 = __TO_B_EXP(sensor->bacc);
+	k2 = __TO_R_EXP(sensor->bacc);
+
+	switch (sensor->cmn.unit.analog) {
+	case 0:
+		result = (double) (((m * val) +
+				    (b * pow(10, k1))) * pow(10, k2));
+		break;
+	case 1:
+		if (val & 0x80)
+			val++;
+		/* Deliberately fall through to case 2. */
+	case 2:
+		result = (double) (((m * (int8_t) val) +
+				    (b * pow(10, k1))) * pow(10, k2));
+		break;
+	default:
+		/* Oops! This isn't an analog sensor. */
+		return 0.0;
+	}
+
+	switch (sensor->linearization & 0x7f) {
+	case SDR_SENSOR_L_LN:
+		result = log(result);
+		break;
+	case SDR_SENSOR_L_LOG10:
+		result = log10(result);
+		break;
+	case SDR_SENSOR_L_LOG2:
+		result = (double) (log(result) / log(2.0));
+		break;
+	case SDR_SENSOR_L_E:
+		result = exp(result);
+		break;
+	case SDR_SENSOR_L_EXP10:
+		result = pow(10.0, result);
+		break;
+	case SDR_SENSOR_L_EXP2:
+		result = pow(2.0, result);
+		break;
+	case SDR_SENSOR_L_1_X:
+		result = pow(result, -1.0);	/*1/x w/o exception */
+		break;
+	case SDR_SENSOR_L_SQR:
+		result = pow(result, 2.0);
+		break;
+	case SDR_SENSOR_L_CUBE:
+		result = pow(result, 3.0);
+		break;
+	case SDR_SENSOR_L_SQRT:
+		result = sqrt(result);
+		break;
+	case SDR_SENSOR_L_CUBERT:
+		result = cbrt(result);
+		break;
+	case SDR_SENSOR_L_LINEAR:
+	default:
+		break;
+	}
+	return result;
+}
+/* sdr_convert_sensor_hysterisis  -  convert raw sensor hysterisis
+ *
+ * Even though spec says histerisis should be computed using Mx+B
+ * formula, B is irrelevant when doing raw comparison
+ *
+ * threshold rearm point is computed using threshold +/- hysterisis
+ * with the full formula however B can't be applied in raw comparisons
+ *
+ * @sensor:	sensor record
+ * @val:	raw sensor reading
+ *
+ * returns floating-point sensor reading
+ */
+double
+sdr_convert_sensor_hysterisis(struct sdr_record_full_sensor *sensor, uint8_t val)
+{
+	int m, k2;
+	double result;
+
+	m = __TO_M(sensor->mtol);
+
+	k2 = __TO_R_EXP(sensor->bacc);
+
+	switch (sensor->cmn.unit.analog) {
+	case 0:
+		result = (double) (((m * val)) * pow(10, k2));
+		break;
+	case 1:
+		if (val & 0x80)
+			val++;
+		/* Deliberately fall through to case 2. */
+	case 2:
+		result = (double) (((m * (int8_t) val) ) * pow(10, k2));
+		break;
+	default:
+		/* Oops! This isn't an analog sensor. */
+		return 0.0;
+	}
+
+	switch (sensor->linearization & 0x7f) {
+	case SDR_SENSOR_L_LN:
+		result = log(result);
+		break;
+	case SDR_SENSOR_L_LOG10:
+		result = log10(result);
+		break;
+	case SDR_SENSOR_L_LOG2:
+		result = (double) (log(result) / log(2.0));
+		break;
+	case SDR_SENSOR_L_E:
+		result = exp(result);
+		break;
+	case SDR_SENSOR_L_EXP10:
+		result = pow(10.0, result);
+		break;
+	case SDR_SENSOR_L_EXP2:
+		result = pow(2.0, result);
+		break;
+	case SDR_SENSOR_L_1_X:
+		result = pow(result, -1.0);	/*1/x w/o exception */
+		break;
+	case SDR_SENSOR_L_SQR:
+		result = pow(result, 2.0);
+		break;
+	case SDR_SENSOR_L_CUBE:
+		result = pow(result, 3.0);
+		break;
+	case SDR_SENSOR_L_SQRT:
+		result = sqrt(result);
+		break;
+	case SDR_SENSOR_L_CUBERT:
+		result = cbrt(result);
+		break;
+	case SDR_SENSOR_L_LINEAR:
+	default:
+		break;
+	}
+	return result;
+}
+
+
+/* sdr_convert_sensor_tolerance  -  convert raw sensor reading
+ *
+ * @sensor:	sensor record
+ * @val:	raw sensor reading
+ *
+ * returns floating-point sensor tolerance(interpreted)
+ */
+double
+sdr_convert_sensor_tolerance(struct sdr_record_full_sensor *sensor, uint8_t val)
+{
+	int m,   k2;
+	double result;
+
+	m = __TO_M(sensor->mtol);
+	k2 = __TO_R_EXP(sensor->bacc);
+
+	switch (sensor->cmn.unit.analog) {
+	case 0:
+                /* as suggested in section 30.4.1 of IPMI 1.5 spec */
+		result = (double) ((((m * (double)val/2)) ) * pow(10, k2));
+		break;
+	case 1:
+		if (val & 0x80)
+			val++;
+		/* Deliberately fall through to case 2. */
+	case 2:
+		result = (double) (((m * ((double)((int8_t) val)/2))) * pow(10, k2));
+		break;
+	default:
+		/* Oops! This isn't an analog sensor. */
+		return 0.0;
+	}
+
+	switch (sensor->linearization & 0x7f) {
+	case SDR_SENSOR_L_LN:
+		result = log(result);
+		break;
+	case SDR_SENSOR_L_LOG10:
+		result = log10(result);
+		break;
+	case SDR_SENSOR_L_LOG2:
+		result = (double) (log(result) / log(2.0));
+		break;
+	case SDR_SENSOR_L_E:
+		result = exp(result);
+		break;
+	case SDR_SENSOR_L_EXP10:
+		result = pow(10.0, result);
+		break;
+	case SDR_SENSOR_L_EXP2:
+		result = pow(2.0, result);
+		break;
+	case SDR_SENSOR_L_1_X:
+		result = pow(result, -1.0);	/*1/x w/o exception */
+		break;
+	case SDR_SENSOR_L_SQR:
+		result = pow(result, 2.0);
+		break;
+	case SDR_SENSOR_L_CUBE:
+		result = pow(result, 3.0);
+		break;
+	case SDR_SENSOR_L_SQRT:
+		result = sqrt(result);
+		break;
+	case SDR_SENSOR_L_CUBERT:
+		result = cbrt(result);
+		break;
+	case SDR_SENSOR_L_LINEAR:
+	default:
+		break;
+	}
+	return result;
+}
+
+/* sdr_convert_sensor_value_to_raw  -  convert sensor reading back to raw
+ *
+ * @sensor:	sensor record
+ * @val:	converted sensor reading
+ *
+ * returns raw sensor reading
+ */
+uint8_t
+sdr_convert_sensor_value_to_raw(struct sdr_record_full_sensor * sensor,
+				double val)
+{
+	int m, b, k1, k2;
+	double result;
+
+	/* only works for analog sensors */
+	if (UNITS_ARE_DISCRETE((&sensor->cmn)))
+		return 0;
+
+	m = __TO_M(sensor->mtol);
+	b = __TO_B(sensor->bacc);
+	k1 = __TO_B_EXP(sensor->bacc);
+	k2 = __TO_R_EXP(sensor->bacc);
+
+	/* don't divide by zero */
+	if (m == 0)
+		return 0;
+
+	result = (((val / pow(10, k2)) - (b * pow(10, k1))) / m);
+
+	if ((result - (int) result) >= .5)
+		return (uint8_t) ceil(result);
+	else
+		return (uint8_t) result;
+}
+
+/* ipmi_sdr_get_sensor_thresholds  -  return thresholds for sensor
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor number
+ * @target:	sensor owner ID
+ * @lun:	sensor lun
+ * @channel:	channel number
+ *
+ * returns pointer to ipmi response
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_thresholds(struct ipmi_intf *intf, uint8_t sensor,
+					uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = GET_SENSOR_THRESHOLDS;
+	req.msg.data = &sensor;
+	req.msg.data_len = sizeof (sensor);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+/* ipmi_sdr_get_sensor_hysteresis  -  return hysteresis for sensor
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor number
+ * @target:	sensor owner ID
+ * @lun:	sensor lun
+ * @channel:	channel number
+ *
+ * returns pointer to ipmi response
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_hysteresis(struct ipmi_intf *intf, uint8_t sensor,
+					uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	uint8_t rqdata[2];
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+
+	rqdata[0] = sensor;
+	rqdata[1] = 0xff;	/* reserved */
+
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = GET_SENSOR_HYSTERESIS;
+	req.msg.data = rqdata;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+/* ipmi_sdr_get_sensor_reading  -  retrieve a raw sensor reading
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor id
+ *
+ * returns ipmi response structure
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_reading(struct ipmi_intf *intf, uint8_t sensor)
+{
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.cmd = GET_SENSOR_READING;
+	req.msg.data = &sensor;
+	req.msg.data_len = 1;
+
+	return intf->sendrecv(intf, &req);
+}
+
+
+/* ipmi_sdr_get_sensor_reading_ipmb  -  retrieve a raw sensor reading from ipmb
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor id
+ * @target:	IPMB target address
+ * @lun:	sensor lun
+ * @channel:	channel number
+ *
+ * returns ipmi response structure
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf, uint8_t sensor,
+				 uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+		lprintf(LOG_DEBUG,
+			"Bridge to Sensor "
+			"Intf my/%#x tgt/%#x:%#x Sdr tgt/%#x:%#x\n",
+			intf->my_addr, intf->target_addr, intf->target_channel,
+			target, channel);
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = GET_SENSOR_READING;
+	req.msg.data = &sensor;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr    = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+/* ipmi_sdr_get_sensor_event_status  -  retrieve sensor event status
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor id
+ * @target:	sensor owner ID
+ * @lun:	sensor lun
+ * @channel:	channel number
+ *
+ * returns ipmi response structure
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_event_status(struct ipmi_intf *intf, uint8_t sensor,
+				 uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = GET_SENSOR_EVENT_STATUS;
+	req.msg.data = &sensor;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+/* ipmi_sdr_get_sensor_event_enable  -  retrieve sensor event enables
+ *
+ * @intf:	ipmi interface
+ * @sensor:	sensor id
+ * @target:	sensor owner ID
+ * @lun:	sensor lun
+ * @channel:	channel number
+ *
+ * returns ipmi response structure
+ */
+struct ipmi_rs *
+ipmi_sdr_get_sensor_event_enable(struct ipmi_intf *intf, uint8_t sensor,
+				 uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = GET_SENSOR_EVENT_ENABLE;
+	req.msg.data = &sensor;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+/* ipmi_sdr_get_thresh_status  -  threshold status indicator
+ *
+ * @rsp:		response from Get Sensor Reading comand
+ * @validread:	validity of the status field argument
+ * @invalidstr:	string to return if status field is not valid
+ *
+ * returns
+ *   cr = critical
+ *   nc = non-critical
+ *   nr = non-recoverable
+ *   ok = ok
+ *   ns = not specified
+ */
+const char *
+ipmi_sdr_get_thresh_status(struct sensor_reading *sr, const char *invalidstr)
+{
+	uint8_t stat;
+	if (!sr->s_reading_valid) {
+	    return invalidstr;
+	}
+	stat = sr->s_data2;
+	if (stat & SDR_SENSOR_STAT_LO_NR) {
+		if (verbose)
+			return "Lower Non-Recoverable";
+		else if (sdr_extended)
+			return "lnr";
+		else
+			return "nr";
+	} else if (stat & SDR_SENSOR_STAT_HI_NR) {
+		if (verbose)
+			return "Upper Non-Recoverable";
+		else if (sdr_extended)
+			return "unr";
+		else
+			return "nr";
+	} else if (stat & SDR_SENSOR_STAT_LO_CR) {
+		if (verbose)
+			return "Lower Critical";
+		else if (sdr_extended)
+			return "lcr";
+		else
+			return "cr";
+	} else if (stat & SDR_SENSOR_STAT_HI_CR) {
+		if (verbose)
+			return "Upper Critical";
+		else if (sdr_extended)
+			return "ucr";
+		else
+			return "cr";
+	} else if (stat & SDR_SENSOR_STAT_LO_NC) {
+		if (verbose)
+			return "Lower Non-Critical";
+		else if (sdr_extended)
+			return "lnc";
+		else
+			return "nc";
+	} else if (stat & SDR_SENSOR_STAT_HI_NC) {
+		if (verbose)
+			return "Upper Non-Critical";
+		else if (sdr_extended)
+			return "unc";
+		else
+			return "nc";
+	}
+	return "ok";
+}
+
+/* ipmi_sdr_get_header  -  retreive SDR record header
+ *
+ * @intf:	ipmi interface
+ * @itr:	sdr iterator
+ *
+ * returns pointer to static sensor retrieval struct
+ * returns NULL on error
+ */
+static struct sdr_get_rs *
+ipmi_sdr_get_header(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	struct sdr_get_rq sdr_rq;
+	static struct sdr_get_rs sdr_rs;
+	int try = 0;
+
+	memset(&sdr_rq, 0, sizeof (sdr_rq));
+	sdr_rq.reserve_id = itr->reservation;
+	sdr_rq.id = itr->next;
+	sdr_rq.offset = 0;
+	sdr_rq.length = 5;	/* only get the header */
+
+	memset(&req, 0, sizeof (req));
+	if (itr->use_built_in == 0) {
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = GET_SDR;
+	} else {
+		req.msg.netfn = IPMI_NETFN_SE;
+		req.msg.cmd = GET_DEVICE_SDR;
+	}
+	req.msg.data = (uint8_t *) & sdr_rq;
+	req.msg.data_len = sizeof (sdr_rq);
+
+	for (try = 0; try < 5; try++) {
+		sdr_rq.reserve_id = itr->reservation;
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Get SDR %04x command failed",
+				itr->next);
+			continue;
+		} else if (rsp->ccode == 0xc5) {
+			/* lost reservation */
+			lprintf(LOG_DEBUG, "SDR reservation %04x cancelled. "
+				"Sleeping a bit and retrying...",
+				itr->reservation);
+
+			sleep(rand() & 3);
+
+			if (ipmi_sdr_get_reservation(intf, itr->use_built_in,
+                                      &(itr->reservation)) < 0) {
+				lprintf(LOG_ERR,
+					"Unable to renew SDR reservation");
+				return NULL;
+			}
+		} else if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Get SDR %04x command failed: %s",
+				itr->next, val2str(rsp->ccode,
+						   completion_code_vals));
+			continue;
+		} else {
+			break;
+		}
+	}
+
+   if (try == 5)
+      return NULL;
+
+	if (!rsp)
+		return NULL;
+
+	lprintf(LOG_DEBUG, "SDR record ID   : 0x%04x", itr->next);
+
+	memcpy(&sdr_rs, rsp->data, sizeof (sdr_rs));
+
+	if (sdr_rs.length == 0) {
+		lprintf(LOG_ERR, "SDR record id 0x%04x: invalid length %d",
+			itr->next, sdr_rs.length);
+		return NULL;
+	}
+
+	/* achu (chu11 at llnl dot gov): - Some boards are stupid and
+	 * return a record id from the Get SDR Record command
+	 * different than the record id passed in.  If we find this
+	 * situation, we cheat and put the original record id back in.
+	 * Otherwise, a later Get SDR Record command will fail with
+	 * completion code CBh = "Requested Sensor, data, or record
+	 * not present". Exception is if 'Record ID' is specified as 0000h.
+	 * For further information see IPMI v2.0 Spec, Section 33.12
+	 */
+	if ((itr->next != 0x0000) &&
+		(sdr_rs.id != itr->next)) {
+		lprintf(LOG_DEBUG, "SDR record id mismatch: 0x%04x", sdr_rs.id);
+		sdr_rs.id = itr->next;
+	}
+
+	lprintf(LOG_DEBUG, "SDR record type : 0x%02x", sdr_rs.type);
+	lprintf(LOG_DEBUG, "SDR record next : 0x%04x", sdr_rs.next);
+	lprintf(LOG_DEBUG, "SDR record bytes: %d", sdr_rs.length);
+
+	return &sdr_rs;
+}
+
+/* ipmi_sdr_get_next_header  -  retreive next SDR header
+ *
+ * @intf:	ipmi interface
+ * @itr:	sdr iterator
+ *
+ * returns pointer to sensor retrieval struct
+ * returns NULL on error
+ */
+struct sdr_get_rs *
+ipmi_sdr_get_next_header(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
+{
+	struct sdr_get_rs *header;
+
+	if (itr->next == 0xffff)
+		return NULL;
+
+	header = ipmi_sdr_get_header(intf, itr);
+	if (header == NULL)
+		return NULL;
+
+	itr->next = header->next;
+
+	return header;
+}
+
+/*
+ * This macro is used to print nominal, normal and threshold settings,
+ * but it is not compatible with PRINT_NORMAL/PRINT_THRESH since it does
+ * not have the sensor.init.thresholds setting qualifier as is done in
+ * PRINT_THRESH.   This means CSV output can be different than non CSV
+ * output if sensor.init.thresholds is ever zero
+ */
+/* helper macro for printing CSV output for Full SDR Threshold reading */
+#define SENSOR_PRINT_CSV(FULLSENS, FLAG, READ)				\
+	if ((FLAG)) {							\
+		if (UNITS_ARE_DISCRETE((&FULLSENS->cmn)))		\
+			printf("0x%02X,", READ); 			\
+		else							\
+			printf("%.3f,",	sdr_convert_sensor_reading(	\
+			       (FULLSENS), READ));			\
+	} else {							\
+		printf(",");						\
+	}
+
+/* helper macro for printing analog values for Full SDR Threshold readings */
+#define SENSOR_PRINT_NORMAL(FULLSENS, NAME, READ)			\
+	if ((FULLSENS)->analog_flag.READ != 0) {			\
+		printf(" %-21s : ", NAME);				\
+		if (UNITS_ARE_DISCRETE((&FULLSENS->cmn)))		\
+			printf("0x%02X\n",				\
+			       (FULLSENS)->READ);			\
+		else							\
+			printf("%.3f\n", sdr_convert_sensor_reading(	\
+				         (FULLSENS), (FULLSENS)->READ));\
+	}
+
+/* helper macro for printing Full SDR sensor Thresholds */
+#define SENSOR_PRINT_THRESH(FULLSENS, NAME, READ, FLAG)			\
+	if ((FULLSENS)->cmn.sensor.init.thresholds &&			\
+	    (FULLSENS)->cmn.mask.type.threshold.read.FLAG != 0) {	\
+		printf(" %-21s : ", NAME);				\
+		if (UNITS_ARE_DISCRETE((&FULLSENS->cmn)))		\
+			printf("0x%02X\n",				\
+			       (FULLSENS)->threshold.READ);		\
+		else                                        		\
+			printf("%.3f\n", sdr_convert_sensor_reading(	\
+			     (FULLSENS), (FULLSENS)->threshold.READ));	\
+	}
+
+int
+ipmi_sdr_print_sensor_event_status(struct ipmi_intf *intf,
+				   uint8_t sensor_num,
+				   uint8_t sensor_type,
+				   uint8_t event_type, int numeric_fmt,
+				   uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rs *rsp;
+	int i;
+	const struct valstr assert_cond_1[] = {
+		{0x80, "unc+"},
+		{0x40, "unc-"},
+		{0x20, "lnr+"},
+		{0x10, "lnr-"},
+		{0x08, "lcr+"},
+		{0x04, "lcr-"},
+		{0x02, "lnc+"},
+		{0x01, "lnc-"},
+		{0x00, NULL},
+	};
+	const struct valstr assert_cond_2[] = {
+		{0x08, "unr+"},
+		{0x04, "unr-"},
+		{0x02, "ucr+"},
+		{0x01, "ucr-"},
+		{0x00, NULL},
+	};
+
+	rsp = ipmi_sdr_get_sensor_event_status(intf, sensor_num,
+						target, lun, channel);
+
+	if (rsp == NULL) {
+		lprintf(LOG_DEBUG,
+			"Error reading event status for sensor #%02x",
+			sensor_num);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_DEBUG,
+			"Error reading event status for sensor #%02x: %s",
+			sensor_num, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	/* There is an assumption here that data_len >= 1 */
+	if (IS_READING_UNAVAILABLE(rsp->data[0])) {
+		printf(" Event Status          : Unavailable\n");
+		return 0;
+	}
+	if (IS_SCANNING_DISABLED(rsp->data[0])) {
+		//printf(" Event Status          : Scanning Disabled\n");
+		//return 0;
+	}
+	if (IS_EVENT_MSG_DISABLED(rsp->data[0])) {
+		printf(" Event Status          : Event Messages Disabled\n");
+		//return 0;
+	}
+
+	switch (numeric_fmt) {
+	case DISCRETE_SENSOR:
+		if (rsp->data_len == 2) {
+			ipmi_sdr_print_discrete_state(intf, "Assertion Events",
+						      sensor_type, event_type,
+						      rsp->data[1], 0);
+		} else if (rsp->data_len > 2) {
+			ipmi_sdr_print_discrete_state(intf, "Assertion Events",
+						      sensor_type, event_type,
+						      rsp->data[1],
+						      rsp->data[2]);
+		}
+		if (rsp->data_len == 4) {
+			ipmi_sdr_print_discrete_state(intf, "Deassertion Events",
+						      sensor_type, event_type,
+						      rsp->data[3], 0);
+		} else if (rsp->data_len > 4) {
+			ipmi_sdr_print_discrete_state(intf, "Deassertion Events",
+						      sensor_type, event_type,
+						      rsp->data[3],
+						      rsp->data[4]);
+		}
+		break;
+
+	case ANALOG_SENSOR:
+		printf(" Assertion Events      : ");
+		for (i = 0; i < 8; i++) {
+			if (rsp->data[1] & (1 << i))
+				printf("%s ", val2str(1 << i, assert_cond_1));
+		}
+		if (rsp->data_len > 2) {
+			for (i = 0; i < 4; i++) {
+				if (rsp->data[2] & (1 << i))
+					printf("%s ",
+					       val2str(1 << i, assert_cond_2));
+			}
+			printf("\n");
+			if ((rsp->data_len == 4 && rsp->data[3] != 0) ||
+			    (rsp->data_len > 4
+			     && (rsp->data[3] != 0 && rsp->data[4] != 0))) {
+				printf(" Deassertion Events    : ");
+				for (i = 0; i < 8; i++) {
+					if (rsp->data[3] & (1 << i))
+						printf("%s ",
+						       val2str(1 << i,
+							       assert_cond_1));
+				}
+				if (rsp->data_len > 4) {
+					for (i = 0; i < 4; i++) {
+						if (rsp->data[4] & (1 << i))
+							printf("%s ",
+							       val2str(1 << i,
+								       assert_cond_2));
+					}
+				}
+				printf("\n");
+			}
+		} else {
+			printf("\n");
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+static int
+ipmi_sdr_print_sensor_mask(struct ipmi_intf *intf,
+			struct sdr_record_mask *mask,
+			uint8_t sensor_type,
+			uint8_t event_type, int numeric_fmt)
+{
+	/* iceblink - don't print some event status fields - CVS rev1.53 */
+	return 0;
+
+	switch (numeric_fmt) {
+	case DISCRETE_SENSOR:
+		ipmi_sdr_print_discrete_state(intf, "Assert Event Mask", sensor_type,
+					      event_type,
+					      mask->type.discrete.
+					      assert_event & 0xff,
+					      (mask->type.discrete.
+					       assert_event & 0xff00) >> 8);
+		ipmi_sdr_print_discrete_state(intf, "Deassert Event Mask",
+					      sensor_type, event_type,
+					      mask->type.discrete.
+					      deassert_event & 0xff,
+					      (mask->type.discrete.
+					       deassert_event & 0xff00) >> 8);
+		break;
+
+	case ANALOG_SENSOR:
+		printf(" Assert Event Mask     : ");
+		if (mask->type.threshold.assert_lnr_high)
+			printf("lnr+ ");
+		if (mask->type.threshold.assert_lnr_low)
+			printf("lnr- ");
+		if (mask->type.threshold.assert_lcr_high)
+			printf("lcr+ ");
+		if (mask->type.threshold.assert_lcr_low)
+			printf("lcr- ");
+		if (mask->type.threshold.assert_lnc_high)
+			printf("lnc+ ");
+		if (mask->type.threshold.assert_lnc_low)
+			printf("lnc- ");
+		if (mask->type.threshold.assert_unc_high)
+			printf("unc+ ");
+		if (mask->type.threshold.assert_unc_low)
+			printf("unc- ");
+		if (mask->type.threshold.assert_ucr_high)
+			printf("ucr+ ");
+		if (mask->type.threshold.assert_ucr_low)
+			printf("ucr- ");
+		if (mask->type.threshold.assert_unr_high)
+			printf("unr+ ");
+		if (mask->type.threshold.assert_unr_low)
+			printf("unr- ");
+		printf("\n");
+
+		printf(" Deassert Event Mask   : ");
+		if (mask->type.threshold.deassert_lnr_high)
+			printf("lnr+ ");
+		if (mask->type.threshold.deassert_lnr_low)
+			printf("lnr- ");
+		if (mask->type.threshold.deassert_lcr_high)
+			printf("lcr+ ");
+		if (mask->type.threshold.deassert_lcr_low)
+			printf("lcr- ");
+		if (mask->type.threshold.deassert_lnc_high)
+			printf("lnc+ ");
+		if (mask->type.threshold.deassert_lnc_low)
+			printf("lnc- ");
+		if (mask->type.threshold.deassert_unc_high)
+			printf("unc+ ");
+		if (mask->type.threshold.deassert_unc_low)
+			printf("unc- ");
+		if (mask->type.threshold.deassert_ucr_high)
+			printf("ucr+ ");
+		if (mask->type.threshold.deassert_ucr_low)
+			printf("ucr- ");
+		if (mask->type.threshold.deassert_unr_high)
+			printf("unr+ ");
+		if (mask->type.threshold.deassert_unr_low)
+			printf("unr- ");
+		printf("\n");
+		break;
+
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+int
+ipmi_sdr_print_sensor_event_enable(struct ipmi_intf *intf,
+				   uint8_t sensor_num,
+				   uint8_t sensor_type,
+				   uint8_t event_type, int numeric_fmt,
+				   uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rs *rsp;
+	int i;
+	const struct valstr assert_cond_1[] = {
+		{0x80, "unc+"},
+		{0x40, "unc-"},
+		{0x20, "lnr+"},
+		{0x10, "lnr-"},
+		{0x08, "lcr+"},
+		{0x04, "lcr-"},
+		{0x02, "lnc+"},
+		{0x01, "lnc-"},
+		{0x00, NULL},
+	};
+	const struct valstr assert_cond_2[] = {
+		{0x08, "unr+"},
+		{0x04, "unr-"},
+		{0x02, "ucr+"},
+		{0x01, "ucr-"},
+		{0x00, NULL},
+	};
+
+	rsp = ipmi_sdr_get_sensor_event_enable(intf, sensor_num,
+						target, lun, channel);
+
+	if (rsp == NULL) {
+		lprintf(LOG_DEBUG,
+			"Error reading event enable for sensor #%02x",
+			sensor_num);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_DEBUG,
+			"Error reading event enable for sensor #%02x: %s",
+			sensor_num, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	if (IS_SCANNING_DISABLED(rsp->data[0])) {
+		//printf(" Event Enable          : Scanning Disabled\n");
+		//return 0;
+	}
+	if (IS_EVENT_MSG_DISABLED(rsp->data[0])) {
+		printf(" Event Enable          : Event Messages Disabled\n");
+		//return 0;
+	}
+
+	switch (numeric_fmt) {
+	case DISCRETE_SENSOR:
+		/* discrete */
+		if (rsp->data_len == 2) {
+			ipmi_sdr_print_discrete_state(intf, "Assertions Enabled",
+						      sensor_type, event_type,
+						      rsp->data[1], 0);
+		} else if (rsp->data_len > 2) {
+			ipmi_sdr_print_discrete_state(intf, "Assertions Enabled",
+						      sensor_type, event_type,
+						      rsp->data[1],
+						      rsp->data[2]);
+		}
+		if (rsp->data_len == 4) {
+			ipmi_sdr_print_discrete_state(intf, "Deassertions Enabled",
+						      sensor_type, event_type,
+						      rsp->data[3], 0);
+		} else if (rsp->data_len > 4) {
+			ipmi_sdr_print_discrete_state(intf, "Deassertions Enabled",
+						      sensor_type, event_type,
+						      rsp->data[3],
+						      rsp->data[4]);
+		}
+		break;
+
+	case ANALOG_SENSOR:
+		/* analog */
+		printf(" Assertions Enabled    : ");
+		for (i = 0; i < 8; i++) {
+			if (rsp->data[1] & (1 << i))
+				printf("%s ", val2str(1 << i, assert_cond_1));
+		}
+		if (rsp->data_len > 2) {
+			for (i = 0; i < 4; i++) {
+				if (rsp->data[2] & (1 << i))
+					printf("%s ",
+					       val2str(1 << i, assert_cond_2));
+			}
+			printf("\n");
+			if ((rsp->data_len == 4 && rsp->data[3] != 0) ||
+			    (rsp->data_len > 4
+			     && (rsp->data[3] != 0 || rsp->data[4] != 0))) {
+				printf(" Deassertions Enabled  : ");
+				for (i = 0; i < 8; i++) {
+					if (rsp->data[3] & (1 << i))
+						printf("%s ",
+						       val2str(1 << i,
+							       assert_cond_1));
+				}
+				if (rsp->data_len > 4) {
+					for (i = 0; i < 4; i++) {
+						if (rsp->data[4] & (1 << i))
+							printf("%s ",
+							       val2str(1 << i,
+								       assert_cond_2));
+					}
+				}
+				printf("\n");
+			}
+		} else {
+			printf("\n");
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_hysteresis  -  print hysteresis for Discrete & Analog
+ *
+ * @sensor:		Common Sensor Record SDR pointer
+ * @full:		Full Sensor Record SDR pointer (if applicable)
+ * @hysteresis_value:	Actual hysteresis value
+ * @hvstr:		hysteresis value Identifier String
+ *
+ * returns void
+ */
+void
+ipmi_sdr_print_sensor_hysteresis(struct sdr_record_common_sensor *sensor,
+		 struct sdr_record_full_sensor   *full,
+		 uint8_t hysteresis_value,
+		 const char *hvstr)
+{
+	/*
+	 * compact can have pos/neg hysteresis, but they cannot be analog!
+	 * We use not full in addition to our discrete units check just in
+	 * case a compact sensor is incorrectly identified as analog.
+	 */
+	if (!full || UNITS_ARE_DISCRETE(sensor)) {
+		if ( hysteresis_value == 0x00 || hysteresis_value == 0xff ) {
+			printf(" %s   : Unspecified\n", hvstr);
+		} else {
+			printf(" %s   : 0x%02X\n", hvstr, hysteresis_value);
+		}
+		return;
+	}
+	/* A Full analog sensor */
+	double creading = sdr_convert_sensor_hysterisis(full, hysteresis_value);
+	if ( hysteresis_value == 0x00 || hysteresis_value == 0xff ||
+	     creading == 0.0 ) {
+		printf(" %s   : Unspecified\n", hvstr);
+	} else {
+		printf(" %s   : %.3f\n", hvstr, creading);
+	}
+}
+
+/* print_sensor_min_max  -  print Discrete & Analog Minimum/Maximum Sensor Range
+ *
+ * @full:		Full Sensor Record SDR pointer
+ *
+ * returns void
+ */
+static void
+print_sensor_min_max(struct sdr_record_full_sensor *full)
+{
+	if (!full) { /* No min/max for compact SDR record */
+	    return;
+	}
+
+	double creading = 0.0;
+	uint8_t is_analog = !UNITS_ARE_DISCRETE(&full->cmn);
+	if (is_analog)
+		creading = sdr_convert_sensor_reading(full, full->sensor_min);
+	if ((full->cmn.unit.analog == 0 && full->sensor_min == 0x00) ||
+	    (full->cmn.unit.analog == 1 && full->sensor_min == 0xff) ||
+	    (full->cmn.unit.analog == 2 && full->sensor_min == 0x80) ||
+	    (is_analog && (creading == 0.0)))
+		printf(" Minimum sensor range  : Unspecified\n");
+	else {
+		if (is_analog)
+			printf(" Minimum sensor range  : %.3f\n", creading);
+		else
+			printf(" Minimum sensor range  : 0x%02X\n", full->sensor_min);
+
+	}
+	if (is_analog)
+		creading = sdr_convert_sensor_reading(full, full->sensor_max);
+	if ((full->cmn.unit.analog == 0 && full->sensor_max == 0xff) ||
+	    (full->cmn.unit.analog == 1 && full->sensor_max == 0x00) ||
+	    (full->cmn.unit.analog == 2 && full->sensor_max == 0x7f) ||
+	    (is_analog && (creading == 0.0)))
+		printf(" Maximum sensor range  : Unspecified\n");
+	else {
+		if (is_analog)
+			printf(" Maximum sensor range  : %.3f\n", creading);
+		else
+			printf(" Maximum sensor range  : 0x%02X\n", full->sensor_max);
+	}
+}
+
+/* print_csv_discrete  -  print csv formatted discrete sensor
+ *
+ * @sensor:		common sensor structure
+ * @sr:			sensor reading
+ *
+ * returns void
+ */
+static void
+print_csv_discrete(struct ipmi_intf *intf,
+		struct sdr_record_common_sensor *sensor,
+		const struct sensor_reading *sr)
+{
+	if (!sr->s_reading_valid  || sr->s_reading_unavailable) {
+		printf("%02Xh,ns,%d.%d,No Reading",
+		       sensor->keys.sensor_num,
+		       sensor->entity.id,
+		       sensor->entity.instance);
+		return;
+	}
+
+	if (sr->s_has_analog_value) {	/* Sensor has an analog value */
+		printf("%s,%s,", sr->s_a_str, sr->s_a_units);
+	} else {	/* Sensor has a discrete value */
+		printf("%02Xh,", sensor->keys.sensor_num);
+	}
+	printf("ok,%d.%d,",
+	       sensor->entity.id,
+	       sensor->entity.instance);
+	ipmi_sdr_print_discrete_state_mini(intf, NULL, ", ",
+		sensor->sensor.type,
+		sensor->event_type,
+		sr->s_data2,
+		sr->s_data3);
+}
+
+/* ipmi_sdr_read_sensor_value  -  read sensor value
+ *
+ * @intf		Interface pointer
+ * @sensor		Common sensor component pointer
+ * @sdr_record_type	Type of sdr sensor record
+ * @precision		decimal precision for analog format conversion
+ *
+ * returns a pointer to sensor value reading data structure
+ */
+struct sensor_reading *
+ipmi_sdr_read_sensor_value(struct ipmi_intf *intf,
+		 struct sdr_record_common_sensor *sensor,
+		 uint8_t sdr_record_type, int precision)
+{
+	static struct sensor_reading sr;
+
+	if (sensor == NULL)
+		return NULL;
+
+	/* Initialize to reading valid value of zero */
+	memset(&sr, 0, sizeof(sr));
+
+	switch (sdr_record_type) {
+		unsigned int idlen;
+		case (SDR_RECORD_TYPE_FULL_SENSOR):
+			sr.full = (struct sdr_record_full_sensor *)sensor;
+			idlen = sr.full->id_code & 0x1f;
+			idlen = idlen < sizeof(sr.s_id) ?
+						idlen : sizeof(sr.s_id) - 1;
+			memcpy(sr.s_id, sr.full->id_string, idlen);
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sr.compact = (struct sdr_record_compact_sensor *)sensor;
+			idlen = sr.compact->id_code & 0x1f;
+			idlen = idlen < sizeof(sr.s_id) ?
+						idlen : sizeof(sr.s_id) - 1;
+			memcpy(sr.s_id, sr.compact->id_string, idlen);
+			break;
+		default:
+			return NULL;
+	}
+
+	/*
+	 * Get current reading via IPMI interface
+	 */
+	struct ipmi_rs *rsp;
+	rsp = ipmi_sdr_get_sensor_reading_ipmb(intf,
+					       sensor->keys.sensor_num,
+					       sensor->keys.owner_id,
+					       sensor->keys.lun,
+					       sensor->keys.channel);
+	sr.s_a_val   = 0.0;	/* init analog value to a floating point 0 */
+	sr.s_a_str[0] = '\0';	/* no converted analog value string */
+	sr.s_a_units = "";	/* no converted analog units units */
+
+
+	if (rsp == NULL) {
+		lprintf(LOG_DEBUG, "Error reading sensor %s (#%02x)",
+			sr.s_id, sensor->keys.sensor_num);
+		return &sr;
+	}
+
+	if (rsp->ccode) {
+		if ( !((sr.full    && rsp->ccode == 0xcb) ||
+		       (sr.compact && rsp->ccode == 0xcd)) ) {
+			lprintf(LOG_DEBUG,
+				"Error reading sensor %s (#%02x): %s", sr.s_id,
+				sensor->keys.sensor_num,
+				val2str(rsp->ccode, completion_code_vals));
+		}
+		return &sr;
+	}
+
+	if (rsp->data_len < 2) {
+		/*
+		 * We must be returned both a value (data[0]), and the validity
+		 * of the value (data[1]), in order to correctly interpret
+		 * the reading.    If we don't have both of these we can't have
+		 * a valid sensor reading.
+		 */
+		lprintf(LOG_DEBUG, "Error reading sensor %s invalid len %d",
+			sr.s_id, rsp->data_len);
+		return &sr;
+	}
+
+
+	if (IS_READING_UNAVAILABLE(rsp->data[1]))
+		sr.s_reading_unavailable = 1;
+
+	if (IS_SCANNING_DISABLED(rsp->data[1])) {
+		sr.s_scanning_disabled = 1;
+		lprintf(LOG_DEBUG, "Sensor %s (#%02x) scanning disabled",
+			sr.s_id, sensor->keys.sensor_num);
+		return &sr;
+	}
+	if ( !sr.s_reading_unavailable ) {
+		sr.s_reading_valid = 1;
+		sr.s_reading = rsp->data[0];
+	}
+	if (rsp->data_len > 2)
+		sr.s_data2   = rsp->data[2];
+	if (rsp->data_len > 3)
+		sr.s_data3   = rsp->data[3];
+	if (sdr_sensor_has_analog_reading(intf, &sr)) {
+		sr.s_has_analog_value = 1;
+		if (sr.s_reading_valid) {
+			sr.s_a_val = sdr_convert_sensor_reading(sr.full, sr.s_reading);
+		}
+		/* determine units string with possible modifiers */
+		sr.s_a_units = ipmi_sdr_get_unit_string(sr.full->cmn.unit.pct,
+					   sr.full->cmn.unit.modifier,
+					   sr.full->cmn.unit.type.base,
+					   sr.full->cmn.unit.type.modifier);
+		snprintf(sr.s_a_str, sizeof(sr.s_a_str), "%.*f",
+			(sr.s_a_val == (int) sr.s_a_val) ? 0 :
+			precision, sr.s_a_val);
+	}
+	return &sr;
+}
+
+/* ipmi_sdr_print_sensor_fc  -  print full & compact SDR records
+ *
+ * @intf:		ipmi interface
+ * @sensor:		common sensor structure
+ * @sdr_record_type:	type of sdr record, either full or compact
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_fc(struct ipmi_intf *intf,
+			   struct sdr_record_common_sensor    *sensor,
+			   uint8_t sdr_record_type)
+{
+	char sval[16];
+	unsigned int i = 0;
+	uint8_t target, lun, channel;
+	struct sensor_reading *sr;
+
+
+	sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr_record_type, 2);
+
+	if (sr == NULL)
+		return -1;
+
+	target = sensor->keys.owner_id;
+	lun = sensor->keys.lun;
+	channel = sensor->keys.channel;
+
+	/*
+	 * CSV OUTPUT
+	 */
+
+	if (csv_output) {
+		/*
+		 * print sensor name, reading, unit, state
+		 */
+		printf("%s,", sr->s_id);
+		if (!IS_THRESHOLD_SENSOR(sensor)) {
+			/* Discrete/Non-Threshold */
+			print_csv_discrete(intf, sensor, sr);
+			printf("\n");
+		}
+		else {
+			/* Threshold Analog & Discrete*/
+			if (sr->s_reading_valid) {
+				if (sr->s_has_analog_value) {
+					/* Analog/Threshold */
+					printf("%.*f,", (sr->s_a_val ==
+					(int) sr->s_a_val) ? 0 : 3,
+					sr->s_a_val);
+					printf("%s,%s", sr->s_a_units,
+					       ipmi_sdr_get_thresh_status(sr, "ns"));
+				} else { /* Discrete/Threshold */
+					print_csv_discrete(intf, sensor, sr);
+				}
+			} else {
+				printf(",,ns");
+			}
+
+			if (verbose) {
+				printf(",%d.%d,%s,%s,",
+					sensor->entity.id, sensor->entity.instance,
+					val2str(sensor->entity.id, entity_id_vals),
+					ipmi_get_sensor_type(intf, sensor->sensor.type));
+
+				if (sr->full) {
+					SENSOR_PRINT_CSV(sr->full, sr->full->analog_flag.nominal_read,
+						sr->full->nominal_read);
+					SENSOR_PRINT_CSV(sr->full, sr->full->analog_flag.normal_min,
+						sr->full->normal_min);
+					SENSOR_PRINT_CSV(sr->full, sr->full->analog_flag.normal_max,
+						     sr->full->normal_max);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.unr,
+						sr->full->threshold.upper.non_recover);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.ucr,
+						sr->full->threshold.upper.critical);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.unc,
+						sr->full->threshold.upper.non_critical);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.lnr,
+						sr->full->threshold.lower.non_recover);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.lcr,
+						sr->full->threshold.lower.critical);
+					SENSOR_PRINT_CSV(sr->full, sensor->mask.type.threshold.read.lnc,
+						sr->full->threshold.lower.non_critical);
+
+					if (UNITS_ARE_DISCRETE(sensor)) {
+						printf("0x%02X,0x%02X", sr->full->sensor_min, sr->full->sensor_max);
+					}
+					else {
+						printf("%.3f,%.3f",
+						       sdr_convert_sensor_reading(sr->full,
+									      sr->full->sensor_min),
+						       sdr_convert_sensor_reading(sr->full,
+									      sr->full->sensor_max));
+					}
+				} else {
+					printf(",,,,,,,,,,");
+				}
+			}
+			printf("\n");
+		}
+
+		return 0;	/* done */
+	}
+
+	/*
+	 * NORMAL OUTPUT
+	 */
+
+	if (verbose == 0 && sdr_extended == 0) {
+		/*
+		 * print sensor name, reading, state
+		 */
+		printf("%-16s | ", sr->s_id);
+
+		memset(sval, 0, sizeof (sval));
+
+		if (sr->s_reading_valid) {
+			if( sr->s_has_analog_value ) {
+				snprintf(sval, sizeof (sval), "%s %s",
+						      sr->s_a_str,
+						      sr->s_a_units);
+			} else /* Discrete */
+				snprintf(sval, sizeof(sval),
+					"0x%02x", sr->s_reading);
+		}
+		else if (sr->s_scanning_disabled)
+			snprintf(sval, sizeof (sval), sr->full ? "disabled"   : "Not Readable");
+		else
+			snprintf(sval, sizeof (sval), sr->full ? "no reading" : "Not Readable");
+
+		printf("%s", sval);
+
+		for (i = strlen(sval); i <= sizeof (sval); i++)
+			printf(" ");
+		printf(" | ");
+
+		if (IS_THRESHOLD_SENSOR(sensor)) {
+			printf("%s", ipmi_sdr_get_thresh_status(sr, "ns"));
+		}
+		else {
+			printf("%s", sr->s_reading_valid ? "ok" : "ns");
+		}
+
+		printf("\n");
+
+		return 0;	/* done */
+	} else if (verbose == 0 && sdr_extended == 1) {
+		/*
+		 * print sensor name, number, state, entity, reading
+		 */
+		printf("%-16s | %02Xh | ",
+		       sr->s_id, sensor->keys.sensor_num);
+
+		if (IS_THRESHOLD_SENSOR(sensor)) {
+			/* Threshold Analog & Discrete */
+			printf("%-3s | %2d.%1d | ",
+			   ipmi_sdr_get_thresh_status(sr, "ns"),
+		           sensor->entity.id, sensor->entity.instance);
+		}
+		else {
+			/* Non Threshold Analog & Discrete */
+			printf("%-3s | %2d.%1d | ",
+			       (sr->s_reading_valid ? "ok" : "ns"),
+			       sensor->entity.id, sensor->entity.instance);
+		}
+
+		memset(sval, 0, sizeof (sval));
+
+		if (sr->s_reading_valid) {
+			if (IS_THRESHOLD_SENSOR(sensor) &&
+				sr->s_has_analog_value ) {
+				/* Threshold Analog */
+					snprintf(sval, sizeof (sval), "%s %s",
+						      sr->s_a_str,
+						      sr->s_a_units);
+			} else {
+				/* Analog & Discrete & Threshold/Discrete */
+				char *header = NULL;
+				if (sr->s_has_analog_value) { /* Sensor has an analog value */
+					printf("%s %s", sr->s_a_str, sr->s_a_units);
+					header = ", ";
+				}
+				ipmi_sdr_print_discrete_state_mini(intf, header, ", ",
+								   sensor->sensor.type,
+								   sensor->event_type,
+								   sr->s_data2,
+								   sr->s_data3);
+			}
+		}
+		else if (sr->s_scanning_disabled)
+			snprintf(sval, sizeof (sval), "Disabled");
+		else
+			snprintf(sval, sizeof (sval), "No Reading");
+
+		printf("%s\n", sval);
+		return 0;	/* done */
+	}
+	/*
+	 * VERBOSE OUTPUT
+	 */
+
+	printf("Sensor ID              : %s (0x%x)\n",
+	       sr->s_id, sensor->keys.sensor_num);
+	printf(" Entity ID             : %d.%d (%s)\n",
+	       sensor->entity.id, sensor->entity.instance,
+	       val2str(sensor->entity.id, entity_id_vals));
+
+	if (!IS_THRESHOLD_SENSOR(sensor)) {
+		/* Discrete */
+		printf(" Sensor Type (Discrete): %s (0x%02x)\n",
+				ipmi_get_sensor_type(intf, sensor->sensor.type),
+				sensor->sensor.type);
+		lprintf(LOG_DEBUG, " Event Type Code       : 0x%02x",
+			sensor->event_type);
+
+		printf(" Sensor Reading        : ");
+		if (sr->s_reading_valid) {
+			if (sr->s_has_analog_value) { /* Sensor has an analog value */
+				printf("%s %s\n", sr->s_a_str, sr->s_a_units);
+			} else {
+				printf("%xh\n", sr->s_reading);
+			}
+		}
+		else if (sr->s_scanning_disabled)
+			printf("Disabled\n");
+		else {
+			/* Used to be 'Not Reading' */
+			printf("No Reading\n");
+		}
+
+		printf(" Event Message Control : ");
+		switch (sensor->sensor.capabilities.event_msg) {
+		case 0:
+			printf("Per-threshold\n");
+			break;
+		case 1:
+			printf("Entire Sensor Only\n");
+			break;
+		case 2:
+			printf("Global Disable Only\n");
+			break;
+		case 3:
+			printf("No Events From Sensor\n");
+			break;
+		}
+
+		ipmi_sdr_print_discrete_state(intf, "States Asserted",
+					      sensor->sensor.type,
+					      sensor->event_type,
+					      sr->s_data2,
+					      sr->s_data3);
+		ipmi_sdr_print_sensor_mask(intf, &sensor->mask, sensor->sensor.type,
+					   sensor->event_type, DISCRETE_SENSOR);
+		ipmi_sdr_print_sensor_event_status(intf,
+						   sensor->keys.sensor_num,
+						   sensor->sensor.type,
+						   sensor->event_type,
+						   DISCRETE_SENSOR,
+						   target,
+						   lun, channel);
+		ipmi_sdr_print_sensor_event_enable(intf,
+						   sensor->keys.sensor_num,
+						   sensor->sensor.type,
+						   sensor->event_type,
+						   DISCRETE_SENSOR,
+						   target,
+						   lun, channel);
+		printf(" OEM                   : %X\n",
+					sr->full ? sr->full->oem : sr->compact->oem);
+		printf("\n");
+
+		return 0;	/* done */
+	}
+	printf(" Sensor Type (Threshold)  : %s (0x%02x)\n",
+		ipmi_get_sensor_type(intf, sensor->sensor.type),
+		sensor->sensor.type);
+
+	printf(" Sensor Reading        : ");
+	if (sr->s_reading_valid) {
+		if (sr->full) {
+			uint16_t raw_tol = __TO_TOL(sr->full->mtol);
+			if (UNITS_ARE_DISCRETE(sensor)) {
+				printf("0x%02X (+/- 0x%02X) %s\n",
+				sr->s_reading, raw_tol, sr->s_a_units);
+			}
+			else {
+				double tol = sdr_convert_sensor_tolerance(sr->full, raw_tol);
+				printf("%.*f (+/- %.*f) %s\n",
+				       (sr->s_a_val == (int) sr->s_a_val) ? 0 : 3,
+				       sr->s_a_val, (tol == (int) tol) ? 0 :
+				       3, tol, sr->s_a_units);
+			}
+		} else {
+			printf("0x%02X %s\n", sr->s_reading, sr->s_a_units);
+		}
+	} else if (sr->s_scanning_disabled)
+		printf("Disabled\n");
+	else
+		printf("No Reading\n");
+
+	printf(" Status                : %s\n",
+	       ipmi_sdr_get_thresh_status(sr, "Not Available"));
+
+	if(sr->full) {
+		SENSOR_PRINT_NORMAL(sr->full, "Nominal Reading", nominal_read);
+		SENSOR_PRINT_NORMAL(sr->full, "Normal Minimum", normal_min);
+		SENSOR_PRINT_NORMAL(sr->full, "Normal Maximum", normal_max);
+
+		SENSOR_PRINT_THRESH(sr->full, "Upper non-recoverable", upper.non_recover, unr);
+		SENSOR_PRINT_THRESH(sr->full, "Upper critical", upper.critical, ucr);
+		SENSOR_PRINT_THRESH(sr->full, "Upper non-critical", upper.non_critical, unc);
+		SENSOR_PRINT_THRESH(sr->full, "Lower non-recoverable", lower.non_recover, lnr);
+		SENSOR_PRINT_THRESH(sr->full, "Lower critical", lower.critical, lcr);
+		SENSOR_PRINT_THRESH(sr->full, "Lower non-critical", lower.non_critical, lnc);
+	}
+	ipmi_sdr_print_sensor_hysteresis(sensor, sr->full,
+		sr->full ? sr->full->threshold.hysteresis.positive :
+		sr->compact->threshold.hysteresis.positive, "Positive Hysteresis");
+
+	ipmi_sdr_print_sensor_hysteresis(sensor, sr->full,
+		sr->full ? sr->full->threshold.hysteresis.negative :
+		sr->compact->threshold.hysteresis.negative, "Negative Hysteresis");
+
+	print_sensor_min_max(sr->full);
+
+	printf(" Event Message Control : ");
+	switch (sensor->sensor.capabilities.event_msg) {
+	case 0:
+		printf("Per-threshold\n");
+		break;
+	case 1:
+		printf("Entire Sensor Only\n");
+		break;
+	case 2:
+		printf("Global Disable Only\n");
+		break;
+	case 3:
+		printf("No Events From Sensor\n");
+		break;
+	}
+
+	printf(" Readable Thresholds   : ");
+	switch (sensor->sensor.capabilities.threshold) {
+	case 0:
+		printf("No Thresholds\n");
+		break;
+	case 1:		/* readable according to mask */
+	case 2:		/* readable and settable according to mask */
+		if (sensor->mask.type.threshold.read.lnr)
+			printf("lnr ");
+		if (sensor->mask.type.threshold.read.lcr)
+			printf("lcr ");
+		if (sensor->mask.type.threshold.read.lnc)
+			printf("lnc ");
+		if (sensor->mask.type.threshold.read.unc)
+			printf("unc ");
+		if (sensor->mask.type.threshold.read.ucr)
+			printf("ucr ");
+		if (sensor->mask.type.threshold.read.unr)
+			printf("unr ");
+		printf("\n");
+		break;
+	case 3:
+		printf("Thresholds Fixed\n");
+		break;
+	}
+
+	printf(" Settable Thresholds   : ");
+	switch (sensor->sensor.capabilities.threshold) {
+	case 0:
+		printf("No Thresholds\n");
+		break;
+	case 1:		/* readable according to mask */
+	case 2:		/* readable and settable according to mask */
+		if (sensor->mask.type.threshold.set.lnr)
+			printf("lnr ");
+		if (sensor->mask.type.threshold.set.lcr)
+			printf("lcr ");
+		if (sensor->mask.type.threshold.set.lnc)
+			printf("lnc ");
+		if (sensor->mask.type.threshold.set.unc)
+			printf("unc ");
+		if (sensor->mask.type.threshold.set.ucr)
+			printf("ucr ");
+		if (sensor->mask.type.threshold.set.unr)
+			printf("unr ");
+		printf("\n");
+		break;
+	case 3:
+		printf("Thresholds Fixed\n");
+		break;
+	}
+
+	if (sensor->mask.type.threshold.status_lnr ||
+	    sensor->mask.type.threshold.status_lcr ||
+	    sensor->mask.type.threshold.status_lnc ||
+	    sensor->mask.type.threshold.status_unc ||
+	    sensor->mask.type.threshold.status_ucr ||
+	    sensor->mask.type.threshold.status_unr) {
+		printf(" Threshold Read Mask   : ");
+		if (sensor->mask.type.threshold.status_lnr)
+			printf("lnr ");
+		if (sensor->mask.type.threshold.status_lcr)
+			printf("lcr ");
+		if (sensor->mask.type.threshold.status_lnc)
+			printf("lnc ");
+		if (sensor->mask.type.threshold.status_unc)
+			printf("unc ");
+		if (sensor->mask.type.threshold.status_ucr)
+			printf("ucr ");
+		if (sensor->mask.type.threshold.status_unr)
+			printf("unr ");
+		printf("\n");
+	}
+
+	ipmi_sdr_print_sensor_mask(intf, &sensor->mask,
+				   sensor->sensor.type,
+				   sensor->event_type, ANALOG_SENSOR);
+	ipmi_sdr_print_sensor_event_status(intf,
+					   sensor->keys.sensor_num,
+					   sensor->sensor.type,
+					   sensor->event_type, ANALOG_SENSOR,
+					   target,
+					   lun, channel);
+
+	ipmi_sdr_print_sensor_event_enable(intf,
+					   sensor->keys.sensor_num,
+					   sensor->sensor.type,
+					   sensor->event_type, ANALOG_SENSOR,
+					   target,
+					   lun, channel);
+
+	printf("\n");
+	return 0;
+}
+
+static inline int
+get_offset(uint8_t x)
+{
+	int i;
+	for (i = 0; i < 8; i++)
+		if (x >> i == 1)
+			return i;
+	return 0;
+}
+
+/* ipmi_sdr_print_discrete_state_mini  -  print list of asserted states
+ *                                        for a discrete sensor
+ *
+ * @header	: header string if necessary
+ * @separator	: field separator string
+ * @sensor_type	: sensor type code
+ * @event_type	: event type code
+ * @state	: mask of asserted states
+ *
+ * no meaningful return value
+ */
+void
+ipmi_sdr_print_discrete_state_mini(struct ipmi_intf *intf,
+				   const char *header, const char *separator,
+				   uint8_t sensor_type, uint8_t event_type,
+				   uint8_t state1, uint8_t state2)
+{
+	const struct ipmi_event_sensor_types *evt;
+	int pre = 0, c = 0;
+
+	if (state1 == 0 && (state2 & 0x7f) == 0)
+		return;
+
+	if (header)
+		printf("%s", header);
+
+	for (evt = ipmi_get_first_event_sensor_type(intf, sensor_type, event_type);
+			evt != NULL; evt = ipmi_get_next_event_sensor_type(evt)) {
+		if (evt->data != 0xFF) {
+			continue;
+		}
+
+		if (evt->offset > 7) {
+			if ((1 << (evt->offset - 8)) & (state2 & 0x7f)) {
+				if (pre++ != 0) {
+					printf("%s", separator);
+				}
+				if (evt->desc) {
+					printf("%s", evt->desc);
+				}
+			}
+		} else {
+			if ((1 << evt->offset) & state1) {
+				if (pre++ != 0) {
+					printf("%s", separator);
+				}
+				if (evt->desc) {
+					printf("%s", evt->desc);
+				}
+			}
+		}
+		c++;
+	}
+}
+
+/* ipmi_sdr_print_discrete_state  -  print list of asserted states
+ *                                   for a discrete sensor
+ *
+ * @desc        : description for this line
+ * @sensor_type	: sensor type code
+ * @event_type	: event type code
+ * @state	: mask of asserted states
+ *
+ * no meaningful return value
+ */
+void
+ipmi_sdr_print_discrete_state(struct ipmi_intf *intf, const char *desc,
+			      uint8_t sensor_type, uint8_t event_type,
+			      uint8_t state1, uint8_t state2)
+{
+	const struct ipmi_event_sensor_types *evt;
+	int pre = 0, c = 0;
+
+	if (state1 == 0 && (state2 & 0x7f) == 0)
+		return;
+
+	for (evt = ipmi_get_first_event_sensor_type(intf, sensor_type, event_type);
+			evt != NULL; evt = ipmi_get_next_event_sensor_type(evt)) {
+		if (evt->data != 0xFF) {
+			continue;
+		}
+
+		if (pre == 0) {
+			printf(" %-21s : %s\n", desc, ipmi_get_sensor_type(intf, sensor_type));
+			pre = 1;
+		}
+
+		if (evt->offset > 7) {
+			if ((1 << (evt->offset - 8)) & (state2 & 0x7f)) {
+				if (evt->desc) {
+					printf("                         "
+					       "[%s]\n",
+					       evt->desc);
+				} else {
+					printf("                         "
+					       "[no description]\n");
+				}
+			}
+		} else {
+			if ((1 << evt->offset) & state1) {
+				if (evt->desc) {
+					printf("                         "
+					       "[%s]\n",
+					       evt->desc);
+				} else {
+					printf("                         "
+					       "[no description]\n");
+				}
+			}
+		}
+		c++;
+	}
+}
+
+
+/* ipmi_sdr_print_sensor_eventonly  -  print SDR event only record
+ *
+ * @intf:	ipmi interface
+ * @sensor:	event only sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+				struct sdr_record_eventonly_sensor *sensor)
+{
+	char desc[17];
+
+	if (sensor == NULL)
+		return -1;
+
+	memset(desc, 0, sizeof (desc));
+	snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string);
+
+	if (verbose) {
+		printf("Sensor ID              : %s (0x%x)\n",
+		       sensor->id_code ? desc : "", sensor->keys.sensor_num);
+		printf("Entity ID              : %d.%d (%s)\n",
+		       sensor->entity.id, sensor->entity.instance,
+		       val2str(sensor->entity.id, entity_id_vals));
+		printf("Sensor Type            : %s (0x%02x)\n",
+			ipmi_get_sensor_type(intf, sensor->sensor_type),
+			sensor->sensor_type);
+		lprintf(LOG_DEBUG, "Event Type Code        : 0x%02x",
+			sensor->event_type);
+		printf("\n");
+	} else {
+		if (csv_output)
+			printf("%s,%02Xh,ns,%d.%d,Event-Only\n",
+			       sensor->id_code ? desc : "",
+			       sensor->keys.sensor_num,
+			       sensor->entity.id, sensor->entity.instance);
+		else if (sdr_extended)
+			printf("%-16s | %02Xh | ns  | %2d.%1d | Event-Only\n",
+			       sensor->id_code ? desc : "",
+			       sensor->keys.sensor_num,
+			       sensor->entity.id, sensor->entity.instance);
+		else
+			printf("%-16s | Event-Only        | ns\n",
+			       sensor->id_code ? desc : "");
+	}
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_mc_locator  -  print SDR MC locator record
+ *
+ * @intf:	ipmi interface
+ * @mc:		mc locator sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+				 struct sdr_record_mc_locator *mc)
+{
+	char desc[17];
+
+	if (mc == NULL)
+		return -1;
+
+	memset(desc, 0, sizeof (desc));
+	snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string);
+
+	if (verbose == 0) {
+		if (csv_output)
+			printf("%s,00h,ok,%d.%d\n",
+			       mc->id_code ? desc : "",
+			       mc->entity.id, mc->entity.instance);
+		else if (sdr_extended) {
+			printf("%-16s | 00h | ok  | %2d.%1d | ",
+			       mc->id_code ? desc : "",
+			       mc->entity.id, mc->entity.instance);
+
+			printf("%s MC @ %02Xh\n",
+			       (mc->
+				pwr_state_notif & 0x1) ? "Static" : "Dynamic",
+			       mc->dev_slave_addr);
+		} else {
+			printf("%-16s | %s MC @ %02Xh %s | ok\n",
+			       mc->id_code ? desc : "",
+			       (mc->
+				pwr_state_notif & 0x1) ? "Static" : "Dynamic",
+			       mc->dev_slave_addr,
+			       (mc->pwr_state_notif & 0x1) ? " " : "");
+		}
+
+		return 0;	/* done */
+	}
+
+	printf("Device ID              : %s\n", mc->id_string);
+	printf("Entity ID              : %d.%d (%s)\n",
+	       mc->entity.id, mc->entity.instance,
+	       val2str(mc->entity.id, entity_id_vals));
+
+	printf("Device Slave Address   : %02Xh\n", mc->dev_slave_addr);
+	printf("Channel Number         : %01Xh\n", mc->channel_num);
+
+	printf("ACPI System P/S Notif  : %sRequired\n",
+	       (mc->pwr_state_notif & 0x4) ? "" : "Not ");
+	printf("ACPI Device P/S Notif  : %sRequired\n",
+	       (mc->pwr_state_notif & 0x2) ? "" : "Not ");
+	printf("Controller Presence    : %s\n",
+	       (mc->pwr_state_notif & 0x1) ? "Static" : "Dynamic");
+	printf("Logs Init Agent Errors : %s\n",
+	       (mc->global_init & 0x8) ? "Yes" : "No");
+
+	printf("Event Message Gen      : ");
+	if (!(mc->global_init & 0x3))
+		printf("Enable\n");
+	else if ((mc->global_init & 0x3) == 0x1)
+		printf("Disable\n");
+	else if ((mc->global_init & 0x3) == 0x2)
+		printf("Do Not Init Controller\n");
+	else
+		printf("Reserved\n");
+
+	printf("Device Capabilities\n");
+	printf(" Chassis Device        : %s\n",
+	       (mc->dev_support & 0x80) ? "Yes" : "No");
+	printf(" Bridge                : %s\n",
+	       (mc->dev_support & 0x40) ? "Yes" : "No");
+	printf(" IPMB Event Generator  : %s\n",
+	       (mc->dev_support & 0x20) ? "Yes" : "No");
+	printf(" IPMB Event Receiver   : %s\n",
+	       (mc->dev_support & 0x10) ? "Yes" : "No");
+	printf(" FRU Inventory Device  : %s\n",
+	       (mc->dev_support & 0x08) ? "Yes" : "No");
+	printf(" SEL Device            : %s\n",
+	       (mc->dev_support & 0x04) ? "Yes" : "No");
+	printf(" SDR Repository        : %s\n",
+	       (mc->dev_support & 0x02) ? "Yes" : "No");
+	printf(" Sensor Device         : %s\n",
+	       (mc->dev_support & 0x01) ? "Yes" : "No");
+
+	printf("\n");
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_generic_locator  -  print generic device locator record
+ *
+ * @intf:	ipmi interface
+ * @gen:	generic device locator sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+				      struct sdr_record_generic_locator *dev)
+{
+	char desc[17];
+
+	memset(desc, 0, sizeof (desc));
+	snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string);
+
+	if (!verbose) {
+		if (csv_output)
+			printf("%s,00h,ns,%d.%d\n",
+			       dev->id_code ? desc : "",
+			       dev->entity.id, dev->entity.instance);
+		else if (sdr_extended)
+			printf
+			    ("%-16s | 00h | ns  | %2d.%1d | Generic Device @%02Xh:%02Xh.%1d\n",
+			     dev->id_code ? desc : "", dev->entity.id,
+			     dev->entity.instance, dev->dev_access_addr,
+			     dev->dev_slave_addr, dev->oem);
+		else
+			printf("%-16s | Generic @%02X:%02X.%-2d | ok\n",
+			       dev->id_code ? desc : "",
+			       dev->dev_access_addr,
+			       dev->dev_slave_addr, dev->oem);
+
+		return 0;
+	}
+
+	printf("Device ID              : %s\n", dev->id_string);
+	printf("Entity ID              : %d.%d (%s)\n",
+	       dev->entity.id, dev->entity.instance,
+	       val2str(dev->entity.id, entity_id_vals));
+
+	printf("Device Access Address  : %02Xh\n", dev->dev_access_addr);
+	printf("Device Slave Address   : %02Xh\n", dev->dev_slave_addr);
+	printf("Address Span           : %02Xh\n", dev->addr_span);
+	printf("Channel Number         : %01Xh\n", dev->channel_num);
+	printf("LUN.Bus                : %01Xh.%01Xh\n", dev->lun, dev->bus);
+	printf("Device Type.Modifier   : %01Xh.%01Xh (%s)\n",
+	       dev->dev_type, dev->dev_type_modifier,
+	       val2str(dev->dev_type << 8 | dev->dev_type_modifier,
+		       entity_device_type_vals));
+	printf("OEM                    : %02Xh\n", dev->oem);
+	printf("\n");
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_fru_locator  -  print FRU locator record
+ *
+ * @intf:	ipmi interface
+ * @fru:	fru locator sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+				  struct sdr_record_fru_locator *fru)
+{
+	char desc[17];
+
+	memset(desc, 0, sizeof (desc));
+	snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string);
+
+	if (!verbose) {
+		if (csv_output)
+			printf("%s,00h,ns,%d.%d\n",
+			       fru->id_code ? desc : "",
+			       fru->entity.id, fru->entity.instance);
+		else if (sdr_extended)
+			printf("%-16s | 00h | ns  | %2d.%1d | %s FRU @%02Xh\n",
+			       fru->id_code ? desc : "",
+			       fru->entity.id, fru->entity.instance,
+			       (fru->logical) ? "Logical" : "Physical",
+			       fru->device_id);
+		else
+			printf("%-16s | %s FRU @%02Xh %02x.%x | ok\n",
+			       fru->id_code ? desc : "",
+			       (fru->logical) ? "Log" : "Phy",
+			       fru->device_id,
+			       fru->entity.id, fru->entity.instance);
+
+		return 0;
+	}
+
+	printf("Device ID              : %s\n", fru->id_string);
+	printf("Entity ID              : %d.%d (%s)\n",
+	       fru->entity.id, fru->entity.instance,
+	       val2str(fru->entity.id, entity_id_vals));
+
+	printf("Device Access Address  : %02Xh\n", fru->dev_slave_addr);
+	printf("%s: %02Xh\n",
+	       fru->logical ? "Logical FRU Device     " :
+	       "Slave Address          ", fru->device_id);
+	printf("Channel Number         : %01Xh\n", fru->channel_num);
+	printf("LUN.Bus                : %01Xh.%01Xh\n", fru->lun, fru->bus);
+	printf("Device Type.Modifier   : %01Xh.%01Xh (%s)\n",
+	       fru->dev_type, fru->dev_type_modifier,
+	       val2str(fru->dev_type << 8 | fru->dev_type_modifier,
+		       entity_device_type_vals));
+	printf("OEM                    : %02Xh\n", fru->oem);
+	printf("\n");
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_entity_assoc  -  print SDR entity association record
+ *
+ * @intf:	ipmi interface
+ * @mc:		entity association sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sensor_entity_assoc(struct ipmi_intf *intf,
+				   struct sdr_record_entity_assoc *assoc)
+{
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_oem_intel  -  print Intel OEM sensors
+ *
+ * @intf:	ipmi interface
+ * @oem:	oem sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_sdr_print_sensor_oem_intel(struct ipmi_intf *intf,
+				struct sdr_record_oem *oem)
+{
+	switch (oem->data[3]) {	/* record sub-type */
+	case 0x02:		/* Power Unit Map */
+		if (verbose) {
+			printf
+			    ("Sensor ID              : Power Unit Redundancy (0x%x)\n",
+			     oem->data[4]);
+			printf
+			    ("Sensor Type            : Intel OEM - Power Unit Map\n");
+			printf("Redundant Supplies     : %d", oem->data[6]);
+			if (oem->data[5])
+				printf(" (flags %xh)", oem->data[5]);
+			printf("\n");
+		}
+
+		switch (oem->data_len) {
+		case 7:	/* SR1300, non-redundant */
+			if (verbose)
+				printf("Power Redundancy       : No\n");
+			else if (csv_output)
+				printf("Power Redundancy,Not Available,nr\n");
+			else
+				printf
+				    ("Power Redundancy | Not Available     | nr\n");
+			break;
+		case 8:	/* SR2300, redundant, PS1 & PS2 present */
+			if (verbose) {
+				printf("Power Redundancy       : No\n");
+				printf("Power Supply 2 Sensor  : %x\n",
+				       oem->data[8]);
+			} else if (csv_output) {
+				printf("Power Redundancy,PS@%02xh,nr\n",
+				       oem->data[8]);
+			} else {
+				printf
+				    ("Power Redundancy | PS@%02xh            | nr\n",
+				     oem->data[8]);
+			}
+			break;
+		case 9:	/* SR2300, non-redundant, PSx present */
+			if (verbose) {
+				printf("Power Redundancy       : Yes\n");
+				printf("Power Supply Sensor    : %x\n",
+				       oem->data[7]);
+				printf("Power Supply Sensor    : %x\n",
+				       oem->data[8]);
+			} else if (csv_output) {
+				printf
+				    ("Power Redundancy,PS@%02xh + PS@%02xh,ok\n",
+				     oem->data[7], oem->data[8]);
+			} else {
+				printf
+				    ("Power Redundancy | PS@%02xh + PS@%02xh   | ok\n",
+				     oem->data[7], oem->data[8]);
+			}
+			break;
+		}
+		if (verbose)
+			printf("\n");
+		break;
+	case 0x03:		/* Fan Speed Control */
+		break;
+	case 0x06:		/* System Information */
+		break;
+	case 0x07:		/* Ambient Temperature Fan Speed Control */
+		break;
+	default:
+		lprintf(LOG_DEBUG, "Unknown Intel OEM SDR Record type %02x",
+			oem->data[3]);
+	}
+
+	return 0;
+}
+
+/* ipmi_sdr_print_sensor_oem  -  print OEM sensors
+ *
+ * This function is generally only filled out by decoding what
+ * a particular BMC might stuff into its OEM records.  The
+ * records are keyed off manufacturer ID and record subtypes.
+ *
+ * @intf:	ipmi interface
+ * @oem:	oem sdr record
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_sdr_print_sensor_oem(struct ipmi_intf *intf, struct sdr_record_oem *oem)
+{
+	int rc = 0;
+
+	if (oem == NULL)
+		return -1;
+	if (oem->data_len == 0 || oem->data == NULL)
+		return -1;
+
+	if (verbose > 2)
+		printbuf(oem->data, oem->data_len, "OEM Record");
+
+	/* intel manufacturer id */
+	if (oem->data[0] == 0x57 &&
+	    oem->data[1] == 0x01 && oem->data[2] == 0x00) {
+		rc = ipmi_sdr_print_sensor_oem_intel(intf, oem);
+	}
+
+	return rc;
+}
+
+/* ipmi_sdr_print_name_from_rawentry  -  Print SDR name  from raw data
+ *
+ * @intf:	ipmi interface
+ * @type:	sensor type
+ * @raw:	raw sensor data
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
+                                  uint8_t type, uint8_t *raw)
+{
+   union {
+      struct sdr_record_full_sensor *full;
+      struct sdr_record_compact_sensor *compact;
+      struct sdr_record_eventonly_sensor *eventonly;
+      struct sdr_record_generic_locator *genloc;
+      struct sdr_record_fru_locator *fruloc;
+      struct sdr_record_mc_locator *mcloc;
+      struct sdr_record_entity_assoc *entassoc;
+      struct sdr_record_oem *oem;
+   } record;
+
+   int rc =0;
+   char desc[17];
+   memset(desc, ' ', sizeof (desc));
+
+   switch ( type) {
+      case SDR_RECORD_TYPE_FULL_SENSOR:
+      record.full = (struct sdr_record_full_sensor *) raw;
+      snprintf(desc, (record.full->id_code & 0x1f) +1, "%s",
+               (const char *)record.full->id_string);
+      break;
+      case SDR_RECORD_TYPE_COMPACT_SENSOR:
+      record.compact = (struct sdr_record_compact_sensor *) raw	;
+      snprintf(desc, (record.compact->id_code & 0x1f)  +1, "%s",
+               (const char *)record.compact->id_string);
+      break;
+      case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+      record.eventonly  = (struct sdr_record_eventonly_sensor *) raw ;
+      snprintf(desc, (record.eventonly->id_code & 0x1f)  +1, "%s",
+               (const char *)record.eventonly->id_string);
+      break;            
+      case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+      record.mcloc  = (struct sdr_record_mc_locator *) raw ;
+      snprintf(desc, (record.mcloc->id_code & 0x1f)  +1, "%s",
+               (const char *)record.mcloc->id_string);		
+      break;
+      default:
+      rc = -1;
+      break;
+   }   
+
+      lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
+   return rc;
+}
+
+/* ipmi_sdr_print_rawentry  -  Print SDR entry from raw data
+ *
+ * @intf:	ipmi interface
+ * @type:	sensor type
+ * @raw:	raw sensor data
+ * @len:	length of raw sensor data
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_rawentry(struct ipmi_intf *intf, uint8_t type,
+			uint8_t * raw, int len)
+{
+	int rc = 0;
+
+	switch (type) {
+	case SDR_RECORD_TYPE_FULL_SENSOR:
+	case SDR_RECORD_TYPE_COMPACT_SENSOR:
+		rc = ipmi_sdr_print_sensor_fc(intf,
+					(struct sdr_record_common_sensor *) raw,
+					type);
+		break;
+	case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+		rc = ipmi_sdr_print_sensor_eventonly(intf,
+						     (struct
+						      sdr_record_eventonly_sensor
+						      *) raw);
+		break;
+	case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_generic_locator(intf,
+							   (struct
+							    sdr_record_generic_locator
+							    *) raw);
+		break;
+	case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_fru_locator(intf,
+						       (struct
+							sdr_record_fru_locator
+							*) raw);
+		break;
+	case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_mc_locator(intf,
+						      (struct
+						       sdr_record_mc_locator *)
+						      raw);
+		break;
+	case SDR_RECORD_TYPE_ENTITY_ASSOC:
+		rc = ipmi_sdr_print_sensor_entity_assoc(intf,
+							(struct
+							 sdr_record_entity_assoc
+							 *) raw);
+		break;
+	case SDR_RECORD_TYPE_OEM:{
+			struct sdr_record_oem oem;
+			oem.data = raw;
+			oem.data_len = len;
+			rc = ipmi_sdr_print_sensor_oem(intf,
+						       (struct sdr_record_oem *)
+						       &oem);
+			break;
+		}
+	case SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC:
+	case SDR_RECORD_TYPE_MC_CONFIRMATION:
+	case SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO:
+		/* not implemented */
+		break;
+	}
+
+	return rc;
+}
+
+/* ipmi_sdr_print_listentry  -  Print SDR entry from list
+ *
+ * @intf:	ipmi interface
+ * @entry:	sdr record list entry
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_listentry(struct ipmi_intf *intf, struct sdr_record_list *entry)
+{
+	int rc = 0;
+
+	switch (entry->type) {
+	case SDR_RECORD_TYPE_FULL_SENSOR:
+	case SDR_RECORD_TYPE_COMPACT_SENSOR:
+		rc = ipmi_sdr_print_sensor_fc(intf, entry->record.common, entry->type);
+		break;
+	case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+		rc = ipmi_sdr_print_sensor_eventonly(intf,
+						     entry->record.eventonly);
+		break;
+	case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_generic_locator(intf,
+							   entry->record.
+							   genloc);
+		break;
+	case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_fru_locator(intf,
+						       entry->record.fruloc);
+		break;
+	case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+		rc = ipmi_sdr_print_sensor_mc_locator(intf,
+						      entry->record.mcloc);
+		break;
+	case SDR_RECORD_TYPE_ENTITY_ASSOC:
+		rc = ipmi_sdr_print_sensor_entity_assoc(intf,
+							entry->record.entassoc);
+		break;
+	case SDR_RECORD_TYPE_OEM:
+		rc = ipmi_sdr_print_sensor_oem(intf, entry->record.oem);
+		break;
+	case SDR_RECORD_TYPE_DEVICE_ENTITY_ASSOC:
+	case SDR_RECORD_TYPE_MC_CONFIRMATION:
+	case SDR_RECORD_TYPE_BMC_MSG_CHANNEL_INFO:
+		/* not implemented yet */
+		break;
+	}
+
+	return rc;
+}
+
+/* ipmi_sdr_print_sdr  -  iterate through SDR printing records
+ *
+ * intf:	ipmi interface
+ * type:	record type to print
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_sdr(struct ipmi_intf *intf, uint8_t type)
+{
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+	int rc = 0;
+
+	lprintf(LOG_DEBUG, "Querying SDR for sensor list");
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return -1;
+		}
+	}
+
+	for (e = sdr_list_head; e != NULL; e = e->next) {
+		if (type != e->type && type != 0xff && type != 0xfe)
+			continue;
+		if (type == 0xfe &&
+		    e->type != SDR_RECORD_TYPE_FULL_SENSOR &&
+		    e->type != SDR_RECORD_TYPE_COMPACT_SENSOR)
+			continue;
+		if (ipmi_sdr_print_listentry(intf, e) < 0)
+			rc = -1;
+	}
+
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			lprintf(LOG_ERR, "ipmitool: ipmi_sdr_get_record() failed");
+			rc = -1;
+			continue;
+		}
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			if (rec != NULL) {
+				free(rec);
+				rec = NULL;
+			}
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+                lprintf(LOG_DEBUG, "SDR record ID   : 0x%04x", sdrr->id);
+
+		if (type == header->type || type == 0xff ||
+		    (type == 0xfe &&
+		     (header->type == SDR_RECORD_TYPE_FULL_SENSOR ||
+		      header->type == SDR_RECORD_TYPE_COMPACT_SENSOR))) {
+			if (ipmi_sdr_print_rawentry(intf, header->type,
+						    rec, header->length) < 0)
+				rc = -1;
+		}
+
+		/* add to global record liset */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	return rc;
+}
+
+/* ipmi_sdr_get_reservation  -  Obtain SDR reservation ID
+ *
+ * @intf:	ipmi interface
+ * @reserve_id:	pointer to short int for storing the id
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_get_reservation(struct ipmi_intf *intf, int use_builtin,
+                         uint16_t * reserve_id)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	/* obtain reservation ID */
+	memset(&req, 0, sizeof (req));
+
+	if (use_builtin == 0) {
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+	} else {
+		req.msg.netfn = IPMI_NETFN_SE;
+	}
+
+	req.msg.cmd = GET_SDR_RESERVE_REPO;
+	rsp = intf->sendrecv(intf, &req);
+
+	/* be slient for errors, they are handled by calling function */
+	if (rsp == NULL)
+		return -1;
+	if (rsp->ccode > 0)
+		return -1;
+
+	*reserve_id = ((struct sdr_reserve_repo_rs *) &(rsp->data))->reserve_id;
+	lprintf(LOG_DEBUG, "SDR reservation ID %04x", *reserve_id);
+
+	return 0;
+}
+
+/* ipmi_sdr_start  -  setup sdr iterator
+ *
+ * @intf:	ipmi interface
+ *
+ * returns sdr iterator structure pointer
+ * returns NULL on error
+ */
+struct ipmi_sdr_iterator *
+ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
+{
+	struct ipmi_sdr_iterator *itr;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	struct ipm_devid_rsp *devid;
+
+	itr = malloc(sizeof (struct ipmi_sdr_iterator));
+	if (itr == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+
+	/* check SDRR capability */
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Device ID command failed");
+		free(itr);
+		itr = NULL;
+		return NULL;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Device ID command failed: %#x %s",
+			rsp->ccode, val2str(rsp->ccode, completion_code_vals));
+		free(itr);
+		itr = NULL;
+		return NULL;
+	}
+	devid = (struct ipm_devid_rsp *) rsp->data;
+
+   sdriana =  (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id);
+
+	if (!use_builtin && (devid->device_revision & IPM_DEV_DEVICE_ID_SDR_MASK)) {
+		if ((devid->adtl_device_support & 0x02) == 0) {
+			if ((devid->adtl_device_support & 0x01)) {
+				lprintf(LOG_DEBUG, "Using Device SDRs\n");
+				use_built_in = 1;
+			} else {
+				lprintf(LOG_ERR, "Error obtaining SDR info");
+				free(itr);
+				itr = NULL;
+				return NULL;
+			}
+		} else {
+			lprintf(LOG_DEBUG, "Using SDR from Repository \n");
+		}
+	}
+	itr->use_built_in = use_builtin ? 1 : use_built_in;
+   /***********************/
+	if (itr->use_built_in == 0) {
+		struct sdr_repo_info_rs sdr_info;
+		/* get sdr repository info */
+		memset(&req, 0, sizeof (req));
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = GET_SDR_REPO_INFO;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Error obtaining SDR info");
+			free(itr);
+			itr = NULL;
+			return NULL;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Error obtaining SDR info: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			free(itr);
+			itr = NULL;
+			return NULL;
+		}
+
+		memcpy(&sdr_info, rsp->data, sizeof (sdr_info));
+		/* IPMIv1.0 == 0x01
+		   * IPMIv1.5 == 0x51
+		   * IPMIv2.0 == 0x02
+		 */
+		if ((sdr_info.version != 0x51) &&
+		    (sdr_info.version != 0x01) &&
+		    (sdr_info.version != 0x02)) {
+			lprintf(LOG_WARN, "WARNING: Unknown SDR repository "
+				"version 0x%02x", sdr_info.version);
+		}
+
+		itr->total = sdr_info.count;
+		itr->next = 0;
+
+		lprintf(LOG_DEBUG, "SDR free space: %d", sdr_info.free);
+		lprintf(LOG_DEBUG, "SDR records   : %d", sdr_info.count);
+
+		/* Build SDRR if there is no record in repository */
+		if( sdr_info.count == 0 ) {
+		   lprintf(LOG_DEBUG, "Rebuilding SDRR...");
+
+		   if( ipmi_sdr_add_from_sensors( intf, 0 ) != 0 ) {
+		      lprintf(LOG_ERR, "Could not build SDRR!");
+		      free(itr);
+					itr = NULL;
+		      return NULL;
+		   }
+		}
+	} else {
+		struct sdr_device_info_rs sdr_info;
+		/* get device sdr info */
+		memset(&req, 0, sizeof (req));
+		req.msg.netfn = IPMI_NETFN_SE;
+		req.msg.cmd = GET_DEVICE_SDR_INFO;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (!rsp || !rsp->data_len || rsp->ccode) {
+			printf("Err in cmd get sensor sdr info\n");
+			free(itr);
+			itr = NULL;
+			return NULL;
+		}
+		memcpy(&sdr_info, rsp->data, sizeof (sdr_info));
+
+		itr->total = sdr_info.count;
+		itr->next = 0;
+		lprintf(LOG_DEBUG, "SDR records   : %d", sdr_info.count);
+	}
+
+	if (ipmi_sdr_get_reservation(intf, itr->use_built_in,
+                                &(itr->reservation)) < 0) {
+		lprintf(LOG_ERR, "Unable to obtain SDR reservation");
+		free(itr);
+		itr = NULL;
+		return NULL;
+	}
+
+	return itr;
+}
+
+/* ipmi_sdr_get_record  -  return RAW SDR record
+ *
+ * @intf:	ipmi interface
+ * @header:	SDR header
+ * @itr:	SDR iterator
+ *
+ * returns raw SDR data
+ * returns NULL on error
+ */
+uint8_t *
+ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
+		    struct ipmi_sdr_iterator * itr)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	struct sdr_get_rq sdr_rq;
+	uint8_t *data;
+	int i = 0, len = header->length;
+
+	if (len < 1)
+		return NULL;
+
+	data = malloc(len + 1);
+	if (data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(data, 0, len + 1);
+
+	memset(&sdr_rq, 0, sizeof (sdr_rq));
+	sdr_rq.reserve_id = itr->reservation;
+	sdr_rq.id = header->id;
+	sdr_rq.offset = 0;
+
+	memset(&req, 0, sizeof (req));
+	if (itr->use_built_in == 0) {
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = GET_SDR;
+	} else {
+		req.msg.netfn = IPMI_NETFN_SE;
+		req.msg.cmd = GET_DEVICE_SDR;
+	}
+	req.msg.data = (uint8_t *) & sdr_rq;
+	req.msg.data_len = sizeof (sdr_rq);
+
+	/* check if max length is null */
+	if ( sdr_max_read_len == 0 ) {
+		/* get maximum response size */
+		sdr_max_read_len = ipmi_intf_get_max_response_data_size(intf) - 2;
+
+		/* cap the number of bytes to read */
+		if (sdr_max_read_len > 0xFE) {
+			sdr_max_read_len = 0xFE;
+		}
+	}
+
+	/* read SDR record with partial reads
+	 * because a full read usually exceeds the maximum
+	 * transport buffer size.  (completion code 0xca)
+	 */
+	while (i < len) {
+		sdr_rq.length = (len - i < sdr_max_read_len) ?
+		    len - i : sdr_max_read_len;
+		sdr_rq.offset = i + 5;	/* 5 header bytes */
+
+		lprintf(LOG_DEBUG, "Getting %d bytes from SDR at offset %d",
+			sdr_rq.length, sdr_rq.offset);
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+		    sdr_max_read_len = sdr_rq.length - 1;
+		    if (sdr_max_read_len > 0) {
+			/* no response may happen if requests are bridged
+			   and too many bytes are requested */
+			continue;
+		    } else {
+			free(data);
+			data = NULL;
+			return NULL;
+		    }
+		}
+
+		switch (rsp->ccode) {
+		case 0xca:
+			/* read too many bytes at once */
+			sdr_max_read_len = sdr_rq.length - 1;
+			continue;
+		case 0xc5:
+			/* lost reservation */
+			lprintf(LOG_DEBUG, "SDR reservation cancelled. "
+				"Sleeping a bit and retrying...");
+
+			sleep(rand() & 3);
+
+			if (ipmi_sdr_get_reservation(intf, itr->use_built_in,
+                                      &(itr->reservation)) < 0) {
+				free(data);
+				data = NULL;
+				return NULL;
+			}
+			sdr_rq.reserve_id = itr->reservation;
+			continue;
+		}
+
+		/* special completion codes handled above */
+		if (rsp->ccode > 0 || rsp->data_len == 0) {
+			free(data);
+			data = NULL;
+			return NULL;
+		}
+
+		memcpy(data + i, rsp->data + 2, sdr_rq.length);
+		i += sdr_max_read_len;
+	}
+
+	return data;
+}
+
+/* ipmi_sdr_end  -  cleanup SDR iterator
+ *
+ * @intf:	ipmi interface
+ * @itr:	SDR iterator
+ *
+ * no meaningful return code
+ */
+void
+ipmi_sdr_end(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
+{
+	if (itr) {
+		free(itr);
+		itr = NULL;
+	}
+}
+
+/* __sdr_list_add  -  helper function to add SDR record to list
+ *
+ * @head:	list head
+ * @entry:	new entry to add to end of list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+__sdr_list_add(struct sdr_record_list *head, struct sdr_record_list *entry)
+{
+	struct sdr_record_list *e;
+	struct sdr_record_list *new;
+
+	if (head == NULL)
+		return -1;
+
+	new = malloc(sizeof (struct sdr_record_list));
+	if (new == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return -1;
+	}
+	memcpy(new, entry, sizeof (struct sdr_record_list));
+
+	e = head;
+	while (e->next)
+		e = e->next;
+	e->next = new;
+	new->next = NULL;
+
+	return 0;
+}
+
+/* __sdr_list_empty  -  low-level handler to clean up record list
+ *
+ * @head:	list head to clean
+ *
+ * no meaningful return code
+ */
+static void
+__sdr_list_empty(struct sdr_record_list *head)
+{
+	struct sdr_record_list *e, *f;
+	for (e = head; e != NULL; e = f) {
+		f = e->next;
+		free(e);
+		e = NULL;
+	}
+	head = NULL;
+}
+
+/* ipmi_sdr_list_empty  -  clean global SDR list
+ *
+ * @intf:	ipmi interface
+ *
+ * no meaningful return code
+ */
+void
+ipmi_sdr_list_empty(struct ipmi_intf *intf)
+{
+	struct sdr_record_list *list, *next;
+
+	ipmi_sdr_end(intf, sdr_list_itr);
+
+	for (list = sdr_list_head; list != NULL; list = next) {
+		switch (list->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (list->record.common) {
+				free(list->record.common);
+				list->record.common = NULL;
+			}
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			if (list->record.eventonly) {
+				free(list->record.eventonly);
+				list->record.eventonly = NULL;
+			}
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			if (list->record.genloc) {
+				free(list->record.genloc);
+				list->record.genloc = NULL;
+			}
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			if (list->record.fruloc) {
+				free(list->record.fruloc);
+				list->record.fruloc = NULL;
+			}
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			if (list->record.mcloc) {
+				free(list->record.mcloc);
+				list->record.mcloc = NULL;
+			}
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			if (list->record.entassoc) {
+				free(list->record.entassoc);
+				list->record.entassoc = NULL;
+			}
+			break;
+		}
+		next = list->next;
+		free(list);
+		list = NULL;
+	}
+
+	sdr_list_head = NULL;
+	sdr_list_tail = NULL;
+	sdr_list_itr = NULL;
+}
+
+/* ipmi_sdr_find_sdr_bynumtype  -  lookup SDR entry by number/type
+ *
+ * @intf:	ipmi interface
+ * @gen_id:	sensor owner ID/LUN - SEL generator ID
+ * @num:	sensor number to search for
+ * @type:	sensor type to search for
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+struct sdr_record_list *
+ipmi_sdr_find_sdr_bynumtype(struct ipmi_intf *intf, uint16_t gen_id, uint8_t num, uint8_t type)
+{
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+	int found = 0;
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return NULL;
+		}
+	}
+
+	/* check what we've already read */
+	for (e = sdr_list_head; e != NULL; e = e->next) {
+		switch (e->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (e->record.common->keys.sensor_num == num &&
+			    e->record.common->keys.owner_id == (gen_id & 0x00ff) &&
+			    e->record.common->sensor.type == type)
+				return e;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			if (e->record.eventonly->keys.sensor_num == num &&
+			    e->record.eventonly->keys.owner_id == (gen_id & 0x00ff) &&
+			    e->record.eventonly->sensor_type == type)
+				return e;
+			break;
+		}
+	}
+
+	/* now keep looking */
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			if (sdrr->record.common->keys.sensor_num == num
+			    && sdrr->record.common->keys.owner_id == (gen_id & 0x00ff)
+			    && sdrr->record.common->sensor.type == type)
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			if (sdrr->record.eventonly->keys.sensor_num == num
+			    && sdrr->record.eventonly->keys.owner_id == (gen_id & 0x00ff)
+			    && sdrr->record.eventonly->sensor_type == type)
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* put in the global record list */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+
+		if (found)
+			return sdrr;
+	}
+
+	return NULL;
+}
+
+/* ipmi_sdr_find_sdr_bysensortype  -  lookup SDR entry by sensor type
+ *
+ * @intf:	ipmi interface
+ * @type:	sensor type to search for
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+struct sdr_record_list *
+ipmi_sdr_find_sdr_bysensortype(struct ipmi_intf *intf, uint8_t type)
+{
+	struct sdr_record_list *head;
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return NULL;
+		}
+	}
+
+	/* check what we've already read */
+	head = malloc(sizeof (struct sdr_record_list));
+	if (head == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(head, 0, sizeof (struct sdr_record_list));
+
+	for (e = sdr_list_head; e != NULL; e = e->next) {
+		switch (e->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (e->record.common->sensor.type == type)
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			if (e->record.eventonly->sensor_type == type)
+				__sdr_list_add(head, e);
+			break;
+		}
+	}
+
+	/* now keep looking */
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			if (sdrr->record.common->sensor.type == type)
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			if (sdrr->record.eventonly->sensor_type == type)
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* put in the global record list */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	return head;
+}
+
+/* ipmi_sdr_find_sdr_byentity  -  lookup SDR entry by entity association
+ *
+ * @intf:	ipmi interface
+ * @entity:	entity id/instance to search for
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+struct sdr_record_list *
+ipmi_sdr_find_sdr_byentity(struct ipmi_intf *intf, struct entity_id *entity)
+{
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+	struct sdr_record_list *head;
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return NULL;
+		}
+	}
+
+	head = malloc(sizeof (struct sdr_record_list));
+	if (head == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(head, 0, sizeof (struct sdr_record_list));
+
+	/* check what we've already read */
+	for (e = sdr_list_head; e != NULL; e = e->next) {
+		switch (e->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (e->record.common->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.common->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			if (e->record.eventonly->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.eventonly->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			if (e->record.genloc->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.genloc->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			if (e->record.fruloc->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.fruloc->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			if (e->record.mcloc->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.mcloc->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			if (e->record.entassoc->entity.id == entity->id &&
+			    (entity->instance == 0x7f ||
+			     e->record.entassoc->entity.instance ==
+			     entity->instance))
+				__sdr_list_add(head, e);
+			break;
+		}
+	}
+
+	/* now keep looking */
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			if (sdrr->record.common->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.common->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			if (sdrr->record.eventonly->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.eventonly->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			if (sdrr->record.genloc->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.genloc->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			if (sdrr->record.fruloc->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.fruloc->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			if (sdrr->record.mcloc->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.mcloc->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			if (sdrr->record.entassoc->entity.id == entity->id
+			    && (entity->instance == 0x7f
+				|| sdrr->record.entassoc->entity.instance ==
+				entity->instance))
+				__sdr_list_add(head, sdrr);
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* add to global record list */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	return head;
+}
+
+/* ipmi_sdr_find_sdr_bytype  -  lookup SDR entries by type
+ *
+ * @intf:	ipmi interface
+ * @type:	type of sensor record to search for
+ *
+ * returns pointer to SDR list with all matching entities
+ * returns NULL on error
+ */
+struct sdr_record_list *
+ipmi_sdr_find_sdr_bytype(struct ipmi_intf *intf, uint8_t type)
+{
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+	struct sdr_record_list *head;
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return NULL;
+		}
+	}
+
+	head = malloc(sizeof (struct sdr_record_list));
+	if (head == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(head, 0, sizeof (struct sdr_record_list));
+
+	/* check what we've already read */
+	for (e = sdr_list_head; e != NULL; e = e->next)
+		if (e->type == type)
+			__sdr_list_add(head, e);
+
+	/* now keep looking */
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		if (header->type == type)
+			__sdr_list_add(head, sdrr);
+
+		/* add to global record list */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	return head;
+}
+
+/* ipmi_sdr_find_sdr_byid  -  lookup SDR entry by ID string
+ *
+ * @intf:	ipmi interface
+ * @id:		string to match for sensor name
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+struct sdr_record_list *
+ipmi_sdr_find_sdr_byid(struct ipmi_intf *intf, char *id)
+{
+	struct sdr_get_rs *header;
+	struct sdr_record_list *e;
+	int found = 0;
+	int idlen;
+
+	if (id == NULL)
+		return NULL;
+
+	idlen = strlen(id);
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return NULL;
+		}
+	}
+
+	/* check what we've already read */
+	for (e = sdr_list_head; e != NULL; e = e->next) {
+		switch (e->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+			if (!strncmp((const char *)e->record.full->id_string,
+				     (const char *)id,
+				     __max(e->record.full->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (!strncmp((const char *)e->record.compact->id_string,
+				     (const char *)id,
+				     __max(e->record.compact->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			if (!strncmp((const char *)e->record.eventonly->id_string,
+				     (const char *)id,
+				     __max(e->record.eventonly->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			if (!strncmp((const char *)e->record.genloc->id_string,
+				     (const char *)id,
+				     __max(e->record.genloc->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			if (!strncmp((const char *)e->record.fruloc->id_string,
+				     (const char *)id,
+				     __max(e->record.fruloc->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			if (!strncmp((const char *)e->record.mcloc->id_string,
+				     (const char *)id,
+				     __max(e->record.mcloc->id_code & 0x1f, idlen)))
+				return e;
+			break;
+		}
+	}
+
+	/* now keep looking */
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+			sdrr->record.full =
+			    (struct sdr_record_full_sensor *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.full->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.full->id_code & 0x1f, idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.compact =
+			    (struct sdr_record_compact_sensor *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.compact->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.compact->id_code & 0x1f,
+				   idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.eventonly->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.eventonly->id_code & 0x1f,
+				   idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.genloc->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.genloc->id_code & 0x1f, idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.fruloc->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.fruloc->id_code & 0x1f, idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			if (!strncmp(
+			    (const char *)sdrr->record.mcloc->id_string,
+			    (const char *)id,
+			    __max(sdrr->record.mcloc->id_code & 0x1f, idlen)))
+				found = 1;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* add to global record liset */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+
+		if (found)
+			return sdrr;
+	}
+
+	return NULL;
+}
+
+/* ipmi_sdr_list_cache_fromfile  -  generate SDR cache for fast lookup from local file
+ *
+ * @intf:	ipmi interface
+ * @ifile:	input filename
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+int
+ipmi_sdr_list_cache_fromfile(struct ipmi_intf *intf, const char *ifile)
+{
+	FILE *fp;
+	struct __sdr_header {
+		uint16_t id;
+		uint8_t version;
+		uint8_t type;
+		uint8_t length;
+	} header;
+	struct sdr_record_list *sdrr;
+	uint8_t *rec;
+	int ret = 0, count = 0, bc = 0;
+
+	if (ifile == NULL) {
+		lprintf(LOG_ERR, "No SDR cache filename given");
+		return -1;
+	}
+
+	fp = ipmi_open_file_read(ifile);
+	if (fp == NULL) {
+		lprintf(LOG_ERR, "Unable to open SDR cache %s for reading",
+			ifile);
+		return -1;
+	}
+
+	while (feof(fp) == 0) {
+		memset(&header, 0, sizeof(header));
+		bc = fread(&header, 1, 5, fp);
+		if (bc <= 0)
+			break;
+
+		if (bc != 5) {
+			lprintf(LOG_ERR, "header read %d bytes, expected 5",
+				bc);
+			ret = -1;
+			break;
+		}
+
+		if (header.length == 0)
+			continue;
+
+		if (header.version != 0x51 &&
+		    header.version != 0x01 &&
+		    header.version != 0x02) {
+			lprintf(LOG_WARN, "invalid sdr header version %02x",
+				header.version);
+			ret = -1;
+			break;
+		}
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			ret = -1;
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+
+		sdrr->id = header.id;
+		sdrr->type = header.type;
+
+		rec = malloc(header.length + 1);
+		if (rec == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			ret = -1;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			break;
+		}
+		memset(rec, 0, header.length + 1);
+
+		bc = fread(rec, 1, header.length, fp);
+		if (bc != header.length) {
+			lprintf(LOG_ERR,
+				"record %04x read %d bytes, expected %d",
+				header.id, bc, header.length);
+			ret = -1;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			if (rec != NULL) {
+				free(rec);
+				rec = NULL;
+			}
+			break;
+		}
+
+		switch (header.type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* add to global record liset */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+
+		count++;
+
+		lprintf(LOG_DEBUG, "Read record %04x from file into cache",
+			sdrr->id);
+	}
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = malloc(sizeof (struct ipmi_sdr_iterator));
+		if (sdr_list_itr != NULL) {
+			sdr_list_itr->reservation = 0;
+			sdr_list_itr->total = count;
+			sdr_list_itr->next = 0xffff;
+		}
+	}
+
+	fclose(fp);
+	return ret;
+}
+
+/* ipmi_sdr_list_cache  -  generate SDR cache for fast lookup
+ *
+ * @intf:	ipmi interface
+ *
+ * returns pointer to SDR list
+ * returns NULL on error
+ */
+int
+ipmi_sdr_list_cache(struct ipmi_intf *intf)
+{
+	struct sdr_get_rs *header;
+
+	if (sdr_list_itr == NULL) {
+		sdr_list_itr = ipmi_sdr_start(intf, 0);
+		if (sdr_list_itr == NULL) {
+			lprintf(LOG_ERR, "Unable to open SDR for reading");
+			return -1;
+		}
+	}
+
+	while ((header = ipmi_sdr_get_next_header(intf, sdr_list_itr)) != NULL) {
+		uint8_t *rec;
+		struct sdr_record_list *sdrr;
+
+		sdrr = malloc(sizeof (struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			break;
+		}
+		memset(sdrr, 0, sizeof (struct sdr_record_list));
+		sdrr->id = header->id;
+		sdrr->type = header->type;
+
+		rec = ipmi_sdr_get_record(intf, header, sdr_list_itr);
+		if (rec == NULL) {
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			sdrr->record.common =
+			    (struct sdr_record_common_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			sdrr->record.eventonly =
+			    (struct sdr_record_eventonly_sensor *) rec;
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			sdrr->record.genloc =
+			    (struct sdr_record_generic_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			sdrr->record.fruloc =
+			    (struct sdr_record_fru_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			sdrr->record.mcloc =
+			    (struct sdr_record_mc_locator *) rec;
+			break;
+		case SDR_RECORD_TYPE_ENTITY_ASSOC:
+			sdrr->record.entassoc =
+			    (struct sdr_record_entity_assoc *) rec;
+			break;
+		default:
+			free(rec);
+			rec = NULL;
+			if (sdrr != NULL) {
+				free(sdrr);
+				sdrr = NULL;
+			}
+			continue;
+		}
+
+		/* add to global record liset */
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	return 0;
+}
+
+/*
+ * ipmi_sdr_get_info
+ *
+ * Execute the GET SDR REPOSITORY INFO command, and populate the sdr_info
+ * structure.
+ * See section 33.9 of the IPMI v2 specification for details
+ *
+ * returns 0 on success
+ *         -1 on transport error
+ *         > 0 for other errors
+ */
+int
+ipmi_sdr_get_info(struct ipmi_intf *intf,
+		  struct get_sdr_repository_info_rsp *sdr_repository_info)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof (req));
+
+	req.msg.netfn = IPMI_NETFN_STORAGE;	// 0x0A
+	req.msg.cmd = IPMI_GET_SDR_REPOSITORY_INFO;	// 0x20
+	req.msg.data = 0;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SDR Repository Info command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SDR Repository Info command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	memcpy(sdr_repository_info,
+	       rsp->data,
+	       __min(sizeof (struct get_sdr_repository_info_rsp),
+		     rsp->data_len));
+
+	return 0;
+}
+
+/* ipmi_sdr_timestamp  -  return string from timestamp value
+ *
+ * @stamp:	32bit timestamp
+ *
+ * returns pointer to static buffer
+ */
+static char *
+ipmi_sdr_timestamp(uint32_t stamp)
+{
+	static char tbuf[40];
+	time_t s = (time_t) stamp;
+	memset(tbuf, 0, 40);
+	if (stamp)
+		strftime(tbuf, sizeof (tbuf), "%m/%d/%Y %H:%M:%S",
+			 gmtime(&s));
+	return tbuf;
+}
+
+/*
+ * ipmi_sdr_print_info
+ *
+ * Display the return data of the GET SDR REPOSITORY INFO command
+ * See section 33.9 of the IPMI v2 specification for details
+ *
+ * returns 0 on success
+ *         -1 on error
+ */
+int
+ipmi_sdr_print_info(struct ipmi_intf *intf)
+{
+	uint32_t timestamp;
+	uint16_t free_space;
+
+	struct get_sdr_repository_info_rsp sdr_repository_info;
+
+	if (ipmi_sdr_get_info(intf, &sdr_repository_info) != 0)
+		return -1;
+
+	printf("SDR Version                         : 0x%x\n",
+	       sdr_repository_info.sdr_version);
+	printf("Record Count                        : %d\n",
+	       (sdr_repository_info.record_count_msb << 8) |
+	       sdr_repository_info.record_count_lsb);
+
+	free_space =
+	    (sdr_repository_info.free_space[1] << 8) |
+	    sdr_repository_info.free_space[0];
+
+	printf("Free Space                          : ");
+	switch (free_space) {
+	case 0x0000:
+		printf("none (full)\n");
+		break;
+	case 0xFFFF:
+		printf("unspecified\n");
+		break;
+	case 0xFFFE:
+		printf("> 64Kb - 2 bytes\n");
+		break;
+	default:
+		printf("%d bytes\n", free_space);
+		break;
+	}
+
+	timestamp =
+	    (sdr_repository_info.most_recent_addition_timestamp[3] << 24) |
+	    (sdr_repository_info.most_recent_addition_timestamp[2] << 16) |
+	    (sdr_repository_info.most_recent_addition_timestamp[1] << 8) |
+	    sdr_repository_info.most_recent_addition_timestamp[0];
+	printf("Most recent Addition                : %s\n",
+	       ipmi_sdr_timestamp(timestamp));
+
+	timestamp =
+	    (sdr_repository_info.most_recent_erase_timestamp[3] << 24) |
+	    (sdr_repository_info.most_recent_erase_timestamp[2] << 16) |
+	    (sdr_repository_info.most_recent_erase_timestamp[1] << 8) |
+	    sdr_repository_info.most_recent_erase_timestamp[0];
+	printf("Most recent Erase                   : %s\n",
+	       ipmi_sdr_timestamp(timestamp));
+
+	printf("SDR overflow                        : %s\n",
+	       (sdr_repository_info.overflow_flag ? "yes" : "no"));
+
+	printf("SDR Repository Update Support       : ");
+	switch (sdr_repository_info.modal_update_support) {
+	case 0:
+		printf("unspecified\n");
+		break;
+	case 1:
+		printf("non-modal\n");
+		break;
+	case 2:
+		printf("modal\n");
+		break;
+	case 3:
+		printf("modal and non-modal\n");
+		break;
+	default:
+		printf("error in response\n");
+		break;
+	}
+
+	printf("Delete SDR supported                : %s\n",
+	       sdr_repository_info.delete_sdr_supported ? "yes" : "no");
+	printf("Partial Add SDR supported           : %s\n",
+	       sdr_repository_info.partial_add_sdr_supported ? "yes" : "no");
+	printf("Reserve SDR repository supported    : %s\n",
+	       sdr_repository_info.
+	       reserve_sdr_repository_supported ? "yes" : "no");
+	printf("SDR Repository Alloc info supported : %s\n",
+	       sdr_repository_info.
+				 get_sdr_repository_allo_info_supported ? "yes" : "no");
+
+	return 0;
+}
+
+/* ipmi_sdr_dump_bin  -  Write raw SDR to binary file
+ *
+ * used for post-processing by other utilities
+ *
+ * @intf:	ipmi interface
+ * @ofile:	output filename
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_sdr_dump_bin(struct ipmi_intf *intf, const char *ofile)
+{
+	struct sdr_get_rs *header;
+	struct ipmi_sdr_iterator *itr;
+	struct sdr_record_list *sdrr;
+	FILE *fp;
+	int rc = 0;
+
+	/* open connection to SDR */
+	itr = ipmi_sdr_start(intf, 0);
+	if (itr == NULL) {
+		lprintf(LOG_ERR, "Unable to open SDR for reading");
+		return -1;
+	}
+
+	printf("Dumping Sensor Data Repository to '%s'\n", ofile);
+
+	/* generate list of records */
+	while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL) {
+		sdrr = malloc(sizeof(struct sdr_record_list));
+		if (sdrr == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return -1;
+		}
+		memset(sdrr, 0, sizeof(struct sdr_record_list));
+
+		lprintf(LOG_INFO, "Record ID %04x (%d bytes)",
+			header->id, header->length);
+
+		sdrr->id = header->id;
+		sdrr->version = header->version;
+		sdrr->type = header->type;
+		sdrr->length = header->length;
+		sdrr->raw = ipmi_sdr_get_record(intf, header, itr);
+
+		if (sdrr->raw == NULL) {
+		    lprintf(LOG_ERR, "ipmitool: cannot obtain SDR record %04x", header->id);
+				if (sdrr != NULL) {
+					free(sdrr);
+					sdrr = NULL;
+				}
+		    return -1;
+		}
+
+		if (sdr_list_head == NULL)
+			sdr_list_head = sdrr;
+		else
+			sdr_list_tail->next = sdrr;
+
+		sdr_list_tail = sdrr;
+	}
+
+	ipmi_sdr_end(intf, itr);
+
+	/* now write to file */
+	fp = ipmi_open_file_write(ofile);
+	if (fp == NULL)
+		return -1;
+
+	for (sdrr = sdr_list_head; sdrr != NULL; sdrr = sdrr->next) {
+		int r;
+		uint8_t h[5];
+
+		/* build and write sdr header */
+		h[0] = sdrr->id & 0xff;   // LS Byte first
+		h[1] = (sdrr->id >> 8) & 0xff;
+		h[2] = sdrr->version;
+		h[3] = sdrr->type;
+		h[4] = sdrr->length;
+
+		r = fwrite(h, 1, 5, fp);
+		if (r != 5) {
+			lprintf(LOG_ERR, "Error writing header "
+				"to output file %s", ofile);
+			rc = -1;
+			break;
+		}
+
+		/* write sdr entry */
+		if (!sdrr->raw) {
+			lprintf(LOG_ERR, "Error: raw data is null (length=%d)",
+								sdrr->length);
+			rc = -1;
+			break;
+		}
+		r = fwrite(sdrr->raw, 1, sdrr->length, fp);
+		if (r != sdrr->length) {
+			lprintf(LOG_ERR, "Error writing %d record bytes "
+				"to output file %s", sdrr->length, ofile);
+			rc = -1;
+			break;
+		}
+	}
+	fclose(fp);
+
+	return rc;
+}
+
+/* ipmi_sdr_print_type  -  print all sensors of specified type
+ *
+ * @intf:	ipmi interface
+ * @type:	sensor type
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_type(struct ipmi_intf *intf, char *type)
+{
+	struct sdr_record_list *list, *entry;
+	int rc = 0;
+	int x;
+	uint8_t sensor_type = 0;
+
+	if (type == NULL ||
+	    strncasecmp(type, "help", 4) == 0 ||
+	    strncasecmp(type, "list", 4) == 0) {
+		printf("Sensor Types:\n");
+		for (x = 1; x < SENSOR_TYPE_MAX; x += 2) {
+			printf("\t%-25s (0x%02x)   %-25s (0x%02x)\n",
+				sensor_type_desc[x], x,
+				sensor_type_desc[x + 1], x + 1);
+		}
+		return 0;
+	}
+
+	if (strncmp(type, "0x", 2) == 0) {
+		/* begins with 0x so let it be entered as raw hex value */
+		if (str2uchar(type, &sensor_type) != 0) {
+			lprintf(LOG_ERR,
+					"Given type of sensor \"%s\" is either invalid or out of range.",
+					type);
+			return (-1);
+		}
+	} else {
+		for (x = 1; x < SENSOR_TYPE_MAX; x++) {
+			if (strncasecmp(sensor_type_desc[x], type,
+					__maxlen(type,
+						 sensor_type_desc[x])) == 0) {
+				sensor_type = x;
+				break;
+			}
+		}
+		if (sensor_type != x) {
+			lprintf(LOG_ERR, "Sensor Type \"%s\" not found.",
+				type);
+			printf("Sensor Types:\n");
+			for (x = 1; x < SENSOR_TYPE_MAX; x += 2) {
+				printf("\t%-25s (0x%02x)   %-25s (0x%02x)\n",
+					sensor_type_desc[x], x,
+					sensor_type_desc[x + 1], x + 1);
+			}
+			return 0;
+		}
+	}
+
+	list = ipmi_sdr_find_sdr_bysensortype(intf, sensor_type);
+
+	for (entry = list; entry != NULL; entry = entry->next) {
+		rc = ipmi_sdr_print_listentry(intf, entry);
+	}
+
+	__sdr_list_empty(list);
+
+	return rc;
+}
+
+/* ipmi_sdr_print_entity  -  print entity's for an id/instance
+ *
+ * @intf:	ipmi interface
+ * @entitystr:	entity id/instance string, i.e. "1.1"
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_print_entity(struct ipmi_intf *intf, char *entitystr)
+{
+	struct sdr_record_list *list, *entry;
+	struct entity_id entity;
+	unsigned id = 0;
+	unsigned instance = 0;
+	int rc = 0;
+
+	if (entitystr == NULL ||
+	    strncasecmp(entitystr, "help", 4) == 0 ||
+	    strncasecmp(entitystr, "list", 4) == 0) {
+		print_valstr_2col(entity_id_vals, "Entity IDs", -1);
+		return 0;
+	}
+
+	if (sscanf(entitystr, "%u.%u", &id, &instance) != 2) {
+		/* perhaps no instance was passed
+		 * in which case we want all instances for this entity
+		 * so set entity.instance = 0x7f to indicate this
+		 */
+		if (sscanf(entitystr, "%u", &id) != 1) {
+			int i, j=0;
+
+			/* now try string input */
+			for (i = 0; entity_id_vals[i].str != NULL; i++) {
+				if (strncasecmp(entitystr, entity_id_vals[i].str,
+						__maxlen(entitystr, entity_id_vals[i].str)) == 0) {
+					entity.id = entity_id_vals[i].val;
+					entity.instance = 0x7f;
+					j=1;
+				}
+			}
+			if (j == 0) {
+				lprintf(LOG_ERR, "Invalid entity: %s", entitystr);
+				return -1;
+			}
+		} else {
+			entity.id = id;
+			entity.instance = 0x7f;
+		}
+	} else {
+		entity.id = id;
+		entity.instance = instance;
+	}
+
+	list = ipmi_sdr_find_sdr_byentity(intf, &entity);
+
+	for (entry = list; entry != NULL; entry = entry->next) {
+		rc = ipmi_sdr_print_listentry(intf, entry);
+	}
+
+	__sdr_list_empty(list);
+
+	return rc;
+}
+
+/* ipmi_sdr_print_entry_byid  -  print sdr entries identified by sensor id
+ *
+ * @intf:	ipmi interface
+ * @argc:	number of entries to print
+ * @argv:	list of sensor ids
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+static int
+ipmi_sdr_print_entry_byid(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct sdr_record_list *sdr;
+	int rc = 0;
+	int v, i;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "No Sensor ID supplied");
+		return -1;
+	}
+
+	v = verbose;
+	verbose = 1;
+
+	for (i = 0; i < argc; i++) {
+		sdr = ipmi_sdr_find_sdr_byid(intf, argv[i]);
+		if (sdr == NULL) {
+			lprintf(LOG_ERR, "Unable to find sensor id '%s'",
+				argv[i]);
+		} else {
+			if (ipmi_sdr_print_listentry(intf, sdr) < 0)
+				rc = -1;
+		}
+	}
+
+	verbose = v;
+
+	return rc;
+}
+
+/* ipmi_sdr_main  -  top-level handler for SDR subsystem
+ *
+ * @intf:	ipmi interface
+ * @argc:	number of arguments
+ * @argv:	argument list
+ *
+ * returns 0 on success
+ * returns -1 on error
+ */
+int
+ipmi_sdr_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	/* initialize random numbers used later */
+	srand(time(NULL));
+
+	if (argc == 0)
+		return ipmi_sdr_print_sdr(intf, 0xfe);
+	else if (strncmp(argv[0], "help", 4) == 0) {
+		printf_sdr_usage();
+	} else if (strncmp(argv[0], "list", 4) == 0
+		   || strncmp(argv[0], "elist", 5) == 0) {
+
+		if (strncmp(argv[0], "elist", 5) == 0)
+			sdr_extended = 1;
+		else
+			sdr_extended = 0;
+
+		if (argc <= 1)
+			rc = ipmi_sdr_print_sdr(intf, 0xfe);
+		else if (strncmp(argv[1], "all", 3) == 0)
+			rc = ipmi_sdr_print_sdr(intf, 0xff);
+		else if (strncmp(argv[1], "full", 4) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_FULL_SENSOR);
+		else if (strncmp(argv[1], "compact", 7) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_COMPACT_SENSOR);
+		else if (strncmp(argv[1], "event", 5) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_EVENTONLY_SENSOR);
+		else if (strncmp(argv[1], "mcloc", 5) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_MC_DEVICE_LOCATOR);
+		else if (strncmp(argv[1], "fru", 3) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR);
+		else if (strncmp(argv[1], "generic", 7) == 0)
+			rc = ipmi_sdr_print_sdr(intf,
+						SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
+		else if (strcmp(argv[1], "help") == 0) {
+			lprintf(LOG_NOTICE,
+				"usage: sdr %s [all|full|compact|event|mcloc|fru|generic]",
+				argv[0]);
+			return 0;
+		}
+		else {
+			lprintf(LOG_ERR,
+				"Invalid SDR %s command: %s",
+				argv[0], argv[1]);
+			lprintf(LOG_NOTICE,
+				"usage: sdr %s [all|full|compact|event|mcloc|fru|generic]",
+				argv[0]);
+			return (-1);
+		}
+	} else if (strncmp(argv[0], "type", 4) == 0) {
+		sdr_extended = 1;
+		rc = ipmi_sdr_print_type(intf, argv[1]);
+	} else if (strncmp(argv[0], "entity", 6) == 0) {
+		sdr_extended = 1;
+		rc = ipmi_sdr_print_entity(intf, argv[1]);
+	} else if (strncmp(argv[0], "info", 4) == 0) {
+		rc = ipmi_sdr_print_info(intf);
+	} else if (strncmp(argv[0], "get", 3) == 0) {
+		rc = ipmi_sdr_print_entry_byid(intf, argc - 1, &argv[1]);
+	} else if (strncmp(argv[0], "dump", 4) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			lprintf(LOG_NOTICE, "usage: sdr dump <file>");
+			return (-1);
+		}
+		rc = ipmi_sdr_dump_bin(intf, argv[1]);
+	} else if (strncmp(argv[0], "fill", 4) == 0) {
+		if (argc <= 1) {
+			lprintf(LOG_ERR, "Not enough parameters given.");
+			lprintf(LOG_NOTICE, "usage: sdr fill sensors");
+			lprintf(LOG_NOTICE, "usage: sdr fill file <file>");
+			lprintf(LOG_NOTICE, "usage: sdr fill range <range>");
+			return (-1);
+		} else if (strncmp(argv[1], "sensors", 7) == 0) {
+			rc = ipmi_sdr_add_from_sensors(intf, 21);
+		} else if (strncmp(argv[1], "nosat", 5) == 0) {
+			rc = ipmi_sdr_add_from_sensors(intf, 0);
+		} else if (strncmp(argv[1], "file", 4) == 0) {
+			if (argc < 3) {
+				lprintf(LOG_ERR,
+					"Not enough parameters given.");
+				lprintf(LOG_NOTICE,
+					"usage: sdr fill file <file>");
+				return (-1);
+			}
+			rc = ipmi_sdr_add_from_file(intf, argv[2]);
+		} else if (strncmp(argv[1], "range", 4) == 0) {
+			if (argc < 3) {
+				lprintf(LOG_ERR,
+					"Not enough parameters given.");
+				lprintf(LOG_NOTICE,
+					"usage: sdr fill range <range>");
+				return (-1);
+			}
+			rc = ipmi_sdr_add_from_list(intf, argv[2]);
+		} else {
+		    lprintf(LOG_ERR,
+			    "Invalid SDR %s command: %s",
+			    argv[0], argv[1]);
+		    lprintf(LOG_NOTICE,
+			    "usage: sdr %s <sensors|nosat|file|range> [options]",
+			    argv[0]);
+		    return (-1);
+		}
+	} else {
+		lprintf(LOG_ERR, "Invalid SDR command: %s", argv[0]);
+		rc = -1;
+	}
+
+	return rc;
+}
+
+void
+printf_sdr_usage()
+{
+	lprintf(LOG_NOTICE,
+"usage: sdr <command> [options]");
+	lprintf(LOG_NOTICE,
+"               list | elist [option]");
+	lprintf(LOG_NOTICE,
+"                     all           All SDR Records");
+	lprintf(LOG_NOTICE,
+"                     full          Full Sensor Record");
+	lprintf(LOG_NOTICE,
+"                     compact       Compact Sensor Record");
+	lprintf(LOG_NOTICE,
+"                     event         Event-Only Sensor Record");
+	lprintf(LOG_NOTICE,
+"                     mcloc         Management Controller Locator Record");
+	lprintf(LOG_NOTICE,
+"                     fru           FRU Locator Record");
+	lprintf(LOG_NOTICE,
+"                     generic       Generic Device Locator Record\n");
+	lprintf(LOG_NOTICE,
+"               type [option]");
+	lprintf(LOG_NOTICE,
+"                     <Sensor_Type> Retrieve the state of specified sensor.");
+	lprintf(LOG_NOTICE,
+"                                   Sensor_Type can be specified either as");
+	lprintf(LOG_NOTICE,
+"                                   a string or a hex value.");
+	lprintf(LOG_NOTICE,
+"                     list          Get a list of available sensor types\n");
+	lprintf(LOG_NOTICE,
+"               get <Sensor_ID>");
+	lprintf(LOG_NOTICE,
+"                     Retrieve state of the first sensor matched by Sensor_ID\n");
+	lprintf(LOG_NOTICE,
+"               info");
+	lprintf(LOG_NOTICE,
+"                     Display information about the repository itself\n");
+	lprintf(LOG_NOTICE,
+"               entity <Entity_ID>[.<Instance_ID>]");
+	lprintf(LOG_NOTICE,
+"                     Display all sensors associated with an entity\n");
+	lprintf(LOG_NOTICE,
+"               dump <file>");
+	lprintf(LOG_NOTICE,
+"                     Dump raw SDR data to a file\n");
+	lprintf(LOG_NOTICE,
+"               fill <option>");
+	lprintf(LOG_NOTICE,
+"                     sensors       Creates the SDR repository for the current");
+	lprintf(LOG_NOTICE,
+"                                   configuration");
+	lprintf(LOG_NOTICE,
+"                     nosat         Creates the SDR repository for the current");
+	lprintf(LOG_NOTICE,
+"                                   configuration, without satellite scan");
+	lprintf(LOG_NOTICE,
+"                     file <file>   Load SDR repository from a file");
+	lprintf(LOG_NOTICE,
+"                     range <range> Load SDR repository from a provided list");
+	lprintf(LOG_NOTICE,
+"                                   or range. Use ',' for list or '-' for");
+	lprintf(LOG_NOTICE,
+"                                   range, eg. 0x28,0x32,0x40-0x44");
+}
diff --git a/lib/ipmi_sdradd.c b/lib/ipmi_sdradd.c
new file mode 100644
index 0000000..52848a3
--- /dev/null
+++ b/lib/ipmi_sdradd.c
@@ -0,0 +1,668 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/*
+ * Functions to program the SDR repository, from built-in sensors or
+ * from sensors dumped in a binary file.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_strings.h>
+
+#include <ipmitool/ipmi_sdr.h>
+
+
+#define ADD_PARTIAL_SDR 0x25
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct sdr_add_rq {
+  uint16_t reserve_id;  /* reservation ID */
+  uint16_t id;          /* record ID */
+  uint8_t offset;       /* offset into SDR */
+  uint8_t in_progress;  /* 0=partial, 1=last */
+#define PARTIAL_ADD (0)
+#define LAST_RECORD (1)
+  uint8_t data[1];      /* SDR record data */
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+/* This was formerly initialized to 24, reduced this to 19 so the overall
+   message fits into the recommended 32-byte limit */
+static int sdr_max_write_len = 19;
+int ipmi_parse_range_list(const char *rangeList, unsigned char *pHexList);
+int ipmi_hex_to_dec( char * rangeList, unsigned char * pDecValue);
+
+static int
+partial_send(struct ipmi_intf *intf, struct ipmi_rq *req, uint16_t *id)
+{
+  struct ipmi_rs *rsp;
+  rsp = intf->sendrecv(intf, req);
+  if (rsp == NULL) {
+    return -1;
+  }
+
+  if (rsp->ccode || rsp->data_len < 2) {
+    return -1;
+  }
+
+  *id = rsp->data[0] + (rsp->data[1] << 8);
+  return 0;
+}
+
+int
+ipmi_sdr_add_record(struct ipmi_intf *intf, struct sdr_record_list *sdrr)
+{
+  struct ipmi_rq req;
+  struct sdr_add_rq *sdr_rq;
+  uint16_t reserve_id;
+  uint16_t id;
+  int i;
+  int len = sdrr->length;
+  int rc = 0;
+
+  /* actually no SDR to program */
+  if (len < 1 || !sdrr->raw) {
+    lprintf(LOG_ERR, "ipmitool: bad record , skipped");
+    return 0;
+  }
+
+  if (ipmi_sdr_get_reservation(intf, 0, &reserve_id)) {
+    lprintf(LOG_ERR, "ipmitool: reservation failed");
+    return -1;
+  }
+
+  sdr_rq = (struct sdr_add_rq *)malloc(sizeof(*sdr_rq) + sdr_max_write_len);
+  if (sdr_rq == NULL) {
+    lprintf(LOG_ERR, "ipmitool: malloc failure");
+    return -1;
+  }
+  sdr_rq->reserve_id = reserve_id;
+  sdr_rq->in_progress = PARTIAL_ADD;
+
+  memset(&req, 0, sizeof(req));
+  req.msg.netfn = IPMI_NETFN_STORAGE;
+  req.msg.cmd = ADD_PARTIAL_SDR;
+  req.msg.data = (uint8_t *) sdr_rq;
+
+  /* header first */
+  sdr_rq->id = 0;
+  sdr_rq->offset = 0;
+  sdr_rq->data[0] = sdrr->id & 0xFF;
+  sdr_rq->data[1] = (sdrr->id >> 8) & 0xFF;
+  sdr_rq->data[2] = sdrr->version;
+  sdr_rq->data[3] = sdrr->type;
+  sdr_rq->data[4] = sdrr->length;
+  req.msg.data_len = 5 + sizeof(*sdr_rq) - 1;
+
+  if (partial_send(intf, &req, &id)) {
+     lprintf(LOG_ERR, "ipmitool: partial send error");
+    free(sdr_rq);
+    sdr_rq = NULL;
+    return -1;
+  }
+
+  i = 0;
+
+  /* sdr entry */
+  while (i < len) {
+     int data_len = 0;
+     if ( (len - i) <= sdr_max_write_len) {
+      /* last crunch */
+      data_len = len - i;
+      sdr_rq->in_progress = LAST_RECORD;
+    } else {
+      data_len = sdr_max_write_len;
+    }
+
+    sdr_rq->id = id;
+    sdr_rq->offset = i + 5;
+    memcpy(sdr_rq->data, sdrr->raw + i, data_len);
+    req.msg.data_len = data_len + sizeof(*sdr_rq) - 1;
+
+    if ((rc = partial_send(intf, &req, &id)) != 0) {
+       lprintf(LOG_ERR, "ipmitool: partial add failed");
+      break;
+    }
+
+    i += data_len;
+  }
+
+  free(sdr_rq);
+  sdr_rq = NULL;
+  return rc;
+}
+
+static int
+ipmi_sdr_repo_clear(struct ipmi_intf *intf)
+{
+  struct ipmi_rs * rsp;
+  struct ipmi_rq req;
+  uint8_t msg_data[8];
+  uint16_t reserve_id;
+  int try;
+
+  if (ipmi_sdr_get_reservation(intf, 0, &reserve_id))
+    return -1;
+
+  memset(&req, 0, sizeof(req));
+  req.msg.netfn = IPMI_NETFN_STORAGE;
+  req.msg.cmd = 0x27; // FIXME
+  req.msg.data = msg_data;
+  req.msg.data_len = 6;
+
+  msg_data[0] = reserve_id & 0xFF;
+  msg_data[1] = reserve_id >> 8;
+  msg_data[2] = 'C';
+  msg_data[3] = 'L';
+  msg_data[4] = 'R';
+  msg_data[5] = 0xAA;
+
+  for (try = 0; try < 5; try++) {
+    rsp = intf->sendrecv(intf, &req);
+    if (rsp == NULL) {
+      lprintf(LOG_ERR, "Unable to clear SDRR");
+      return -1;
+    }
+    if (rsp->ccode > 0) {
+      lprintf(LOG_ERR, "Unable to clear SDRR: %s",
+        val2str(rsp->ccode, completion_code_vals));
+      return -1;
+    }
+    if ((rsp->data[0] & 1) == 1) {
+      printf("SDRR successfully erased\n");
+      return 0;
+    }
+    printf("Wait for SDRR erasure completed...\n");
+    msg_data[5] = 0;
+    sleep(1);
+  }
+    
+  /* if we are here we fed up trying erase */
+  return -1;
+}
+
+
+struct sdrr_queue {
+  struct sdr_record_list *head;
+  struct sdr_record_list *tail;
+}; 
+
+
+/*
+ * Fill the SDR repository from built-in sensors
+ *
+ */
+
+/*
+ * Get all the SDR records stored in <queue>
+ */
+static int
+sdrr_get_records(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr,
+                 struct sdrr_queue *queue)
+{
+  struct sdr_get_rs *header;
+
+  queue->head = NULL;
+  queue->tail = NULL;
+
+  while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL) {
+    struct sdr_record_list *sdrr;
+
+    sdrr = malloc(sizeof (struct sdr_record_list));
+    if (sdrr == NULL) {
+      lprintf(LOG_ERR, "ipmitool: malloc failure");
+      return -1;
+    }
+    memset(sdrr, 0, sizeof (struct sdr_record_list));
+   
+    sdrr->id = header->id;
+    sdrr->version = header->version;
+    sdrr->type = header->type;
+    sdrr->length = header->length;
+    sdrr->raw = ipmi_sdr_get_record(intf, header, itr);
+    (void)ipmi_sdr_print_name_from_rawentry(intf,  sdrr->id, sdrr->type,sdrr->raw);
+
+    /* put in the record queue */
+    if (queue->head == NULL)
+      queue->head = sdrr;
+    else
+      queue->tail->next = sdrr;
+    queue->tail = sdrr;
+  }
+  return 0;
+}
+
+static int
+sdr_copy_to_sdrr(struct ipmi_intf *intf, int use_builtin,
+                 int from_addr, int to_addr)
+{
+  int rc;
+  struct sdrr_queue sdrr_queue;
+  struct ipmi_sdr_iterator *itr;
+  struct sdr_record_list *sdrr;
+  struct sdr_record_list *sdrr_next;
+
+  /* generate list of records for this target */
+  intf->target_addr = from_addr;
+
+  /* initialize iterator */
+  itr = ipmi_sdr_start(intf, use_builtin);
+  if (itr == 0)
+    return 0;
+
+  printf("Load SDRs from 0x%x\n", from_addr);
+  rc = sdrr_get_records(intf, itr, &sdrr_queue);
+  ipmi_sdr_end(intf, itr);
+  /* ... */
+
+  /* write the SDRs to the destination SDR Repository */
+  intf->target_addr = to_addr;
+  for (sdrr = sdrr_queue.head; sdrr != NULL; sdrr = sdrr_next) {
+    sdrr_next = sdrr->next;
+    rc = ipmi_sdr_add_record(intf, sdrr);
+    if(rc < 0){
+      lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id);
+    }
+    free(sdrr);
+    sdrr = NULL;
+  }
+  return rc;
+}
+
+int
+ipmi_sdr_add_from_sensors(struct ipmi_intf *intf, int maxslot)
+{
+  int i;
+  int rc = 0;
+  int slave_addr;
+  int myaddr = intf->target_addr;
+
+  if (ipmi_sdr_repo_clear(intf)) {
+    lprintf(LOG_ERR, "Cannot erase SDRR. Give up.");
+    return -1;
+  }
+
+  /* First fill the SDRR from local built-in sensors */
+  rc = sdr_copy_to_sdrr(intf, 1, myaddr, myaddr);
+
+  /* Now fill the SDRR with remote sensors */
+  if( maxslot != 0 ) {
+     for (i = 0, slave_addr = 0xB0; i < maxslot; i++, slave_addr += 2) {
+        /* Hole in the PICMG 2.9 mapping */
+        if (slave_addr == 0xC2) slave_addr += 2;
+        if(sdr_copy_to_sdrr(intf, 0, slave_addr, myaddr) < 0)
+        {
+           rc = -1;
+        }
+     }
+  }
+  return rc;
+}
+
+int ipmi_hex_to_dec( char * strchar, unsigned char * pDecValue)
+{
+  int rc = -1;
+  unsigned char retValue = 0; 
+
+  if(
+     (strlen(strchar) == 4) 
+     &&
+     (strchar[0] == '0') 
+     && 
+     (strchar[1] == 'x') 
+    ) 
+  {
+      rc = 0;
+
+      if((strchar[2] >= '0') && (strchar[2] <= '9')) 
+      {
+        retValue += ((strchar[2]-'0') * 16);
+      }
+      else if((strchar[2] >= 'a') && (strchar[2] <= 'f')) 
+      {
+        retValue += (((strchar[2]-'a') + 10) * 16);
+      }
+      else if((strchar[2] >= 'A') && (strchar[2] <= 'F')) 
+      {
+        retValue += (((strchar[2]-'A') + 10) * 16);
+      }
+      else
+      {
+        rc = -1;
+      }
+
+      if((strchar[3] >= '0') && (strchar[3] <= '9')) 
+      {
+        retValue += ((strchar[3]-'0'));
+      }
+      else if((strchar[3] >= 'a') && (strchar[3] <= 'f')) 
+      {
+        retValue += (((strchar[3]-'a') + 10));
+      }
+      else if((strchar[3] >= 'A') && (strchar[3] <= 'F')) 
+      {
+        retValue += (((strchar[3]-'A') + 10));
+      }
+      else
+      {
+        rc = -1;
+      }
+  }
+
+  if(rc == 0) 
+  {
+    * pDecValue = retValue;
+  }
+  else
+  {
+    lprintf(LOG_ERR, "Must be Hex value of 4 characters (Ex.: 0x24)");
+  }
+
+  return rc;
+}
+
+
+
+#define MAX_NUM_SLOT  128
+int ipmi_parse_range_list(const char *rangeList, unsigned char * pHexList)
+{
+  int rc = -1;
+
+  unsigned char listOffset = 0;
+  char * nextString;
+  char * rangeString;
+  char * inProcessString = (char *) rangeList;
+
+  /* Discard empty string */
+  if(strlen(rangeList) == 0) 
+  {
+    return rc;
+  }
+
+  /* First, cut to comma separated string */
+  nextString = strstr( rangeList, "," );
+
+  if(nextString != rangeList) 
+  {
+    unsigned char isLast;
+    /* We get a valid string so far */
+    rc = 0;
+
+    do
+    {
+      if(nextString != NULL) 
+      {
+        (*nextString)= 0;
+        nextString   ++;
+        isLast = 0;
+      }
+      else
+      {
+        isLast = 1;
+      }
+
+      /* At this point, it is a single entry or a range */
+      rangeString = strstr( inProcessString, "-" );
+      if(rangeString == NULL) 
+      {
+        unsigned char decValue = 0;
+
+        /* Single entry */
+        rc = ipmi_hex_to_dec( inProcessString, &decValue); 
+        
+        if(rc == 0)
+        {  
+          if((decValue % 2) == 0)
+          {
+            pHexList[listOffset++] = decValue;
+          }
+          else
+          {
+            lprintf(LOG_ERR, "I2C address provided value must be even.");
+          }
+        }
+      }
+      else
+      {
+        unsigned char startValue = 0;
+        unsigned char endValue = 0;
+
+
+        (*rangeString)= 0; /* Cut string*/
+        rangeString ++;
+
+        /* Range */
+        rc = ipmi_hex_to_dec( inProcessString, &startValue); 
+        if(rc == 0) 
+          rc = ipmi_hex_to_dec( rangeString, &endValue); 
+
+        if(rc == 0)
+        {  
+          if(((startValue % 2) == 0) && ((endValue % 2) == 0))
+          {
+            do
+            {
+              pHexList[listOffset++] = startValue;
+              startValue += 2;
+            }
+            while(startValue != endValue);
+            pHexList[listOffset++] = endValue;
+          }
+          else
+          {
+            lprintf(LOG_ERR, "I2C address provided value must be even.");
+          }
+        }
+      }
+
+      if(isLast == 0) 
+      {
+        /* Setup for next string */
+        inProcessString = nextString;
+        nextString = strstr( rangeList, "," );
+      }
+    }while ((isLast == 0) && (rc == 0)); 
+  }
+
+  return rc;
+}
+
+int
+ipmi_sdr_add_from_list(struct ipmi_intf *intf, const char *rangeList)
+{
+  int rc = 0;
+  int slave_addr;
+  int myaddr = intf->target_addr;
+  unsigned char listValue[MAX_NUM_SLOT];
+
+  memset( listValue, 0, MAX_NUM_SLOT );
+
+  /* Build list from string */
+  if(ipmi_parse_range_list(rangeList, listValue) != 0)
+  {
+    lprintf(LOG_ERR, "Range - List invalid, cannot be parsed.");
+    return -1;
+  }
+
+  {
+    unsigned char counter = 0;
+    printf("List to scan: (Built-in) ");
+    while(listValue[counter] != 0) 
+    {
+      printf("%02x ", listValue[counter]);
+      counter++;
+    }
+    printf("\n");
+  }
+
+  printf("Clearing SDR Repository\n");
+  if (ipmi_sdr_repo_clear(intf)) {
+    lprintf(LOG_ERR, "Cannot erase SDRR. Give up.");
+    return -1;
+  }
+
+  /* First fill the SDRR from local built-in sensors */
+  printf("Sanning built-in sensors..\n");
+  rc = sdr_copy_to_sdrr(intf, 1, myaddr, myaddr);
+
+  /* Now fill the SDRR with provided sensors list */
+  {
+    unsigned char counter = 0;
+    while((rc == 0) && (listValue[counter] != 0)) 
+    {
+      slave_addr = listValue[counter];
+      printf("Scanning %02Xh..\n", slave_addr);
+      if(sdr_copy_to_sdrr(intf, 0, slave_addr, myaddr) < 0)
+      {
+         rc = -1;
+      }
+      counter++;
+    }
+  }
+
+  return rc;
+}
+
+
+/*
+ * Fill the SDR repository from records stored in a binary file
+ *
+ */
+
+static int
+ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
+{
+  int rc = 0;
+  int fd;
+  uint8_t binHdr[5];
+
+  queue->head = NULL;
+  queue->tail = NULL;
+
+  if ((fd = open(filename, O_RDONLY)) < 0) {
+    return -1;
+  }
+
+  while (read(fd, binHdr, 5) == 5) {
+    
+    struct sdr_record_list *sdrr;
+
+    lprintf(LOG_DEBUG, "binHdr[0] (id[MSB]) = 0x%02x", binHdr[0]);
+    lprintf(LOG_DEBUG, "binHdr[1] (id[LSB]) = 0x%02x", binHdr[1]);
+    lprintf(LOG_DEBUG, "binHdr[2] (version) = 0x%02x", binHdr[2]);
+    lprintf(LOG_DEBUG, "binHdr[3] (type) = 0x%02x", binHdr[3]);
+    lprintf(LOG_DEBUG, "binHdr[4] (length) = 0x%02x", binHdr[4]);
+
+    sdrr = malloc(sizeof(*sdrr));
+    if (sdrr == NULL) {
+      lprintf(LOG_ERR, "ipmitool: malloc failure");
+      rc = -1;
+      break;
+    }
+    sdrr->id = (binHdr[1] << 8) | binHdr[0];  // LS Byte first
+    sdrr->version = binHdr[2];
+    sdrr->type = binHdr[3];
+    sdrr->length = binHdr[4];
+
+    if ((sdrr->raw = malloc(sdrr->length)) == NULL) {
+      lprintf(LOG_ERR, "ipmitool: malloc failure");
+      free(sdrr);
+      sdrr = NULL;
+      rc = -1;
+      break;
+    }
+
+    if (read(fd, sdrr->raw, sdrr->length) != sdrr->length) {
+      lprintf(LOG_ERR, "SDR from '%s' truncated", filename);
+      free(sdrr->raw);
+      sdrr->raw = NULL;
+      free(sdrr);
+      sdrr = NULL;
+      rc = -1;
+      break;
+    }
+
+    /* put in the record queue */
+    if (queue->head == NULL)
+      queue->head = sdrr;
+    else
+      queue->tail->next = sdrr;
+    queue->tail = sdrr;
+  }
+  close(fd);
+  return rc;
+}
+
+int
+ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile)
+{
+  int rc;
+  struct sdrr_queue sdrr_queue;
+  struct sdr_record_list *sdrr;
+  struct sdr_record_list *sdrr_next;
+
+  /* read the SDR records from file */
+  rc = ipmi_sdr_read_records(ifile, &sdrr_queue);
+
+  if (ipmi_sdr_repo_clear(intf)) {
+    lprintf(LOG_ERR, "Cannot erase SDRR. Giving up.");
+    /* FIXME: free sdr list */
+    return -1;
+  }
+
+  /* write the SDRs to the SDR Repository */
+  for (sdrr = sdrr_queue.head; sdrr != NULL; sdrr = sdrr_next) {
+    sdrr_next = sdrr->next;
+    rc = ipmi_sdr_add_record(intf, sdrr);
+    if(rc < 0){
+      lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id);
+    }
+    free(sdrr);
+    sdrr = NULL;
+  }
+  return rc;
+}
+
diff --git a/lib/ipmi_sel.c b/lib/ipmi_sel.c
new file mode 100644
index 0000000..8b0395e
--- /dev/null
+++ b/lib/ipmi_sel.c
@@ -0,0 +1,3176 @@
+/* -*-mode: C; indent-tabs-mode: t; -*-
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _BSD_SOURCE
+
+#include <string.h>
+#include <strings.h>
+#include <math.h>
+#define __USE_XOPEN /* glibc2 needs this for strptime */
+#include <time.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_sel_supermicro.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_strings.h>
+
+extern int verbose;
+static int sel_extended = 0;
+static int sel_oem_nrecs = 0;
+
+static IPMI_OEM sel_iana = IPMI_OEM_UNKNOWN;
+
+struct ipmi_sel_oem_msg_rec {
+	int	value[14];
+	char	*string[14];
+	char	*text;
+} *sel_oem_msg;
+
+#define SEL_BYTE(n) (n-3) /* So we can refer to byte positions in log entries (byte 3 is at index 0, etc) */
+
+// Definiation for the Decoding the SEL OEM Bytes for DELL Platfoms
+#define BIT(x)	 (1 << x)	/* Select the Bit */
+#define	SIZE_OF_DESC	128	/* Max Size of the description String to be displyed for the Each sel entry */
+#define	MAX_CARDNO_STR	32	/* Max Size of Card number string */
+#define	MAX_DIMM_STR	32	/* Max Size of DIMM string */
+#define	MAX_CARD_STR	32	/* Max Size of Card string */
+/*
+ * Reads values found in message translation file.  XX is a wildcard, R means reserved.
+ * Returns -1 for XX, -2 for R, -3 for non-hex (string), or positive integer from a hex value.
+ */
+static int ipmi_sel_oem_readval(char *str)
+{
+	int ret;
+	if (!strcmp(str, "XX")) {
+		return -1;
+	}
+	if (!strcmp(str, "R")) {
+		return -2;
+	}
+	if (sscanf(str, "0x%x", &ret) != 1) {
+		return -3;
+	}
+	return ret;
+}
+
+/*
+ * This is where the magic happens.  SEL_BYTE is a bit ugly, but it allows
+ * reference to byte positions instead of array indexes which (hopefully)
+ * helps make the code easier to read.
+ */
+static int
+ipmi_sel_oem_match(uint8_t *evt, const struct ipmi_sel_oem_msg_rec *rec)
+{
+	if (evt[2] == rec->value[SEL_BYTE(3)]
+		&& ((rec->value[SEL_BYTE(4)] < 0)
+			|| (evt[3] == rec->value[SEL_BYTE(4)]))
+		&& ((rec->value[SEL_BYTE(5)] < 0)
+			|| (evt[4] == rec->value[SEL_BYTE(5)]))
+		&& ((rec->value[SEL_BYTE(6)] < 0)
+			|| (evt[5] == rec->value[SEL_BYTE(6)]))
+		&& ((rec->value[SEL_BYTE(7)] < 0)
+			|| (evt[6] == rec->value[SEL_BYTE(7)]))
+		&& ((rec->value[SEL_BYTE(11)] < 0)
+			|| (evt[10] == rec->value[SEL_BYTE(11)]))
+		&& ((rec->value[SEL_BYTE(12)] < 0)
+			|| (evt[11] == rec->value[SEL_BYTE(12)]))) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+int ipmi_sel_oem_init(const char * filename)
+{
+	FILE * fp;
+	int i, j, k, n, byte;
+	char buf[15][150];
+
+	if (filename == NULL) {
+		lprintf(LOG_ERR, "No SEL OEM filename provided");
+		return -1;
+	}
+
+	fp = ipmi_open_file_read(filename);
+	if (fp == NULL) {
+		lprintf(LOG_ERR, "Could not open %s file", filename);
+		return -1;
+	}
+
+	/* count number of records (lines) in input file */
+	sel_oem_nrecs = 0;
+	while (fscanf(fp, "%*[^\n]\n") == 0) {
+		sel_oem_nrecs++;
+	}
+
+	printf("nrecs=%d\n", sel_oem_nrecs);
+
+	rewind(fp);
+	sel_oem_msg = (struct ipmi_sel_oem_msg_rec *)calloc(sel_oem_nrecs,
+				 sizeof(struct ipmi_sel_oem_msg_rec));
+
+	for (i=0; i < sel_oem_nrecs; i++) {
+		n=fscanf(fp, "\"%[^\"]\",\"%[^\"]\",\"%[^\"]\",\"%[^\"]\",\""
+			       "%[^\"]\",\"%[^\"]\",\"%[^\"]\",\"%[^\"]\",\""
+			       "%[^\"]\",\"%[^\"]\",\"%[^\"]\",\"%[^\"]\",\""
+			       "%[^\"]\",\"%[^\"]\",\"%[^\"]\"\n",
+			 buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
+			 buf[6], buf[7], buf[8], buf[9], buf[10], buf[11],
+			 buf[12], buf[13], buf[14]);
+
+		if (n != 15) {
+			lprintf (LOG_ERR, "Encountered problems reading line %d of %s",
+				 i+1, filename);
+			fclose(fp);
+			fp = NULL;
+			sel_oem_nrecs = 0;
+			/* free all the memory allocated so far */
+			for (j=0; j<i ; j++) {
+				for (k=3; k<17; k++) {
+					if (sel_oem_msg[j].value[SEL_BYTE(k)] == -3) {
+						free(sel_oem_msg[j].string[SEL_BYTE(k)]);
+						sel_oem_msg[j].string[SEL_BYTE(k)] = NULL;
+					}
+				}
+			}
+			free(sel_oem_msg);
+			sel_oem_msg = NULL;
+			return -1;
+		}
+
+		for (byte = 3; byte < 17; byte++) {
+			if ((sel_oem_msg[i].value[SEL_BYTE(byte)] =
+			     ipmi_sel_oem_readval(buf[SEL_BYTE(byte)])) == -3) {
+				sel_oem_msg[i].string[SEL_BYTE(byte)] =
+					(char *)malloc(strlen(buf[SEL_BYTE(byte)]) + 1);
+				strcpy(sel_oem_msg[i].string[SEL_BYTE(byte)],
+				       buf[SEL_BYTE(byte)]);
+			}
+		}
+		sel_oem_msg[i].text = (char *)malloc(strlen(buf[SEL_BYTE(17)]) + 1);
+		strcpy(sel_oem_msg[i].text, buf[SEL_BYTE(17)]);
+	}
+
+	fclose(fp);
+	fp = NULL;
+	return 0;
+}
+
+static void ipmi_sel_oem_message(struct sel_event_record * evt, int verbose)
+{
+	/*
+	 * Note: although we have a verbose argument, currently the output
+	 * isn't affected by it.
+	 */
+	int i, j;
+
+	for (i=0; i < sel_oem_nrecs; i++) {
+		if (ipmi_sel_oem_match((uint8_t *)evt, &sel_oem_msg[i])) {
+			printf (csv_output ? ",\"%s\"" : " | %s", sel_oem_msg[i].text);
+			for (j=4; j<17; j++) {
+				if (sel_oem_msg[i].value[SEL_BYTE(j)] == -3) {
+					printf (csv_output ? ",%s=0x%x" : " %s = 0x%x",
+						sel_oem_msg[i].string[SEL_BYTE(j)],
+						((uint8_t *)evt)[SEL_BYTE(j)]);
+				}
+			}
+		}
+	}
+}
+
+static const struct valstr event_dir_vals[] = {
+	{ 0, "Assertion Event" },
+	{ 1, "Deassertion Event" },
+	{ 0, NULL },
+};
+
+static const char *
+ipmi_get_event_type(uint8_t code)
+{
+        if (code == 0)
+                return "Unspecified";
+        if (code == 1)
+                return "Threshold";
+        if (code >= 0x02 && code <= 0x0b)
+                return "Generic Discrete";
+        if (code == 0x6f)
+                return "Sensor-specific Discrete";
+        if (code >= 0x70 && code <= 0x7f)
+                return "OEM";
+        return "Reserved";
+}
+
+static char *
+ipmi_sel_timestamp(uint32_t stamp)
+{
+	static char tbuf[40];
+	time_t s = (time_t)stamp;
+	memset(tbuf, 0, 40);
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", gmtime(&s));
+	return tbuf;
+}
+
+static char *
+ipmi_sel_timestamp_date(uint32_t stamp)
+{
+	static char tbuf[11];
+	time_t s = (time_t)stamp;
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y", gmtime(&s));
+	return tbuf;
+}
+
+static char *
+ipmi_sel_timestamp_time(uint32_t stamp)
+{
+	static char tbuf[9];
+	time_t s = (time_t)stamp;
+	strftime(tbuf, sizeof(tbuf), "%H:%M:%S", gmtime(&s));
+	return tbuf;
+}
+
+static char *
+hex2ascii (uint8_t * hexChars, uint8_t numBytes)
+{
+	int count;
+	static char hexString[SEL_OEM_NOTS_DATA_LEN+1];       /*Max Size*/
+
+	if(numBytes > SEL_OEM_NOTS_DATA_LEN)
+		numBytes = SEL_OEM_NOTS_DATA_LEN;
+
+	for(count=0;count < numBytes;count++)
+	{
+		if((hexChars[count]<0x40)||(hexChars[count]>0x7e))
+			hexString[count]='.';
+    		else
+			hexString[count]=hexChars[count];
+	}
+	hexString[numBytes]='\0';
+	return hexString;
+}
+
+IPMI_OEM
+ipmi_get_oem(struct ipmi_intf * intf)
+{
+	/* Execute a Get Device ID command to determine the OEM */
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipm_devid_rsp *devid;
+
+	if (intf->fd == 0) {
+		if( sel_iana != IPMI_OEM_UNKNOWN ){
+			return sel_iana;
+		}
+		return IPMI_OEM_UNKNOWN;
+	}	
+
+	/*
+	 * Return the cached manufacturer id if the device is open and
+	 * we got an identified OEM owner.   Otherwise just attempt to read
+	 * it.
+	 */
+	if (intf->opened && intf->manufacturer_id != IPMI_OEM_UNKNOWN) {
+		return intf->manufacturer_id;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd   = BMC_GET_DEVICE_ID;
+	req.msg.data_len = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Device ID command failed");
+		return IPMI_OEM_UNKNOWN;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get Device ID command failed: %#x %s",
+			rsp->ccode, val2str(rsp->ccode, completion_code_vals));
+		return IPMI_OEM_UNKNOWN;
+	}
+
+	devid = (struct ipm_devid_rsp *) rsp->data;
+
+	lprintf(LOG_DEBUG,"Iana: %u",
+           IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id));
+
+	return  IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id);
+}
+
+static int
+ipmi_sel_add_entry(struct ipmi_intf * intf, struct sel_event_record * rec)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_ADD_SEL_ENTRY;
+	req.msg.data = (unsigned char *)rec;
+	req.msg.data_len = 16;
+
+	ipmi_sel_print_std_entry(intf, rec);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Add SEL Entry failed");
+		return -1;
+	}
+	else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Add SEL Entry failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+
+static int
+ipmi_sel_add_entries_fromfile(struct ipmi_intf * intf, const char * filename)
+{
+	FILE * fp;
+	char buf[1024];
+	char * ptr, * tok;
+	int i, j;
+	int rc = 0;
+	uint8_t rqdata[8];
+	struct sel_event_record sel_event;
+	
+	if (filename == NULL)
+		return -1;
+
+	fp = ipmi_open_file_read(filename);
+	if (fp == NULL)
+		return -1;
+
+	while (feof(fp) == 0) {
+		if (fgets(buf, 1024, fp) == NULL)
+			continue;
+
+		/* clip off optional comment tail indicated by # */
+		ptr = strchr(buf, '#');
+		if (ptr)
+			*ptr = '\0';
+		else
+			ptr = buf + strlen(buf);
+
+		/* clip off trailing and leading whitespace */
+		ptr--;
+		while (isspace((int)*ptr) && ptr >= buf)
+			*ptr-- = '\0';
+		ptr = buf;
+		while (isspace((int)*ptr))
+			ptr++;
+		if (strlen(ptr) == 0)
+			continue;
+
+		/* parse the event, 7 bytes with optional comment */
+		/* 0x00 0x00 0x00 0x00 0x00 0x00 0x00 # event */
+		i = 0;
+		tok = strtok(ptr, " ");
+		while (tok) {
+			if (i == 7)
+				break;
+			j = i++;
+			if (str2uchar(tok, &rqdata[j]) != 0) {
+				break;
+			}
+			tok = strtok(NULL, " ");
+		}
+		if (i < 7) {
+			lprintf(LOG_ERR, "Invalid Event: %s",
+			       buf2str(rqdata, sizeof(rqdata)));
+			continue;
+		}
+
+		memset(&sel_event, 0, sizeof(struct sel_event_record));
+		sel_event.record_id = 0x0000;
+		sel_event.record_type = 0x02;
+		/*
+		 * IPMI spec §32.1 generator ID
+		 * Bit 0   = 1 "Software defined"
+		 * Bit 1-7: SWID (IPMI spec §5.5), using 2 = "System management software"
+		 */
+		sel_event.sel_type.standard_type.gen_id = 0x41;
+		sel_event.sel_type.standard_type.evm_rev = rqdata[0];
+		sel_event.sel_type.standard_type.sensor_type = rqdata[1];
+		sel_event.sel_type.standard_type.sensor_num = rqdata[2];
+		sel_event.sel_type.standard_type.event_type = rqdata[3] & 0x7f;
+		sel_event.sel_type.standard_type.event_dir = (rqdata[3] & 0x80) >> 7;
+		sel_event.sel_type.standard_type.event_data[0] = rqdata[4];
+		sel_event.sel_type.standard_type.event_data[1] = rqdata[5];
+		sel_event.sel_type.standard_type.event_data[2] = rqdata[6];
+
+		rc = ipmi_sel_add_entry(intf, &sel_event);
+		if (rc < 0)
+			break;
+	}
+
+	fclose(fp);
+	return rc;
+}
+
+static struct ipmi_event_sensor_types oem_kontron_event_reading_types[] __attribute__((unused)) = {
+   { 0x70 , 0x00 , 0xff, "Code Assert" },
+   { 0x71 , 0x00 , 0xff, "Code Assert" },
+   { 0, 0, 0xFF, NULL }
+};
+ 
+char *
+get_kontron_evt_desc(struct ipmi_intf *intf, struct sel_event_record * rec)
+{
+	char * description = NULL;
+	/*
+	 * Kontron OEM events are described in the product's user manual,  but are limited in favor of
+    * sensor specific 
+	 */
+
+	/* Only standard records are defined so far */
+	if( rec->record_type < 0xC0 ){
+		const struct ipmi_event_sensor_types *st=NULL;
+		for ( st=oem_kontron_event_types ; st->desc != NULL; st++){
+			if (st->code == rec->sel_type.standard_type.event_type ){
+				size_t len =strlen(st->desc);
+				description = (char*)malloc( len + 1 );
+				memcpy(description, st->desc , len);
+				description[len] = 0;;
+				return description;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+char *
+get_newisys_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
+{
+	/*
+	 * Newisys OEM event descriptions can be retrieved through an
+	 * OEM IPMI command.
+	 */
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[6];
+	char * description = NULL;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x2E;
+	req.msg.cmd   = 0x01;
+	req.msg.data_len = sizeof(msg_data);
+	
+	msg_data[0] = 0x15;	/* IANA LSB */ 
+	msg_data[1] = 0x24; /* IANA     */
+	msg_data[2] = 0x00; /* IANA MSB */
+	msg_data[3] = 0x01; /* Subcommand */
+	msg_data[4] = rec->record_id & 0x00FF;        /* SEL Record ID LSB */
+	msg_data[5] = (rec->record_id & 0xFF00) >> 8; /* SEL Record ID MSB */
+
+	req.msg.data = msg_data;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		if (verbose)
+			lprintf(LOG_ERR, "Error issuing OEM command");
+		return NULL;
+	}
+	if (rsp->ccode > 0) {
+		if (verbose)
+			lprintf(LOG_ERR, "OEM command returned error code: %s",
+					val2str(rsp->ccode, completion_code_vals));
+		return NULL;
+	}
+	
+	/* Verify our response before we use it */
+	if (rsp->data_len < 5)
+	{
+		lprintf(LOG_ERR, "Newisys OEM response too short");
+		return NULL;
+	}
+	else if (rsp->data_len != (4 + rsp->data[3]))
+	{
+		lprintf(LOG_ERR, "Newisys OEM response has unexpected length");
+		return NULL;
+	}
+	else if (IPM_DEV_MANUFACTURER_ID(rsp->data) != IPMI_OEM_NEWISYS)
+	{
+		lprintf(LOG_ERR, "Newisys OEM response has unexpected length");
+		return NULL;
+	}
+
+	description = (char*)malloc(rsp->data[3] + 1);
+	memcpy(description, rsp->data + 4, rsp->data[3]);
+	description[rsp->data[3]] = 0;;
+
+	return description;
+}
+
+char *
+get_supermicro_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	char *desc = NULL;
+	int chipset_type = 4;
+	int data1;
+	int data2;
+	int data3;
+	int sensor_type;
+	uint8_t i = 0;
+	uint16_t oem_id = 0;
+	/* Get the OEM event Bytes of the SEL Records byte 13, 14, 15 to
+	 * data1,data2,data3
+	 */
+	data1 = rec->sel_type.standard_type.event_data[0];
+	data2 = rec->sel_type.standard_type.event_data[1];
+	data3 = rec->sel_type.standard_type.event_data[2];
+	/* Check for the Standard Event type == 0x6F */
+	if (rec->sel_type.standard_type.event_type != 0x6F) {
+		return NULL;
+	}
+	/* Allocate mem for te Description string */
+	desc = malloc(sizeof(char) * SIZE_OF_DESC);
+	if (desc == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(desc, '\0', SIZE_OF_DESC);
+	sensor_type = rec->sel_type.standard_type.sensor_type;
+	switch (sensor_type) {
+		case SENSOR_TYPE_MEMORY:
+			memset(&req, 0, sizeof (req));
+			req.msg.netfn = IPMI_NETFN_APP;
+			req.msg.lun = 0;
+			req.msg.cmd = BMC_GET_DEVICE_ID;
+			req.msg.data = NULL;
+			req.msg.data_len = 0;
+
+			rsp = intf->sendrecv(intf, &req);
+			if (rsp == NULL) {
+				lprintf(LOG_ERR, " Error getting system info");
+				if (desc != NULL) {
+					free(desc);
+					desc = NULL;
+				}
+				return NULL;
+			} else if (rsp->ccode > 0) {
+				lprintf(LOG_ERR, " Error getting system info: %s",
+						val2str(rsp->ccode, completion_code_vals));
+				if (desc != NULL) {
+					free(desc);
+					desc = NULL;
+				}
+				return NULL;
+			}
+			/* check the chipset type */
+			oem_id = ipmi_get_oem_id(intf);
+			if (oem_id == 0) {
+				if (desc != NULL) {
+					free(desc);
+					desc = NULL;
+				}
+				return NULL;
+			}
+			for (i = 0; supermicro_X8[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_X8[i]) {
+					chipset_type = 0;
+					break;
+				}
+			}
+			for (i = 0; supermicro_older[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_older[i]) {
+					chipset_type = 0;
+					break;
+				}
+			}
+			for (i = 0; supermicro_romely[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_romely[i]) {
+					chipset_type = 1;
+					break;
+				}
+			}
+			for (i = 0; supermicro_x9[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_x9[i]) {
+					chipset_type = 2;
+					break;
+				}
+			}
+			for (i = 0; supermicro_brickland[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_brickland[i]) {
+					chipset_type = 3;
+					break;
+				}
+			}
+			for (i = 0; supermicro_x10QRH[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_x10QRH[i]) {
+					chipset_type = 4;
+					break;
+				}
+			}
+			for (i = 0; supermicro_x10QBL[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_x10QBL[i]) {
+					chipset_type = 4;
+					break;
+				}
+			}
+			for (i = 0; supermicro_x10OBi[i] != 0xFFFF; i++) {
+				if (oem_id == supermicro_x10OBi[i]) {
+					chipset_type = 5;
+					break;
+				}
+			}
+			if (chipset_type == 0) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%2X(CPU%x)",
+						data2,
+						(data3 & 0x03) + 1);
+			} else if (chipset_type == 1) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%c%c(CPU%x)",
+						(data2 >> 4) + 0x40 + (data3 & 0x3) * 4,
+						(data2 & 0xf) + 0x27, (data3 & 0x03) + 1);
+			} else if (chipset_type == 2) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%c%c(CPU%x)",
+						(data2 >> 4) + 0x40 + (data3 & 0x3) * 3,
+						(data2 & 0xf) + 0x27, (data3 & 0x03) + 1);
+			} else if (chipset_type == 3) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%c%d(P%dM%d)",
+						((data2 & 0xf) >> 4) > 4
+						? '@' - 4 + ((data2 & 0xff) >> 4)
+						: '@' + ((data2 & 0xff) >> 4),
+						(data2 & 0xf) - 0x09, (data3 & 0x0f) + 1,
+						(data2 & 0xff) >> 4 > 4 ? 2 : 1);
+			} else if (chipset_type == 4) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%c%c(CPU%x)",
+						(data2 >> 4) + 0x40,
+						(data2 & 0xf) + 0x27, (data3 & 0x03) + 1);
+			} else if (chipset_type == 5) {
+				snprintf(desc, SIZE_OF_DESC, "@DIMM%c%c(CPU%x)",
+						(data2 >> 4) + 0x40,
+						(data2 & 0xf) + 0x27, (data3 & 0x07) + 1);
+			} else {
+				/* No description. */
+				desc[0] = '\0';
+			}
+			break;
+		case SENSOR_TYPE_SUPERMICRO_OEM:
+			if (data1 == 0x80 && data3 == 0xFF) {
+				if (data2 == 0x0) {
+					snprintf(desc, SIZE_OF_DESC, "BMC unexpected reset");
+				} else if (data2 == 0x1) {
+					snprintf(desc, SIZE_OF_DESC, "BMC cold reset");
+				} else if (data2 == 0x2) {
+					snprintf(desc, SIZE_OF_DESC, "BMC warm reset");
+				}
+			}
+			break;
+	}
+	return desc;
+}
+
+/*
+ * Function 	: Decoding the SEL OEM Bytes for the DELL Platforms.
+ * Description  : The below fucntion will decode the SEL Events OEM Bytes for the Dell specific	Sensors only.
+ * The below function will append the additional information Strings/description to the normal sel desc.
+ * With this the SEL will display additional information sent via OEM Bytes of the SEL Record.
+ * NOTE		: Specific to DELL Platforms only.
+ * Returns	: 	Pointer to the char string.
+ */
+char * get_dell_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
+{
+	int data1, data2, data3;
+	int sensor_type;
+	char *desc = NULL;
+
+	unsigned char count;
+	unsigned char node;
+	unsigned char dimmNum;
+	unsigned char dimmsPerNode;
+	char          dimmStr[MAX_DIMM_STR];
+	char          tmpdesc[SIZE_OF_DESC];
+	char*         str;
+	unsigned char incr = 0;
+	unsigned char i=0,j = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	char tmpData;
+	int version;
+	/* Get the OEM event Bytes of the SEL Records byte 13, 14, 15 to Data1,data2,data3 */
+	data1 = rec->sel_type.standard_type.event_data[0];
+	data2 = rec->sel_type.standard_type.event_data[1];
+	data3 = rec->sel_type.standard_type.event_data[2];
+	/* Check for the Standard Event type == 0x6F */
+	if (0x6F == rec->sel_type.standard_type.event_type)
+		{
+		sensor_type = rec->sel_type.standard_type.sensor_type;
+		/* Allocate mem for te Description string */
+		desc = (char*)malloc(SIZE_OF_DESC);
+		if(NULL == desc)
+			return NULL;
+		memset(desc,0,SIZE_OF_DESC);
+		memset(tmpdesc,0,SIZE_OF_DESC);
+		switch (sensor_type) {					
+			case SENSOR_TYPE_PROCESSOR:	/* Processor/CPU related OEM Sel Byte Decoding for DELL Platforms only */
+				if((OEM_CODE_IN_BYTE2 == (data1 & DATA_BYTE2_SPECIFIED_MASK)))
+				{
+					if(0x00 == (data1 & MASK_LOWER_NIBBLE))
+						snprintf(desc,SIZE_OF_DESC,"CPU Internal Err | ");
+					if(0x06 == (data1 & MASK_LOWER_NIBBLE))
+					{
+						snprintf(desc,SIZE_OF_DESC,"CPU Protocol Err | ");
+
+					}
+
+					/* change bit location to a number */
+					for (count= 0; count < 8; count++)
+					{
+					  if (BIT(count)& data2)
+					  {
+					    count++;
+						/* 0x0A - CPU sensor number */
+						if((0x06 == (data1 & MASK_LOWER_NIBBLE)) && (0x0A == rec->sel_type.standard_type.sensor_num)) 
+						    snprintf(desc,SIZE_OF_DESC,"FSB %d ",count);			// Which CPU Has generated the FSB
+						else
+						    snprintf(desc,SIZE_OF_DESC,"CPU %d | APIC ID %d ",count,data3);	/* Specific CPU related info */
+					    break;
+					  }
+					}
+				}
+			break;
+			case SENSOR_TYPE_MEMORY:	/* Memory or DIMM related OEM Sel Byte Decoding for DELL Platforms only */
+			case SENSOR_TYPE_EVT_LOG:	/* Events Logging for Memory or DIMM related OEM Sel Byte Decoding for DELL Platforms only */			
+
+				/* Get the current version of the IPMI Spec Based on that Decoding of memory info is done.*/
+				memset(&req, 0, sizeof (req));
+				req.msg.netfn = IPMI_NETFN_APP;
+				req.msg.lun = 0;
+				req.msg.cmd = BMC_GET_DEVICE_ID;
+				req.msg.data = NULL;
+				req.msg.data_len = 0;
+
+				rsp = intf->sendrecv(intf, &req);
+				if (NULL == rsp) 
+				{
+					lprintf(LOG_ERR, " Error getting system info");
+					if (desc != NULL) {
+						free(desc);
+						desc = NULL;
+					}
+					return NULL;
+				} 
+				else if (rsp->ccode > 0)
+				{
+					lprintf(LOG_ERR, " Error getting system info: %s",
+						val2str(rsp->ccode, completion_code_vals));
+					if (desc != NULL) {
+						free(desc);
+						desc = NULL;
+					}
+					return NULL;
+				}
+				version = rsp->data[4];
+				/* Memory DIMMS */
+				if( (data1 &  OEM_CODE_IN_BYTE2) || (data1 & OEM_CODE_IN_BYTE3 ) )
+				{
+					/* Memory Redundancy related oem bytes docoding .. */
+					if( (SENSOR_TYPE_MEMORY == sensor_type) && (0x0B == rec->sel_type.standard_type.event_type) )
+					{
+						if(0x00 == (data1 & MASK_LOWER_NIBBLE)) 
+						{
+							snprintf(desc,SIZE_OF_DESC," Redundancy Regained | ");
+						}
+						else if(0x01 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							snprintf(desc,SIZE_OF_DESC,"Redundancy Lost | ");
+						}
+					} /* Correctable and uncorrectable ECC Error Decoding */	
+					else if(SENSOR_TYPE_MEMORY == sensor_type) 
+					{
+						if(0x00 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							/* 0x1C - Memory Sensor Number */
+							if(0x1C == rec->sel_type.standard_type.sensor_num)
+							{
+								/*Add the complete information about the Memory Configs.*/
+								if((data1 &  OEM_CODE_IN_BYTE2) && (data1 & OEM_CODE_IN_BYTE3 ))
+								{
+									count = 0;
+									snprintf(desc,SIZE_OF_DESC,"CRC Error on:");
+									for(i=0;i<4;i++)
+									{
+										if((BIT(i))&(data2))
+										{
+											if(count)
+											{
+						                        str = desc+strlen(desc);
+												*str++ = ',';
+												str = '\0';
+						              					count = 0;
+											}
+											switch(i) /* Which type of memory config is present.. */
+											{
+												case 0: snprintf(tmpdesc,SIZE_OF_DESC,"South Bound Memory");
+														strcat(desc,tmpdesc);
+														count++;
+														break;
+												case 1:	snprintf(tmpdesc,SIZE_OF_DESC,"South Bound Config");
+														strcat(desc,tmpdesc);
+														count++;
+														break;
+												case 2: snprintf(tmpdesc,SIZE_OF_DESC,"North Bound memory");
+														strcat(desc,tmpdesc);
+														count++;
+														break;
+												case 3:	snprintf(tmpdesc,SIZE_OF_DESC,"North Bound memory-corr");
+														strcat(desc,tmpdesc);
+														count++;
+														break;
+												default:
+														break;
+											}
+										}
+									}
+									if(data3>=0x00 && data3<0xFF)
+									{
+										snprintf(tmpdesc,SIZE_OF_DESC,"|Failing_Channel:%d",data3);
+										strcat(desc,tmpdesc);
+									}
+								}
+								break;
+							}
+							snprintf(desc,SIZE_OF_DESC,"Correctable ECC | ");
+						}
+						else if(0x01 == (data1 & MASK_LOWER_NIBBLE))  
+						{
+							snprintf(desc,SIZE_OF_DESC,"UnCorrectable ECC | ");
+						}
+					} /* Corr Memory log disabled */
+					else if(SENSOR_TYPE_EVT_LOG == sensor_type)
+					{
+						if(0x00 == (data1 & MASK_LOWER_NIBBLE)) 
+							snprintf(desc,SIZE_OF_DESC,"Corr Memory Log Disabled | ");
+					}
+				} 
+				else
+				{
+					if(SENSOR_TYPE_SYS_EVENT == sensor_type) 
+					{
+						if(0x02 == (data1 & MASK_LOWER_NIBBLE)) 
+							snprintf(desc,SIZE_OF_DESC,"Unknown System Hardware Failure ");
+					}
+					if(SENSOR_TYPE_EVT_LOG == sensor_type)
+					{
+						if(0x03 == (data1 & MASK_LOWER_NIBBLE)) 
+							snprintf(desc,SIZE_OF_DESC,"All Even Logging Dissabled");
+					}
+				}
+				/* 
+ 				 * Based on the above error, we need to find whcih memory slot or 
+ 				 * Card has got the Errors/Sel Generated.
+ 				 */
+				if(data1 & OEM_CODE_IN_BYTE2 ) 
+				{
+					/* Find the Card Type */
+					if((0x0F != (data2 >> 4)) && ((data2 >> 4) < 0x08))
+					{
+						tmpData = 	('A'+ (data2 >> 4));
+						if( (SENSOR_TYPE_MEMORY == sensor_type) && (0x0B == rec->sel_type.standard_type.event_type) )
+						{
+							snprintf(tmpdesc, SIZE_OF_DESC, "Bad Card %c", tmpData);								
+						}
+						else
+						{
+							snprintf(tmpdesc, SIZE_OF_DESC, "Card %c", tmpData);
+						}
+						strcat(desc, tmpdesc);
+					} /* Find the Bank Number of the DIMM */
+					if (0x0F != (data2 & MASK_LOWER_NIBBLE)) 
+					{
+						if(0x51  == version)
+						{
+							snprintf(tmpdesc, SIZE_OF_DESC, "Bank %d", ((data2 & 0x0F)+1));	
+							strcat(desc, tmpdesc);
+						}
+						else 
+						{
+							incr = (data2 & 0x0f) << 3;
+						}
+					}
+					
+				}
+				/* Find the DIMM Number of the Memory which has Generated the Fault or Sel */
+				if(data1 & OEM_CODE_IN_BYTE3 )
+				{
+					// Based on the IPMI Spec Need Identify the DIMM Details.
+					// For the SPEC 1.5 Only the DIMM Number is Valid.
+					if(0x51  == version) 
+					{
+						snprintf(tmpdesc, SIZE_OF_DESC, "DIMM %c", ('A'+ data3));
+						strcat(desc, tmpdesc);						
+					} 
+					/* For the SPEC 2.0 Decode the DIMM Number as it supports more.*/
+					else if( ((data2 >> 4) > 0x07) && (0x0F != (data2 >> 4) )) 
+					{
+						strcpy(dimmStr, " DIMM");
+						str = desc+strlen(desc);
+						dimmsPerNode = 4;
+						if(0x09 == (data2 >> 4)) dimmsPerNode = 6;
+						else if(0x0A == (data2 >> 4)) dimmsPerNode = 8;
+						else if(0x0B == (data2 >> 4)) dimmsPerNode = 9;
+						else if(0x0C == (data2 >> 4)) dimmsPerNode = 12;
+						else if(0x0D == (data2 >> 4)) dimmsPerNode = 24;	
+						else if(0x0E == (data2 >> 4)) dimmsPerNode = 3;							
+						count = 0;
+				        	for (i = 0; i < 8; i++)
+				        	{
+				        		if (BIT(i) & data3)
+				          		{
+								if(count)
+								{
+									strcat(str,",");
+									count = 0x00;
+								}
+				            		node = (incr + i)/dimmsPerNode;
+					            	dimmNum = ((incr + i)%dimmsPerNode)+1;
+					            	dimmStr[5] = node + 'A';
+					            	sprintf(tmpdesc,"%d",dimmNum);
+					            	for(j = 0; j < strlen(tmpdesc);j++)
+								dimmStr[6+j] = tmpdesc[j];
+							dimmStr[6+j] = '\0'; 
+							strcat(str,dimmStr); // final DIMM Details.
+		 			               	count++;
+					          	}
+					        }
+					} 
+					else
+					{
+					        strcpy(dimmStr, " DIMM");
+						str = desc+strlen(desc);
+					        count = 0;
+					        for (i = 0; i < 8; i++)
+					        {
+				        		if (BIT(i) & data3)
+				   			{
+						            // check if more than one DIMM, if so add a comma to the string.
+						        	sprintf(tmpdesc,"%d",(i + incr + 1));
+								if(count)
+								{
+									strcat(str,",");
+									count = 0x00;
+								}
+								for(j = 0; j < strlen(tmpdesc);j++)
+									dimmStr[5+j] = tmpdesc[j];
+								dimmStr[5+j] = '\0'; 
+							        strcat(str, dimmStr);
+							        count++;
+				          		}
+				        	}
+			        	}
+				}
+			break;
+			/* Sensor In system charectorization Error Decoding.
+				Sensor type  0x20*/
+			case SENSOR_TYPE_TXT_CMD_ERROR:
+				if((0x00 == (data1 & MASK_LOWER_NIBBLE))&&((data1 & OEM_CODE_IN_BYTE2) && (data1 & OEM_CODE_IN_BYTE3)))
+				{
+					switch(data3)
+					{
+						case 0x01:
+							snprintf(desc,SIZE_OF_DESC,"BIOS TXT Error");
+							break;
+						case 0x02:
+							snprintf(desc,SIZE_OF_DESC,"Processor/FIT TXT");
+							break;
+						case 0x03:
+							snprintf(desc,SIZE_OF_DESC,"BIOS ACM TXT Error");
+							break;
+						case 0x04:
+							snprintf(desc,SIZE_OF_DESC,"SINIT ACM TXT Error");
+							break;
+						case 0xff:
+							snprintf(desc,SIZE_OF_DESC,"Unrecognized TT Error12");
+							break;
+						default:
+							break;						
+					}
+				}
+			break;	
+			/* OS Watch Dog Timer Sel Events */
+			case SENSOR_TYPE_WTDOG:
+				
+				if(SENSOR_TYPE_OEM_SEC_EVENT == data1)
+				{
+					if(0x04 == data2)
+					{
+						snprintf(desc,SIZE_OF_DESC,"Hard Reset|Interrupt type None,SMS/OS Timer used at expiration");
+					}
+				}	
+				
+			break;
+						/* This Event is for BMC to Othe Hardware or CPU . */
+			case SENSOR_TYPE_VER_CHANGE:
+				if((0x02 == (data1 & MASK_LOWER_NIBBLE))&&((data1 & OEM_CODE_IN_BYTE2) && (data1 & OEM_CODE_IN_BYTE3)))
+				{
+					if(0x02 == data2)
+					{
+						if(0x00 == data3)
+						{
+							snprintf(desc, SIZE_OF_DESC, "between BMC/iDRAC Firmware and other hardware");
+						}
+						else if(0x01 == data3)
+						{
+							snprintf(desc, SIZE_OF_DESC, "between BMC/iDRAC Firmware and CPU");
+						}
+					}
+				}
+			break;
+			/* Flex or Mac tuning OEM Decoding for the DELL. */
+			case SENSOR_TYPE_OEM_SEC_EVENT:
+				/* 0x25 - Virtual MAC sensory number - Dell OEM */
+				if(0x25 == rec->sel_type.standard_type.sensor_num)
+				{
+					if(0x01 == (data1 & MASK_LOWER_NIBBLE))
+					{
+						snprintf(desc, SIZE_OF_DESC, "Failed to program Virtual Mac Address");
+						if((data1 & OEM_CODE_IN_BYTE2)&&(data1 & OEM_CODE_IN_BYTE3))
+						{
+							snprintf(tmpdesc, SIZE_OF_DESC, " at bus:%.2x device:%.2x function:%x",
+							data3 &0x7F, (data2 >> 3) & 0x1F,
+							data2 & 0x07);
+                            strcat(desc,tmpdesc);
+						}
+					}
+					else if(0x02 == (data1 & MASK_LOWER_NIBBLE))
+					{
+						snprintf(desc, SIZE_OF_DESC, "Device option ROM failed to support link tuning or flex address");
+					}
+					else if(0x03 == (data1 & MASK_LOWER_NIBBLE))
+					{
+						snprintf(desc, SIZE_OF_DESC, "Failed to get link tuning or flex address data from BMC/iDRAC");
+					}
+				}
+			break;
+			case SENSOR_TYPE_CRIT_INTR:
+			case SENSOR_TYPE_OEM_NFATAL_ERROR:	/* Non - Fatal PCIe Express Error Decoding */
+			case SENSOR_TYPE_OEM_FATAL_ERROR:	/* Fatal IO Error Decoding */
+				/* 0x29 - QPI Linx Error Sensor Dell OEM */
+				if(0x29 == rec->sel_type.standard_type.sensor_num)
+				{
+					if((0x02 == (data1 & MASK_LOWER_NIBBLE))&&((data1 & OEM_CODE_IN_BYTE2) && (data1 & OEM_CODE_IN_BYTE3)))
+					{
+						snprintf(tmpdesc, SIZE_OF_DESC, "Partner-(LinkId:%d,AgentId:%d)|",(data2 & 0xC0),(data2 & 0x30));
+						strcat(desc,tmpdesc);
+						snprintf(tmpdesc, SIZE_OF_DESC, "ReportingAgent(LinkId:%d,AgentId:%d)|",(data2 & 0x0C),(data2 & 0x03));
+						strcat(desc,tmpdesc);
+						if(0x00 == (data3 & 0xFC))
+						{
+							snprintf(tmpdesc, SIZE_OF_DESC, "LinkWidthDegraded|");
+							strcat(desc,tmpdesc);
+						}
+						if(BIT(1)& data3)
+						{
+							snprintf(tmpdesc,SIZE_OF_DESC,"PA_Type:IOH|");
+						}
+						else
+						{
+							snprintf(tmpdesc,SIZE_OF_DESC,"PA-Type:CPU|");
+						}
+						strcat(desc,tmpdesc);
+						if(BIT(0)& data3)
+						{
+							snprintf(tmpdesc,SIZE_OF_DESC,"RA-Type:IOH");
+						}
+						else
+						{
+							snprintf(tmpdesc,SIZE_OF_DESC,"RA-Type:CPU");
+						}
+						strcat(desc,tmpdesc);
+					}
+				}
+				else
+				{
+
+					if(0x02 == (data1 & MASK_LOWER_NIBBLE))
+					{
+						sprintf(desc,"%s","IO channel Check NMI");
+                    }
+					else
+					{
+						if(0x00 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							snprintf(desc, SIZE_OF_DESC, "%s","PCIe Error |");
+						}
+						else if(0x01 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							snprintf(desc, SIZE_OF_DESC, "%s","I/O Error |");
+						}
+						else if(0x04 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							snprintf(desc, SIZE_OF_DESC, "%s","PCI PERR |");
+						}
+						else if(0x05 == (data1 & MASK_LOWER_NIBBLE))
+						{
+							snprintf(desc, SIZE_OF_DESC, "%s","PCI SERR |");
+						}
+						else
+						{
+							snprintf(desc, SIZE_OF_DESC, "%s"," ");
+						}
+						if (data3 & 0x80)
+							snprintf(tmpdesc, SIZE_OF_DESC, "Slot %d", data3 & 0x7F);
+						else
+							snprintf(tmpdesc, SIZE_OF_DESC, "PCI bus:%.2x device:%.2x function:%x",
+							data3 &0x7F, (data2 >> 3) & 0x1F,
+							data2 & 0x07);
+
+						strcat(desc,tmpdesc);
+					}
+				}
+			break;
+			/* POST Fatal Errors generated from the  Server with much more info*/
+			case SENSOR_TYPE_FRM_PROG:
+				if((0x0F == (data1 & MASK_LOWER_NIBBLE))&&(data1 & OEM_CODE_IN_BYTE2))
+				{
+					switch(data2)
+					{
+						case 0x80:
+							snprintf(desc, SIZE_OF_DESC, "No memory is detected.");break;
+						case 0x81:
+							snprintf(desc,SIZE_OF_DESC, "Memory is detected but is not configurable.");break;
+						case 0x82:
+							snprintf(desc, SIZE_OF_DESC, "Memory is configured but not usable.");break;
+						case 0x83:
+							snprintf(desc, SIZE_OF_DESC, "System BIOS shadow failed.");break;
+						case 0x84:
+							snprintf(desc, SIZE_OF_DESC, "CMOS failed.");break;
+						case 0x85:
+							snprintf(desc, SIZE_OF_DESC, "DMA controller failed.");break;
+						case 0x86:
+							snprintf(desc, SIZE_OF_DESC, "Interrupt controller failed.");break;
+						case 0x87:
+							snprintf(desc, SIZE_OF_DESC, "Timer refresh failed.");break;
+						case 0x88:
+							snprintf(desc, SIZE_OF_DESC, "Programmable interval timer error.");break;
+						case 0x89:
+							snprintf(desc, SIZE_OF_DESC, "Parity error.");break;
+						case 0x8A:
+							snprintf(desc, SIZE_OF_DESC, "SIO failed.");break;
+						case 0x8B:
+							snprintf(desc, SIZE_OF_DESC, "Keyboard controller failed.");break;
+						case 0x8C:
+							snprintf(desc, SIZE_OF_DESC, "System management interrupt initialization failed.");break;
+						case 0x8D:
+							snprintf(desc, SIZE_OF_DESC, "TXT-SX Error.");break;
+						case 0xC0:
+							snprintf(desc, SIZE_OF_DESC, "Shutdown test failed.");break;
+						case 0xC1:
+							snprintf(desc, SIZE_OF_DESC, "BIOS POST memory test failed.");break;
+						case 0xC2:
+							snprintf(desc, SIZE_OF_DESC, "RAC configuration failed.");break;
+						case 0xC3:
+							snprintf(desc, SIZE_OF_DESC, "CPU configuration failed.");break;
+						case 0xC4:
+							snprintf(desc, SIZE_OF_DESC, "Incorrect memory configuration.");break;
+						case 0xFE:
+							snprintf(desc, SIZE_OF_DESC, "General failure after video.");
+							break;
+					}
+				}
+			break;
+
+			default:
+			break;				
+		} 
+	}
+	else
+	{
+		sensor_type = rec->sel_type.standard_type.event_type;
+	}
+	return desc;
+}
+
+char *
+ipmi_get_oem_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
+{
+	char * desc = NULL;
+
+	switch (ipmi_get_oem(intf))
+	{
+	case IPMI_OEM_NEWISYS:
+		desc = get_newisys_evt_desc(intf, rec);
+		break;
+	case IPMI_OEM_KONTRON:
+		desc =  get_kontron_evt_desc(intf, rec);
+		break;
+	case IPMI_OEM_DELL: // Dell Decoding of the OEM Bytes from SEL Record.
+		desc = get_dell_evt_desc(intf, rec);
+		break;
+	case IPMI_OEM_SUPERMICRO:
+	case IPMI_OEM_SUPERMICRO_47488:
+		desc = get_supermicro_evt_desc(intf, rec);
+		break;
+	case IPMI_OEM_UNKNOWN:
+	default:
+		break;
+	}
+
+	return desc;
+}
+
+
+const struct ipmi_event_sensor_types *
+ipmi_get_first_event_sensor_type(struct ipmi_intf *intf,
+		uint8_t sensor_type, uint8_t event_type)
+{
+	const struct ipmi_event_sensor_types *evt, *start, *next = NULL;
+	uint8_t code;
+
+	if (event_type == 0x6f) {
+		if (sensor_type >= 0xC0
+				&& sensor_type < 0xF0
+				&& ipmi_get_oem(intf) == IPMI_OEM_KONTRON) {
+			/* check Kontron OEM sensor event types */
+			start = oem_kontron_event_types;
+		} else if (intf->vita_avail) {
+			/* check VITA sensor event types first */
+			start = vita_sensor_event_types;
+
+			/* then check generic sensor types */
+			next = sensor_specific_event_types;
+		} else {
+			/* check generic sensor types */
+			start = sensor_specific_event_types;
+		}
+		code = sensor_type;
+	} else {
+		start = generic_event_types;
+		code = event_type;
+	}
+
+	for (evt = start; evt->desc != NULL || next != NULL; evt++) {
+		/* check if VITA sensor event types has finished */
+		if (evt->desc == NULL) {
+			/* proceed with next table */
+			evt = next;
+			next = NULL;
+		}
+
+		if (code == evt->code)
+			return evt;
+	}
+
+	return NULL;
+}
+
+
+const struct ipmi_event_sensor_types *
+ipmi_get_next_event_sensor_type(const struct ipmi_event_sensor_types *evt)
+{
+	const struct ipmi_event_sensor_types *start = evt;
+
+	for (evt = start + 1; evt->desc != NULL; evt++) {
+		if (evt->code == start->code) {
+			return evt;
+		}
+	}
+
+	return NULL;
+}
+
+
+void
+ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char ** desc)
+{
+	uint8_t offset;
+	const struct ipmi_event_sensor_types *evt = NULL;
+	char *sfx = NULL;	/* This will be assigned if the Platform is DELL,
+				 additional info is appended to the current Description */
+
+	if (desc == NULL)
+		return;
+	*desc = NULL;
+
+	if ((rec->sel_type.standard_type.event_type >= 0x70) && (rec->sel_type.standard_type.event_type < 0x7F)) {
+		*desc = ipmi_get_oem_desc(intf, rec);
+		return;
+	} else if (rec->sel_type.standard_type.event_type == 0x6f) {
+		if( rec->sel_type.standard_type.sensor_type >= 0xC0 &&  rec->sel_type.standard_type.sensor_type < 0xF0) {
+			IPMI_OEM iana = ipmi_get_oem(intf);
+
+			switch(iana){
+				case IPMI_OEM_KONTRON:
+					lprintf(LOG_DEBUG, "oem sensor type %x %d using oem type supplied description",
+		                       rec->sel_type.standard_type.sensor_type , iana);
+				 break;
+				case IPMI_OEM_DELL:		/* OEM Bytes Decoding for DELLi */
+				 	if ( (OEM_CODE_IN_BYTE2 == (rec->sel_type.standard_type.event_data[0] & DATA_BYTE2_SPECIFIED_MASK)) ||
+					     (OEM_CODE_IN_BYTE3 == (rec->sel_type.standard_type.event_data[0] & DATA_BYTE3_SPECIFIED_MASK)) )
+				 	{
+						 sfx = ipmi_get_oem_desc(intf, rec);
+				 	}
+				 break;
+				case IPMI_OEM_SUPERMICRO:
+				case IPMI_OEM_SUPERMICRO_47488:
+					sfx = ipmi_get_oem_desc(intf, rec);
+					break;
+				 /* add your oem sensor assignation here */
+				default:
+					lprintf(LOG_DEBUG, "oem sensor type %x  using standard type supplied description",
+						rec->sel_type.standard_type.sensor_type );
+					break;
+			}
+		} else {
+			switch (ipmi_get_oem(intf)) {
+				case IPMI_OEM_SUPERMICRO:
+				case IPMI_OEM_SUPERMICRO_47488:
+					sfx = ipmi_get_oem_desc(intf, rec);
+				 break;
+				default:
+				 break;
+			}
+		}
+		/*
+ 		 * Check for the OEM DELL Interface based on the Dell Specific Vendor Code.
+ 		 * If its Dell Platform, do the OEM Byte decode from the SEL Records.
+ 		 * Additional information should be written by the ipmi_get_oem_desc()
+ 		 */
+		if(ipmi_get_oem(intf) == IPMI_OEM_DELL) {
+			if ( (OEM_CODE_IN_BYTE2 == (rec->sel_type.standard_type.event_data[0] & DATA_BYTE2_SPECIFIED_MASK)) ||
+			     (OEM_CODE_IN_BYTE3 == (rec->sel_type.standard_type.event_data[0] & DATA_BYTE3_SPECIFIED_MASK)) )
+			{
+				sfx = ipmi_get_oem_desc(intf, rec);
+			}
+			else if(SENSOR_TYPE_OEM_SEC_EVENT == rec->sel_type.standard_type.event_data[0])
+			{
+				/* 0x23 : Sensor Number.*/
+				if(0x23 == rec->sel_type.standard_type.sensor_num)
+					sfx = ipmi_get_oem_desc(intf, rec);
+			}
+		}
+	}
+
+	offset = rec->sel_type.standard_type.event_data[0] & 0xf;
+
+	for (evt = ipmi_get_first_event_sensor_type(intf,
+			rec->sel_type.standard_type.sensor_type,
+			rec->sel_type.standard_type.event_type);
+			evt != NULL; evt = ipmi_get_next_event_sensor_type(evt)) {
+		if ((evt->offset == offset && evt->desc != NULL) &&
+			((evt->data == ALL_OFFSETS_SPECIFIED) ||
+			 ((rec->sel_type.standard_type.event_data[0] & DATA_BYTE2_SPECIFIED_MASK) &&
+			  (evt->data == rec->sel_type.standard_type.event_data[1]))))
+		{
+			/* Increase the Malloc size to current_size + Dellspecific description size */
+			*desc = (char *)malloc(strlen(evt->desc) + 48 + SIZE_OF_DESC);
+			if (NULL == *desc) {
+				lprintf(LOG_ERR, "ipmitool: malloc failure");
+				return;
+			}
+			memset(*desc, 0, strlen(evt->desc)+ 48 + SIZE_OF_DESC);
+			/*
+ 			 * Additional info is present for the DELL Platforms.
+ 			 * Append the same to the evt->desc string.
+ 			 */
+			if (sfx) {
+				sprintf(*desc, "%s (%s)", evt->desc, sfx);
+				free(sfx);
+				sfx = NULL;
+			} else {
+				sprintf(*desc, "%s", evt->desc);
+			}
+			return;
+		}
+	}
+	/* The Above while Condition was not met beacouse the below sensor type were Newly defined OEM 
+	   Secondary Events. 0xC1, 0xC2, 0xC3. */	
+    if((sfx) && (0x6F == rec->sel_type.standard_type.event_type)) 
+	{
+	    uint8_t flag = 0x00;
+	    switch(rec->sel_type.standard_type.sensor_type)
+		{
+            case SENSOR_TYPE_FRM_PROG:
+                 if(0x0F == offset) 
+                     flag = 0x01;			
+                 break;            
+			case SENSOR_TYPE_OEM_SEC_EVENT:
+			     if((0x01 == offset) || (0x02 == offset) || (0x03 == offset))
+                     flag = 0x01;
+                 break;
+            case SENSOR_TYPE_OEM_NFATAL_ERROR:
+                 if((0x00 == offset) || (0x02 == offset))
+                     flag = 0x01;			
+                 break;			
+            case SENSOR_TYPE_OEM_FATAL_ERROR:		
+                 if(0x01 == offset)
+                     flag = 0x01;			
+                 break;
+            case SENSOR_TYPE_SUPERMICRO_OEM:
+                 flag = 0x02;
+                 break;
+            default:
+                 break;
+		}
+		if(flag)
+		{
+		    *desc = (char *)malloc( 48 + SIZE_OF_DESC);
+		    if (NULL == *desc)
+			{
+		        lprintf(LOG_ERR, "ipmitool: malloc failure");
+			    return;
+		    }
+		memset(*desc, 0, 48 + SIZE_OF_DESC);
+		if (flag == 0x02) {
+			sprintf(*desc, "%s", sfx);
+			return;
+		}
+		sprintf(*desc, "(%s)",sfx);		
+     	}
+		free(sfx);
+		sfx = NULL;
+	}
+}
+
+
+const char*
+ipmi_get_generic_sensor_type(uint8_t code)
+{
+	if (code <= SENSOR_TYPE_MAX) {
+		return ipmi_generic_sensor_type_vals[code];
+	}
+
+	return NULL;
+}
+
+
+const char *
+ipmi_get_oem_sensor_type(struct ipmi_intf *intf, uint8_t code)
+{
+	const struct oemvalstr *v, *found = NULL;
+	uint32_t iana = ipmi_get_oem(intf);
+
+	for (v = ipmi_oem_sensor_type_vals; v->str; v++) {
+		if (v->oem == iana && v->val == code) {
+			return v->str;
+		}
+
+		if ((intf->picmg_avail
+				&& v->oem == IPMI_OEM_PICMG
+				&& v->val == code)
+			|| (intf->vita_avail
+				&& v->oem == IPMI_OEM_VITA
+				&& v->val == code)) {
+			found = v;
+		}
+	}
+
+	return found ? found->str : NULL;
+}
+
+
+const char *
+ipmi_get_sensor_type(struct ipmi_intf *intf, uint8_t code)
+{
+	const char *type;
+
+	if (code >= 0xC0) {
+		type = ipmi_get_oem_sensor_type(intf, code);
+	} else {
+		type = ipmi_get_generic_sensor_type(code);
+	}
+
+	if (type == NULL) {
+		type = "Unknown";
+	}
+
+	return type;
+}
+
+static int
+ipmi_sel_get_info(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint16_t e, version;
+	uint32_t f;
+	int pctfull = 0;
+	uint32_t fs    = 0xffffffff;
+	uint32_t zeros = 0;
+
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SEL Info command failed");
+		return -1;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SEL Info command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len != 14) {
+		lprintf(LOG_ERR, "Get SEL Info command failed: "
+			"Invalid data length %d", rsp->data_len);
+		return (-1);
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "sel_info");
+
+	printf("SEL Information\n");
+        version = rsp->data[0];
+	printf("Version          : %d.%d (%s)\n",
+	       version & 0xf, (version>>4) & 0xf,
+	       (version == 0x51 || version == 0x02) ? "v1.5, v2 compliant" : "Unknown");
+
+	/* save the entry count and free space to determine percent full */
+	e = buf2short(rsp->data + 1);
+	f = buf2short(rsp->data + 3);
+	printf("Entries          : %d\n", e);
+	printf("Free Space       : %d bytes %s\n", f ,(f==65535 ? "or more" : "" ));
+
+	if (e) {
+		e *= 16; /* each entry takes 16 bytes */
+		f += e;	/* this is supposed to give the total size ... */
+		pctfull = (int)(100 * ( (double)e / (double)f ));
+	}
+
+	if( f >= 65535 ) {
+		printf("Percent Used     : %s\n", "unknown" );
+	}
+	else {
+		printf("Percent Used     : %d%%\n", pctfull);
+	}
+
+
+	if ((!memcmp(rsp->data + 5, &fs,    4)) ||
+		(!memcmp(rsp->data + 5, &zeros, 4)))
+		printf("Last Add Time    : Not Available\n");
+	else
+		printf("Last Add Time    : %s\n",
+			   ipmi_sel_timestamp(buf2long(rsp->data + 5)));
+
+	if ((!memcmp(rsp->data + 9, &fs,    4)) ||
+		(!memcmp(rsp->data + 9, &zeros, 4)))
+		printf("Last Del Time    : Not Available\n");
+	else
+		printf("Last Del Time    : %s\n",
+			   ipmi_sel_timestamp(buf2long(rsp->data + 9)));
+
+
+	printf("Overflow         : %s\n",
+	       rsp->data[13] & 0x80 ? "true" : "false");
+	printf("Supported Cmds   : ");
+        if (rsp->data[13] & 0x0f)
+        {
+	        if (rsp->data[13] & 0x08)
+                        printf("'Delete' ");
+	        if (rsp->data[13] & 0x04)
+                        printf("'Partial Add' ");
+	        if (rsp->data[13] & 0x02)
+                        printf("'Reserve' ");
+	        if (rsp->data[13] & 0x01)
+                        printf("'Get Alloc Info' ");
+        }
+        else
+                printf("None");
+        printf("\n");
+
+	/* get sel allocation info if supported */
+	if (rsp->data[13] & 1) {
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = IPMI_CMD_GET_SEL_ALLOC_INFO;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR,
+				"Get SEL Allocation Info command failed");
+			return -1;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR,
+				"Get SEL Allocation Info command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			return -1;
+		}
+
+		printf("# of Alloc Units : %d\n", buf2short(rsp->data));
+		printf("Alloc Unit Size  : %d\n", buf2short(rsp->data + 2));
+		printf("# Free Units     : %d\n", buf2short(rsp->data + 4));
+		printf("Largest Free Blk : %d\n", buf2short(rsp->data + 6));
+		printf("Max Record Size  : %d\n", rsp->data[8]);
+	}
+	return 0;
+}
+
+uint16_t
+ipmi_sel_get_std_entry(struct ipmi_intf * intf, uint16_t id,
+		       struct sel_event_record * evt)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	uint8_t msg_data[6];
+	uint16_t next;
+	int data_count;
+
+	memset(msg_data, 0, 6);
+	msg_data[0] = 0x00;	/* no reserve id, not partial get */
+	msg_data[1] = 0x00;
+	msg_data[2] = id & 0xff;
+	msg_data[3] = (id >> 8) & 0xff;
+	msg_data[4] = 0x00;	/* offset */
+	msg_data[5] = 0xff;	/* length */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_GET_SEL_ENTRY;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SEL Entry %x command failed", id);
+		return 0;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SEL Entry %x command failed: %s",
+			id, val2str(rsp->ccode, completion_code_vals));
+		return 0;
+	}
+
+	/* save next entry id */
+	next = (rsp->data[1] << 8) | rsp->data[0];
+
+	lprintf(LOG_DEBUG, "SEL Entry: %s", buf2str(rsp->data+2, rsp->data_len-2));
+	memset(evt, 0, sizeof(*evt));
+  
+	/*Clear SEL Structure*/
+	evt->record_id = 0;
+	evt->record_type = 0;
+	if (evt->record_type < 0xc0)
+	{
+		evt->sel_type.standard_type.timestamp = 0;
+		evt->sel_type.standard_type.gen_id = 0;
+		evt->sel_type.standard_type.evm_rev = 0;
+		evt->sel_type.standard_type.sensor_type = 0;
+		evt->sel_type.standard_type.sensor_num = 0;
+		evt->sel_type.standard_type.event_type = 0;
+		evt->sel_type.standard_type.event_dir = 0;
+		evt->sel_type.standard_type.event_data[0] = 0;
+		evt->sel_type.standard_type.event_data[1] = 0;
+		evt->sel_type.standard_type.event_data[2] = 0;
+	}
+	else if (evt->record_type < 0xe0)
+	{
+		evt->sel_type.oem_ts_type.timestamp = 0;
+		evt->sel_type.oem_ts_type.manf_id[0] = 0;
+		evt->sel_type.oem_ts_type.manf_id[1] = 0;
+		evt->sel_type.oem_ts_type.manf_id[2] = 0;
+		for(data_count=0; data_count < SEL_OEM_TS_DATA_LEN ; data_count++)
+			evt->sel_type.oem_ts_type.oem_defined[data_count] = 0;
+	}
+	else
+	{
+		for(data_count=0; data_count < SEL_OEM_NOTS_DATA_LEN ; data_count++)
+			evt->sel_type.oem_nots_type.oem_defined[data_count] = 0;
+	}
+
+	/* save response into SEL event structure */
+	evt->record_id = (rsp->data[3] << 8) | rsp->data[2];
+	evt->record_type = rsp->data[4];
+	if (evt->record_type < 0xc0)
+	{
+    		evt->sel_type.standard_type.timestamp = (rsp->data[8] << 24) |	(rsp->data[7] << 16) |
+    			(rsp->data[6] << 8) | rsp->data[5];
+    		evt->sel_type.standard_type.gen_id = (rsp->data[10] << 8) | rsp->data[9];
+    		evt->sel_type.standard_type.evm_rev = rsp->data[11];
+    		evt->sel_type.standard_type.sensor_type = rsp->data[12];
+    		evt->sel_type.standard_type.sensor_num = rsp->data[13];
+    		evt->sel_type.standard_type.event_type = rsp->data[14] & 0x7f;
+    		evt->sel_type.standard_type.event_dir = (rsp->data[14] & 0x80) >> 7;
+    		evt->sel_type.standard_type.event_data[0] = rsp->data[15];
+    		evt->sel_type.standard_type.event_data[1] = rsp->data[16];
+    		evt->sel_type.standard_type.event_data[2] = rsp->data[17];
+  	}
+  	else if (evt->record_type < 0xe0)
+  	{
+    		evt->sel_type.oem_ts_type.timestamp= (rsp->data[8] << 24) |	(rsp->data[7] << 16) |
+    			(rsp->data[6] << 8) | rsp->data[5];
+		evt->sel_type.oem_ts_type.manf_id[0]= rsp->data[11];
+		evt->sel_type.oem_ts_type.manf_id[1]= rsp->data[10];
+		evt->sel_type.oem_ts_type.manf_id[2]= rsp->data[9];
+  		for(data_count=0; data_count < SEL_OEM_TS_DATA_LEN ; data_count++)
+      			evt->sel_type.oem_ts_type.oem_defined[data_count] = rsp->data[(data_count+12)];
+  	}
+  	else
+  	{
+  		for(data_count=0; data_count < SEL_OEM_NOTS_DATA_LEN ; data_count++)
+      			evt->sel_type.oem_nots_type.oem_defined[data_count] = rsp->data[(data_count+5)];
+	}
+	return next;
+}
+
+static void
+ipmi_sel_print_event_file(struct ipmi_intf * intf, struct sel_event_record * evt, FILE * fp)
+{
+	char * description;
+
+	if (fp == NULL)
+		return;
+
+	ipmi_get_event_desc(intf, evt, &description);
+
+	fprintf(fp, "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x # %s #0x%02x %s\n",
+		evt->sel_type.standard_type.evm_rev,
+		evt->sel_type.standard_type.sensor_type,
+		evt->sel_type.standard_type.sensor_num,
+		evt->sel_type.standard_type.event_type | (evt->sel_type.standard_type.event_dir << 7),
+		evt->sel_type.standard_type.event_data[0],
+		evt->sel_type.standard_type.event_data[1],
+		evt->sel_type.standard_type.event_data[2],
+		ipmi_get_sensor_type(intf, evt->sel_type.standard_type.sensor_type),
+		evt->sel_type.standard_type.sensor_num,
+		(description != NULL) ? description : "Unknown");
+
+	if (description != NULL) {
+		free(description);
+		description = NULL;
+	}
+}
+
+void
+ipmi_sel_print_extended_entry(struct ipmi_intf * intf, struct sel_event_record * evt)
+{
+	sel_extended++;
+	ipmi_sel_print_std_entry(intf, evt);
+	sel_extended--;
+}
+
+void
+ipmi_sel_print_std_entry(struct ipmi_intf * intf, struct sel_event_record * evt)
+{
+	char * description;
+	struct sdr_record_list * sdr = NULL;
+	int data_count;
+
+	if (sel_extended && (evt->record_type < 0xc0))
+		sdr = ipmi_sdr_find_sdr_bynumtype(intf, evt->sel_type.standard_type.gen_id, evt->sel_type.standard_type.sensor_num, evt->sel_type.standard_type.sensor_type);
+
+
+	if (!evt)
+		return;
+
+	if (csv_output)
+		printf("%x,", evt->record_id);
+	else
+		printf("%4x | ", evt->record_id);
+
+	if (evt->record_type == 0xf0)
+	{
+		if (csv_output)
+			printf(",,");
+
+		printf ("Linux kernel panic: %.11s\n", (char *) evt + 5);
+		return;
+	}
+
+	if (evt->record_type < 0xe0)
+	{
+		if ((evt->sel_type.standard_type.timestamp < 0x20000000)||(evt->sel_type.oem_ts_type.timestamp <  0x20000000)){
+			printf(" Pre-Init "); 
+
+			if (csv_output)
+				printf(",");
+			else
+				printf(" |");
+
+			printf("%010d", evt->sel_type.standard_type.timestamp );
+			if (csv_output)
+				printf(",");
+			else
+				printf("| ");
+		}
+		else {
+			if (evt->record_type < 0xc0)
+				printf("%s", ipmi_sel_timestamp_date(evt->sel_type.standard_type.timestamp));
+			else
+        			printf("%s", ipmi_sel_timestamp_date(evt->sel_type.oem_ts_type.timestamp));
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+				
+			if (evt->record_type < 0xc0)
+				printf("%s", ipmi_sel_timestamp_time(evt->sel_type.standard_type.timestamp));
+			else
+        			printf("%s", ipmi_sel_timestamp_time(evt->sel_type.oem_ts_type.timestamp));
+
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+		}
+
+	}
+	else
+	{
+		if (csv_output)
+			printf(",,");
+	}
+
+	if (evt->record_type >= 0xc0)
+	{
+		printf ("OEM record %02x", evt->record_type);
+		if (csv_output)
+			printf(",");
+		else
+			printf(" | ");
+
+		if(evt->record_type <= 0xdf)
+		{
+			printf ("%02x%02x%02x", evt->sel_type.oem_ts_type.manf_id[0], evt->sel_type.oem_ts_type.manf_id[1], evt->sel_type.oem_ts_type.manf_id[2]);
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+			for(data_count=0;data_count < SEL_OEM_TS_DATA_LEN;data_count++)
+				printf("%02x", evt->sel_type.oem_ts_type.oem_defined[data_count]);
+		}
+		else
+		{
+			for(data_count=0;data_count < SEL_OEM_NOTS_DATA_LEN;data_count++)
+				printf("%02x", evt->sel_type.oem_nots_type.oem_defined[data_count]);
+		}
+		ipmi_sel_oem_message(evt, 0);
+		printf ("\n");
+		return;
+	}
+
+	/* lookup SDR entry based on sensor number and type */
+	if (sdr != NULL) {
+		printf("%s ", ipmi_get_sensor_type(intf,
+			evt->sel_type.standard_type.sensor_type));
+		switch (sdr->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+			printf("%s", sdr->record.full->id_string);
+			break;
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			printf("%s", sdr->record.compact->id_string);
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			printf("%s", sdr->record.eventonly->id_string);
+			break;
+		case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
+			printf("%s", sdr->record.fruloc->id_string);
+			break;
+		case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+			printf("%s", sdr->record.mcloc->id_string);
+			break;
+		case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
+			printf("%s", sdr->record.genloc->id_string);
+			break;
+		default:
+			printf("#%02x", evt->sel_type.standard_type.sensor_num);
+			break;
+		}
+	} else {
+		printf("%s", ipmi_get_sensor_type(intf,
+				evt->sel_type.standard_type.sensor_type));
+		if (evt->sel_type.standard_type.sensor_num != 0)
+			printf(" #0x%02x", evt->sel_type.standard_type.sensor_num);
+	}
+
+	if (csv_output)
+		printf(",");
+	else
+		printf(" | ");
+
+	ipmi_get_event_desc(intf, evt, &description);
+	if (description) {
+		printf("%s", description);
+		free(description);
+		description = NULL;
+	}
+
+	if (csv_output) {
+		printf(",");
+	} else {
+		printf(" | ");
+	}
+
+	if (evt->sel_type.standard_type.event_dir) {
+		printf("Deasserted");
+	} else {
+		printf("Asserted");
+	}
+
+	if (sdr != NULL && evt->sel_type.standard_type.event_type == 1) {
+		/*
+		 * Threshold Event
+		 */
+		float trigger_reading = 0.0;
+		float threshold_reading = 0.0;
+		uint8_t threshold_reading_provided = 0;
+
+		/* trigger reading in event data byte 2 */
+		if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) {
+			trigger_reading = sdr_convert_sensor_reading(
+				sdr->record.full, evt->sel_type.standard_type.event_data[1]);
+		}
+
+		/* trigger threshold in event data byte 3 */
+		if (((evt->sel_type.standard_type.event_data[0] >> 4) & 3) == 1) {
+			threshold_reading = sdr_convert_sensor_reading(
+				sdr->record.full, evt->sel_type.standard_type.event_data[2]);
+			threshold_reading_provided = 1;
+		}
+
+		if (csv_output)
+			printf(",");
+		else
+			printf(" | ");
+		
+		printf("Reading %.*f",
+				(trigger_reading==(int)trigger_reading) ? 0 : 2,
+				trigger_reading);
+		if (threshold_reading_provided) {
+			printf(" %s Threshold %.*f %s",
+					((evt->sel_type.standard_type.event_data[0] & 0xf) % 2) ? ">" : "<",
+					(threshold_reading==(int)threshold_reading) ? 0 : 2,
+					threshold_reading,
+					ipmi_sdr_get_unit_string(sdr->record.common->unit.pct,
+						sdr->record.common->unit.modifier,
+						sdr->record.common->unit.type.base,
+						sdr->record.common->unit.type.modifier));
+		}
+	}
+	else if (evt->sel_type.standard_type.event_type == 0x6f) {
+		int print_sensor = 1;
+		switch (ipmi_get_oem(intf)) {
+			case IPMI_OEM_SUPERMICRO:
+			case IPMI_OEM_SUPERMICRO_47488:
+				print_sensor = 0;
+			 break;
+			default:
+			 break;
+		}
+		/*
+		 * Sensor-Specific Discrete
+		 */
+		if (print_sensor && evt->sel_type.standard_type.sensor_type == 0xC && /*TODO*/
+		    evt->sel_type.standard_type.sensor_num == 0 &&
+		    (evt->sel_type.standard_type.event_data[0] & 0x30) == 0x20) {
+			/* break down memory ECC reporting if we can */
+			if (csv_output)
+				printf(",");
+			else
+				printf(" | ");
+
+			printf("CPU %d DIMM %d",
+			       evt->sel_type.standard_type.event_data[2] & 0x0f,
+			       (evt->sel_type.standard_type.event_data[2] & 0xf0) >> 4);
+		}
+	}
+
+	printf("\n");
+}
+
+void
+ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt)
+{
+  char * description;
+  int data_count;
+  	
+	if (!evt)
+		return;
+
+	printf("SEL Record ID          : %04x\n", evt->record_id);
+
+	if (evt->record_type == 0xf0)
+	{
+		printf (" Record Type           : Linux kernel panic (OEM record %02x)\n", evt->record_type);
+		printf (" Panic string          : %.11s\n\n", (char *) evt + 5);
+		return;
+	}
+
+	printf(" Record Type           : %02x", evt->record_type);
+	if (evt->record_type >= 0xc0)
+	{
+		if (evt->record_type < 0xe0)
+			printf("  (OEM timestamped)");
+		else
+			printf("  (OEM non-timestamped)");
+	}
+	printf("\n");
+  
+	if (evt->record_type < 0xe0)
+	{
+		printf(" Timestamp             : ");
+		if (evt->record_type < 0xc0)
+			printf("%s %s", ipmi_sel_timestamp_date(evt->sel_type.standard_type.timestamp),
+				ipmi_sel_timestamp_time(evt->sel_type.standard_type.timestamp));
+		else
+			printf("%s %s", ipmi_sel_timestamp_date(evt->sel_type.oem_ts_type.timestamp),
+				ipmi_sel_timestamp_time(evt->sel_type.oem_ts_type.timestamp));
+		printf("\n");
+	}
+
+	if (evt->record_type >= 0xc0)
+	{
+		if(evt->record_type <= 0xdf)
+		{
+			printf (" Manufactacturer ID    : %02x%02x%02x\n", evt->sel_type.oem_ts_type.manf_id[0],
+			evt->sel_type.oem_ts_type.manf_id[1], evt->sel_type.oem_ts_type.manf_id[2]);
+			printf (" OEM Defined           : ");
+			for(data_count=0;data_count < SEL_OEM_TS_DATA_LEN;data_count++)
+				printf("%02x", evt->sel_type.oem_ts_type.oem_defined[data_count]);
+			printf(" [%s]\n\n",hex2ascii (evt->sel_type.oem_ts_type.oem_defined, SEL_OEM_TS_DATA_LEN));
+		}
+		else
+		{
+			printf (" OEM Defined           : ");
+			for(data_count=0;data_count < SEL_OEM_NOTS_DATA_LEN;data_count++)
+				printf("%02x", evt->sel_type.oem_nots_type.oem_defined[data_count]);
+			printf(" [%s]\n\n",hex2ascii (evt->sel_type.oem_nots_type.oem_defined, SEL_OEM_NOTS_DATA_LEN));
+			ipmi_sel_oem_message(evt, 1);
+		}
+		return;
+	}
+	
+	printf(" Generator ID          : %04x\n",
+	       evt->sel_type.standard_type.gen_id);
+	printf(" EvM Revision          : %02x\n",
+	       evt->sel_type.standard_type.evm_rev);
+	printf(" Sensor Type           : %s\n",
+			ipmi_get_sensor_type(intf,
+					evt->sel_type.standard_type.sensor_type));
+	printf(" Sensor Number         : %02x\n",
+	       evt->sel_type.standard_type.sensor_num);
+	printf(" Event Type            : %s\n",
+	       ipmi_get_event_type(evt->sel_type.standard_type.event_type));
+	printf(" Event Direction       : %s\n",
+	       val2str(evt->sel_type.standard_type.event_dir, event_dir_vals));
+	printf(" Event Data            : %02x%02x%02x\n",
+	       evt->sel_type.standard_type.event_data[0], evt->sel_type.standard_type.event_data[1], evt->sel_type.standard_type.event_data[2]);
+        ipmi_get_event_desc(intf, evt, &description);
+	printf(" Description           : %s\n",
+               description ? description : "");
+        free(description);
+				description = NULL;
+
+	printf("\n");
+}
+
+
+void
+ipmi_sel_print_extended_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt)
+{
+	struct sdr_record_list * sdr;
+	char * description;
+
+	if (!evt)
+		return;
+	
+	sdr = ipmi_sdr_find_sdr_bynumtype(intf,
+					  evt->sel_type.standard_type.gen_id,
+					  evt->sel_type.standard_type.sensor_num,
+					  evt->sel_type.standard_type.sensor_type);
+	if (sdr == NULL) 
+	{
+	    ipmi_sel_print_std_entry_verbose(intf, evt);
+		return;
+	}
+
+	printf("SEL Record ID          : %04x\n", evt->record_id);
+
+	if (evt->record_type == 0xf0)
+	{
+		printf (" Record Type           : "
+			"Linux kernel panic (OEM record %02x)\n",
+			evt->record_type);
+		printf (" Panic string          : %.11s\n\n",
+			(char *) evt + 5);
+		return;
+	}
+
+	printf(" Record Type           : %02x\n", evt->record_type);
+	if (evt->record_type < 0xe0)
+	{
+		printf(" Timestamp             : ");
+		printf("%s %s\n", ipmi_sel_timestamp_date(evt->sel_type.standard_type.timestamp),
+		ipmi_sel_timestamp_time(evt->sel_type.standard_type.timestamp));
+	}
+
+
+	printf(" Generator ID          : %04x\n",
+	       evt->sel_type.standard_type.gen_id);
+	printf(" EvM Revision          : %02x\n",
+	       evt->sel_type.standard_type.evm_rev);
+	printf(" Sensor Type           : %s\n",
+	       ipmi_get_sensor_type(intf, evt->sel_type.standard_type.sensor_type));
+	printf(" Sensor Number         : %02x\n",
+	       evt->sel_type.standard_type.sensor_num);
+	printf(" Event Type            : %s\n",
+	       ipmi_get_event_type(evt->sel_type.standard_type.event_type));
+	printf(" Event Direction       : %s\n",
+	       val2str(evt->sel_type.standard_type.event_dir, event_dir_vals));
+	printf(" Event Data (RAW)      : %02x%02x%02x\n",
+	       evt->sel_type.standard_type.event_data[0], evt->sel_type.standard_type.event_data[1], evt->sel_type.standard_type.event_data[2]);
+
+	/* break down event data field
+	 * as per IPMI Spec 2.0 Table 29-6 */
+	if (evt->sel_type.standard_type.event_type == 1 && sdr->type == SDR_RECORD_TYPE_FULL_SENSOR) {
+		/* Threshold */
+		switch ((evt->sel_type.standard_type.event_data[0] >> 6) & 3) {  /* EV1[7:6] */
+		case 0:
+			/* unspecified byte 2 */
+			break;
+		case 1:
+			/* trigger reading in byte 2 */
+			printf(" Trigger Reading       : %.3f",
+			       sdr_convert_sensor_reading(sdr->record.full,
+							  evt->sel_type.standard_type.event_data[1]));
+			/* determine units with possible modifiers */
+			printf ("%s\n", ipmi_sdr_get_unit_string(sdr->record.common->unit.pct,
+								 sdr->record.common->unit.modifier,
+								 sdr->record.common->unit.type.base,
+								 sdr->record.common->unit.type.modifier));
+			break;
+		case 2:
+			/* oem code in byte 2 */
+			printf(" OEM Data              : %02x\n",
+			       evt->sel_type.standard_type.event_data[1]);
+			break;
+		case 3:
+			/* sensor-specific extension code in byte 2 */
+			printf(" Sensor Extension Code : %02x\n",
+			       evt->sel_type.standard_type.event_data[1]);
+			break;
+		}
+		switch ((evt->sel_type.standard_type.event_data[0] >> 4) & 3) {   /* EV1[5:4] */
+		case 0:
+			/* unspecified byte 3 */
+			break;
+		case 1:
+			/* trigger threshold value in byte 3 */
+			printf(" Trigger Threshold     : %.3f",
+			       sdr_convert_sensor_reading(sdr->record.full,
+							  evt->sel_type.standard_type.event_data[2]));
+			/* determine units with possible modifiers */
+			printf ("%s\n", ipmi_sdr_get_unit_string(sdr->record.common->unit.pct,
+								 sdr->record.common->unit.modifier,
+								 sdr->record.common->unit.type.base,
+								 sdr->record.common->unit.type.modifier));
+			break;
+		case 2:
+			/* OEM code in byte 3 */
+			printf(" OEM Data              : %02x\n",
+			       evt->sel_type.standard_type.event_data[2]);
+			break;
+		case 3:
+			/* sensor-specific extension code in byte 3 */
+			printf(" Sensor Extension Code : %02x\n",
+			       evt->sel_type.standard_type.event_data[2]);
+			break;
+		}
+	} else if (evt->sel_type.standard_type.event_type >= 0x2 && evt->sel_type.standard_type.event_type <= 0xc) {
+		/* Generic Discrete */
+	} else if (evt->sel_type.standard_type.event_type == 0x6f) {
+
+		/* Sensor-Specific Discrete */
+		if (evt->sel_type.standard_type.sensor_type == 0xC &&		   
+		    evt->sel_type.standard_type.sensor_num  == 0 &&			 /**** THIS LOOK TO BE OEM ****/
+		    (evt->sel_type.standard_type.event_data[0] & 0x30) == 0x20)
+		{
+			/* break down memory ECC reporting if we can */
+			printf(" Event Data            : CPU %d DIMM %d\n",
+			       evt->sel_type.standard_type.event_data[2] & 0x0f,
+			       (evt->sel_type.standard_type.event_data[2] & 0xf0) >> 4);
+		}
+		else if(
+				evt->sel_type.standard_type.sensor_type == 0x2b &&   /* Version change */
+				evt->sel_type.standard_type.event_data[0] == 0xC1	 /* Data in Data 2 */
+			   )
+			    
+		{
+			//evt->sel_type.standard_type.event_data[1]
+		}
+		else 
+		{
+			/* FIXME : Add sensor specific discrete types */
+			printf(" Event Interpretation  : Missing\n");
+		}
+	} else if (evt->sel_type.standard_type.event_type >= 0x70 && evt->sel_type.standard_type.event_type <= 0x7f) {
+		/* OEM */
+	} else {
+		printf(" Event Data            : %02x%02x%02x\n",
+		       evt->sel_type.standard_type.event_data[0], evt->sel_type.standard_type.event_data[1], evt->sel_type.standard_type.event_data[2]);
+	}
+
+        ipmi_get_event_desc(intf, evt, &description);
+	printf(" Description           : %s\n",
+               description ? description : "");
+        free(description);
+				description = NULL;
+
+	printf("\n");
+}
+
+static int
+__ipmi_sel_savelist_entries(struct ipmi_intf * intf, int count, const char * savefile,
+							int binary)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint16_t next_id = 0, curr_id = 0;
+	struct sel_event_record evt;
+	int n=0;
+	FILE * fp = NULL;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SEL Info command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SEL Info command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "sel_info");
+
+	if (rsp->data[1] == 0 && rsp->data[2] == 0) {
+		lprintf(LOG_ERR, "SEL has no entries");
+		return 0;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_RESERVE_SEL;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Reserve SEL command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Reserve SEL command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	if (count < 0) {
+		/** Show only the most recent 'count' records. */
+		int i;
+		uint16_t entries;
+
+		req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Get SEL Info command failed");
+			return -1;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Get SEL Info command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			return -1;
+		}
+		entries = buf2short(rsp->data + 1);
+		if (-count > entries)
+			count = -entries;
+
+		for(i = 0; i < entries + count; i++) {
+			next_id = ipmi_sel_get_std_entry(intf, next_id, &evt);
+			if (next_id == 0) {
+				/*
+				 * usually next_id of zero means end but
+				 * retry because some hardware has quirks
+				 * and will return 0 randomly.
+				 */
+				next_id = ipmi_sel_get_std_entry(intf, next_id, &evt);
+				if (next_id == 0) {
+					break;
+				}
+			}
+		}
+	}
+
+	if (savefile != NULL) {
+		fp = ipmi_open_file_write(savefile);
+	}
+
+	while (next_id != 0xffff) {
+		curr_id = next_id;
+		lprintf(LOG_DEBUG, "SEL Next ID: %04x", curr_id);
+
+		next_id = ipmi_sel_get_std_entry(intf, curr_id, &evt);
+		if (next_id == 0) {
+			/*
+			 * usually next_id of zero means end but
+			 * retry because some hardware has quirks
+			 * and will return 0 randomly.
+			 */
+			next_id = ipmi_sel_get_std_entry(intf, curr_id, &evt);
+			if (next_id == 0)
+				break;
+		}
+
+		if (verbose)
+			ipmi_sel_print_std_entry_verbose(intf, &evt);
+		else
+			ipmi_sel_print_std_entry(intf, &evt);
+
+		if (fp != NULL) {
+			if (binary)
+				fwrite(&evt, 1, 16, fp);
+			else
+				ipmi_sel_print_event_file(intf, &evt, fp);
+		}
+
+		if (++n == count) {
+			break;
+		}
+	}
+
+	if (fp != NULL)
+		fclose(fp);
+
+	return 0;
+}
+
+static int
+ipmi_sel_list_entries(struct ipmi_intf * intf, int count)
+{
+	return __ipmi_sel_savelist_entries(intf, count, NULL, 0);
+}
+
+static int
+ipmi_sel_save_entries(struct ipmi_intf * intf, int count, const char * savefile)
+{
+	return __ipmi_sel_savelist_entries(intf, count, savefile, 0);
+}
+
+/*
+ * ipmi_sel_interpret
+ *
+ * return 0 on success,
+ *        -1 on error
+ */
+static int
+ipmi_sel_interpret(struct ipmi_intf *intf, unsigned long iana,
+		const char *readfile, const char *format)
+{
+	FILE *fp = 0;
+	struct sel_event_record evt;
+	char *buffer = NULL;
+	char *cursor = NULL;
+	int status = 0;
+	/* since the interface is not used, iana is taken from
+	 * the command line
+	 */
+	sel_iana = iana;
+	if (strncmp("pps", format, 3) == 0) {
+		/* Parser for the following format */
+		/* 0x001F: Event: at Mar 27 06:41:10 2007;from:(0x9a,0,7);
+		 * sensor:(0xc3,119); event:0x6f(asserted): 0xA3 0x00 0x88
+		 * commonly found in PPS shelf managers
+		 * Supports a tweak for hotswap events that are already interpreted.
+		 */
+		fp = ipmi_open_file(readfile, 0);
+		if (fp == NULL) {
+			lprintf(LOG_ERR, "Failed to open file '%s' for reading.",
+					readfile);
+			return (-1);
+		}
+		buffer = (char *)malloc((size_t)256);
+		if (buffer == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			fclose(fp);
+			return (-1);
+		}
+		do {
+			/* Only allow complete lines to be parsed,
+			 * hardcoded maximum line length
+			 */
+			if (fgets(buffer, 256, fp) == NULL) {
+				status = (-1);
+				break;
+			}
+			if (strlen(buffer) > 255) {
+				lprintf(LOG_ERR, "ipmitool: invalid entry found in file.");
+				continue;
+			}
+			cursor = buffer;
+			/* assume normal "System" event */
+			evt.record_type = 2;
+			errno = 0;
+			evt.record_id = strtol((const char *)cursor, (char **)NULL, 16);
+			if (errno != 0) {
+				lprintf(LOG_ERR, "Invalid record ID.");
+				status = (-1);
+				break;
+			}	
+			evt.sel_type.standard_type.evm_rev = 4;
+
+			/* FIXME: convert*/
+			/* evt.sel_type.standard_type.timestamp; */
+
+			/* skip timestamp */
+			cursor = index((const char *)cursor, ';');
+			cursor++;
+
+			/* FIXME: parse originator */
+			evt.sel_type.standard_type.gen_id = 0x0020;
+
+			/* skip  originator info */
+			cursor = index((const char *)cursor, ';');
+			cursor++;
+
+			/* Get sensor type */
+			cursor = index((const char *)cursor, '(');
+			cursor++;
+
+			errno = 0;
+			evt.sel_type.standard_type.sensor_type =
+				strtol((const char *)cursor, (char **)NULL, 16);
+			if (errno != 0) {
+				lprintf(LOG_ERR, "Invalid Sensor Type.");
+				status = (-1);
+				break;
+			}	
+			cursor = index((const char *)cursor, ',');
+			cursor++;
+
+			errno = 0;
+			evt.sel_type.standard_type.sensor_num =
+				strtol((const char *)cursor, (char **)NULL, 10);
+			if (errno != 0) {
+				lprintf(LOG_ERR, "Invalid Sensor Number.");
+				status = (-1);
+				break;
+			}	
+
+			/* skip  to event type  info */
+			cursor = index((const char *)cursor, ':');
+			cursor++;
+
+			errno = 0;
+			evt.sel_type.standard_type.event_type=
+				strtol((const char *)cursor, (char **)NULL, 16);
+			if (errno != 0) {
+				lprintf(LOG_ERR, "Invalid Event Type.");
+				status = (-1);
+				break;
+			}	
+
+			/* skip  to event dir  info */
+			cursor = index((const char *)cursor, '(');
+			cursor++;
+			if (*cursor == 'a') {
+				evt.sel_type.standard_type.event_dir = 0;
+			} else {
+				evt.sel_type.standard_type.event_dir = 1;
+			}
+			/* skip  to data info */
+			cursor = index((const char *)cursor, ' ');
+			cursor++;
+
+			if (evt.sel_type.standard_type.sensor_type == 0xF0) {
+				/* got to FRU id */
+				while (!isdigit(*cursor)) {
+					cursor++;
+				}
+				/* store FRUid */
+				errno = 0;
+				evt.sel_type.standard_type.event_data[2] =
+					strtol(cursor, (char **)NULL, 10);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#2.");
+					status = (-1);
+					break;
+				}	
+
+				/* Get to previous state */
+				cursor = index((const char *)cursor, 'M');
+				cursor++;
+
+				/* Set previous state */
+				errno = 0;
+				evt.sel_type.standard_type.event_data[1] =
+					strtol(cursor, (char **)NULL, 10);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#1.");
+					status = (-1);
+					break;
+				}	
+
+				/* Get to current state */
+				cursor = index((const char *)cursor, 'M');
+				cursor++;
+
+				/* Set current state */
+				errno = 0;
+				evt.sel_type.standard_type.event_data[0] =
+					0xA0 | strtol(cursor, (char **)NULL, 10);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#0.");
+					status = (-1);
+					break;
+				}	
+
+				/* skip  to cause */
+				cursor = index((const char *)cursor, '=');
+				cursor++;
+				errno = 0;
+				evt.sel_type.standard_type.event_data[1] |=
+					(strtol(cursor, (char **)NULL, 16)) << 4;
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#1.");
+					status = (-1);
+					break;
+				}	
+			} else if (*cursor == '0') {
+				errno = 0;
+				evt.sel_type.standard_type.event_data[0] =
+					strtol((const char *)cursor, (char **)NULL, 16);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#0.");
+					status = (-1);
+					break;
+				}	
+				cursor = index((const char *)cursor, ' ');
+				cursor++;
+
+				errno = 0;
+				evt.sel_type.standard_type.event_data[1] =
+					strtol((const char *)cursor, (char **)NULL, 16);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#1.");
+					status = (-1);
+					break;
+				}	
+
+				cursor = index((const char *)cursor, ' ');
+				cursor++;
+
+				errno = 0;
+				evt.sel_type.standard_type.event_data[2] =
+					strtol((const char *)cursor, (char **)NULL, 16);
+				if (errno != 0) {
+					lprintf(LOG_ERR, "Invalid Event Data#2.");
+					status = (-1);
+					break;
+				}	
+			} else {
+				lprintf(LOG_ERR, "ipmitool: can't guess format.");
+			}
+			/* parse the PPS line into a sel_event_record */
+			if (verbose) {
+				ipmi_sel_print_std_entry_verbose(intf, &evt);
+			} else {
+				ipmi_sel_print_std_entry(intf, &evt);
+			}
+			cursor = NULL;
+		} while (status == 0); /* until file is completely read */
+		cursor = NULL;
+		free(buffer);
+		buffer = NULL;
+		fclose(fp);
+	} else {
+		lprintf(LOG_ERR, "Given format '%s' is unknown.", format);
+		status = (-1);
+	}
+	return status;
+}
+
+
+static int
+ipmi_sel_writeraw(struct ipmi_intf * intf, const char * savefile)
+{
+    return __ipmi_sel_savelist_entries(intf, 0, savefile, 1);
+}
+
+
+static int
+ipmi_sel_readraw(struct ipmi_intf * intf, const char * inputfile)
+{
+	struct sel_event_record evt;
+	int ret = 0;
+	FILE* fp = 0;
+
+	fp = ipmi_open_file(inputfile, 0);
+	if (fp)
+	{
+		size_t bytesRead;
+
+		do {
+			if ((bytesRead = fread(&evt, 1, 16, fp)) == 16)
+			{
+				if (verbose)
+					ipmi_sel_print_std_entry_verbose(intf, &evt);
+				else
+					ipmi_sel_print_std_entry(intf, &evt);
+			}
+			else
+			{
+				if (bytesRead != 0)
+				{
+					lprintf(LOG_ERR, "ipmitool: incomplete record found in file.");
+					ret = -1;
+				}
+				
+				break;
+			}
+
+		} while (1);
+		fclose(fp);
+	}
+	else
+	{
+		lprintf(LOG_ERR, "ipmitool: could not open input file.");
+		ret = -1;
+	}
+	return ret;
+}
+
+
+
+static uint16_t
+ipmi_sel_reserve(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_RESERVE_SEL;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_WARN, "Unable to reserve SEL");
+		return 0;
+	}
+	if (rsp->ccode > 0) {
+		printf("Unable to reserve SEL: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return 0;
+	}
+
+	return (rsp->data[0] | (rsp->data[1] << 8));
+}
+
+
+
+/*
+ * ipmi_sel_get_time
+ *
+ * return 0 on success,
+ *        -1 on error
+ */
+static int
+ipmi_sel_get_time(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	static char tbuf[40];
+	uint32_t timei;
+	time_t time;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd   = IPMI_GET_SEL_TIME;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SEL Time command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SEL Time command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+	if (rsp->data_len != 4) {
+		lprintf(LOG_ERR, "Get SEL Time command failed: "
+			"Invalid data length %d", rsp->data_len);
+		return -1;
+	}
+
+	memcpy(&timei, rsp->data, 4);
+#if WORDS_BIGENDIAN
+	time = (time_t)(BSWAP_32(timei));
+#else
+	time = (time_t)timei;
+#endif
+
+	strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", gmtime(&time));
+	printf("%s\n", tbuf);
+
+	return 0;
+}
+
+
+
+/*
+ * ipmi_sel_set_time
+ *
+ * return 0 on success,
+ *        -1 on error
+ */
+static int
+ipmi_sel_set_time(struct ipmi_intf * intf, const char * time_string)
+{
+	struct ipmi_rs     * rsp;
+	struct ipmi_rq       req;
+	struct tm            tm = {0};
+	time_t               t;
+	uint32_t	     timei;
+	const char *         time_format = "%m/%d/%Y %H:%M:%S";
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_STORAGE;
+	req.msg.cmd      = IPMI_SET_SEL_TIME;
+
+	/* See if user requested set to current client system time */
+	if (strncasecmp(time_string, "now", 3) == 0) {
+		t = time(NULL);
+	}
+	else {
+		/* Now how do we get our time_t from our ascii version? */
+		if (strptime(time_string, time_format, &tm) == 0) {
+			lprintf(LOG_ERR, "Specified time could not be parsed");
+			return -1;
+		}
+		tm.tm_isdst = (-1); /* look up DST information */
+		t = mktime(&tm);
+		if (t < 0) {
+			lprintf(LOG_ERR, "Specified time could not be parsed");
+			return -1;
+		}
+	}
+
+	{
+		//modify UTC time to local time expressed in number of seconds from 1/1/70 0:0:0 1970 GMT
+		struct tm * tm_tmp = {0};
+		int gt_year,gt_yday,gt_hour,gt_min,lt_year,lt_yday,lt_hour,lt_min;
+		int delta_hour;
+		tm_tmp=gmtime(&t);
+		gt_year=tm_tmp->tm_year;
+		gt_yday=tm_tmp->tm_yday;
+		gt_hour=tm_tmp->tm_hour;
+		gt_min=tm_tmp->tm_min;
+		memset(&*tm_tmp, 0, sizeof(struct tm));
+		tm_tmp=localtime(&t);
+		lt_year=tm_tmp->tm_year;
+		lt_yday=tm_tmp->tm_yday;
+		lt_hour=tm_tmp->tm_hour;
+		lt_min=tm_tmp->tm_min;
+		delta_hour=lt_hour - gt_hour;
+		if ( (lt_year > gt_year) || ((lt_year == gt_year) && (lt_yday > gt_yday)) )
+			delta_hour += 24;
+		if ( (lt_year < gt_year) || ((lt_year == gt_year) && (lt_yday < gt_yday)) )
+			delta_hour -= 24;
+
+		t += (delta_hour * 60 * 60) + (lt_min - gt_min) * 60;
+	}
+
+	timei = (uint32_t)t;
+	req.msg.data = (uint8_t *)&timei;
+	req.msg.data_len = 4;
+
+#if WORDS_BIGENDIAN
+	timei = BSWAP_32(timei);
+#endif
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set SEL Time command failed");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set SEL Time command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	ipmi_sel_get_time(intf);
+
+	return 0;
+}
+
+
+
+static int
+ipmi_sel_clear(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint16_t reserve_id;
+	uint8_t msg_data[6];
+
+	reserve_id = ipmi_sel_reserve(intf);
+	if (reserve_id == 0)
+		return -1;
+
+	memset(msg_data, 0, 6);
+	msg_data[0] = reserve_id & 0xff;
+	msg_data[1] = reserve_id >> 8;
+	msg_data[2] = 'C';
+	msg_data[3] = 'L';
+	msg_data[4] = 'R';
+	msg_data[5] = 0xaa;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_CLEAR_SEL;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to clear SEL");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Unable to clear SEL: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	printf("Clearing SEL.  Please allow a few seconds to erase.\n");
+	return 0;
+}
+
+static int
+ipmi_sel_delete(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint16_t id;
+	uint8_t msg_data[4];
+	int rc = 0;
+
+	if (argc == 0 || strncmp(argv[0], "help", 4) == 0) {
+		lprintf(LOG_ERR, "usage: delete <id>...<id>\n");
+		return -1;
+	}
+
+	id = ipmi_sel_reserve(intf);
+	if (id == 0)
+		return -1;
+
+	memset(msg_data, 0, 4);
+	msg_data[0] = id & 0xff;
+	msg_data[1] = id >> 8;
+
+	for (; argc != 0; argc--)
+	{
+		if (str2ushort(argv[argc-1], &id) != 0) {
+			lprintf(LOG_ERR, "Given SEL ID '%s' is invalid.",
+					argv[argc-1]);
+			rc = (-1);
+			continue;
+		}
+		msg_data[2] = id & 0xff;
+		msg_data[3] = id >> 8;
+
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_STORAGE;
+		req.msg.cmd = IPMI_CMD_DELETE_SEL_ENTRY;
+		req.msg.data = msg_data;
+		req.msg.data_len = 4;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Unable to delete entry %d", id);
+			rc = -1;
+		}
+		else if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Unable to delete entry %d: %s", id,
+				val2str(rsp->ccode, completion_code_vals));
+			rc = -1;
+		}
+		else {
+			printf("Deleted entry %d\n", id);
+		}
+	}
+
+	return rc;
+}
+
+static int
+ipmi_sel_show_entry(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct entity_id entity;
+	struct sdr_record_list *entry;
+	struct sdr_record_list *list;
+	struct sdr_record_list *sdr;
+	struct sel_event_record evt;
+	int i;
+	int oldv;
+	int rc = 0;
+	uint16_t id;
+
+	if (argc == 0 || strncmp(argv[0], "help", 4) == 0) {
+		lprintf(LOG_ERR, "usage: sel get <id>...<id>");
+		return (-1);
+	}
+
+	if (ipmi_sel_reserve(intf) == 0) {
+		lprintf(LOG_ERR, "Unable to reserve SEL");
+		return (-1);
+	}
+
+	for (i = 0; i < argc; i++) {
+		if (str2ushort(argv[i], &id) != 0) {
+			lprintf(LOG_ERR, "Given SEL ID '%s' is invalid.",
+					argv[i]);
+			rc = (-1);
+			continue;
+		}
+
+		lprintf(LOG_DEBUG, "Looking up SEL entry 0x%x", id);
+
+		/* lookup SEL entry based on ID */
+		if (!ipmi_sel_get_std_entry(intf, id, &evt)) {
+			lprintf(LOG_DEBUG, "SEL Entry 0x%x not found.", id);
+			rc = (-1);
+			continue;
+		}
+		if (evt.sel_type.standard_type.sensor_num == 0
+				&& evt.sel_type.standard_type.sensor_type == 0
+				&& evt.record_type == 0) {
+			lprintf(LOG_WARN, "SEL Entry 0x%x not found", id);
+			rc = (-1);
+			continue;
+		}
+
+		/* lookup SDR entry based on sensor number and type */
+		ipmi_sel_print_extended_entry_verbose(intf, &evt);
+
+		sdr = ipmi_sdr_find_sdr_bynumtype(intf,
+				evt.sel_type.standard_type.gen_id,
+				evt.sel_type.standard_type.sensor_num,
+				evt.sel_type.standard_type.sensor_type);
+		if (sdr == NULL) {
+			continue;
+		}
+
+		/* print SDR entry */
+		oldv = verbose;
+		verbose = verbose ? verbose : 1;
+		switch (sdr->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			ipmi_sensor_print_fc(intf, sdr->record.common,
+					     sdr->type);
+			entity.id = sdr->record.common->entity.id;
+			entity.instance = sdr->record.common->entity.instance;
+			break;
+		case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+			ipmi_sdr_print_sensor_eventonly(intf, sdr->record.eventonly);
+			entity.id = sdr->record.eventonly->entity.id;
+			entity.instance = sdr->record.eventonly->entity.instance;
+			break;
+		default:
+			verbose = oldv;
+			continue;
+		}
+		verbose = oldv;
+
+		/* lookup SDR entry based on entity id */
+		list = ipmi_sdr_find_sdr_byentity(intf, &entity);
+		for (entry=list; entry; entry=entry->next) {
+			/* print FRU devices we find for this entity */
+			if (entry->type == SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR)
+				ipmi_fru_print(intf, entry->record.fruloc);
+		}
+
+		if ((argc > 1) && (i < (argc - 1))) {
+			printf("----------------------\n\n");
+		}
+	}
+
+	return rc;
+}
+
+int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if (argc == 0)
+		rc = ipmi_sel_get_info(intf);
+	else if (strncmp(argv[0], "help", 4) == 0)
+		lprintf(LOG_ERR, "SEL Commands:  "
+				"info clear delete list elist get add time save readraw writeraw interpret");
+	else if (strncmp(argv[0], "interpret", 9) == 0) {
+		uint32_t iana = 0;
+		if (argc < 4) {
+			lprintf(LOG_NOTICE, "usage: sel interpret iana filename format(pps)");
+			return 0;
+		}
+		if (str2uint(argv[1], &iana) != 0) {
+			lprintf(LOG_ERR, "Given IANA '%s' is invalid.",
+					argv[1]);
+			return (-1);
+		}
+		rc = ipmi_sel_interpret(intf, iana, argv[2], argv[3]);
+	}
+	else if (strncmp(argv[0], "info", 4) == 0)
+		rc = ipmi_sel_get_info(intf);
+	else if (strncmp(argv[0], "save", 4) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_NOTICE, "usage: sel save <filename>");
+			return 0;
+		}
+		rc = ipmi_sel_save_entries(intf, 0, argv[1]);
+	}
+	else if (strncmp(argv[0], "add", 3) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_NOTICE, "usage: sel add <filename>");
+			return 0;
+		}
+		rc = ipmi_sel_add_entries_fromfile(intf, argv[1]);
+	}
+	else if (strncmp(argv[0], "writeraw", 8) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_NOTICE, "usage: sel writeraw <filename>");
+			return 0;
+		}
+		rc = ipmi_sel_writeraw(intf, argv[1]);
+	}
+	else if (strncmp(argv[0], "readraw", 7) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_NOTICE, "usage: sel readraw <filename>");
+			return 0;
+		}
+		rc = ipmi_sel_readraw(intf, argv[1]);
+	}
+	else if (strncmp(argv[0], "ereadraw", 8) == 0) {
+		if (argc < 2) {
+			lprintf(LOG_NOTICE, "usage: sel ereadraw <filename>");
+			return 0;
+		}
+		sel_extended = 1;
+		rc = ipmi_sel_readraw(intf, argv[1]);
+	}
+	else if (strncmp(argv[0], "list", 4) == 0 ||
+		 strncmp(argv[0], "elist", 5) == 0) {
+		/*
+		 * Usage:
+		 *	list           - show all SEL entries
+		 *  list first <n> - show the first (oldest) <n> SEL entries
+		 *  list last <n>  - show the last (newsest) <n> SEL entries
+		 */
+		int count = 0;
+		int sign = 1;
+		char *countstr = NULL;
+
+		if (strncmp(argv[0], "elist", 5) == 0)
+			sel_extended = 1;
+		else
+			sel_extended = 0;
+
+		if (argc == 2) {
+			countstr = argv[1];
+		}
+		else if (argc == 3) {
+			countstr = argv[2];
+
+			if (strncmp(argv[1], "last", 4) == 0) {
+				sign = -1;
+			}
+			else if (strncmp(argv[1], "first", 5) != 0) {
+				lprintf(LOG_ERR, "Unknown sel list option");
+				return -1;
+			}
+		}
+
+		if (countstr) {
+			if (str2int(countstr, &count) != 0) {
+				lprintf(LOG_ERR, "Numeric argument required; got '%s'",
+					countstr);
+				return -1;
+			}
+		}
+		count *= sign;
+
+		rc = ipmi_sel_list_entries(intf,count);
+	}
+	else if (strncmp(argv[0], "clear", 5) == 0)
+		rc = ipmi_sel_clear(intf);
+	else if (strncmp(argv[0], "delete", 6) == 0) {
+		if (argc < 2)
+			lprintf(LOG_ERR, "usage: sel delete <id>...<id>");
+		else
+			rc = ipmi_sel_delete(intf, argc-1, &argv[1]);
+	}
+	else if (strncmp(argv[0], "get", 3) == 0) {
+		if (argc < 2)
+			lprintf(LOG_ERR, "usage: sel get <entry>");
+		else
+			rc = ipmi_sel_show_entry(intf, argc-1, &argv[1]);
+	}
+	else if (strncmp(argv[0], "time", 4) == 0) {
+		if (argc < 2)
+			lprintf(LOG_ERR, "sel time commands: get set");
+		else if (strncmp(argv[1], "get", 3) == 0)
+			ipmi_sel_get_time(intf);
+		else if (strncmp(argv[1], "set", 3) == 0) {
+			if (argc < 3)
+				lprintf(LOG_ERR, "usage: sel time set \"mm/dd/yyyy hh:mm:ss\"");
+			else
+				rc = ipmi_sel_set_time(intf, argv[2]);
+		} else {
+			lprintf(LOG_ERR, "sel time commands: get set");
+		}
+	}
+	else {
+		lprintf(LOG_ERR, "Invalid SEL command: %s", argv[0]);
+		rc = -1;
+	}
+
+	return rc;
+}
diff --git a/lib/ipmi_sensor.c b/lib/ipmi_sensor.c
new file mode 100644
index 0000000..a0b7eb8
--- /dev/null
+++ b/lib/ipmi_sensor.c
@@ -0,0 +1,991 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <string.h>
+#include <math.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_sensor.h>
+
+extern int verbose;
+void print_sensor_get_usage();
+void print_sensor_thresh_usage();
+
+// Macro's for Reading the current sensor Data.
+#define SCANNING_DISABLED	0x40
+#define READING_UNAVAILABLE	0x20
+#define	INVALID_THRESHOLD	"Invalid Threshold data values. Cannot Set Threshold Data."
+// static
+int
+ipmi_sensor_get_sensor_reading_factors(
+	struct ipmi_intf * intf,
+	struct sdr_record_full_sensor * sensor,
+	uint8_t reading)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs * rsp;
+	uint8_t req_data[2];
+
+	char id[17];
+
+	if (intf == NULL || sensor == NULL)
+		return -1;
+
+	memset(id, 0, sizeof(id));
+	memcpy(id, sensor->id_string, 16);
+
+	req_data[0] = sensor->cmn.keys.sensor_num;
+	req_data[1] = reading;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = sensor->cmn.keys.lun;
+	req.msg.cmd   = GET_SENSOR_FACTORS;
+	req.msg.data  = req_data;
+	req.msg.data_len = sizeof(req_data);
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error updating reading factor for sensor %s (#%02x)",
+			id, sensor->cmn.keys.sensor_num);
+		return -1;
+	} else if (rsp->ccode) {
+		return -1;
+	} else {
+		/* Update SDR copy with updated Reading Factors for this reading */
+		/* Note:
+		 * The Format of the returned data is exactly as in the SDR definition (Little Endian Format),
+		 * therefore we can use raw copy operation here.
+		 * Note: rsp->data[0] would point to the next valid entry in the sampling table
+		 */
+		 // BUGBUG: uses 'hardcoded' length information from SDR Definition
+		memcpy(&sensor->mtol, &rsp->data[1], sizeof(sensor->mtol));
+		memcpy(&sensor->bacc, &rsp->data[3], sizeof(sensor->bacc));
+		return 0;
+	}
+
+}
+
+static
+struct ipmi_rs *
+ipmi_sensor_set_sensor_thresholds(struct ipmi_intf *intf,
+				  uint8_t sensor,
+				  uint8_t threshold, uint8_t setting,
+				  uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rq req;
+	static struct sensor_set_thresh_rq set_thresh_rq;
+	struct ipmi_rs *rsp;
+	uint8_t  bridged_request = 0;
+	uint32_t save_addr;
+	uint32_t save_channel;
+
+	memset(&set_thresh_rq, 0, sizeof (set_thresh_rq));
+	set_thresh_rq.sensor_num = sensor;
+	set_thresh_rq.set_mask = threshold;
+	if (threshold == UPPER_NON_RECOV_SPECIFIED)
+		set_thresh_rq.upper_non_recov = setting;
+	else if (threshold == UPPER_CRIT_SPECIFIED)
+		set_thresh_rq.upper_crit = setting;
+	else if (threshold == UPPER_NON_CRIT_SPECIFIED)
+		set_thresh_rq.upper_non_crit = setting;
+	else if (threshold == LOWER_NON_CRIT_SPECIFIED)
+		set_thresh_rq.lower_non_crit = setting;
+	else if (threshold == LOWER_CRIT_SPECIFIED)
+		set_thresh_rq.lower_crit = setting;
+	else if (threshold == LOWER_NON_RECOV_SPECIFIED)
+		set_thresh_rq.lower_non_recov = setting;
+	else
+		return NULL;
+
+	if (BRIDGE_TO_SENSOR(intf, target, channel)) {
+		bridged_request = 1;
+		save_addr = intf->target_addr;
+		intf->target_addr = target;
+		save_channel = intf->target_channel;
+		intf->target_channel = channel;
+	}
+	memset(&req, 0, sizeof (req));
+	req.msg.netfn = IPMI_NETFN_SE;
+	req.msg.lun = lun;
+	req.msg.cmd = SET_SENSOR_THRESHOLDS;
+	req.msg.data = (uint8_t *) & set_thresh_rq;
+	req.msg.data_len = sizeof (set_thresh_rq);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (bridged_request) {
+		intf->target_addr = save_addr;
+		intf->target_channel = save_channel;
+	}
+	return rsp;
+}
+
+static int
+ipmi_sensor_print_fc_discrete(struct ipmi_intf *intf,
+				struct sdr_record_common_sensor *sensor,
+				uint8_t sdr_record_type)
+{
+	struct sensor_reading *sr;
+
+	sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr_record_type, 3);
+
+	if (sr == NULL) {
+		return -1;
+	}
+
+	if (csv_output) {
+		/* NOT IMPLEMENTED */
+	} else {
+		if (verbose == 0) {
+			/* output format
+			 *   id value units status thresholds....
+			 */
+			printf("%-16s ", sr->s_id);
+			if (sr->s_reading_valid) {
+				if (sr->s_has_analog_value) {
+					/* don't show discrete component */
+					printf("| %-10s | %-10s | %-6s",
+					       sr->s_a_str, sr->s_a_units, "ok");
+				} else {
+					printf("| 0x%-8x | %-10s | 0x%02x%02x",
+					       sr->s_reading, "discrete",
+					       sr->s_data2, sr->s_data3);
+				}
+			} else {
+				printf("| %-10s | %-10s | %-6s",
+				       "na", "discrete", "na");
+			}
+			printf("| %-10s| %-10s| %-10s| %-10s| %-10s| %-10s",
+			       "na", "na", "na", "na", "na", "na");
+
+			printf("\n");
+		} else {
+			printf("Sensor ID              : %s (0x%x)\n",
+			       sr->s_id, sensor->keys.sensor_num);
+			printf(" Entity ID             : %d.%d\n",
+			       sensor->entity.id, sensor->entity.instance);
+			printf(" Sensor Type (Discrete): %s\n",
+			       ipmi_get_sensor_type(intf, sensor->sensor.
+							     type));
+			if( sr->s_reading_valid )
+			{
+				if (sr->s_has_analog_value) {
+					printf(" Sensor Reading        : %s %s\n", sr->s_a_str, sr->s_a_units);
+				}
+				ipmi_sdr_print_discrete_state(intf, "States Asserted",
+							sensor->sensor.type,
+							sensor->event_type,
+							sr->s_data2,
+							sr->s_data3);
+				printf("\n");
+			} else {
+			   printf(" Unable to read sensor: Device Not Present\n\n");
+			}
+	   }
+	}
+
+	return (sr->s_reading_valid ? 0 : -1 );
+}
+
+static void
+print_thresh_setting(struct sdr_record_full_sensor *full,
+			 uint8_t thresh_is_avail, uint8_t setting,
+			 const char *field_sep,
+			 const char *analog_fmt,
+			 const char *discrete_fmt,
+			 const char *na_fmt)
+{
+	printf("%s", field_sep);
+	if (!thresh_is_avail) {
+		printf(na_fmt, "na");
+		return;
+	}
+	if (full && !UNITS_ARE_DISCRETE(&full->cmn)) {
+		printf(analog_fmt, sdr_convert_sensor_reading (full, setting));
+	} else {
+		printf(discrete_fmt, setting);
+	}
+}
+
+static int
+ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
+			      struct sdr_record_common_sensor *sensor,
+			      uint8_t sdr_record_type)
+{
+	int thresh_available = 1;
+	struct ipmi_rs *rsp;
+	struct sensor_reading *sr;
+
+	sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr_record_type, 3);
+
+	if (sr == NULL) {
+		return -1;
+	}
+
+	const char *thresh_status = ipmi_sdr_get_thresh_status(sr, "ns");
+
+	/*
+	 * Get sensor thresholds
+	 */
+	rsp = ipmi_sdr_get_sensor_thresholds(intf,
+				sensor->keys.sensor_num, sensor->keys.owner_id,
+				sensor->keys.lun, sensor->keys.channel);
+
+	if ((rsp == NULL) || (rsp->ccode > 0) || (rsp->data_len == 0))
+		thresh_available = 0;
+
+	if (csv_output) {
+		/* NOT IMPLEMENTED */
+	} else {
+		if (verbose == 0) {
+			/* output format
+			 *   id value units status thresholds....
+			 */
+			printf("%-16s ", sr->s_id);
+			if (sr->s_reading_valid) {
+				if (sr->s_has_analog_value)
+					printf("| %-10.3f | %-10s | %-6s",
+					       sr->s_a_val, sr->s_a_units, thresh_status);
+				else
+					printf("| 0x%-8x | %-10s | %-6s",
+					       sr->s_reading, sr->s_a_units, thresh_status);
+			} else {
+				printf("| %-10s | %-10s | %-6s",
+				       "na", sr->s_a_units, "na");
+			}
+			if (thresh_available && sr->full) {
+#define PTS(bit, dataidx) {						\
+	print_thresh_setting(sr->full, rsp->data[0] & (bit),  		\
+	    rsp->data[(dataidx)], "| ", "%-10.3f", "0x-8x", "%-10s");	\
+}
+				PTS(LOWER_NON_RECOV_SPECIFIED,	3);
+				PTS(LOWER_CRIT_SPECIFIED,	2);
+				PTS(LOWER_NON_CRIT_SPECIFIED,	1);
+				PTS(UPPER_NON_CRIT_SPECIFIED,	4);
+				PTS(UPPER_CRIT_SPECIFIED,	5);
+				PTS(UPPER_NON_RECOV_SPECIFIED,	6);
+#undef PTS
+			} else {
+				printf
+				    ("| %-10s| %-10s| %-10s| %-10s| %-10s| %-10s",
+				     "na", "na", "na", "na", "na", "na");
+			}
+
+			printf("\n");
+		} else {
+			printf("Sensor ID              : %s (0x%x)\n",
+			       sr->s_id, sensor->keys.sensor_num);
+
+			printf(" Entity ID             : %d.%d\n",
+			       sensor->entity.id, sensor->entity.instance);
+
+			printf(" Sensor Type (Threshold)  : %s\n",
+			       ipmi_get_sensor_type(intf, sensor->sensor.
+							     type));
+
+			printf(" Sensor Reading        : ");
+			if (sr->s_reading_valid) {
+				if (sr->full) {
+					uint16_t raw_tol = __TO_TOL(sr->full->mtol);
+					if (sr->s_has_analog_value) {
+						double tol =
+						    sdr_convert_sensor_tolerance(sr->full,
+									       raw_tol);
+						printf("%.*f (+/- %.*f) %s\n",
+						       (sr->s_a_val == (int)
+						       sr->s_a_val) ? 0 : 3,
+						       sr->s_a_val,
+						       (tol == (int) tol) ? 0 : 3, tol,
+						       sr->s_a_units);
+					} else {
+						printf("0x%x (+/- 0x%x) %s\n",
+						       sr->s_reading,
+						       raw_tol,
+						       sr->s_a_units);
+					}
+				} else {
+					printf("0x%x %s\n", sr->s_reading,
+					sr->s_a_units);
+				}
+				printf(" Status                : %s\n", thresh_status);
+
+				if (thresh_available) {
+					if (sr->full) {
+#define PTS(bit, dataidx, str) { 			\
+print_thresh_setting(sr->full, rsp->data[0] & (bit),	\
+		     rsp->data[(dataidx)], 		\
+		    (str), "%.3f\n", "0x%x\n", "%s\n"); \
+}
+
+						PTS(LOWER_NON_RECOV_SPECIFIED,	3, " Lower Non-Recoverable : ");
+						PTS(LOWER_CRIT_SPECIFIED,	2, " Lower Critical        : ");
+						PTS(LOWER_NON_CRIT_SPECIFIED,	1, " Lower Non-Critical    : ");
+						PTS(UPPER_NON_CRIT_SPECIFIED,	4, " Upper Non-Critical    : ");
+						PTS(UPPER_CRIT_SPECIFIED,	5, " Upper Critical        : ");
+						PTS(UPPER_NON_RECOV_SPECIFIED,	6, " Upper Non-Recoverable : ");
+#undef PTS
+
+					}
+					ipmi_sdr_print_sensor_hysteresis(sensor, sr->full,
+						sr->full ?  sr->full->threshold.hysteresis.positive :
+						sr->compact->threshold.hysteresis.positive,
+						"Positive Hysteresis");
+
+					ipmi_sdr_print_sensor_hysteresis(sensor, sr->full,
+						sr->full ?  sr->full->threshold.hysteresis.negative :
+						sr->compact->threshold.hysteresis.negative,
+						"Negative Hysteresis");
+				} else {
+					printf(" Sensor Threshold Settings not available\n");
+				}
+			} else {
+			  printf(" Unable to read sensor: Device Not Present\n\n");
+			}
+
+			ipmi_sdr_print_sensor_event_status(intf,
+							   sensor->keys.
+							   sensor_num,
+							   sensor->sensor.type,
+							   sensor->event_type,
+							   ANALOG_SENSOR,
+							   sensor->keys.owner_id,
+							   sensor->keys.lun,
+							   sensor->keys.channel);
+			ipmi_sdr_print_sensor_event_enable(intf,
+							   sensor->keys.
+							   sensor_num,
+							   sensor->sensor.type,
+							   sensor->event_type,
+							   ANALOG_SENSOR,
+							   sensor->keys.owner_id,
+							   sensor->keys.lun,
+							   sensor->keys.channel);
+
+			printf("\n");
+		}
+	}
+
+	return (sr->s_reading_valid ? 0 : -1 );
+}
+
+int
+ipmi_sensor_print_fc(struct ipmi_intf *intf,
+		       struct sdr_record_common_sensor *sensor,
+			uint8_t sdr_record_type)
+{
+	if (IS_THRESHOLD_SENSOR(sensor))
+		return ipmi_sensor_print_fc_threshold(intf, sensor, sdr_record_type);
+	else
+		return ipmi_sensor_print_fc_discrete(intf, sensor, sdr_record_type);
+}
+
+static int
+ipmi_sensor_list(struct ipmi_intf *intf)
+{
+	struct sdr_get_rs *header;
+	struct ipmi_sdr_iterator *itr;
+	int rc = 0;
+
+	lprintf(LOG_DEBUG, "Querying SDR for sensor list");
+
+	itr = ipmi_sdr_start(intf, 0);
+	if (itr == NULL) {
+		lprintf(LOG_ERR, "Unable to open SDR for reading");
+		return -1;
+	}
+
+	while ((header = ipmi_sdr_get_next_header(intf, itr)) != NULL) {
+		uint8_t *rec;
+
+		rec = ipmi_sdr_get_record(intf, header, itr);
+		if (rec == NULL) {
+			lprintf(LOG_DEBUG, "rec == NULL");
+			continue;
+		}
+
+		switch (header->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			ipmi_sensor_print_fc(intf,
+						   (struct
+						    sdr_record_common_sensor *)
+						   rec,
+						   header->type);
+			break;
+		}
+		free(rec);
+		rec = NULL;
+
+		/* fix for CR6604909: */
+		/* mask failure of individual reads in sensor list command */
+		/* rc = (r == 0) ? rc : r; */
+	}
+
+	ipmi_sdr_end(intf, itr);
+
+	return rc;
+}
+
+static const struct valstr threshold_vals[] = {
+	{UPPER_NON_RECOV_SPECIFIED, "Upper Non-Recoverable"},
+	{UPPER_CRIT_SPECIFIED, "Upper Critical"},
+	{UPPER_NON_CRIT_SPECIFIED, "Upper Non-Critical"},
+	{LOWER_NON_RECOV_SPECIFIED, "Lower Non-Recoverable"},
+	{LOWER_CRIT_SPECIFIED, "Lower Critical"},
+	{LOWER_NON_CRIT_SPECIFIED, "Lower Non-Critical"},
+	{0x00, NULL},
+};
+
+static int
+__ipmi_sensor_set_threshold(struct ipmi_intf *intf,
+			    uint8_t num, uint8_t mask, uint8_t setting,
+			    uint8_t target, uint8_t lun, uint8_t channel)
+{
+	struct ipmi_rs *rsp;
+
+	rsp = ipmi_sensor_set_sensor_thresholds(intf, num, mask, setting,
+				  target, lun, channel);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting threshold");
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Error setting threshold: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+static uint8_t
+__ipmi_sensor_threshold_value_to_raw(struct sdr_record_full_sensor *full, double value)
+{
+	if (!UNITS_ARE_DISCRETE(&full->cmn)) { /* Has an analog reading */
+		/* Has an analog reading and supports mx+b */
+		return sdr_convert_sensor_value_to_raw(full, value);
+	}
+	else {
+		/* Does not have an analog reading and/or does not support mx+b */
+		if (value > 255) {
+			return 255;
+		}
+		else if (value < 0) {
+			return 0;
+		}
+		else {
+			return (uint8_t )value;
+		}
+	}
+}
+
+static int
+ipmi_sensor_set_threshold(struct ipmi_intf *intf, int argc, char **argv)
+{
+	char *id, *thresh;
+	uint8_t settingMask = 0;
+	double setting1 = 0.0, setting2 = 0.0, setting3 = 0.0;
+	int allUpper = 0, allLower = 0;
+	int ret = 0;
+	struct ipmi_rs *rsp;
+	int i =0;
+	double val[10] = {0};
+
+	struct sdr_record_list *sdr;
+
+	if (argc < 3 || strncmp(argv[0], "help", 4) == 0) {
+		print_sensor_thresh_usage();
+		return 0;
+	}
+
+	id = argv[0];
+	thresh = argv[1];
+
+	if (strncmp(thresh, "upper", 5) == 0) {
+		if (argc < 5) {
+			lprintf(LOG_ERR,
+				"usage: sensor thresh <id> upper <unc> <ucr> <unr>");
+			return -1;
+		}
+		allUpper = 1;
+		if (str2double(argv[2], &setting1) != 0) {
+			lprintf(LOG_ERR, "Given unc '%s' is invalid.",
+					argv[2]);
+			return (-1);
+		}
+		if (str2double(argv[3], &setting2) != 0) {
+			lprintf(LOG_ERR, "Given ucr '%s' is invalid.",
+					argv[3]);
+			return (-1);
+		}
+		if (str2double(argv[4], &setting3) != 0) {
+			lprintf(LOG_ERR, "Given unr '%s' is invalid.",
+					argv[4]);
+			return (-1);
+		}
+	} else if (strncmp(thresh, "lower", 5) == 0) {
+		if (argc < 5) {
+			lprintf(LOG_ERR,
+				"usage: sensor thresh <id> lower <lnr> <lcr> <lnc>");
+			return -1;
+		}
+		allLower = 1;
+		if (str2double(argv[2], &setting1) != 0) {
+			lprintf(LOG_ERR, "Given lnc '%s' is invalid.",
+					argv[2]);
+			return (-1);
+		}
+		if (str2double(argv[3], &setting2) != 0) {
+			lprintf(LOG_ERR, "Given lcr '%s' is invalid.",
+					argv[3]);
+			return (-1);
+		}
+		if (str2double(argv[4], &setting3) != 0) {
+			lprintf(LOG_ERR, "Given lnr '%s' is invalid.",
+					argv[4]);
+			return (-1);
+		}
+	} else {
+		if (strncmp(thresh, "unr", 3) == 0)
+			settingMask = UPPER_NON_RECOV_SPECIFIED;
+		else if (strncmp(thresh, "ucr", 3) == 0)
+			settingMask = UPPER_CRIT_SPECIFIED;
+		else if (strncmp(thresh, "unc", 3) == 0)
+			settingMask = UPPER_NON_CRIT_SPECIFIED;
+		else if (strncmp(thresh, "lnc", 3) == 0)
+			settingMask = LOWER_NON_CRIT_SPECIFIED;
+		else if (strncmp(thresh, "lcr", 3) == 0)
+			settingMask = LOWER_CRIT_SPECIFIED;
+		else if (strncmp(thresh, "lnr", 3) == 0)
+			settingMask = LOWER_NON_RECOV_SPECIFIED;
+		else {
+			lprintf(LOG_ERR,
+				"Valid threshold '%s' for sensor '%s' not specified!",
+				thresh, id);
+			return -1;
+		}
+		if (str2double(argv[2], &setting1) != 0) {
+			lprintf(LOG_ERR,
+					"Given %s threshold value '%s' is invalid.",
+					thresh, argv[2]);
+			return (-1);
+		}
+	}
+
+	printf("Locating sensor record '%s'...\n", id);
+
+	/* lookup by sensor name */
+	sdr = ipmi_sdr_find_sdr_byid(intf, id);
+	if (sdr == NULL) {
+		lprintf(LOG_ERR, "Sensor data record not found!");
+		return -1;
+	}
+
+	if (sdr->type != SDR_RECORD_TYPE_FULL_SENSOR) {
+		lprintf(LOG_ERR, "Invalid sensor type %02x", sdr->type);
+		return -1;
+	}
+
+	if (!IS_THRESHOLD_SENSOR(sdr->record.common)) {
+		lprintf(LOG_ERR, "Invalid sensor event type %02x", sdr->record.common->event_type);
+		return -1;
+	}
+
+
+	if (allUpper) {
+		settingMask = UPPER_NON_CRIT_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting1);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting1),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+
+		settingMask = UPPER_CRIT_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting2);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting2),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+
+		settingMask = UPPER_NON_RECOV_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting3);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting3),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+	} else if (allLower) {
+		settingMask = LOWER_NON_RECOV_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting1);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting1),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+
+		settingMask = LOWER_CRIT_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting2);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting2),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+
+		settingMask = LOWER_NON_CRIT_SPECIFIED;
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting3);
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting3),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+	} else {
+
+	/*
+ 	 * Current implementation doesn't check for the valid setting of upper non critical and other thresholds.
+ 	 * In the below logic:
+ 	 * 	Get all the current reading of the sensor i.e. unc, uc, lc,lnc.
+ 	 * 	Validate the values given by the user.
+ 	 * 	If the values are not correct, then popup with the Error message and return.
+ 	 */
+	/*
+	 * Get current reading
+	 */
+		rsp = ipmi_sdr_get_sensor_reading_ipmb(intf,
+					       sdr->record.common->keys.sensor_num,
+					       sdr->record.common->keys.owner_id,
+					       sdr->record.common->keys.lun,sdr->record.common->keys.channel);
+		rsp = ipmi_sdr_get_sensor_thresholds(intf,
+						sdr->record.common->keys.sensor_num,
+						sdr->record.common->keys.owner_id,
+						sdr->record.common->keys.lun,
+						sdr->record.common->keys.channel);
+		if ((rsp == NULL) || (rsp->ccode > 0)) {
+			lprintf(LOG_ERR, "Sensor data record not found!");
+				return -1;
+		}
+		for(i=1;i<=6;i++) {
+			val[i] = sdr_convert_sensor_reading(sdr->record.full, rsp->data[i]);
+			if(val[i] < 0)
+				val[i] = 0;
+		}
+		/* Check for the valid Upper non recovarable Value.*/
+		if( (settingMask & UPPER_NON_RECOV_SPECIFIED) ) {
+
+			if( (rsp->data[0] & UPPER_NON_RECOV_SPECIFIED) &&
+				(( (rsp->data[0] & UPPER_CRIT_SPECIFIED) && ( setting1 <= val[5])) ||
+					( (rsp->data[0] & UPPER_NON_CRIT_SPECIFIED) && ( setting1 <= val[4]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else if( (settingMask & UPPER_CRIT_SPECIFIED) ) { 		/* Check for the valid Upper critical Value.*/
+			if( (rsp->data[0] & UPPER_CRIT_SPECIFIED) &&
+				(((rsp->data[0] & UPPER_NON_RECOV_SPECIFIED)&& ( setting1 >= val[6])) ||
+				((rsp->data[0] & UPPER_NON_CRIT_SPECIFIED)&&( setting1 <= val[4]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else if( (settingMask & UPPER_NON_CRIT_SPECIFIED) ) {  		/* Check for the valid Upper non critical Value.*/
+			if( (rsp->data[0] & UPPER_NON_CRIT_SPECIFIED) &&
+				(((rsp->data[0] & UPPER_NON_RECOV_SPECIFIED)&&( setting1 >= val[6])) ||
+				((rsp->data[0] & UPPER_CRIT_SPECIFIED)&&( setting1 >= val[5])) ||
+				((rsp->data[0] & LOWER_NON_CRIT_SPECIFIED)&&( setting1 <= val[1]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else if( (settingMask & LOWER_NON_CRIT_SPECIFIED) ) {		/* Check for the valid lower non critical Value.*/
+			if( (rsp->data[0] & LOWER_NON_CRIT_SPECIFIED) &&
+				(((rsp->data[0] & LOWER_CRIT_SPECIFIED)&&( setting1 <= val[2])) ||
+				((rsp->data[0] & LOWER_NON_RECOV_SPECIFIED)&&( setting1 <= val[3]))||
+				((rsp->data[0] & UPPER_NON_CRIT_SPECIFIED)&&( setting1 >= val[4]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else if( (settingMask & LOWER_CRIT_SPECIFIED) ) {		/* Check for the valid lower critical Value.*/
+			if( (rsp->data[0] & LOWER_CRIT_SPECIFIED) &&
+				(((rsp->data[0] & LOWER_NON_CRIT_SPECIFIED)&&( setting1 >= val[1])) ||
+				((rsp->data[0] & LOWER_NON_RECOV_SPECIFIED)&&( setting1 <= val[3]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else if( (settingMask & LOWER_NON_RECOV_SPECIFIED) ) {		/* Check for the valid lower non recovarable Value.*/
+			if( (rsp->data[0] & LOWER_NON_RECOV_SPECIFIED) &&
+				(((rsp->data[0] & LOWER_NON_CRIT_SPECIFIED)&&( setting1 >= val[1])) ||
+				((rsp->data[0] & LOWER_CRIT_SPECIFIED)&&( setting1 >= val[2]))) )
+			{
+				lprintf(LOG_ERR, INVALID_THRESHOLD);
+				return -1;
+			}
+		} else {			/* None of this Then Return with error messages.*/
+			lprintf(LOG_ERR, INVALID_THRESHOLD);
+			return -1;
+		}
+
+
+		printf("Setting sensor \"%s\" %s threshold to %.3f\n",
+		       sdr->record.full->id_string,
+		       val2str(settingMask, threshold_vals), setting1);
+
+		ret = __ipmi_sensor_set_threshold(intf,
+						  sdr->record.common->keys.
+						  sensor_num, settingMask,
+						  __ipmi_sensor_threshold_value_to_raw(sdr->record.full, setting1),
+						  sdr->record.common->keys.owner_id,
+						  sdr->record.common->keys.lun,
+						  sdr->record.common->keys.channel);
+	}
+
+	return ret;
+}
+
+static int
+ipmi_sensor_get_reading(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct sdr_record_list *sdr;
+	int i, rc=0;
+
+	if (argc < 1 || strncmp(argv[0], "help", 4) == 0) {
+		lprintf(LOG_NOTICE, "sensor reading <id> ... [id]");
+		lprintf(LOG_NOTICE, "   id        : name of desired sensor");
+		return -1;
+	}
+
+	for (i = 0; i < argc; i++) {
+		sdr = ipmi_sdr_find_sdr_byid(intf, argv[i]);
+		if (sdr == NULL) {
+			lprintf(LOG_ERR, "Sensor \"%s\" not found!",
+				argv[i]);
+			rc = -1;
+			continue;
+		}
+
+		switch (sdr->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+		{
+			struct sensor_reading *sr;
+			struct sdr_record_common_sensor	*sensor = sdr->record.common;
+			sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr->type, 3);
+
+			if (sr == NULL) {
+				rc = -1;
+				continue;
+			}
+
+			if (!sr->full)
+				continue;
+
+			if (!sr->s_reading_valid)
+				continue;
+
+			if (!sr->s_has_analog_value) {
+				lprintf(LOG_ERR, "Sensor \"%s\" is a discrete sensor!", argv[i]);
+				continue;
+			}
+			if (csv_output)
+				printf("%s,%s\n", argv[i], sr->s_a_str);
+			else
+				printf("%-16s | %s\n", argv[i], sr->s_a_str);
+
+			break;
+		}
+		default:
+			continue;
+		}
+	}
+
+	return rc;
+}
+
+static int
+ipmi_sensor_get(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int i, v;
+	int rc = 0;
+	struct sdr_record_list *sdr;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		print_sensor_get_usage();
+		return (-1);
+	} else if (strcmp(argv[0], "help") == 0) {
+		print_sensor_get_usage();
+		return 0;
+	}
+	printf("Locating sensor record...\n");
+	/* lookup by sensor name */
+	for (i = 0; i < argc; i++) {
+		sdr = ipmi_sdr_find_sdr_byid(intf, argv[i]);
+		if (sdr == NULL) {
+			lprintf(LOG_ERR, "Sensor data record \"%s\" not found!",
+					argv[i]);
+			rc = -1;
+			continue;
+		}
+		/* need to set verbose level to 1 */
+		v = verbose;
+		verbose = 1;
+		switch (sdr->type) {
+		case SDR_RECORD_TYPE_FULL_SENSOR:
+		case SDR_RECORD_TYPE_COMPACT_SENSOR:
+			if (ipmi_sensor_print_fc(intf,
+					(struct sdr_record_common_sensor *) sdr->record.common,
+					sdr->type)) {
+				rc = -1;
+			}
+			break;
+		default:
+			if (ipmi_sdr_print_listentry(intf, sdr) < 0) {
+				rc = (-1);
+			}
+			break;
+		}
+		verbose = v;
+		sdr = NULL;
+	}
+	return rc;
+}
+
+int
+ipmi_sensor_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = 0;
+
+	if (argc == 0) {
+		rc = ipmi_sensor_list(intf);
+	} else if (strncmp(argv[0], "help", 4) == 0) {
+		lprintf(LOG_NOTICE, "Sensor Commands:  list thresh get reading");
+	} else if (strncmp(argv[0], "list", 4) == 0) {
+		rc = ipmi_sensor_list(intf);
+	} else if (strncmp(argv[0], "thresh", 5) == 0) {
+		rc = ipmi_sensor_set_threshold(intf, argc - 1, &argv[1]);
+	} else if (strncmp(argv[0], "get", 3) == 0) {
+		rc = ipmi_sensor_get(intf, argc - 1, &argv[1]);
+	} else if (strncmp(argv[0], "reading", 7) == 0) {
+		rc = ipmi_sensor_get_reading(intf, argc - 1, &argv[1]);
+	} else {
+		lprintf(LOG_ERR, "Invalid sensor command: %s", argv[0]);
+		rc = -1;
+	}
+
+	return rc;
+}
+
+/* print_sensor_get_usage - print usage for # ipmitool sensor get NAC;
+ *
+ * @returns: void
+ */
+void
+print_sensor_get_usage()
+{
+	lprintf(LOG_NOTICE, "sensor get <id> ... [id]");
+	lprintf(LOG_NOTICE, "   id        : name of desired sensor");
+}
+
+/* print_sensor_thresh_set_usage - print usage for # ipmitool sensor thresh;
+ *
+ * @returns: void
+ */
+void
+print_sensor_thresh_usage()
+{
+	lprintf(LOG_NOTICE,
+"sensor thresh <id> <threshold> <setting>");
+	lprintf(LOG_NOTICE,
+"   id        : name of the sensor for which threshold is to be set");
+	lprintf(LOG_NOTICE,
+"   threshold : which threshold to set");
+	lprintf(LOG_NOTICE,
+"                 unr = upper non-recoverable");
+	lprintf(LOG_NOTICE,
+"                 ucr = upper critical");
+	lprintf(LOG_NOTICE,
+"                 unc = upper non-critical");
+	lprintf(LOG_NOTICE,
+"                 lnc = lower non-critical");
+	lprintf(LOG_NOTICE,
+"                 lcr = lower critical");
+	lprintf(LOG_NOTICE,
+"                 lnr = lower non-recoverable");
+	lprintf(LOG_NOTICE,
+"   setting   : the value to set the threshold to");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"sensor thresh <id> lower <lnr> <lcr> <lnc>");
+	lprintf(LOG_NOTICE,
+"   Set all lower thresholds at the same time");
+	lprintf(LOG_NOTICE,
+"");
+	lprintf(LOG_NOTICE,
+"sensor thresh <id> upper <unc> <ucr> <unr>");
+	lprintf(LOG_NOTICE,
+"   Set all upper thresholds at the same time");
+	lprintf(LOG_NOTICE, "");
+}
diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
new file mode 100644
index 0000000..141f0f4
--- /dev/null
+++ b/lib/ipmi_session.c
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_session.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/bswap.h>
+
+
+typedef enum {
+	IPMI_SESSION_REQUEST_CURRENT = 0,
+	IPMI_SESSION_REQUEST_ALL,
+	IPMI_SESSION_REQUEST_BY_ID,
+	IPMI_SESSION_REQUEST_BY_HANDLE
+} Ipmi_Session_Request_Type;
+
+
+
+
+/*
+ * print_session_info_csv
+ */
+static void
+print_session_info_csv(const struct  get_session_info_rsp * session_info,
+					   int data_len)
+{
+	char     buffer[18];
+	uint16_t console_port_tmp;
+	
+	printf("%d", session_info->session_handle);
+	printf(",%d", session_info->session_slot_count);
+	printf(",%d", session_info->active_session_count);
+
+	if (data_len == 3)
+	{
+		/* There is no session data here*/
+		printf("\n");
+		return;
+	}
+
+	printf(",%d", session_info->user_id);
+	printf(",%s", val2str(session_info->privilege_level, ipmi_privlvl_vals));
+
+	printf(",%s", session_info->auxiliary_data?
+		   "IPMIv2/RMCP+" : "IPMIv1.5");
+
+	printf(",0x%02x", session_info->channel_number);
+
+	if (data_len == 18)
+	{
+		/* We have 802.3 LAN data */
+		printf(",%s",
+			   inet_ntop(AF_INET,
+						 &(session_info->channel_data.lan_data.console_ip),
+						 buffer,
+						 16));
+
+		printf(",%s", mac2str(
+			session_info->channel_data.lan_data.console_mac));
+
+		console_port_tmp = session_info->channel_data.lan_data.console_port;
+		#if WORDS_BIGENDIAN
+		console_port_tmp = BSWAP_16(console_port_tmp);
+		#endif
+		printf(",%d", console_port_tmp);
+	}
+
+
+	else if ((data_len == 12) || (data_len == 14))
+	{
+		/* Channel async serial/modem */
+		printf(",%s",
+			   val2str(session_info->channel_data.modem_data.session_channel_activity_type,
+					   ipmi_channel_activity_type_vals));
+
+		printf(",%d",
+			   session_info->channel_data.modem_data.destination_selector);
+
+		printf(",%s",
+			   inet_ntop(AF_INET,
+						 &(session_info->channel_data.modem_data.console_ip),
+						 buffer,
+						 16));
+
+		if (data_len == 14)
+		{
+			/* Connection is PPP */
+			console_port_tmp = session_info->channel_data.lan_data.console_port;
+			#if WORDS_BIGENDIAN
+			console_port_tmp = BSWAP_16(console_port_tmp);
+			#endif
+			printf(",%d", console_port_tmp);
+		}
+	}
+
+	printf("\n");
+}
+
+
+
+/*
+ * print_session_info_verbose
+ */
+static void
+print_session_info_verbose(const struct  get_session_info_rsp * session_info,
+						   int data_len)
+{
+	char     buffer[18];
+	uint16_t console_port_tmp;
+	
+	printf("session handle                : %d\n", session_info->session_handle);
+	printf("slot count                    : %d\n", session_info->session_slot_count);
+	printf("active sessions               : %d\n", session_info->active_session_count);
+
+	if (data_len == 3)
+	{
+		/* There is no session data here */
+		printf("\n");
+		return;
+	}
+
+	printf("user id                       : %d\n", session_info->user_id);
+	printf("privilege level               : %s\n",
+		   val2str(session_info->privilege_level, ipmi_privlvl_vals));
+	
+	printf("session type                  : %s\n", session_info->auxiliary_data?
+		   "IPMIv2/RMCP+" : "IPMIv1.5");
+
+	printf("channel number                : 0x%02x\n", session_info->channel_number);
+
+	
+	if (data_len == 18)
+	{
+		/* We have 802.3 LAN data */
+		printf("console ip                    : %s\n",
+			   inet_ntop(AF_INET,
+						 &(session_info->channel_data.lan_data.console_ip),
+						 buffer,
+						 16));
+
+		printf("console mac                   : %s\n", mac2str(
+			session_info->channel_data.lan_data.console_mac));
+
+		console_port_tmp = session_info->channel_data.lan_data.console_port;
+		#if WORDS_BIGENDIAN
+		console_port_tmp = BSWAP_16(console_port_tmp);
+		#endif
+		printf("console port                  : %d\n", console_port_tmp);
+	}
+
+
+	else if ((data_len == 12) || (data_len == 14))
+	{
+		/* Channel async serial/modem */
+		printf("Session/Channel Activity Type : %s\n",
+			   val2str(session_info->channel_data.modem_data.session_channel_activity_type,
+					   ipmi_channel_activity_type_vals));
+
+		printf("Destination selector          : %d\n",
+			   session_info->channel_data.modem_data.destination_selector);
+
+		printf("console ip                    : %s\n",
+			   inet_ntop(AF_INET,
+						 &(session_info->channel_data.modem_data.console_ip),
+						 buffer,
+						 16));
+
+		if (data_len == 14)
+		{
+			/* Connection is PPP */
+			console_port_tmp = session_info->channel_data.lan_data.console_port;
+			#if WORDS_BIGENDIAN
+			console_port_tmp = BSWAP_16(console_port_tmp);
+			#endif
+			printf("console port                  : %d\n", console_port_tmp);
+		}
+	}
+
+	printf("\n");
+}
+
+
+static void print_session_info(const struct  get_session_info_rsp * session_info,
+							   int data_len)
+{
+	if (csv_output)
+		print_session_info_csv(session_info, data_len);
+	else
+		print_session_info_verbose(session_info, data_len);
+}
+
+
+/*
+ * ipmi_get_session_info
+ *
+ * returns 0 on success
+ *         -1 on error
+ */
+int
+ipmi_get_session_info(struct ipmi_intf         * intf,
+					  Ipmi_Session_Request_Type  session_request_type,
+					  uint32_t                   id_or_handle)
+{
+	int i, retval = 0;
+
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t rqdata[5]; //  max length of the variable length request
+	struct get_session_info_rsp   session_info;
+
+	memset(&req, 0, sizeof(req));
+	memset(&session_info, 0, sizeof(session_info));
+	req.msg.netfn = IPMI_NETFN_APP;        // 0x06
+	req.msg.cmd   = IPMI_GET_SESSION_INFO; // 0x3D
+	req.msg.data = rqdata;
+
+	switch (session_request_type)
+	{
+		
+	case IPMI_SESSION_REQUEST_CURRENT:
+	case IPMI_SESSION_REQUEST_BY_ID:	
+	case IPMI_SESSION_REQUEST_BY_HANDLE:
+		switch (session_request_type)
+		{
+		case IPMI_SESSION_REQUEST_CURRENT:
+			rqdata[0]        = 0x00;
+			req.msg.data_len = 1;
+			break;
+		case IPMI_SESSION_REQUEST_BY_ID:	
+			rqdata[0]        = 0xFF;
+			rqdata[1]        = id_or_handle         & 0x000000FF;
+			rqdata[2]        = (id_or_handle >> 8)  & 0x000000FF;
+			rqdata[3]        = (id_or_handle >> 16) & 0x000000FF;
+			rqdata[4]        = (id_or_handle >> 24) & 0x000000FF;
+			req.msg.data_len = 5;
+			break;
+		case IPMI_SESSION_REQUEST_BY_HANDLE:
+			rqdata[0]        = 0xFE;
+			rqdata[1]        = (uint8_t)id_or_handle;
+			req.msg.data_len = 2;
+			break;
+		case IPMI_SESSION_REQUEST_ALL:
+			break;
+		}
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL)
+		{
+			lprintf(LOG_ERR, "Get Session Info command failed");
+			retval = -1;
+		}
+		else if (rsp->ccode > 0)
+		{
+			lprintf(LOG_ERR, "Get Session Info command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			retval = -1;
+		}
+
+		if (retval < 0)
+		{
+			if ((session_request_type == IPMI_SESSION_REQUEST_CURRENT) &&
+			    (strncmp(intf->name, "lan", 3) != 0))
+				lprintf(LOG_ERR, "It is likely that the channel in use "
+					"does not support sessions");
+		}
+		else
+		{
+			memcpy(&session_info,  rsp->data, rsp->data_len);
+			print_session_info(&session_info, rsp->data_len);
+		}
+		break;
+		
+	case IPMI_SESSION_REQUEST_ALL:
+		req.msg.data_len = 1;
+		i = 1;
+		do
+		{
+			rqdata[0] = i++;
+			rsp = intf->sendrecv(intf, &req);
+			
+			if (rsp == NULL)
+			{
+				lprintf(LOG_ERR, "Get Session Info command failed");
+				retval = -1;
+				break;
+			}
+			else if (rsp->ccode > 0 && rsp->ccode != 0xCC && rsp->ccode != 0xCB)
+			{
+				lprintf(LOG_ERR, "Get Session Info command failed: %s",
+					val2str(rsp->ccode, completion_code_vals));
+				retval = -1;
+				break;
+			}
+			else if (rsp->data_len < 3)
+			{
+				retval = -1;
+				break;
+			}
+
+			memcpy(&session_info,  rsp->data, rsp->data_len);
+			print_session_info(&session_info, rsp->data_len);
+			
+		} while (i <= session_info.session_slot_count);
+		break;
+	}
+
+	return retval;
+}
+
+
+
+static void
+printf_session_usage(void)
+{
+	lprintf(LOG_NOTICE, "Session Commands: info <active | all | id 0xnnnnnnnn | handle 0xnn>");
+}
+
+
+int
+ipmi_session_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int retval = 0;
+
+	if (argc == 0 || strncmp(argv[0], "help", 4) == 0)
+	{
+		printf_session_usage();
+	}
+	else if (strncmp(argv[0], "info", 4) == 0)
+	{
+
+		if ((argc < 2) || strncmp(argv[1], "help", 4) == 0)
+		{
+				printf_session_usage();
+		}
+		else
+		{
+			Ipmi_Session_Request_Type session_request_type = 0;
+			uint32_t                  id_or_handle = 0;
+
+			if (strncmp(argv[1], "active", 6) == 0)
+				session_request_type = IPMI_SESSION_REQUEST_CURRENT;
+			else if (strncmp(argv[1], "all", 3) == 0)
+				session_request_type = IPMI_SESSION_REQUEST_ALL;
+			else if (strncmp(argv[1], "id", 2) == 0)
+			{
+				if (argc >= 3)
+				{
+					session_request_type = IPMI_SESSION_REQUEST_BY_ID;
+					if (str2uint(argv[2], &id_or_handle) != 0) {
+						lprintf(LOG_ERR, "HEX number expected, but '%s' given.",
+								argv[2]);
+						printf_session_usage();
+						retval = -1;
+					}
+				}
+				else
+				{
+					lprintf(LOG_ERR, "Missing id argument");
+					printf_session_usage();
+					retval = -1;
+				}
+			}
+			else if (strncmp(argv[1], "handle", 6) == 0)
+			{
+				if (argc >= 3)
+				{
+					session_request_type = IPMI_SESSION_REQUEST_BY_HANDLE;
+					if (str2uint(argv[2], &id_or_handle) != 0) {
+						lprintf(LOG_ERR, "HEX number expected, but '%s' given.",
+								argv[2]);
+						printf_session_usage();
+						retval = -1;
+					}
+				}
+				else
+				{
+					lprintf(LOG_ERR, "Missing handle argument");
+					printf_session_usage();
+					retval = -1;
+				}
+			}
+			else
+			{
+				lprintf(LOG_ERR, "Invalid SESSION info parameter: %s", argv[1]);
+				printf_session_usage();
+				retval = -1;
+			}
+			
+
+			if (retval == 0)
+				retval = ipmi_get_session_info(intf,
+											   session_request_type,
+											   id_or_handle);
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Invalid SESSION command: %s", argv[0]);
+		printf_session_usage();
+		retval = -1;
+	}
+
+	return retval;
+}
+
diff --git a/lib/ipmi_sol.c b/lib/ipmi_sol.c
new file mode 100644
index 0000000..3acd5bb
--- /dev/null
+++ b/lib/ipmi_sol.c
@@ -0,0 +1,2086 @@
+/*                                 
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE
+#define _BSD_SOURCE || \
+	(_XOPEN_SOURCE >= 500 || \
+                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+	!(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <time.h>
+#include <signal.h>
+#include <unistd.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#if defined(HAVE_TERMIOS_H)
+# include <termios.h>
+#elif defined (HAVE_SYS_TERMIOS_H)
+# include <sys/termios.h>
+#endif
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sol.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/bswap.h>
+
+
+#define SOL_PARAMETER_SET_IN_PROGRESS           0x00
+#define SOL_PARAMETER_SOL_ENABLE                0x01
+#define SOL_PARAMETER_SOL_AUTHENTICATION        0x02
+#define SOL_PARAMETER_CHARACTER_INTERVAL        0x03
+#define SOL_PARAMETER_SOL_RETRY                 0x04
+#define SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE 0x05
+#define SOL_PARAMETER_SOL_VOLATILE_BIT_RATE     0x06
+#define SOL_PARAMETER_SOL_PAYLOAD_CHANNEL       0x07
+#define SOL_PARAMETER_SOL_PAYLOAD_PORT          0x08
+
+#define MAX_SOL_RETRY 6
+
+const struct valstr sol_parameter_vals[] = {
+	{ SOL_PARAMETER_SET_IN_PROGRESS,           "Set In Progress (0)" },
+	{ SOL_PARAMETER_SOL_ENABLE,                "Enable (1)" },
+	{ SOL_PARAMETER_SOL_AUTHENTICATION,        "Authentication (2)" },
+	{ SOL_PARAMETER_CHARACTER_INTERVAL,        "Character Interval (3)" },
+	{ SOL_PARAMETER_SOL_RETRY,                 "Retry (4)" },
+	{ SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE, "Nonvolatile Bitrate (5)" },
+	{ SOL_PARAMETER_SOL_VOLATILE_BIT_RATE,     "Volatile Bitrate (6)" },
+	{ SOL_PARAMETER_SOL_PAYLOAD_CHANNEL,       "Payload Channel (7)" },
+	{ SOL_PARAMETER_SOL_PAYLOAD_PORT,          "Payload Port (8)" },
+	{ 0x00, NULL },
+};
+
+
+static struct timeval _start_keepalive;
+static struct termios _saved_tio;
+static int            _in_raw_mode = 0;
+static int            _disable_keepalive = 0;
+static int            _use_sol_for_keepalive = 0;
+
+extern int verbose;
+
+/*
+ * ipmi_sol_payload_access
+ */
+int
+ipmi_sol_payload_access(struct ipmi_intf * intf, uint8_t channel,
+		uint8_t userid, int enable)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	int rc = (-1);
+	uint8_t data[6];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_SET_USER_PAYLOAD_ACCESS;
+	req.msg.data = data;
+	req.msg.data_len = 6;
+
+	memset(data, 0, 6);
+	/* channel */
+	data[0] = channel & 0xf;
+	/* user id */
+	data[1] = userid & 0x3f;
+	if (!enable) {
+		/* disable */
+		data[1] |= 0x40;
+	}
+	/* payload 1 is SOL */
+	data[2] = 0x02;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error %sabling SOL payload for user %d on channel %d",
+				enable ? "en" : "dis", userid, channel);
+		rc = (-1);
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Error %sabling SOL payload for user %d on channel %d: %s",
+				enable ? "en" : "dis", userid, channel,
+				val2str(rsp->ccode, completion_code_vals));
+		rc = (-1);
+	} else {
+		rc = 0;
+	}
+	return rc;
+}
+
+int
+ipmi_sol_payload_access_status(struct ipmi_intf * intf,
+				uint8_t channel,
+				uint8_t userid)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	uint8_t data[2];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;
+	req.msg.cmd      = IPMI_GET_USER_PAYLOAD_ACCESS;
+	req.msg.data     = data;
+	req.msg.data_len = sizeof(data);
+
+	data[0] = channel & 0xf;	/* channel */
+	data[1] = userid & 0x3f;	/* user id */
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error. No valid response received.");
+		return -1;
+	}
+
+	switch(rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len != 4) {
+				lprintf(LOG_ERR, "Error parsing SOL payload status for user %d on channel %d",
+					userid, channel);
+				return -1;
+			}
+
+			printf("User %d on channel %d is %sabled\n",
+				userid, channel, (rsp->data[0] & 0x02) ? "en":"dis");
+			return 0;
+
+		default:
+			lprintf(LOG_ERR, "Error getting SOL payload status for user %d on channel %d: %s",
+				userid, channel, 
+				val2str(rsp->ccode, completion_code_vals));
+			return -1;
+	}
+}
+
+
+/*
+ * ipmi_get_sol_info
+ */
+int
+ipmi_get_sol_info(
+				  struct ipmi_intf * intf,
+				  uint8_t channel,
+				  struct sol_config_parameters * params)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t data[4];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;
+	req.msg.cmd      = IPMI_GET_SOL_CONFIG_PARAMETERS;
+	req.msg.data_len = 4;
+	req.msg.data     = data;
+
+	/*
+	 * set in progress
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                       /* channel number     */
+	data[1] = SOL_PARAMETER_SET_IN_PROGRESS; /* parameter selector */
+	data[2] = 0x00;                          /* set selector       */
+	data[3] = 0x00;                          /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->set_in_progress = rsp->data[1];
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL enable
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                  /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_ENABLE; /* parameter selector */
+	data[2] = 0x00;                     /* set selector       */
+	data[3] = 0x00;                     /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->enabled = rsp->data[1];
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL authentication
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                          /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_AUTHENTICATION; /* parameter selector */
+	data[2] = 0x00;                             /* set selector       */
+	data[3] = 0x00;                             /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->force_encryption     = ((rsp->data[1] & 0x80)? 1 : 0);
+				params->force_authentication = ((rsp->data[1] & 0x40)? 1 : 0);
+				params->privilege_level      = rsp->data[1] & 0x0F;
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * Character accumulate interval and character send interval
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                          /* channel number     */
+	data[1] = SOL_PARAMETER_CHARACTER_INTERVAL; /* parameter selector */
+	data[2] = 0x00;                             /* set selector       */
+	data[3] = 0x00;                             /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 3) {
+				params->character_accumulate_level = rsp->data[1];
+				params->character_send_threshold   = rsp->data[2];
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL retry
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                 /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_RETRY; /* parameter selector */
+	data[2] = 0x00;                    /* set selector       */
+	data[3] = 0x00;                    /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 3) {
+				params->retry_count    = rsp->data[1];
+				params->retry_interval = rsp->data[2];
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL non-volatile bit rate
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                                 /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE; /* parameter selector */
+	data[2] = 0x00;                                    /* set selector       */
+	data[3] = 0x00;                                    /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->non_volatile_bit_rate = rsp->data[1] & 0x0F;
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL volatile bit rate
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                             /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_VOLATILE_BIT_RATE; /* parameter selector */
+	data[2] = 0x00;                                /* set selector       */
+	data[3] = 0x00;                                /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->volatile_bit_rate = rsp->data[1] & 0x0F;
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported",
+					val2str(data[1], sol_parameter_vals));
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL payload channel
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                           /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_PAYLOAD_CHANNEL; /* parameter selector */
+	data[2] = 0x00;                              /* set selector       */
+	data[3] = 0x00;                              /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 2) {
+				params->payload_channel = rsp->data[1];
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to 0x%02x",
+					val2str(data[1], sol_parameter_vals), channel);
+			params->payload_channel = channel;
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+					val2str(data[1], sol_parameter_vals),
+					val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	/*
+	 * SOL payload port
+	 */
+	memset(data, 0, sizeof(data));
+	data[0] = channel;                        /* channel number     */
+	data[1] = SOL_PARAMETER_SOL_PAYLOAD_PORT; /* parameter selector */
+	data[2] = 0x00;                           /* set selector       */
+	data[3] = 0x00;                           /* block selector     */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error: No response requesting SOL parameter '%s'",
+				val2str(data[1], sol_parameter_vals));
+		return (-1);
+	}
+
+	switch (rsp->ccode) {
+		case 0x00:
+			if (rsp->data_len == 3) {
+				params->payload_port = (rsp->data[1]) | (rsp->data[2] << 8);
+			} else {
+				lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						"for SOL parameter '%s'",
+						rsp->data_len,
+						val2str(data[1], sol_parameter_vals));
+			}
+			break;
+		case 0x80:
+			if( intf->session != NULL ) {
+				lprintf(LOG_ERR, "Info: SOL parameter '%s' not supported - defaulting to %d",
+						val2str(data[1], sol_parameter_vals), intf->ssn_params.port);
+				params->payload_port = intf->ssn_params.port;
+			} else {
+				lprintf(LOG_ERR,
+						"Info: SOL parameter '%s' not supported - can't determine which "
+						"payload port to use on NULL session",
+						val2str(data[1], sol_parameter_vals));
+						return (-1);               
+			}
+			break;
+		default:
+			lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
+				val2str(data[1], sol_parameter_vals),
+				val2str(rsp->ccode, completion_code_vals));
+			return (-1);
+	}
+
+	return 0;
+}
+
+
+
+/*
+ * ipmi_print_sol_info
+ */
+static int
+ipmi_print_sol_info(struct ipmi_intf * intf, uint8_t channel)
+{
+	struct sol_config_parameters params = {0};
+	if (ipmi_get_sol_info(intf, channel, &params))
+		return -1;
+
+	if (csv_output)
+	{
+		printf("%s,",
+			   val2str(params.set_in_progress & 0x03,
+					   ipmi_set_in_progress_vals));
+		printf("%s,", params.enabled?"true": "false");
+		printf("%s,", params.force_encryption?"true":"false");
+		printf("%s,", params.force_encryption?"true":"false");
+		printf("%s,",
+			   val2str(params.privilege_level, ipmi_privlvl_vals));
+		printf("%d,", params.character_accumulate_level * 5);
+		printf("%d,", params.character_send_threshold);
+		printf("%d,", params.retry_count);
+		printf("%d,", params.retry_interval * 10);
+
+		printf("%s,",
+			   val2str(params.volatile_bit_rate, ipmi_bit_rate_vals));
+
+		printf("%s,",
+			   val2str(params.non_volatile_bit_rate, ipmi_bit_rate_vals));
+
+		printf("%d,", params.payload_channel);
+		printf("%d\n", params.payload_port);
+	}
+	else
+	{
+		printf("Set in progress                 : %s\n",
+			   val2str(params.set_in_progress & 0x03,
+					   ipmi_set_in_progress_vals));
+		printf("Enabled                         : %s\n",
+			   params.enabled?"true": "false");
+		printf("Force Encryption                : %s\n",
+			   params.force_encryption?"true":"false");
+		printf("Force Authentication            : %s\n",
+			   params.force_authentication?"true":"false");
+		printf("Privilege Level                 : %s\n",
+			   val2str(params.privilege_level, ipmi_privlvl_vals));
+		printf("Character Accumulate Level (ms) : %d\n",
+			   params.character_accumulate_level * 5);
+		printf("Character Send Threshold        : %d\n",
+			   params.character_send_threshold);
+		printf("Retry Count                     : %d\n",
+			   params.retry_count);
+		printf("Retry Interval (ms)             : %d\n",
+			   params.retry_interval * 10);
+
+		printf("Volatile Bit Rate (kbps)        : %s\n",
+			   val2str(params.volatile_bit_rate, ipmi_bit_rate_vals));
+
+		printf("Non-Volatile Bit Rate (kbps)    : %s\n",
+			   val2str(params.non_volatile_bit_rate, ipmi_bit_rate_vals));
+
+		printf("Payload Channel                 : %d (0x%02x)\n",
+			   params.payload_channel, params.payload_channel);
+		printf("Payload Port                    : %d\n",
+			   params.payload_port);
+	}
+
+	return 0;
+}
+
+
+
+/*
+ * Small function to validate that user-supplied SOL
+ * configuration parameter values we store in uint8_t
+ * data type falls within valid range.  With minval
+ * and maxval parameters we can use the same function
+ * to validate parameters that have different ranges
+ * of values.
+ *
+ * function will return -1 if value is not valid, or
+ * will return 0 if valid.
+ */
+int ipmi_sol_set_param_isvalid_uint8_t( const char *strval,
+					const char *name,
+					int base,
+					uint8_t minval,
+					uint8_t maxval,
+					uint8_t *out_value)
+{
+	if (str2uchar(strval, out_value) != 0 || (*out_value < minval)
+			|| (*out_value > maxval)) {
+		lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+			strval, name);
+		lprintf(LOG_ERR, "Valid values are %d-%d", minval, maxval);
+		return -1;
+	}
+	return 0;
+}
+
+
+/*
+ * ipmi_sol_set_param
+ *
+ * Set the specified Serial Over LAN value to the specified
+ * value
+ *
+ * return 0 on success,
+ *        -1 on failure
+ */
+static int
+ipmi_sol_set_param(struct ipmi_intf * intf,
+		   uint8_t            channel,
+		   const char       * param,
+		   const char       * value,
+		   uint8_t            guarded)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq   req;
+	uint8_t          data[4];
+	int              bGuarded = guarded; /* Use set-in-progress indicator? */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_TRANSPORT;           /* 0x0c */
+	req.msg.cmd      = IPMI_SET_SOL_CONFIG_PARAMETERS; /* 0x21 */
+	req.msg.data     = data;
+
+	data[0] = channel;
+
+	/*
+	 * set-in-progress
+	 */
+	if (! strcmp(param, "set-in-progress"))
+	{
+		bGuarded = 0; /* We _ARE_ the set-in-progress indicator */
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SET_IN_PROGRESS;
+
+		if (! strcmp(value, "set-complete"))
+			data[2] = 0x00;
+		else if (! strcmp(value, "set-in-progress"))
+			data[2] = 0x01;
+		else if (! strcmp(value, "commit-write"))
+			data[2] = 0x02;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are set-complete, set-in-progress "
+				   "and commit-write");
+			return -1;
+		}
+	}
+
+
+	/*
+	 * enabled
+	 */
+	else if (! strcmp(param, "enabled"))
+	{
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_ENABLE;
+
+		if (! strcmp(value, "true"))
+			data[2] = 0x01;
+		else if (! strcmp(value, "false"))
+			data[2] = 0x00;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are true and false");
+			return -1;
+		}
+	}
+
+
+	/*
+	 * force-payload-encryption 
+	 */
+	else if (! strcmp(param, "force-encryption"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_AUTHENTICATION;
+
+		if (! strcmp(value, "true"))
+			data[2] = 0x80;
+		else if (! strcmp(value, "false"))
+			data[2] = 0x00;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are true and false");
+			return -1;
+		}
+
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[2] |= params.force_authentication? 0x40 : 0x00;
+		data[2] |= params.privilege_level;
+	}
+
+
+	/*
+	 * force-payload-authentication
+	 */
+	else if (! strcmp(param, "force-authentication"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_AUTHENTICATION;
+
+		if (! strcmp(value, "true"))
+			data[2] = 0x40;
+		else if (! strcmp(value, "false"))
+			data[2] = 0x00;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are true and false");
+			return -1;
+		}
+
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[2] |= params.force_encryption? 0x80 : 0x00;
+		data[2] |= params.privilege_level;
+	}
+
+
+	/*
+	 * privilege-level
+	 */
+	else if (! strcmp(param, "privilege-level"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_AUTHENTICATION;
+
+		if (! strcmp(value, "user"))
+			data[2] = 0x02;
+		else if (! strcmp(value, "operator"))
+			data[2] = 0x03;
+		else if (! strcmp(value, "admin"))
+			data[2] = 0x04;
+		else if (! strcmp(value, "oem"))
+			data[2] = 0x05;
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value %s for parameter %s",
+				   value, param);
+			lprintf(LOG_ERR, "Valid values are user, operator, admin, and oem");
+			return -1;
+		}
+
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[2] |= params.force_encryption?     0x80 : 0x00;
+		data[2] |= params.force_authentication? 0x40 : 0x00;
+	}
+
+
+	/*
+	 * character-accumulate-level
+	 */
+	else if (! strcmp(param, "character-accumulate-level"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 4;
+		data[1] = SOL_PARAMETER_CHARACTER_INTERVAL;
+
+		/* validate user-supplied input */
+		if (ipmi_sol_set_param_isvalid_uint8_t(value, param, 0, 1, 255, &data[2]))
+			return -1;
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[3] = params.character_send_threshold;
+	}
+
+
+	/*
+	 * character-send-threshold
+	 */
+	else if (! strcmp(param, "character-send-threshold"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 4;
+		data[1] = SOL_PARAMETER_CHARACTER_INTERVAL;
+
+		/* validate user-supplied input */
+		if (ipmi_sol_set_param_isvalid_uint8_t(value, param, 0, 0, 255, &data[3]))
+			return -1;
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[2] = params.character_accumulate_level;
+	}
+
+
+	/*
+	 * retry-count
+	 */
+	else if (! strcmp(param, "retry-count"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 4;
+		data[1] = SOL_PARAMETER_SOL_RETRY;
+
+		/* validate user input, 7 is max value */
+		if (ipmi_sol_set_param_isvalid_uint8_t(value, param, 0, 0, 7, &data[2]))
+			return -1;
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[3] = params.retry_interval;
+	}
+
+
+	/*
+	 * retry-interval
+	 */
+	else if (! strcmp(param, "retry-interval"))
+	{
+		struct sol_config_parameters params;
+
+		req.msg.data_len = 4;
+		data[1] = SOL_PARAMETER_SOL_RETRY;
+
+		/* validate user-supplied input */
+		if (ipmi_sol_set_param_isvalid_uint8_t(value, param, 0, 0, 255, &data[3]))
+			return -1;
+
+		/* We need other values to complete the request */
+		if (ipmi_get_sol_info(intf, channel, &params))
+		{
+			lprintf(LOG_ERR, "Error fetching SOL parameters for %s update",
+				   param);
+			return -1;
+		}
+
+		data[2] = params.retry_count;
+	}
+
+
+	/*
+	 * non-volatile-bit-rate
+	 */
+	else if (! strcmp(param, "non-volatile-bit-rate"))
+	{
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_NON_VOLATILE_BIT_RATE;
+
+		if (!strcmp(value, "serial"))
+		{
+			data[2] = 0x00;
+		}
+		else if (!strcmp(value, "9.6"))
+		{
+			data[2] = 0x06;
+		}
+		else if (!strcmp(value, "19.2"))
+		{
+			data[2] = 0x07;
+		}
+		else if (!strcmp(value, "38.4"))
+		{
+			data[2] = 0x08;
+		}
+		else if (!strcmp(value, "57.6"))
+		{
+			data[2] = 0x09;
+		}
+		else if (!strcmp(value, "115.2"))
+		{
+			data[2] = 0x0A;
+		}
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value \"%s\" for parameter \"%s\"",
+				   value,
+				   param);
+			lprintf(LOG_ERR, "Valid values are serial, 9.6 19.2, 38.4, 57.6 and 115.2");
+			return -1;
+		}
+	}
+
+
+	/*
+	 * volatile-bit-rate
+	 */
+	else if (! strcmp(param, "volatile-bit-rate"))
+	{
+		req.msg.data_len = 3;
+		data[1] = SOL_PARAMETER_SOL_VOLATILE_BIT_RATE;
+
+		if (!strcmp(value, "serial"))
+		{
+			data[2] = 0x00;
+		}
+		else if (!strcmp(value, "9.6"))
+		{
+			data[2] = 0x06;
+		}
+		else if (!strcmp(value, "19.2"))
+		{
+			data[2] = 0x07;
+		}
+		else if (!strcmp(value, "38.4"))
+		{
+			data[2] = 0x08;
+		}
+		else if (!strcmp(value, "57.6"))
+		{
+			data[2] = 0x09;
+		}
+		else if (!strcmp(value, "115.2"))
+		{
+			data[2] = 0x0A;
+		}
+		else
+		{
+			lprintf(LOG_ERR, "Invalid value \"%s\" for parameter \"%s\"",
+				   value,
+				   param);
+			lprintf(LOG_ERR, "Valid values are serial, 9.6 19.2, 38.4, 57.6 and 115.2");
+			return -1;
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "Error: invalid SOL parameter %s", param);
+		return -1;
+	}
+
+
+	/*
+	 * Execute the request
+	 */
+	if (bGuarded &&
+		(ipmi_sol_set_param(intf,
+				    channel,
+				    "set-in-progress",
+				    "set-in-progress",
+				    bGuarded)))
+	{
+		lprintf(LOG_ERR, "Error: set of parameter \"%s\" failed", param);
+		return -1;
+	}
+
+
+	/* The command proper */
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error setting SOL parameter '%s'", param);
+		return -1;
+	}
+
+	if (!(!strncmp(param, "set-in-progress", 15) && !strncmp(value, "commit-write", 12)) &&
+	    rsp->ccode > 0) {
+		switch (rsp->ccode) {
+		case 0x80:
+			lprintf(LOG_ERR, "Error setting SOL parameter '%s': "
+				"Parameter not supported", param);
+			break;
+		case 0x81:
+			lprintf(LOG_ERR, "Error setting SOL parameter '%s': "
+				"Attempt to set set-in-progress when not in set-complete state",
+				param);
+			break;
+		case 0x82:
+			lprintf(LOG_ERR, "Error setting SOL parameter '%s': "
+				"Attempt to write read-only parameter", param);
+			break;
+		case 0x83:
+			lprintf(LOG_ERR, "Error setting SOL parameter '%s': "
+				"Attempt to read write-only parameter", param);
+			break;
+		default:
+			lprintf(LOG_ERR, "Error setting SOL parameter '%s' to '%s': %s",
+				param, value, val2str(rsp->ccode, completion_code_vals));
+			break;
+		}
+
+		if (bGuarded &&
+			(ipmi_sol_set_param(intf,
+					    channel,
+					    "set-in-progress",
+					    "set-complete",
+					    bGuarded)))
+		{
+			lprintf(LOG_ERR, "Error could not set \"set-in-progress\" "
+				   "to \"set-complete\"");
+		}
+
+		return -1;
+	}
+
+
+	/*
+	 * The commit write could very well fail, but that's ok.
+	 * It may not be implemented.
+	 */
+	if (bGuarded)
+		ipmi_sol_set_param(intf,
+				   channel,
+				   "set-in-progress",
+				   "commit-write",
+				   bGuarded);
+
+
+	if (bGuarded &&
+ 		ipmi_sol_set_param(intf,
+				   channel,
+				   "set-in-progress",
+				   "set-complete",
+				   bGuarded))
+	{
+		lprintf(LOG_ERR, "Error could not set \"set-in-progress\" "
+			   "to \"set-complete\"");
+		return -1;
+	}
+
+	return 0;
+}
+
+
+
+void
+leave_raw_mode(void)
+{
+	if (!_in_raw_mode)
+		return;
+	if (tcsetattr(fileno(stdin), TCSADRAIN, &_saved_tio) == -1)
+		perror("tcsetattr");
+	else
+		_in_raw_mode = 0;
+}
+
+
+
+void
+enter_raw_mode(void)
+{
+	struct termios tio;
+	if (tcgetattr(fileno(stdin), &tio) == -1) {
+		perror("tcgetattr");
+		return;
+	}
+	_saved_tio = tio;
+	tio.c_iflag |= IGNPAR;
+	tio.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+	tio.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
+	//	#ifdef IEXTEN
+	tio.c_lflag &= ~IEXTEN;
+	//	#endif
+	tio.c_oflag &= ~OPOST;
+	tio.c_cc[VMIN] = 1;
+	tio.c_cc[VTIME] = 0;
+	if (tcsetattr(fileno(stdin), TCSADRAIN, &tio) == -1)
+		perror("tcsetattr");
+	else
+		_in_raw_mode = 1;
+}
+
+
+static void
+sendBreak(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload  v2_payload;
+
+	memset(&v2_payload, 0, sizeof(v2_payload));
+
+	v2_payload.payload.sol_packet.character_count = 0;
+	v2_payload.payload.sol_packet.generate_break  = 1;
+
+	intf->send_sol(intf, &v2_payload);
+}
+
+
+
+/*
+ * suspendSelf
+ *
+ * Put ourself in the background
+ *
+ * param bRestoreTty specifies whether we will put our self back
+ *       in raw mode when we resume
+ */
+static void
+suspendSelf(int bRestoreTty)
+{
+	leave_raw_mode();
+	kill(getpid(), SIGTSTP);
+
+	if (bRestoreTty)
+		enter_raw_mode();
+}
+
+
+
+/*
+ * printSolEscapeSequences
+ *
+ * Send some useful documentation to the user
+ */
+static void
+printSolEscapeSequences(struct ipmi_intf * intf)
+{
+	printf(
+		   "%c?\n\
+	Supported escape sequences:\n\
+	%c.  - terminate connection\n\
+	%c^Z - suspend ipmitool\n\
+	%c^X - suspend ipmitool, but don't restore tty on restart\n\
+	%cB  - send break\n\
+	%c?  - this message\n\
+	%c%c  - send the escape character by typing it twice\n\
+	(Note that escapes are only recognized immediately after newline.)\n",
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char,
+		   intf->ssn_params.sol_escape_char);
+}
+
+
+
+/*
+ * output
+ *
+ * Send the specified data to stdout
+ */
+static void
+output(struct ipmi_rs * rsp)
+{
+	/* Add checks to make sure it is actually SOL data, in general I see
+	 * outside code mostly trying to guard against this happening, but
+	 * some places fail to do so, so I do so here to make sure nothing gets
+	 * through.  If non-sol data comes through here, there is probably 
+	 * a packet that won't get processed somewhere else, but the alternative
+	 * of outputting corrupt data is worse.  Generally I see the get device
+	 * id response make it here somehow.  I assume it is a heartbeat and the
+	 * other code will retry if it cares about the response and misses it.
+	 */
+	if (rsp &&
+	    (rsp->session.authtype    == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+	    (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL))
+	{
+		int i;
+
+		for (i = 0; i < rsp->data_len; ++i)
+			putc(rsp->data[i], stdout);
+
+		fflush(stdout);
+	}
+}
+
+
+
+/*
+ * ipmi_sol_deactivate
+ */
+static int
+ipmi_sol_deactivate(struct ipmi_intf * intf, int instance)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq   req;
+	uint8_t          data[6];
+
+	if ((instance <= 0) || (instance > 15)) {
+		lprintf(LOG_ERR, "Error: Instance must range from 1 to 15");
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;
+	req.msg.cmd      = IPMI_DEACTIVATE_PAYLOAD;
+	req.msg.data_len = 6;
+	req.msg.data     = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = IPMI_PAYLOAD_TYPE_SOL;  /* payload type      */
+	data[1] = instance;               /* payload instance. */
+
+	/* Lots of important data */
+	data[2] = 0;
+	data[3] = 0;
+	data[4] = 0;
+	data[5] = 0;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (NULL != rsp) {
+		switch (rsp->ccode) {
+			case 0x00:
+				return 0;
+			case 0x80:
+				lprintf(LOG_ERR, "Info: SOL payload already de-activated");
+				break;
+			case 0x81:
+				lprintf(LOG_ERR, "Info: SOL payload type disabled");
+				break;
+			default:
+				lprintf(LOG_ERR, "Error de-activating SOL payload: %s",
+					val2str(rsp->ccode, completion_code_vals));
+				break;
+		}
+	} else {
+		lprintf(LOG_ERR, "Error: No response de-activating SOL payload");
+	}
+
+	return -1;
+}
+
+
+
+/*
+ * processSolUserInput
+ *
+ * Act on user input into the SOL session.  The only reason this
+ * is complicated is that we have to process escape sequences.
+ *
+ * return   0 on success
+ *          1 if we should exit
+ *        < 0 on error (BMC probably closed the session)
+ */
+static int
+processSolUserInput(
+					struct ipmi_intf * intf,
+					uint8_t    * input,
+					uint16_t   buffer_length)
+{
+	static int escape_pending = 0;
+	static int last_was_cr    = 1;
+	struct ipmi_v2_payload v2_payload;
+	int  length               = 0;
+	int  retval               = 0;
+	char ch;
+	int  i;
+
+	memset(&v2_payload, 0, sizeof(v2_payload));
+
+	/*
+	 * Our first order of business is to check the input for escape
+	 * sequences to act on.
+	 */
+	for (i = 0; i < buffer_length; ++i)
+	{
+		ch = input[i];
+
+		if (escape_pending){
+			escape_pending = 0;
+
+			/*
+			 * Process a possible escape sequence.
+			 */
+			switch (ch) {
+			case '.':
+				printf("%c. [terminated ipmitool]\n",
+				       intf->ssn_params.sol_escape_char);
+				retval = 1;
+				break;
+
+			case 'Z' - 64:
+				printf("%c^Z [suspend ipmitool]\n",
+				       intf->ssn_params.sol_escape_char);
+				suspendSelf(1); /* Restore tty back to raw */
+				continue;
+
+			case 'X' - 64:
+				printf("%c^Z [suspend ipmitool]\n",
+				       intf->ssn_params.sol_escape_char);
+				suspendSelf(0); /* Don't restore to raw mode */
+				continue;
+
+			case 'B':
+				printf("%cB [send break]\n",
+				       intf->ssn_params.sol_escape_char);
+				sendBreak(intf);
+				continue;
+
+			case '?':
+				printSolEscapeSequences(intf);
+				continue;
+
+			default:
+				if (ch != intf->ssn_params.sol_escape_char)
+					v2_payload.payload.sol_packet.data[length++] =
+						intf->ssn_params.sol_escape_char;
+				v2_payload.payload.sol_packet.data[length++] = ch;
+			}
+		}
+
+		else
+		{
+			if (last_was_cr && (ch == intf->ssn_params.sol_escape_char)) {
+				escape_pending = 1;
+				continue;
+			}
+
+			v2_payload.payload.sol_packet.data[length++] =	ch;
+		}
+
+
+		/*
+		 * Normal character.  Record whether it was a newline.
+		 */
+		last_was_cr = (ch == '\r' || ch == '\n');
+	}
+
+
+	/*
+	 * If there is anything left to process we dispatch it to the BMC,
+	 * send intf->session->sol_data.max_outbound_payload_size bytes
+	 * at a time.
+	 */
+	if (length)
+	{
+		struct ipmi_rs * rsp = NULL;
+		int try = 0;
+
+		while (try < intf->ssn_params.retry) {
+
+			v2_payload.payload.sol_packet.character_count = length;
+
+			rsp = intf->send_sol(intf, &v2_payload);
+
+			if (rsp)
+			{
+				break;
+			}
+
+			usleep(5000);
+			try++;
+		}
+
+		if (! rsp)
+		{
+			lprintf(LOG_ERR, "Error sending SOL data: FAIL");
+			retval = -1;
+		}
+
+		/* If the sequence number is set we know we have new data */
+		if (retval == 0)
+			if ((rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+			    (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL)        &&
+			    (rsp->payload.sol_packet.packet_sequence_number))
+				output(rsp);
+	}
+
+	return retval;
+}
+
+static int
+ipmi_sol_keepalive_using_sol(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload v2_payload;
+	struct timeval end;
+
+	if (_disable_keepalive)
+		return 0;
+
+	gettimeofday(&end, 0);
+
+	if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
+		memset(&v2_payload, 0, sizeof(v2_payload));
+		v2_payload.payload.sol_packet.character_count = 0;
+		if (intf->send_sol(intf, &v2_payload) == NULL)
+			return -1;
+		/* good return, reset start time */
+		gettimeofday(&_start_keepalive, 0);
+	}
+	return 0;
+}
+
+static int
+ipmi_sol_keepalive_using_getdeviceid(struct ipmi_intf * intf)
+{
+	struct timeval  end;
+
+	if (_disable_keepalive)
+		return 0;
+
+	gettimeofday(&end, 0);
+
+	if (end.tv_sec - _start_keepalive.tv_sec > SOL_KEEPALIVE_TIMEOUT) {
+		if (intf->keepalive(intf) != 0)
+         		return -1;
+		/* good return, reset start time */
+		gettimeofday(&_start_keepalive, 0);
+   	}
+	return 0;
+}
+
+
+
+/*
+ * ipmi_sol_red_pill
+ */
+static int
+ipmi_sol_red_pill(struct ipmi_intf * intf, int instance)
+{
+	char   * buffer;
+	int    numRead;
+	int    bShouldExit       = 0;
+	int    bBmcClosedSession = 0;
+	fd_set read_fds;
+	struct timeval tv;
+	int    retval;
+	int    buffer_size = intf->session->sol_data.max_inbound_payload_size;
+	int    keepAliveRet = 0;
+	int    retrySol = 0;
+
+	/* Subtract SOL header from max_inbound_payload_size */
+	if (buffer_size > 4)
+		buffer_size -= 4;
+
+	buffer = (char*)malloc(buffer_size);
+	if (buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure"); 
+		return -1;
+	}
+
+	/* Initialize keepalive start time */
+	gettimeofday(&_start_keepalive, 0);
+
+	enter_raw_mode();
+
+	while (! bShouldExit)
+	{
+		FD_ZERO(&read_fds);
+		FD_SET(0, &read_fds);
+		FD_SET(intf->fd, &read_fds);
+
+		if (!ipmi_oem_active(intf,"i82571spt"))
+		{
+			/* Send periodic keepalive packet */
+			if(_use_sol_for_keepalive == 0)
+			{
+				keepAliveRet = ipmi_sol_keepalive_using_getdeviceid(intf);
+			}
+			else
+			{
+				keepAliveRet = ipmi_sol_keepalive_using_sol(intf);
+			}
+		
+			if (keepAliveRet != 0)
+			{
+				/*
+				 * Retrying the keep Alive before declaring a communication
+				 * lost state with the IPMC. Helpful when the payload is
+				 * reset and brings down the connection temporarily. Otherwise,
+				 * if we send getDevice Id to check the status of IPMC during
+				 * this down time when the connection is restarting, SOL will
+				 * exit even though the IPMC is available and the session is open.
+				 */
+				if (retrySol == MAX_SOL_RETRY)
+				{
+					/* no response to Get Device ID keepalive message */
+					bShouldExit = 1;
+					continue;
+				}
+				else
+				{
+					retrySol++;
+				}
+			}
+			else
+			{
+				/* if the keep Alive is successful reset retries to zero */
+				retrySol = 0;
+			}
+		} /* !oem="i82571spt" */
+		/* Wait up to half a second */
+		tv.tv_sec =  0;
+		tv.tv_usec = 500000;
+
+		retval = select(intf->fd + 1, &read_fds, NULL, NULL, &tv);
+
+		if (retval)
+		{
+			if (retval == -1)
+			{
+				/* ERROR */
+				perror("select");
+				return -1;
+			}
+
+
+			/*
+			 * Process input from the user
+			 */
+			if (FD_ISSET(0, &read_fds))
+	 		{
+				memset(buffer, 0, buffer_size);
+				numRead = read(fileno(stdin),
+							   buffer,
+							   buffer_size);
+
+				if (numRead > 0)
+				{
+					int rc = processSolUserInput(intf, (uint8_t *)buffer, numRead);
+
+					if (rc)
+					{
+						if (rc < 0)
+							bShouldExit = bBmcClosedSession = 1;
+						else
+							bShouldExit = 1;
+					}
+				}
+				else
+				{
+					bShouldExit = 1;
+				}
+			}
+
+
+			/*
+			 * Process input from the BMC
+			 */
+			else if (FD_ISSET(intf->fd, &read_fds))
+			{
+				struct ipmi_rs * rs =intf->recv_sol(intf);
+				if (rs) {
+					output(rs);
+				} else {
+					bShouldExit = bBmcClosedSession = 1;
+				}
+ 			}
+
+
+			/*
+			 * ERROR in select
+			 */
+ 			else
+			{
+				lprintf(LOG_ERR, "Error: Select returned with nothing to read");
+				bShouldExit = 1;
+			}
+		}
+	}
+
+	leave_raw_mode();
+
+	if (keepAliveRet != 0)
+	{
+		lprintf(LOG_ERR, "Error: No response to keepalive - Terminating session");
+		/* attempt to clean up anyway */
+		ipmi_sol_deactivate(intf, instance);
+		exit(1);
+	}
+
+	if (bBmcClosedSession)
+	{
+		lprintf(LOG_ERR, "SOL session closed by BMC");
+		exit(1);
+	}
+	else
+		ipmi_sol_deactivate(intf, instance);
+
+	return 0;
+}
+
+
+
+
+/*
+ * ipmi_sol_activate
+ */
+static int
+ipmi_sol_activate(struct ipmi_intf * intf, int looptest, int interval,
+		int instance)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq   req;
+	struct activate_payload_rsp ap_rsp;
+	uint8_t    data[6];
+	uint8_t    bSolEncryption     = 1;
+	uint8_t    bSolAuthentication = 1;
+
+	/*
+	 * This command is only available over RMCP+ (the lanplus
+	 * interface).
+	 */
+	if (strncmp(intf->name, "lanplus", 7) != 0)
+	{
+		lprintf(LOG_ERR, "Error: This command is only available over the "
+			   "lanplus interface");
+		return -1;
+	}
+
+	if ((instance <= 0) || (instance > 15)) {
+		lprintf(LOG_ERR, "Error: Instance must range from 1 to 15");
+		return -1;
+	}
+
+
+	/*
+	 * Setup a callback so that the lanplus processing knows what
+	 * to do with packets that come unexpectedly (while waiting for
+	 * an ACK, perhaps.
+	 */
+	intf->session->sol_data.sol_input_handler = output;
+
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;
+	req.msg.cmd      = IPMI_ACTIVATE_PAYLOAD;
+	req.msg.data_len = 6;
+	req.msg.data     = data;
+
+	data[0] = IPMI_PAYLOAD_TYPE_SOL;  /* payload type     */
+	data[1] = instance;               /* payload instance */
+
+	/* Lots of important data.  Most is default */
+	data[2]  = bSolEncryption?     0x80 : 0;
+	data[2] |= bSolAuthentication? 0x40 : 0;
+	data[2] |= IPMI_SOL_SERIAL_ALERT_MASK_DEFERRED;
+
+	if (ipmi_oem_active(intf, "intelplus")) {
+		data[2] |= IPMI_SOL_BMC_ASSERTS_CTS_MASK_TRUE;
+	} else if (ipmi_oem_active(intf, "i82571spt")) {
+		/*
+		 * A quote from Intel: "Engineering believes the problem
+		 * lies within the Auxiliary data being sent with the
+		 * 'Activate Payload' command from IPMITool.  IPMITool
+		 * sends a C6h which sets some bits having to do with
+		 * encryption and some behavior dealing with CTS DCD/DSR.
+		 * I recommend that the customer modify this request
+		 * to send 08h instead. This is what our internal utility
+		 * sends and it works without issue. I will work with
+		 * engineering to ensure the settings that IPMITool uses
+		 * (C6h) are supported in the future.
+		 */
+		data[2] = 0x08;
+	} else {
+		data[2] |= IPMI_SOL_BMC_ASSERTS_CTS_MASK_FALSE;
+	}
+
+	data[3] = 0x00; /* reserved */
+	data[4] = 0x00; /* reserved */
+	data[5] = 0x00; /* reserved */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (NULL != rsp) {
+		switch (rsp->ccode) {
+			case 0x00: 
+				if (rsp->data_len == 12) {
+					break;
+				} else {
+					lprintf(LOG_ERR, "Error: Unexpected data length (%d) received "
+						   "in payload activation response",
+						   rsp->data_len);
+					return -1;
+				}
+				break;
+			case 0x80:
+				lprintf(LOG_ERR, "Info: SOL payload already active on another session");
+				return -1;
+			case 0x81:
+				lprintf(LOG_ERR, "Info: SOL payload disabled");
+				return -1;
+			case 0x82:
+				lprintf(LOG_ERR, "Info: SOL payload activation limit reached");
+				return -1;
+			case 0x83:
+				lprintf(LOG_ERR, "Info: cannot activate SOL payload with encryption");
+				return -1;
+			case 0x84:
+				lprintf(LOG_ERR, "Info: cannot activate SOL payload without encryption");
+				return -1;
+			default:
+				lprintf(LOG_ERR, "Error activating SOL payload: %s",
+					val2str(rsp->ccode, completion_code_vals));
+				return -1;
+		}
+	} else {
+		lprintf(LOG_ERR, "Error: No response activating SOL payload");
+		return -1;
+	}
+
+
+	memcpy(&ap_rsp, rsp->data, sizeof(struct activate_payload_rsp));
+
+	intf->session->sol_data.max_inbound_payload_size =
+		(ap_rsp.inbound_payload_size[1] << 8) |
+		ap_rsp.inbound_payload_size[0];
+
+	intf->session->sol_data.max_outbound_payload_size =
+		(ap_rsp.outbound_payload_size[1] << 8) |
+		ap_rsp.outbound_payload_size[0];
+
+	intf->session->sol_data.port =
+		(ap_rsp.payload_udp_port[1] << 8) |
+		ap_rsp.payload_udp_port[0];
+
+	intf->session->timeout = 1;
+
+
+	/* NOTE: the spec does allow for SOL traffic to be sent on
+	 * a different port.  we do not yet support that feature. */
+	if (intf->session->sol_data.port != intf->ssn_params.port)
+	{
+		/* try byteswapping port in case BMC sent it incorrectly */
+		uint16_t portswap = BSWAP_16(intf->session->sol_data.port);
+
+		if (portswap == intf->ssn_params.port) {
+			intf->session->sol_data.port = portswap;
+		}
+		else {
+			lprintf(LOG_ERR, "Error: BMC requests SOL session on different port");
+			return -1;
+		}
+	}
+
+	printf("[SOL Session operational.  Use %c? for help]\n",
+	       intf->ssn_params.sol_escape_char);
+
+	if(looptest == 1)
+	{
+		ipmi_sol_deactivate(intf, instance);
+		usleep(interval*1000);
+		return 0;
+	}
+
+	/*
+	 * At this point we are good to go with our SOL session.  We
+	 * need to listen to
+	 * 1) STDIN for user input
+	 * 2) The FD for incoming SOL packets
+	 */
+	if (ipmi_sol_red_pill(intf, instance))
+	{
+		lprintf(LOG_ERR, "Error in SOL session");
+		return -1;
+	}
+
+	return 0;
+}
+
+
+
+/*
+ * print_sol_usage
+ */
+static void
+print_sol_usage(void)
+{
+	lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]");
+	lprintf(LOG_NOTICE, "              set <parameter> <value> [channel]");
+	lprintf(LOG_NOTICE, "              payload <enable|disable|status> [channel] [userid]");
+	lprintf(LOG_NOTICE, "              activate [<usesolkeepalive|nokeepalive>] [instance=<number>]");
+	lprintf(LOG_NOTICE, "              deactivate [instance=<number>]");
+	lprintf(LOG_NOTICE, "              looptest [<loop times> [<loop interval(in ms)> [<instance>]]]");
+}
+
+
+
+/*
+ * print_sol_set_usage
+ */
+static void
+print_sol_set_usage(void)
+{
+	lprintf(LOG_NOTICE, "\nSOL set parameters and values: \n");
+  	lprintf(LOG_NOTICE, "  set-in-progress             set-complete | "
+		"set-in-progress | commit-write");
+	lprintf(LOG_NOTICE, "  enabled                     true | false");
+	lprintf(LOG_NOTICE, "  force-encryption            true | false");
+	lprintf(LOG_NOTICE, "  force-authentication        true | false");
+	lprintf(LOG_NOTICE, "  privilege-level             user | operator | admin | oem");
+	lprintf(LOG_NOTICE, "  character-accumulate-level  <in 5 ms increments>");
+	lprintf(LOG_NOTICE, "  character-send-threshold    N");
+	lprintf(LOG_NOTICE, "  retry-count                 N");
+	lprintf(LOG_NOTICE, "  retry-interval              <in 10 ms increments>");
+	lprintf(LOG_NOTICE, "  non-volatile-bit-rate       "
+		"serial | 9.6 | 19.2 | 38.4 | 57.6 | 115.2");
+	lprintf(LOG_NOTICE, "  volatile-bit-rate           "
+		"serial | 9.6 | 19.2 | 38.4 | 57.6 | 115.2");
+	lprintf(LOG_NOTICE, "");
+}
+
+
+
+/* ipmi_sol_main */
+int
+ipmi_sol_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int retval = 0;
+	if (!argc || !strncmp(argv[0], "help", 4)) {
+		/* Help */
+		print_sol_usage();
+	} else if (!strncmp(argv[0], "info", 4)) {
+		/* Info */
+		uint8_t channel;
+		if (argc == 1) {
+			/* Ask about the current channel */
+			channel = 0x0E;
+		} else if (argc == 2) {
+			if (is_ipmi_channel_num(argv[1], &channel) != 0) {
+				return (-1);
+			}
+		} else {
+			print_sol_usage();
+			return -1;
+		}
+		retval = ipmi_print_sol_info(intf, channel);
+	} else if (!strncmp(argv[0], "payload", 7)) {
+		/* Payload enable or disable */
+		uint8_t channel = 0xe;
+		uint8_t userid = 1;
+		int enable = -1;
+		if (argc == 1 || argc > 4) {
+			print_sol_usage();
+			return -1;
+		}
+		if (argc >= 3) {
+			if (is_ipmi_channel_num(argv[2], &channel) != 0) {
+				return (-1);
+			}
+		}
+		if (argc == 4) {
+			if (is_ipmi_user_id(argv[3], &userid) != 0) {
+				return (-1);
+			}
+		}
+		if (!strncmp(argv[1], "enable", 6)) {
+			enable = 1;
+		} else if (!strncmp(argv[1], "disable", 7)) {
+			enable = 0;
+		} else if (!strncmp(argv[1], "status", 6)) {
+			return ipmi_sol_payload_access_status(intf, channel, userid);
+		} else {
+			print_sol_usage();
+			return -1;
+		}
+		retval = ipmi_sol_payload_access(intf, channel, userid, enable);
+	} else if (!strncmp(argv[0], "set", 3)) {
+		/* Set a parameter value */
+		uint8_t channel = 0xe;
+		uint8_t guard = 1;
+		if (argc == 3) {
+			channel = 0xe;
+		} else if (argc == 4) {
+			if (!strncmp(argv[3], "noguard", 7)) {
+				guard = 0;
+			} else {
+				if (is_ipmi_channel_num(argv[3], &channel) != 0) {
+					return (-1);
+				}
+			}
+		} else if (argc == 5) {
+			if (is_ipmi_channel_num(argv[3], &channel) != 0) {
+				return (-1);
+			}
+			if (!strncmp(argv[4], "noguard", 7)) {
+				guard = 0;
+			}
+		} else {
+			print_sol_set_usage();
+			return -1;
+		}
+		retval = ipmi_sol_set_param(intf, channel, argv[1], argv[2], guard);
+	} else if (!strncmp(argv[0], "activate", 8)) {
+		/* Activate */
+		int i;
+		uint8_t instance = 1;
+		for (i = 1; i < argc; i++) {
+			if (!strncmp(argv[i], "usesolkeepalive", 15)) {
+				_use_sol_for_keepalive = 1;
+			} else if (!strncmp(argv[i], "nokeepalive", 11)) {
+				_disable_keepalive = 1;
+			} else if (!strncmp(argv[i], "instance=", 9)) {
+				if (str2uchar(argv[i] + 9, &instance) != 0) {
+					lprintf(LOG_ERR, "Given instance '%s' is invalid.", argv[i] + 9);
+					print_sol_usage();
+					return -1;
+				}
+			} else {
+				print_sol_usage();
+				return -1;
+			}
+		}
+		retval = ipmi_sol_activate(intf, 0, 0, instance);
+	} else if (!strncmp(argv[0], "deactivate", 10)) {
+		/* Dectivate */
+		int i;
+		uint8_t instance = 1;
+		for (i = 1; i < argc; i++) {
+			if (!strncmp(argv[i], "instance=", 9)) {
+				if (str2uchar(argv[i] + 9, &instance) != 0) {
+					lprintf(LOG_ERR,
+							"Given instance '%s' is invalid.",
+							argv[i] + 9);
+					print_sol_usage();
+					return -1;
+				}
+			} else {
+				print_sol_usage();
+				return -1;
+			}
+		}
+		retval = ipmi_sol_deactivate(intf, instance);
+	} else if (!strncmp(argv[0], "looptest", 8)) {
+		/* SOL loop test: Activate and then Dectivate */
+		int cnt = 200;
+		int interval = 100; /* Unit is: ms */
+		uint8_t instance = 1;
+		if (argc > 4) {
+			print_sol_usage();
+			return -1;
+		}
+		if (argc != 1) {
+			/* at least 2 */
+			if (str2int(argv[1], &cnt) != 0) {
+				lprintf(LOG_ERR, "Given cnt '%s' is invalid.",
+						argv[1]);
+				return (-1);
+			}
+			if (cnt <= 0) {
+				cnt = 200;
+			}
+		}
+		if (argc >= 3) {
+			if (str2int(argv[2], &interval) != 0) {
+				lprintf(LOG_ERR, "Given interval '%s' is invalid.",
+						argv[2]);
+				return (-1);
+			}
+			if (interval < 0) {
+				interval = 0;
+			}
+		}
+		if (argc >= 4) {
+			if (str2uchar(argv[3], &instance) != 0) {
+				lprintf(LOG_ERR, "Given instance '%s' is invalid.",
+						argv[3]);
+				print_sol_usage();
+				return -1;
+			}
+		}
+
+		while (cnt > 0) {
+			printf("remain loop test counter: %d\n", cnt);
+			retval = ipmi_sol_activate(intf, 1, interval, instance);
+			if (retval) {
+				printf("SOL looptest failed: %d\n",
+						retval);
+				break;
+			}
+			cnt -= 1;
+		}
+	} else {
+		print_sol_usage();
+		retval = -1;
+	}
+	return retval;
+}
diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c
new file mode 100644
index 0000000..94b2abd
--- /dev/null
+++ b/lib/ipmi_strings.c
@@ -0,0 +1,789 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stddef.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_sel.h>  /* for IPMI_OEM */
+
+const struct valstr ipmi_oem_info[] = {
+
+   { IPMI_OEM_UNKNOWN,                "Unknown" },
+   { IPMI_OEM_HP,                     "Hewlett-Packard" },
+   { IPMI_OEM_SUN,                    "Sun Microsystems" },
+   { IPMI_OEM_INTEL,                  "Intel Corporation" },
+   { IPMI_OEM_LMC,                    "LMC" },
+   { IPMI_OEM_RADISYS,                "RadiSys Corporation" },
+   { IPMI_OEM_TYAN,                   "Tyan Computer Corporation" },
+   { IPMI_OEM_NEWISYS,                "Newisys" },
+   { IPMI_OEM_SUPERMICRO,             "Supermicro" },
+   { IPMI_OEM_GOOGLE,                 "Google" },
+   { IPMI_OEM_KONTRON,                "Kontron" },
+   { IPMI_OEM_NOKIA,                  "Nokia" },
+   { IPMI_OEM_PICMG,                  "PICMG" },
+   { IPMI_OEM_PEPPERCON,              "Peppercon AG" },
+   { IPMI_OEM_DELL,                   "DELL Inc" },
+   { IPMI_OEM_NEC,                    "NEC" },
+   { IPMI_OEM_MAGNUM,                 "Magnum Technologies" },
+   { IPMI_OEM_FUJITSU_SIEMENS,        "Fujitsu Siemens" },
+   { IPMI_OEM_TATUNG,                 "Tatung" },
+   { IPMI_OEM_AMI,                    "AMI" },
+   { IPMI_OEM_RARITAN,                "Raritan" },
+   { IPMI_OEM_AVOCENT,                "Avocent" },
+   { IPMI_OEM_OSA,                    "OSA" },
+   { IPMI_OEM_TOSHIBA,                "Toshiba" },
+   { IPMI_OEM_HITACHI_116,            "Hitachi" },
+   { IPMI_OEM_HITACHI_399,            "Hitachi" },
+   { IPMI_OEM_NOKIA_SOLUTIONS_AND_NETWORKS, "Nokia Solutions and Networks" },
+   { IPMI_OEM_BULL,                   "Bull Company" },
+   { IPMI_OEM_PPS,                    "Pigeon Point Systems" },
+   { IPMI_OEM_BROADCOM,               "Broadcom Corporation" },
+   { IPMI_OEM_ERICSSON,               "Ericsson AB"},
+   { IPMI_OEM_QUANTA,                 "Quanta" },
+   { IPMI_OEM_VITA,                   "VITA" },
+   { IPMI_OEM_ADVANTECH,              "Advantech" },
+   /************************************************************************
+    * Add ID String for IANA Enterprise Number of IBM & ADLINK
+    * https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
+    *  2
+    *    IBM
+    *      Kristine Adamson
+    *        adamson&us.ibm.com
+    *  4769
+    *    IBM Corporation
+    *      Victor Sample
+    *        vsample&us.ibm.com
+    *  20301
+    *    IBM eServer X
+    *      Lynn Fore
+    *        sls&us.ibm.com
+    *  24339
+    *    ADLINK TECHNOLOGY INC.
+    *      Ryan Hsu
+    *        ryan.hsu&adlinktech.com
+    ************************************************************************/
+   { IPMI_OEM_IBM_2,                  "IBM" },
+   { IPMI_OEM_IBM_4769,               "IBM Corporation" },
+   { IPMI_OEM_IBM_20301,              "IBM eServer X" },
+   { IPMI_OEM_ADLINK_24339,           "ADLINK Technology Inc." },
+   { 0xffff , NULL },
+};
+
+const struct oemvalstr ipmi_oem_product_info[] = {
+   /* Keep OEM grouped together */
+   /* Intel stuff, thanks to Tim Bell */
+   { IPMI_OEM_INTEL, 0x000C, "TSRLT2" },
+   { IPMI_OEM_INTEL, 0x001B, "TIGPR2U" },
+   { IPMI_OEM_INTEL, 0x0022, "TIGI2U" },
+   { IPMI_OEM_INTEL, 0x0026, "Bridgeport" },
+   { IPMI_OEM_INTEL, 0x0028, "S5000PAL" },
+   { IPMI_OEM_INTEL, 0x0029, "S5000PSL" },
+   { IPMI_OEM_INTEL, 0x0100, "Tiger4" },
+   { IPMI_OEM_INTEL, 0x0103, "McCarran" },
+   { IPMI_OEM_INTEL, 0x0800, "ZT5504" },
+   { IPMI_OEM_INTEL, 0x0808, "MPCBL0001" },
+   { IPMI_OEM_INTEL, 0x0811, "TIGW1U" },
+   { IPMI_OEM_INTEL, 0x4311, "NSI2U" },
+   /* Kontron */
+   { IPMI_OEM_KONTRON,4000, "AM4000 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4001, "AM4001 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4002, "AM4002 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4010, "AM4010 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5503, "AM4500/4520 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5504, "AM4300 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5507, "AM4301 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5508, "AM4330 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5520, "KTC5520/EATX" },
+   { IPMI_OEM_KONTRON,5703, "RTM8020" },
+   { IPMI_OEM_KONTRON,5704, "RTM8030" },
+   { IPMI_OEM_KONTRON,5705, "RTM8050" },
+   { IPMI_OEM_KONTRON,6000, "CP6000" },
+   { IPMI_OEM_KONTRON,6006, "DT-64" },
+   { IPMI_OEM_KONTRON,6010, "CP6010" },
+   { IPMI_OEM_KONTRON,6011, "CP6011" },
+   { IPMI_OEM_KONTRON,6012, "CP6012" },
+   { IPMI_OEM_KONTRON,6014, "CP6014" },
+   { IPMI_OEM_KONTRON,5002, "AT8001" },
+   { IPMI_OEM_KONTRON,5003, "AT8010" },
+   { IPMI_OEM_KONTRON,5004, "AT8020" },
+   { IPMI_OEM_KONTRON,5006, "AT8030 IPMC" },
+   { IPMI_OEM_KONTRON,2025, "AT8030 MMC" },
+   { IPMI_OEM_KONTRON,5007, "AT8050" },
+   { IPMI_OEM_KONTRON,5301, "AT8400" },
+   { IPMI_OEM_KONTRON,5303, "AT8901" },
+   /* Broadcom */
+   { IPMI_OEM_BROADCOM, 5725, "BCM5725" },
+   /* Ericsson */
+   { IPMI_OEM_ERICSSON, 0x0054, "Phantom" },
+   /* Advantech */
+   /* ATCA Blades */
+   { IPMI_OEM_ADVANTECH, 0x3393, "MIC-3393" },
+   { IPMI_OEM_ADVANTECH, 0x3395, "MIC-3395" },
+   { IPMI_OEM_ADVANTECH, 0x3396, "MIC-3396" },
+   { IPMI_OEM_ADVANTECH, 0x5302, "MIC-5302" },
+   { IPMI_OEM_ADVANTECH, 0x5304, "MIC-5304" },
+   { IPMI_OEM_ADVANTECH, 0x5320, "MIC-5320" },
+   { IPMI_OEM_ADVANTECH, 0x5321, "MIC-5321" },
+   { IPMI_OEM_ADVANTECH, 0x5322, "MIC-5322" },
+   { IPMI_OEM_ADVANTECH, 0x5332, "MIC-5332" },
+   { IPMI_OEM_ADVANTECH, 0x5333, "MIC-5333" },
+   { IPMI_OEM_ADVANTECH, 0x5342, "MIC-5342" },
+   { IPMI_OEM_ADVANTECH, 0x5343, "MIC-5343" },
+   { IPMI_OEM_ADVANTECH, 0x5344, "MIC-5344" },
+   { IPMI_OEM_ADVANTECH, 0x5345, "MIC-5345" },
+   { IPMI_OEM_ADVANTECH, 0x5201, "MIC-5201 Dual 10GE AMC"},
+   { IPMI_OEM_ADVANTECH, 0x5203, "MIC-5203 Quad GbE AMC"},
+   { IPMI_OEM_ADVANTECH, 0x5212, "MIC-5212 Dual 10GE AMC"},
+   /* AdvancedMC */
+   { IPMI_OEM_ADVANTECH, 0x5401, "MIC-5401" },
+   { IPMI_OEM_ADVANTECH, 0x5601, "MIC-5601" },
+   { IPMI_OEM_ADVANTECH, 0x5602, "MIC-5602" },
+   { IPMI_OEM_ADVANTECH, 0x5604, "MIC-5604" },
+   { IPMI_OEM_ADVANTECH, 0x5603, "MIC-5603" },
+   { IPMI_OEM_ADVANTECH, 0x6311, "MIC-6311" },
+   { IPMI_OEM_ADVANTECH, 0x6313, "MIC-6313" },
+   { IPMI_OEM_ADVANTECH, 0x8301, "MIC-8301" },
+   { IPMI_OEM_ADVANTECH, 0x8302, "MIC-8302" },
+   { IPMI_OEM_ADVANTECH, 0x8304, "MIC-8304" },
+   { IPMI_OEM_ADVANTECH, 0x5101, "RTM-5101" },
+   { IPMI_OEM_ADVANTECH, 0x5102, "RTM-5102" },
+   { IPMI_OEM_ADVANTECH, 0x5106, "RTM-5106" },
+   { IPMI_OEM_ADVANTECH, 0x5107, "RTM-5107" },
+   { IPMI_OEM_ADVANTECH, 0x5210, "RTM-5210" },
+   { IPMI_OEM_ADVANTECH, 0x5220, "RTM-5220" },
+   { IPMI_OEM_ADVANTECH, 0x5104, "RTM-5104" },
+   { IPMI_OEM_ADVANTECH, 0x5500, "UTCA-5500"},
+   { IPMI_OEM_ADVANTECH, 0x5503, "UTCA-5503"},
+   { IPMI_OEM_ADVANTECH, 0x5504, "UTCA-5504"},
+   { IPMI_OEM_ADVANTECH, 0x5801, "UTCA-5801"},
+   { IPMI_OEM_ADVANTECH, 0x2210, "NCPB-2210"},
+   { IPMI_OEM_ADVANTECH, 0x2305, "NCPB-2305"},
+   { IPMI_OEM_ADVANTECH, 0x2320, "NCPB-2320"},
+   { IPMI_OEM_ADVANTECH, 0x3109, "NCP-3109" },
+   { IPMI_OEM_ADVANTECH, 0x3110, "NCP-3110" },
+   { IPMI_OEM_ADVANTECH, 0x3200, "NCP-3200" },
+   { IPMI_OEM_ADVANTECH, 0x5060, "SMM-5060" },
+   { IPMI_OEM_ADVANTECH, 0x3210, "FWA-3210" },
+   { IPMI_OEM_ADVANTECH, 0x3220, "FWA-3220" },
+   { IPMI_OEM_ADVANTECH, 0x3221, "FWA-3221" },
+   { IPMI_OEM_ADVANTECH, 0x3230, "FWA-3230" },
+   { IPMI_OEM_ADVANTECH, 0x3231, "FWA-3231" },
+   { IPMI_OEM_ADVANTECH, 0x3233, "FWA-3233" },
+   { IPMI_OEM_ADVANTECH, 0x3250, "FWA-3250" },
+   { IPMI_OEM_ADVANTECH, 0x3260, "FWA-3260" },
+   { IPMI_OEM_ADVANTECH, 0x5020, "FWA-5020" },
+   { IPMI_OEM_ADVANTECH, 0x6510, "FWA-6510" },
+   { IPMI_OEM_ADVANTECH, 0x6511, "FWA-6511" },
+   { IPMI_OEM_ADVANTECH, 0x6512, "FWA-6512" },
+   { IPMI_OEM_ADVANTECH, 0x6520, "FWA-6520" },
+   { IPMI_OEM_ADVANTECH, 0x6521, "FWA-6521" },
+   { IPMI_OEM_ADVANTECH, 0x6522, "FWA-6522" },
+   { IPMI_OEM_ADVANTECH, 0x7310, "ATCA-7310"},
+   { IPMI_OEM_ADVANTECH, 0x7330, "ATCA-7330"},
+   { IPMI_OEM_ADVANTECH, 0x7410, "ATCA-7410"},
+   { IPMI_OEM_ADVANTECH, 0x9023, "ATCA-9023"},
+   { IPMI_OEM_ADVANTECH, 0x9112, "ATCA-9112"},
+   { IPMI_OEM_ADVANTECH, 0x4201, "AMC-4201" },
+   { IPMI_OEM_ADVANTECH, 0x4202, "AMC-4202" },
+   { IPMI_OEM_ADVANTECH, 0x3211, "NAMB-3211"},
+   { IPMI_OEM_ADVANTECH, 0x1207, "CPCI-1207"},
+   { IPMI_OEM_ADVANTECH, 0x120E, "CPCI-1207 Test Board"},
+   { IPMI_OEM_ADVANTECH, 0x1304, "CPCI-1304"},
+   { IPMI_OEM_ADVANTECH, 0x7001, "CPCI-7001"},
+   { IPMI_OEM_ADVANTECH, 0x8220, "CPCI-8220"},
+   { IPMI_OEM_ADVANTECH, 0x9001, "ESP-9001" },
+   { IPMI_OEM_ADVANTECH, 0x9002, "ESP-9002" },
+   { IPMI_OEM_ADVANTECH, 0x9012, "ESP-9012" },
+   { IPMI_OEM_ADVANTECH, 0x9212, "ESP-9212" },
+   { IPMI_OEM_ADVANTECH, 0x6000, "CGS-6000" },
+   { IPMI_OEM_ADVANTECH, 0x6010, "CGS-6010" },
+   /* ADLINK Technology Inc. */
+   /* AdvancedTCA Processor Blades */
+   { IPMI_OEM_ADLINK_24339, 0x3100, "aTCA-3100" },
+   { IPMI_OEM_ADLINK_24339, 0x3110, "aTCA-3110" },
+   { IPMI_OEM_ADLINK_24339, 0x3150, "aTCA-3150" },
+   { IPMI_OEM_ADLINK_24339, 0x3420, "aTCA-3420" },
+   { IPMI_OEM_ADLINK_24339, 0x3710, "aTCA-3710" },
+   { IPMI_OEM_ADLINK_24339, 0x6100, "aTCA-6100" },
+   { IPMI_OEM_ADLINK_24339, 0x6200, "aTCA-6200" },
+   { IPMI_OEM_ADLINK_24339, 0x6250, "aTCA-6250/6250STW" },
+   { IPMI_OEM_ADLINK_24339, 0x6270, "aTCA-R6270" },
+   { IPMI_OEM_ADLINK_24339, 0x6280, "aTCA-R6280" },
+   { IPMI_OEM_ADLINK_24339, 0x6890, "aTCA-6890" },
+   { IPMI_OEM_ADLINK_24339, 0x6891, "aTCA-6891" },
+   { IPMI_OEM_ADLINK_24339, 0x6900, "aTCA-6900" },
+   { IPMI_OEM_ADLINK_24339, 0x6905, "aTCA-R6905" },
+   { IPMI_OEM_ADLINK_24339, 0x690A, "aTCA-R6900" },
+   { IPMI_OEM_ADLINK_24339, 0x8214, "aTCA-8214" },
+   { IPMI_OEM_ADLINK_24339, 0x8606, "aTCA-8606" },
+   { IPMI_OEM_ADLINK_24339, 0x9300, "aTCA-9300" },
+   { IPMI_OEM_ADLINK_24339, 0x9700, "aTCA-9700" },
+   { IPMI_OEM_ADLINK_24339, 0x9700, "aTCA-R9700" },
+   { IPMI_OEM_ADLINK_24339, 0x970D, "aTCA-9700D" },
+   { IPMI_OEM_ADLINK_24339, 0x9710, "aTCA-9710" },
+   { IPMI_OEM_ADLINK_24339, 0x9710, "aTCA-R9710" },
+   { IPMI_OEM_ADLINK_24339, 0xF001, "aTCA-FN001" },
+   { IPMI_OEM_ADLINK_24339, 0xF2A0, "aTCA-F2AX" },
+   { IPMI_OEM_ADLINK_24339, 0xF5A0, "aTCA-F5AX" },
+   /* CompactPCI Blades */
+   { IPMI_OEM_ADLINK_24339, 0x3510, "cPCI-3510" },
+   { IPMI_OEM_ADLINK_24339, 0x3970, "cPCI-3970" },
+   { IPMI_OEM_ADLINK_24339, 0x6010, "cPCI-6010" },
+   { IPMI_OEM_ADLINK_24339, 0x6210, "cPCI-6210" },
+   { IPMI_OEM_ADLINK_24339, 0x6510, "cPCI-6510" },
+   { IPMI_OEM_ADLINK_24339, 0x6520, "cPCI-6520" },
+   { IPMI_OEM_ADLINK_24339, 0x6525, "cPCI-6525" },
+   { IPMI_OEM_ADLINK_24339, 0x6530, "cPCI-6530/6530BL" },
+   { IPMI_OEM_ADLINK_24339, 0x6600, "cPCI-6600" },
+   { IPMI_OEM_ADLINK_24339, 0x6840, "cPCI-6840" },
+   { IPMI_OEM_ADLINK_24339, 0x6870, "cPCI-6870" },
+   { IPMI_OEM_ADLINK_24339, 0x6880, "cPCI-6880" },
+   { IPMI_OEM_ADLINK_24339, 0x6910, "cPCI-6910" },
+   { IPMI_OEM_ADLINK_24339, 0x6920, "cPCI-6920" },
+   { IPMI_OEM_ADLINK_24339, 0x6930, "cPCI-6930" },
+   { IPMI_OEM_ADLINK_24339, 0x6940, "cPCI-6940" },
+   /* VPX Blades */
+   { IPMI_OEM_ADLINK_24339, 0x3000, "VPX3000" },
+   { IPMI_OEM_ADLINK_24339, 0x3001, "VPX3001" },
+   { IPMI_OEM_ADLINK_24339, 0x3002, "VPX3002" },
+   { IPMI_OEM_ADLINK_24339, 0x3010, "VPX3010" },
+   { IPMI_OEM_ADLINK_24339, 0x3F10, "VPX3G10" },
+   { IPMI_OEM_ADLINK_24339, 0x6000, "VPX6000" },
+   /* Network Appliance */
+   { IPMI_OEM_ADLINK_24339, 0x0410, "MXN-0410" },
+   { IPMI_OEM_ADLINK_24339, 0x2600, "MCN-2600" },
+   { IPMI_OEM_ADLINK_24339, 0x1500, "MCN-1500" },
+
+   { 0xffffff        , 0xffff , NULL },
+ };
+
+const char *ipmi_generic_sensor_type_vals[] = {
+    "reserved",
+    "Temperature", "Voltage", "Current", "Fan",
+    "Physical Security", "Platform Security", "Processor",
+    "Power Supply", "Power Unit", "Cooling Device", "Other",
+    "Memory", "Drive Slot / Bay", "POST Memory Resize",
+    "System Firmwares", "Event Logging Disabled", "Watchdog1",
+    "System Event", "Critical Interrupt", "Button",
+    "Module / Board", "Microcontroller", "Add-in Card",
+    "Chassis", "Chip Set", "Other FRU", "Cable / Interconnect",
+    "Terminator", "System Boot Initiated", "Boot Error",
+    "OS Boot", "OS Critical Stop", "Slot / Connector",
+    "System ACPI Power State", "Watchdog2", "Platform Alert",
+    "Entity Presence", "Monitor ASIC", "LAN",
+    "Management Subsys Health", "Battery", "Session Audit",
+    "Version Change", "FRU State",
+    NULL
+};
+
+const struct oemvalstr ipmi_oem_sensor_type_vals[] = {
+   /* Keep OEM grouped together */
+   { IPMI_OEM_KONTRON, 0xC0, "Firmware Info" },
+   { IPMI_OEM_KONTRON, 0xC2, "Init Agent" },
+   { IPMI_OEM_KONTRON, 0xC2, "Board Reset(cPCI)" },
+   { IPMI_OEM_KONTRON, 0xC3, "IPMBL Link State" },
+   { IPMI_OEM_KONTRON, 0xC4, "Board Reset" },
+   { IPMI_OEM_KONTRON, 0xC5, "FRU Information Agent" },
+   { IPMI_OEM_KONTRON, 0xC6, "POST Value Sensor" },
+   { IPMI_OEM_KONTRON, 0xC7, "FWUM Status" },
+   { IPMI_OEM_KONTRON, 0xC8, "Switch Mngt Software Status" },
+   { IPMI_OEM_KONTRON, 0xC9, "OEM Diagnostic Status" },
+   { IPMI_OEM_KONTRON, 0xCA, "Component Firmware Upgrade" },
+   { IPMI_OEM_KONTRON, 0xCB, "FRU Over Current" },
+   { IPMI_OEM_KONTRON, 0xCC, "FRU Sensor Error" },
+   { IPMI_OEM_KONTRON, 0xCD, "FRU Power Denied" },
+   { IPMI_OEM_KONTRON, 0xCE, "Reserved" },
+   { IPMI_OEM_KONTRON, 0xCF, "Board Reset" },
+   { IPMI_OEM_KONTRON, 0xD0, "Clock Resource Control" },
+   { IPMI_OEM_KONTRON, 0xD1, "Power State" },
+   { IPMI_OEM_KONTRON, 0xD2, "FRU Mngt Power Failure" },
+   { IPMI_OEM_KONTRON, 0xD3, "Jumper Status" },
+   { IPMI_OEM_KONTRON, 0xF2, "RTM Module Hotswap" },
+   /* PICMG Sensor Types */
+   { IPMI_OEM_PICMG, 0xF0, "FRU Hot Swap" },
+   { IPMI_OEM_PICMG, 0xF1,"IPMB Physical Link" },
+   { IPMI_OEM_PICMG, 0xF2, "Module Hot Swap" },
+   { IPMI_OEM_PICMG, 0xF3, "Power Channel Notification" },
+   { IPMI_OEM_PICMG, 0xF4, "Telco Alarm Input" },
+   /* VITA 46.11 Sensor Types */
+   { IPMI_OEM_VITA, 0xF0, "FRU State" },
+   { IPMI_OEM_VITA, 0xF1, "System IPMB Link" },
+   { IPMI_OEM_VITA, 0xF2, "FRU Health" },
+   { IPMI_OEM_VITA, 0xF3, "FRU Temperature" },
+   { IPMI_OEM_VITA, 0xF4, "Payload Test Results" },
+   { IPMI_OEM_VITA, 0xF5, "Payload Test Status" },
+
+   { 0xffffff,      0x00,  NULL }
+};
+
+const struct valstr ipmi_netfn_vals[] = {
+	{ IPMI_NETFN_CHASSIS,	"Chassis" },
+	{ IPMI_NETFN_BRIDGE,	"Bridge" },
+	{ IPMI_NETFN_SE,	"SensorEvent" },
+	{ IPMI_NETFN_APP,	"Application" },
+	{ IPMI_NETFN_FIRMWARE,	"Firmware" },
+	{ IPMI_NETFN_STORAGE,	"Storage" },
+	{ IPMI_NETFN_TRANSPORT,	"Transport" },
+	{ 0xff,			NULL },
+};
+
+/*
+ * From table 26-4 of the IPMI v2 specification
+ */
+const struct valstr ipmi_bit_rate_vals[] = {
+	{ 0x00, "IPMI-Over-Serial-Setting"}, /* Using the value in the IPMI Over Serial Config */
+	{ 0x06, "9.6" },
+	{ 0x07, "19.2" },
+	{ 0x08, "38.4" },
+	{ 0x09, "57.6" },
+	{ 0x0A, "115.2" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ipmi_channel_activity_type_vals[] = {
+	{ 0, "IPMI Messaging session active" },
+	{ 1, "Callback Messaging session active" },
+	{ 2, "Dial-out Alert active" },
+	{ 3, "TAP Page Active" },
+	{ 0x00, NULL },
+};
+
+
+const struct valstr ipmi_privlvl_vals[] = {
+	{ IPMI_SESSION_PRIV_CALLBACK,   "CALLBACK" },
+	{ IPMI_SESSION_PRIV_USER,    	"USER" },
+	{ IPMI_SESSION_PRIV_OPERATOR,	"OPERATOR" },
+	{ IPMI_SESSION_PRIV_ADMIN,	    "ADMINISTRATOR" },
+	{ IPMI_SESSION_PRIV_OEM,    	"OEM" },
+	{ 0xF,	        		    	"NO ACCESS" },
+	{ 0xFF,			             	NULL },
+};
+
+
+const struct valstr ipmi_set_in_progress_vals[] = {
+	{ IPMI_SET_IN_PROGRESS_SET_COMPLETE, "set-complete"    },
+	{ IPMI_SET_IN_PROGRESS_IN_PROGRESS,  "set-in-progress" },
+	{ IPMI_SET_IN_PROGRESS_COMMIT_WRITE, "commit-write"    },
+	{ 0,                            NULL },
+};
+
+
+const struct valstr ipmi_authtype_session_vals[] = {
+	{ IPMI_SESSION_AUTHTYPE_NONE,     "NONE" },
+	{ IPMI_SESSION_AUTHTYPE_MD2,      "MD2" },
+	{ IPMI_SESSION_AUTHTYPE_MD5,      "MD5" },
+	{ IPMI_SESSION_AUTHTYPE_PASSWORD, "PASSWORD" },
+	{ IPMI_SESSION_AUTHTYPE_OEM,      "OEM" },
+	{ IPMI_SESSION_AUTHTYPE_RMCP_PLUS,"RMCP+" },
+	{ 0xFF,                           NULL },
+};
+
+
+const struct valstr ipmi_authtype_vals[] = {
+	{ IPMI_1_5_AUTH_TYPE_BIT_NONE,     "NONE" },
+	{ IPMI_1_5_AUTH_TYPE_BIT_MD2,      "MD2" },
+	{ IPMI_1_5_AUTH_TYPE_BIT_MD5,      "MD5" },
+	{ IPMI_1_5_AUTH_TYPE_BIT_PASSWORD, "PASSWORD" },
+	{ IPMI_1_5_AUTH_TYPE_BIT_OEM,      "OEM" },
+	{ 0,                               NULL },
+};
+
+const struct valstr entity_id_vals[] = {
+	{ 0x00, "Unspecified" },
+	{ 0x01, "Other" },
+	{ 0x02, "Unknown" },
+	{ 0x03, "Processor" },
+	{ 0x04, "Disk or Disk Bay" },
+	{ 0x05, "Peripheral Bay" },
+	{ 0x06, "System Management Module" },
+	{ 0x07, "System Board" },
+	{ 0x08, "Memory Module" },
+	{ 0x09, "Processor Module" },
+	{ 0x0a, "Power Supply" },
+	{ 0x0b, "Add-in Card" },
+	{ 0x0c, "Front Panel Board" },
+	{ 0x0d, "Back Panel Board" },
+	{ 0x0e, "Power System Board" },
+	{ 0x0f, "Drive Backplane" },
+	{ 0x10, "System Internal Expansion Board" },
+	{ 0x11, "Other System Board" },
+	{ 0x12, "Processor Board" },
+	{ 0x13, "Power Unit" },
+	{ 0x14, "Power Module" },
+	{ 0x15, "Power Management" },
+	{ 0x16, "Chassis Back Panel Board" },
+	{ 0x17, "System Chassis" },
+	{ 0x18, "Sub-Chassis" },
+	{ 0x19, "Other Chassis Board" },
+	{ 0x1a, "Disk Drive Bay" },
+	{ 0x1b, "Peripheral Bay" },
+	{ 0x1c, "Device Bay" },
+	{ 0x1d, "Fan Device" },
+	{ 0x1e, "Cooling Unit" },
+	{ 0x1f, "Cable/Interconnect" },
+	{ 0x20, "Memory Device" },
+	{ 0x21, "System Management Software" },
+	{ 0x22, "BIOS" },
+	{ 0x23, "Operating System" },
+	{ 0x24, "System Bus" },
+	{ 0x25, "Group" },
+	{ 0x26, "Remote Management Device" },
+	{ 0x27, "External Environment" },
+	{ 0x28, "Battery" },
+	{ 0x29, "Processing Blade" },
+	{ 0x2A, "Connectivity Switch" },
+	{ 0x2B, "Processor/Memory Module" },
+	{ 0x2C, "I/O Module" },
+	{ 0x2D, "Processor/IO Module" },
+	{ 0x2E, "Management Controller Firmware" },
+	{ 0x2F, "IPMI Channel" },
+	{ 0x30, "PCI Bus" },
+	{ 0x31, "PCI Express Bus" },
+	{ 0x32, "SCSI Bus (parallel)" },
+	{ 0x33, "SATA/SAS Bus" },
+	{ 0x34, "Processor/Front-Side Bus" },
+	{ 0x35, "Real Time Clock(RTC)" },
+	{ 0x36, "Reserved" },
+	{ 0x37, "Air Inlet" },
+	{ 0x38, "Reserved" },
+	{ 0x39, "Reserved" },
+	{ 0x3A, "Reserved" },
+	{ 0x3B, "Reserved" },
+	{ 0x3C, "Reserved" },
+	{ 0x3D, "Reserved" },
+	{ 0x3E, "Reserved" },
+	{ 0x3F, "Reserved" },
+	{ 0x40, "Air Inlet" },
+	{ 0x41, "Processor" },
+	{ 0x42, "Baseboard/Main System Board" },
+	/* PICMG */
+	{ 0xA0, "PICMG Front Board" },
+	{ 0xC0, "PICMG Rear Transition Module" },
+	{ 0xC1, "PICMG AdvancedMC Module" },
+	{ 0xF0, "PICMG Shelf Management Controller" },
+	{ 0xF1, "PICMG Filtration Unit" },
+	{ 0xF2, "PICMG Shelf FRU Information" },
+	{ 0xF3, "PICMG Alarm Panel" },
+	{ 0x00, NULL },
+};
+
+const struct valstr entity_device_type_vals[] = {
+	{ 0x00, "Reserved" },
+	{ 0x01, "Reserved" },
+	{ 0x02, "DS1624 temperature sensor" },
+	{ 0x03, "DS1621 temperature sensor" },
+	{ 0x04, "LM75 Temperature Sensor" },
+	{ 0x05, "Heceta ASIC" },
+	{ 0x06, "Reserved" },
+	{ 0x07, "Reserved" },
+	{ 0x08, "EEPROM, 24C01" },
+	{ 0x09, "EEPROM, 24C02" },
+	{ 0x0a, "EEPROM, 24C04" },
+	{ 0x0b, "EEPROM, 24C08" },
+	{ 0x0c, "EEPROM, 24C16" },
+	{ 0x0d, "EEPROM, 24C17" },
+	{ 0x0e, "EEPROM, 24C32" },
+	{ 0x0f, "EEPROM, 24C64" },
+	{ 0x1000, "IPMI FRU Inventory" },
+	{ 0x1001, "DIMM Memory ID" },
+	{ 0x1002, "IPMI FRU Inventory" },
+	{ 0x1003, "System Processor Cartridge FRU" },
+	{ 0x11, "Reserved" },
+	{ 0x12, "Reserved" },
+	{ 0x13, "Reserved" },
+	{ 0x14, "PCF 8570 256 byte RAM" },
+	{ 0x15, "PCF 8573 clock/calendar" },
+	{ 0x16, "PCF 8574A I/O Port" },
+	{ 0x17, "PCF 8583 clock/calendar" },
+	{ 0x18, "PCF 8593 clock/calendar" },
+	{ 0x19, "Clock calendar" },
+	{ 0x1a, "PCF 8591 A/D, D/A Converter" },
+	{ 0x1b, "I/O Port" },
+	{ 0x1c, "A/D Converter" },
+	{ 0x1d, "D/A Converter" },
+	{ 0x1e, "A/D, D/A Converter" },
+	{ 0x1f, "LCD Controller/Driver" },
+	{ 0x20, "Core Logic (Chip set) Device" },
+	{ 0x21, "LMC6874 Intelligent Battery controller" },
+	{ 0x22, "Intelligent Batter controller" },
+	{ 0x23, "Combo Management ASIC" },
+	{ 0x24, "Maxim 1617 Temperature Sensor" },
+	{ 0xbf, "Other/Unspecified" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ipmi_channel_protocol_vals[] = {
+	{ 0x00, "reserved" },
+	{ 0x01, "IPMB-1.0" },
+	{ 0x02, "ICMB-1.0" },
+	{ 0x03, "reserved" },
+	{ 0x04, "IPMI-SMBus" },
+	{ 0x05, "KCS" },
+	{ 0x06, "SMIC" },
+	{ 0x07, "BT-10" },
+	{ 0x08, "BT-15" },
+	{ 0x09, "TMode" },
+	{ 0x1c, "OEM 1" },
+	{ 0x1d, "OEM 2" },
+	{ 0x1e, "OEM 3" },
+	{ 0x1f, "OEM 4" },
+	{ 0x00, NULL },
+};
+
+
+const struct valstr ipmi_channel_medium_vals[] = {
+	{ IPMI_CHANNEL_MEDIUM_RESERVED,	"reserved" },
+	{ IPMI_CHANNEL_MEDIUM_IPMB_I2C,	"IPMB (I2C)" },
+	{ IPMI_CHANNEL_MEDIUM_ICMB_1,	"ICMB v1.0" },
+	{ IPMI_CHANNEL_MEDIUM_ICMB_09,	"ICMB v0.9" },
+	{ IPMI_CHANNEL_MEDIUM_LAN,	"802.3 LAN" },
+	{ IPMI_CHANNEL_MEDIUM_SERIAL,	"Serial/Modem" },
+	{ IPMI_CHANNEL_MEDIUM_LAN_OTHER,"Other LAN" },
+	{ IPMI_CHANNEL_MEDIUM_SMBUS_PCI,"PCI SMBus" },
+	{ IPMI_CHANNEL_MEDIUM_SMBUS_1,	"SMBus v1.0/v1.1" },
+	{ IPMI_CHANNEL_MEDIUM_SMBUS_2,	"SMBus v2.0" },
+	{ IPMI_CHANNEL_MEDIUM_USB_1,	"USB 1.x" },
+	{ IPMI_CHANNEL_MEDIUM_USB_2,	"USB 2.x" },
+	{ IPMI_CHANNEL_MEDIUM_SYSTEM,	"System Interface" },
+	{ 0x00, NULL },
+};
+
+const struct valstr completion_code_vals[] = {
+	{ 0x00, "Command completed normally" },
+	{ 0xc0, "Node busy" },
+	{ 0xc1, "Invalid command" },
+	{ 0xc2, "Invalid command on LUN" },
+	{ 0xc3, "Timeout" },
+	{ 0xc4, "Out of space" },
+	{ 0xc5, "Reservation cancelled or invalid" },
+	{ 0xc6, "Request data truncated" },
+	{ 0xc7, "Request data length invalid" },
+	{ 0xc8, "Request data field length limit exceeded" },
+	{ 0xc9, "Parameter out of range" },
+	{ 0xca, "Cannot return number of requested data bytes" },
+	{ 0xcb, "Requested sensor, data, or record not found" },
+	{ 0xcc, "Invalid data field in request" },
+	{ 0xcd, "Command illegal for specified sensor or record type" },
+	{ 0xce, "Command response could not be provided" },
+	{ 0xcf, "Cannot execute duplicated request" },
+	{ 0xd0, "SDR Repository in update mode" },
+	{ 0xd1, "Device firmeware in update mode" },
+	{ 0xd2, "BMC initialization in progress" },
+	{ 0xd3, "Destination unavailable" },
+	{ 0xd4, "Insufficient privilege level" },
+	{ 0xd5, "Command not supported in present state" },
+	{ 0xd6, "Cannot execute command, command disabled" },
+	{ 0xff, "Unspecified error" },
+	{ 0x00, NULL }
+};
+
+const struct valstr ipmi_chassis_power_control_vals[] = {
+	{ IPMI_CHASSIS_CTL_POWER_DOWN,   "Down/Off" },
+	{ IPMI_CHASSIS_CTL_POWER_UP,     "Up/On" },
+	{ IPMI_CHASSIS_CTL_POWER_CYCLE,  "Cycle" },
+	{ IPMI_CHASSIS_CTL_HARD_RESET,   "Reset" },
+	{ IPMI_CHASSIS_CTL_PULSE_DIAG,   "Diag" },
+	{ IPMI_CHASSIS_CTL_ACPI_SOFT,    "Soft" },
+	{ 0x00, NULL },
+};
+
+const struct valstr ipmi_auth_algorithms[] = {
+	{ IPMI_AUTH_RAKP_NONE,      "none"      },
+	{ IPMI_AUTH_RAKP_HMAC_SHA1, "hmac_sha1" },
+	{ IPMI_AUTH_RAKP_HMAC_MD5,  "hmac_md5"  },
+#ifdef HAVE_CRYPTO_SHA256
+	{ IPMI_AUTH_RAKP_HMAC_SHA256, "hmac_sha256" },
+#endif /* HAVE_CRYPTO_SHA256 */
+	{ 0x00, NULL }
+};
+
+const struct valstr ipmi_integrity_algorithms[] = {
+	{ IPMI_INTEGRITY_NONE,         "none" },
+	{ IPMI_INTEGRITY_HMAC_SHA1_96, "hmac_sha1_96" },
+	{ IPMI_INTEGRITY_HMAC_MD5_128, "hmac_md5_128" },
+	{ IPMI_INTEGRITY_MD5_128 ,     "md5_128"      },
+#ifdef HAVE_CRYPTO_SHA256
+	{ IPMI_INTEGRITY_HMAC_SHA256_128, "sha256_128" },
+#endif /* HAVE_CRYPTO_SHA256 */
+	{ 0x00, NULL }
+};
+
+const struct valstr ipmi_encryption_algorithms[] = {
+	{ IPMI_CRYPT_NONE,        "none"        },
+	{ IPMI_CRYPT_AES_CBC_128, "aes_cbc_128" },
+	{ IPMI_CRYPT_XRC4_128,    "xrc4_128"    },
+	{ IPMI_CRYPT_XRC4_40,     "xrc4_40"     },
+	{ 0x00, NULL }
+};
+
+const struct valstr ipmi_user_enable_status_vals[] = {
+	{ 0x00, "unknown" },
+	{ 0x40, "enabled" },
+	{ 0x80, "disabled" },
+	{ 0xC0, "reserved" },
+	{ 0xFF, NULL },
+};
+
+const struct valstr picmg_frucontrol_vals[] = {
+	{ 0, "Cold Reset" },
+	{ 1, "Warm Reset"  },
+	{ 2, "Graceful Reboot" },
+	{ 3, "Issue Diagnostic Interrupt" },
+	{ 4, "Quiesce" },
+	{ 5, NULL },
+};
+
+const struct valstr picmg_clk_family_vals[] = {
+	{ 0x00, "Unspecified" },
+	{ 0x01, "SONET/SDH/PDH" },
+	{ 0x02, "Reserved for PCI Express" },
+	{ 0x03, "Reserved" }, /* from 03h to C8h */
+	{ 0xC9, "Vendor defined clock family" }, /* from C9h to FFh */
+	{ 0x00, NULL },
+};
+
+const struct oemvalstr picmg_clk_accuracy_vals[] = {
+	{ 0x01, 10, "PRS" },
+	{ 0x01, 20, "STU" },
+	{ 0x01, 30, "ST2" },
+	{ 0x01, 40, "TNC" },
+	{ 0x01, 50, "ST3E" },
+	{ 0x01, 60, "ST3" },
+	{ 0x01, 70, "SMC" },
+	{ 0x01, 80, "ST4" },
+	{ 0x01, 90, "DUS" },
+   { 0x02, 0xE0, "PCI Express Generation 2" },
+   { 0x02, 0xF0, "PCI Express Generation 1" },
+   { 0xffffff, 0x00,  NULL }
+};
+
+const struct oemvalstr picmg_clk_resource_vals[] = {
+	{ 0x0, 0, "On-Carrier Device 0" },
+	{ 0x0, 1, "On-Carrier Device 1" },
+	{ 0x1, 1, "AMC Site 1 - A1" },
+	{ 0x1, 2, "AMC Site 1 - A2" },
+	{ 0x1, 3, "AMC Site 1 - A3" },
+	{ 0x1, 4, "AMC Site 1 - A4" },
+	{ 0x1, 5, "AMC Site 1 - B1" },
+	{ 0x1, 6, "AMC Site 1 - B2" },
+	{ 0x1, 7, "AMC Site 1 - B3" },
+	{ 0x1, 8, "AMC Site 1 - B4" },
+   { 0x2, 0, "ATCA Backplane" },
+   { 0xffffff, 0x00,  NULL }
+};
+
+const struct oemvalstr picmg_clk_id_vals[] = {
+	{ 0x0, 0, "Clock 0" },
+	{ 0x0, 1, "Clock 1" },
+	{ 0x0, 2, "Clock 2" },
+	{ 0x0, 3, "Clock 3" },
+	{ 0x0, 4, "Clock 4" },
+	{ 0x0, 5, "Clock 5" },
+	{ 0x0, 6, "Clock 6" },
+	{ 0x0, 7, "Clock 7" },
+	{ 0x0, 8, "Clock 8" },
+	{ 0x0, 9, "Clock 9" },
+	{ 0x0, 10, "Clock 10" },
+	{ 0x0, 11, "Clock 11" },
+	{ 0x0, 12, "Clock 12" },
+	{ 0x0, 13, "Clock 13" },
+	{ 0x0, 14, "Clock 14" },
+	{ 0x0, 15, "Clock 15" },
+	{ 0x1, 1, "TCLKA" },
+	{ 0x1, 2, "TCLKB" },
+	{ 0x1, 3, "TCLKC" },
+	{ 0x1, 4, "TCLKD" },
+	{ 0x1, 5, "FLCKA" },
+   { 0x2, 1, "CLK1A" },
+   { 0x2, 2, "CLK1A" },
+   { 0x2, 3, "CLK1A" },
+   { 0x2, 4, "CLK1A" },
+   { 0x2, 5, "CLK1A" },
+   { 0x2, 6, "CLK1A" },
+   { 0x2, 7, "CLK1A" },
+   { 0x2, 8, "CLK1A" },
+   { 0x2, 9, "CLK1A" },
+   { 0xffffff, 0x00,  NULL }
+};
+
+const struct valstr picmg_busres_id_vals[] = {
+   { 0x0, "Metallic Test Bus pair #1" },
+   { 0x1, "Metallic Test Bus pair #2" },
+   { 0x2, "Synch clock group 1 (CLK1)" },
+   { 0x3, "Synch clock group 2 (CLK2)" },
+   { 0x4, "Synch clock group 3 (CLK3)" },
+	{ 0x5, NULL }
+};
+const struct valstr picmg_busres_board_cmd_vals[] = {
+  { 0x0, "Query" },
+  { 0x1, "Release" },
+  { 0x2, "Force" },
+  { 0x3, "Bus Free" },
+  { 0x4, NULL }
+};
+
+const struct valstr picmg_busres_shmc_cmd_vals[] = {
+  { 0x0, "Request" },
+  { 0x1, "Relinquish" },
+  { 0x2, "Notify" },
+  { 0x3, NULL }
+};
+
+const struct oemvalstr picmg_busres_board_status_vals[] = {
+ { 0x0, 0x0, "In control" },
+ { 0x0, 0x1, "No control" },
+ { 0x1, 0x0, "Ack" },
+ { 0x1, 0x1, "Refused" },
+ { 0x1, 0x2, "No control" },
+ { 0x2, 0x0, "Ack" },
+ { 0x2, 0x1, "No control" },
+ { 0x3, 0x0, "Accept" },
+ { 0x3, 0x1, "Not Needed" },
+ { 0xffffff, 0x00,  NULL }
+};
+
+const struct oemvalstr picmg_busres_shmc_status_vals[] = {
+ { 0x0, 0x0, "Grant" },
+ { 0x0, 0x1, "Busy" },
+ { 0x0, 0x2, "Defer" },
+ { 0x0, 0x3, "Deny" },
+
+ { 0x1, 0x0, "Ack" },
+ { 0x1, 0x1, "Error" },
+
+ { 0x2, 0x0, "Ack" },
+ { 0x2, 0x1, "Error" },
+ { 0x2, 0x2, "Deny" },
+
+ { 0xffffff, 0x00,  NULL }
+};
diff --git a/lib/ipmi_sunoem.c b/lib/ipmi_sunoem.c
new file mode 100644
index 0000000..ecbcbd9
--- /dev/null
+++ b/lib/ipmi_sunoem.c
@@ -0,0 +1,2431 @@
+/*
+ * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <time.h>
+#include <unistd.h>
+#include <signal.h>
+#include <ctype.h>
+#include <sys/time.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <sys/select.h>
+
+#include <termios.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_sunoem.h>
+#include <ipmitool/ipmi_raw.h>
+
+static const struct valstr sunoem_led_type_vals[] = {
+	{ 0, "OK2RM" },
+	{ 1, "SERVICE" },
+	{ 2, "ACT" },
+	{ 3, "LOCATE" },
+	{ 0xFF, NULL },
+};
+
+static const struct valstr sunoem_led_mode_vals[] = {
+	{ 0, "OFF" },
+	{ 1, "ON" },
+	{ 2, "STANDBY" },
+	{ 3, "SLOW" },
+	{ 4, "FAST" },
+	{ 0xFF, NULL },
+};
+
+static const struct valstr sunoem_led_mode_optvals[] = {
+	{ 0, "STEADY_OFF" },
+	{ 1, "STEADY_ON" },
+	{ 2, "STANDBY_BLINK" },
+	{ 3, "SLOW_BLINK" },
+	{ 4, "FAST_BLINK" },
+	{ 0xFF, NULL },
+};
+
+#define SUNOEM_SUCCESS 1
+
+#define IPMI_SUNOEM_GETFILE_VERSION {3,2,0,0}
+#define IPMI_SUNOEM_GETBEHAVIOR_VERSION {3,2,0,0}
+
+/*
+ * PRINT_NORMAL: print out the LED value as normal
+ * PRINT_ERROR: print out "na" for the LED value
+ */
+typedef enum
+{
+	PRINT_NORMAL = 0, PRINT_ERROR
+} print_status_t;
+
+int ret_get = 0;
+int ret_set = 0;
+
+static void
+ipmi_sunoem_usage(void)
+{
+	lprintf(LOG_NOTICE, "Usage: sunoem <command> [option...]");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "Commands:");
+	lprintf(LOG_NOTICE, " - cli [<command string> ...]");
+	lprintf(LOG_NOTICE, "      Execute SP CLI commands.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - led get [<sensor_id>] [ledtype]");
+	lprintf(LOG_NOTICE, "      - Read status of LED found in Generic Device Locator.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - led set <sensor_id> <led_mode> [led_type]");
+	lprintf(LOG_NOTICE, "      - Set mode of LED found in Generic Device Locator.");
+	lprintf(LOG_NOTICE, "      - You can pass 'all' as the <senso_rid> to change the LED mode of all sensors.");
+	lprintf(LOG_NOTICE, "      - Use 'sdr list generic' command to get list of Generic");
+	lprintf(LOG_NOTICE, "      - Devices that are controllable LEDs.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "      - Required SIS LED Mode:");
+	lprintf(LOG_NOTICE, "          OFF          Off");
+	lprintf(LOG_NOTICE, "          ON           Steady On");
+	lprintf(LOG_NOTICE, "          STANDBY      100ms on 2900ms off blink rate");
+	lprintf(LOG_NOTICE, "          SLOW         1HZ blink rate");
+	lprintf(LOG_NOTICE, "          FAST         4HZ blink rate");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "      - Optional SIS LED Type:");
+	lprintf(LOG_NOTICE, "          OK2RM        OK to Remove");
+	lprintf(LOG_NOTICE, "          SERVICE      Service Required");
+	lprintf(LOG_NOTICE, "          ACT          Activity");
+	lprintf(LOG_NOTICE, "          LOCATE       Locate");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - nacname <ipmi_nac_name>");
+	lprintf(LOG_NOTICE, "      - Returns the full nac name");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - ping NUMBER <q>");
+	lprintf(LOG_NOTICE, "      - Send and Receive NUMBER (64 Byte) packets.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "      - q - Quiet. Displays output at start and end");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - getval <target_name>");
+	lprintf(LOG_NOTICE, "      - Returns the ILOM property value");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - setval <property name> <property value> <timeout>");
+	lprintf(LOG_NOTICE, "      - Sets the ILOM property value");
+	lprintf(LOG_NOTICE, "      - If timeout is not specified, the default is 5 sec.");
+	lprintf(LOG_NOTICE, "      - NOTE: must be executed locally on host, not remotely over LAN!");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - sshkey del <user_id>");
+	lprintf(LOG_NOTICE, "      - Delete ssh key for user id from authorized_keys,");
+	lprintf(LOG_NOTICE, "      - view users with 'user list' command.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - sshkey set <user_id> <id_rsa.pub>");
+	lprintf(LOG_NOTICE, "      - Set ssh key for a userid into authorized_keys,");
+	lprintf(LOG_NOTICE, "      - view users with 'user list' command.");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - version");
+	lprintf(LOG_NOTICE, "      - Display the software version");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - nacname <ipmi_nac_name>");
+	lprintf(LOG_NOTICE, "      - Returns the full nac name");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - getfile <file_string_id> <destination_file_name>");
+	lprintf(LOG_NOTICE, "      - Copy file <file_string_id> to <destination_file_name>");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "      - File string ids:");
+	lprintf(LOG_NOTICE, "          SSH_PUBKEYS");
+	lprintf(LOG_NOTICE, "          DIAG_PASSED");
+	lprintf(LOG_NOTICE, "          DIAG_FAILED");
+	lprintf(LOG_NOTICE, "          DIAG_END_TIME");
+	lprintf(LOG_NOTICE, "          DIAG_INVENTORY");
+	lprintf(LOG_NOTICE, "          DIAG_TEST_LOG");
+	lprintf(LOG_NOTICE, "          DIAG_START_TIME");
+	lprintf(LOG_NOTICE, "          DIAG_UEFI_LOG");
+	lprintf(LOG_NOTICE, "          DIAG_TEST_LOG");
+	lprintf(LOG_NOTICE, "          DIAG_LAST_LOG");
+	lprintf(LOG_NOTICE, "          DIAG_LAST_CMD");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, " - getbehavior <behavior_string_id>");
+	lprintf(LOG_NOTICE, "      - Test if ILOM behavior is enabled");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE, "      - Behavior string ids:");
+	lprintf(LOG_NOTICE, "          SUPPORTS_SIGNED_PACKAGES");
+	lprintf(LOG_NOTICE, "          REQUIRES_SIGNED_PACKAGES");
+	lprintf(LOG_NOTICE, "");
+}
+
+#define SUNOEM_FAN_MODE_AUTO    0x00
+#define SUNOEM_FAN_MODE_MANUAL  0x01
+
+static void
+__sdr_list_empty(struct sdr_record_list * head)
+{
+	struct sdr_record_list * e, *f;
+	for (e = head; e != NULL; e = f) {
+		f = e->next;
+		free(e);
+	}
+	head = NULL;
+}
+
+/*
+ *  led_print
+ *  Print out the led name and the state, if stat is PRINT_NORMAL.
+ *  Otherwise, print out the led name and "na".
+ *  The state parameter is not referenced if stat is not PRINT_NORMAL.
+ */
+static void
+led_print(const char * name, print_status_t stat, uint8_t state)
+{
+	const char *theValue;
+
+	if (stat == PRINT_NORMAL) {
+		theValue = val2str(state, sunoem_led_mode_vals);
+	} else {
+		theValue = "na";
+	}
+
+	if (csv_output) {
+		printf("%s,%s\n", name, theValue);
+	} else {
+		printf("%-16s | %s\n", name, theValue);
+	}
+}
+
+#define CC_NORMAL                  0x00
+#define CC_PARAM_OUT_OF_RANGE      0xc9
+#define CC_DEST_UNAVAILABLE        0xd3
+#define CC_UNSPECIFIED_ERR         0xff
+#define CC_INSUFFICIENT_PRIVILEGE  0xd4
+#define CC_INV_CMD                 0xc1
+#define CC_INV_DATA_FIELD          0xcc
+
+/*
+ * sunoem_led_get(....)
+ *
+ * OUTPUT:
+ *   SUNOEM_EC_INVALID_ARG         if dev is NULL,
+ *   SUNOEM_EC_BMC_NOT_RESPONDING  if no reply is obtained from BMC,
+ *   SUNOEM_EC_BMC_CCODE_NONZERO   if completion code is nonzero,
+ *   SUNOEM_EC_SUCCESS             otherwise.
+ */
+static sunoem_ec_t
+sunoem_led_get(struct ipmi_intf * intf,	struct sdr_record_generic_locator * dev,
+		int ledtype, struct ipmi_rs **loc_rsp)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t rqdata[7];
+	int rqdata_len;
+
+	if (dev == NULL) {
+		*loc_rsp = NULL;
+		return (SUNOEM_EC_INVALID_ARG);
+	}
+
+	rqdata[0] = dev->dev_slave_addr;
+	if (ledtype == 0xFF)
+		rqdata[1] = dev->oem;
+	else
+		rqdata[1] = ledtype;
+
+	rqdata[2] = dev->dev_access_addr;
+	rqdata[3] = dev->oem;
+	rqdata[4] = dev->entity.id;
+	rqdata[5] = dev->entity.instance;
+	rqdata[6] = 0;
+	rqdata_len = 7;
+
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_LED_GET;
+	req.msg.lun = dev->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = rqdata_len;
+
+	rsp = intf->sendrecv(intf, &req);
+	/*
+	 * Just return NULL if there was
+	 * an error.
+	 */
+	if (rsp == NULL) {
+		*loc_rsp = NULL;
+		return (SUNOEM_EC_BMC_NOT_RESPONDING);
+	} else if (rsp->ccode > 0) {
+		*loc_rsp = rsp;
+		return (SUNOEM_EC_BMC_CCODE_NONZERO);
+	} else {
+		*loc_rsp = rsp;
+		return (SUNOEM_EC_SUCCESS);
+	}
+}
+
+static struct ipmi_rs *
+sunoem_led_set(struct ipmi_intf * intf, struct sdr_record_generic_locator * dev,
+		int ledtype, int ledmode)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t rqdata[9];
+	int rqdata_len;
+
+	if (dev == NULL)
+		return NULL;
+
+	rqdata[0] = dev->dev_slave_addr;
+
+	if (ledtype == 0xFF)
+		rqdata[1] = dev->oem;
+	else
+		rqdata[1] = ledtype;
+
+	rqdata[2] = dev->dev_access_addr;
+	rqdata[3] = dev->oem;
+	rqdata[4] = ledmode;
+	rqdata[5] = dev->entity.id;
+	rqdata[6] = dev->entity.instance;
+	rqdata[7] = 0;
+	rqdata[8] = 0;
+	rqdata_len = 9;
+
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_LED_SET;
+	req.msg.lun = dev->lun;
+	req.msg.data = rqdata;
+	req.msg.data_len = rqdata_len;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Sun OEM Set LED command failed.");
+		return NULL;
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Sun OEM Set LED command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return NULL;
+	}
+
+	return (rsp);
+}
+
+static void
+sunoem_led_get_byentity(struct ipmi_intf * intf, uint8_t entity_id,
+		uint8_t entity_inst, int ledtype)
+{
+	struct ipmi_rs * rsp;
+	struct sdr_record_list *elist, *e;
+	struct entity_id entity;
+	sunoem_ec_t res;
+
+	if (entity_id == 0)
+		return;
+
+	/* lookup sdrs with this entity */
+	memset(&entity, 0, sizeof(struct entity_id));
+	entity.id = entity_id;
+	entity.instance = entity_inst;
+
+	elist = ipmi_sdr_find_sdr_byentity(intf, &entity);
+
+	if (elist == NULL)
+		ret_get = -1;
+
+	/* for each generic sensor get its led state */
+	for (e = elist; e != NULL; e = e->next) {
+		if (e->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
+			continue;
+
+		res = sunoem_led_get(intf, e->record.genloc, ledtype, &rsp);
+
+		if (res == SUNOEM_EC_SUCCESS && rsp && rsp->data_len == 1) {
+			led_print((const char *) e->record.genloc->id_string, PRINT_NORMAL,
+					rsp->data[0]);
+		} else {
+			led_print((const char *) e->record.genloc->id_string, PRINT_ERROR,
+					0);
+			if (res != SUNOEM_EC_BMC_CCODE_NONZERO|| !rsp
+			|| rsp->ccode != CC_DEST_UNAVAILABLE) {
+				ret_get = -1;
+			}
+		}
+	}
+	__sdr_list_empty(elist);
+}
+
+static void
+sunoem_led_set_byentity(struct ipmi_intf * intf, uint8_t entity_id,
+		uint8_t entity_inst, int ledtype, int ledmode)
+{
+	struct ipmi_rs * rsp;
+	struct sdr_record_list *elist, *e;
+	struct entity_id entity;
+
+	if (entity_id == 0)
+		return;
+
+	/* lookup sdrs with this entity */
+	memset(&entity, 0, sizeof(struct entity_id));
+	entity.id = entity_id;
+	entity.instance = entity_inst;
+
+	elist = ipmi_sdr_find_sdr_byentity(intf, &entity);
+
+	if (elist == NULL)
+		ret_set = -1;
+
+	/* for each generic sensor set its led state */
+	for (e = elist; e != NULL; e = e->next) {
+
+		if (e->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
+			continue;
+
+		rsp = sunoem_led_set(intf, e->record.genloc, ledtype, ledmode);
+		if (rsp && rsp->data_len == 0) {
+			led_print((const char *) e->record.genloc->id_string, PRINT_NORMAL,
+					ledmode);
+		} else if (rsp == NULL) {
+			ret_set = -1;
+		}
+	}
+
+	__sdr_list_empty(elist);
+}
+
+/*
+ * IPMI Request Data: 5 bytes
+ *
+ * [byte 0]  devAddr     Value from the "Device Slave Address" field in
+ *                       LED's Generic Device Locator record in the SDR
+ * [byte 1]  led         LED Type: OK2RM, ACT, LOCATE, SERVICE
+ * [byte 2]  ctrlrAddr   Controller address; value from the "Device
+ *                       Access Address" field, 0x20 if the LED is local
+ * [byte 3]  hwInfo      The OEM field from the SDR record
+ * [byte 4]  force       1 = directly access the device
+ *                       0 = go thru its controller
+ *                       Ignored if LED is local
+ *
+ * The format below is for Sun Blade Modular systems only
+ * [byte 4]  entityID    The entityID field from the SDR record
+ * [byte 5]  entityIns   The entityIns field from the SDR record
+ * [byte 6]  force       1 = directly access the device
+ *                       0 = go thru its controller
+ *                       Ignored if LED is local
+ */
+static int
+ipmi_sunoem_led_get(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct sdr_record_list *sdr;
+	struct sdr_record_list *alist, *a;
+	struct sdr_record_entity_assoc *assoc;
+	int ledtype = 0xFF;
+	int i;
+	sunoem_ec_t res;
+
+	/*
+	 * sunoem led/sbled get <id> [type]
+	 */
+
+	if (argc < 1 || strncmp(argv[0], "help", 4) == 0) {
+		ipmi_sunoem_usage();
+		return (0);
+	}
+
+	if (argc > 1) {
+		ledtype = str2val(argv[1], sunoem_led_type_vals);
+		if (ledtype == 0xFF)
+			lprintf(LOG_ERR,
+					"Unknown ledtype, will use data from the SDR oem field");
+	}
+
+	if (strncasecmp(argv[0], "all", 3) == 0) {
+		/* do all generic sensors */
+		alist = ipmi_sdr_find_sdr_bytype(intf,
+		SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
+
+		if (alist == NULL)
+			return (-1);
+
+		for (a = alist; a != NULL; a = a->next) {
+			if (a->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
+				continue;
+			if (a->record.genloc->entity.logical)
+				continue;
+
+			res = sunoem_led_get(intf, a->record.genloc, ledtype, &rsp);
+
+			if (res == SUNOEM_EC_SUCCESS && rsp && rsp->data_len == 1) {
+				led_print((const char *) a->record.genloc->id_string,
+						PRINT_NORMAL, rsp->data[0]);
+			} else {
+				led_print((const char *) a->record.genloc->id_string,
+						PRINT_ERROR, 0);
+				if (res != SUNOEM_EC_BMC_CCODE_NONZERO|| !rsp ||
+				rsp->ccode != CC_DEST_UNAVAILABLE) {
+					ret_get = -1;
+				}
+			}
+		}
+		__sdr_list_empty(alist);
+
+		if (ret_get == -1)
+			return (-1);
+
+		return (0);
+	}
+
+	/* look up generic device locator record in SDR */
+	sdr = ipmi_sdr_find_sdr_byid(intf, argv[0]);
+
+	if (sdr == NULL) {
+		lprintf(LOG_ERR, "No Sensor Data Record found for %s", argv[0]);
+		return (-1);
+	}
+
+	if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) {
+		lprintf(LOG_ERR, "Invalid SDR type %d", sdr->type);
+		return (-1);
+	}
+
+	if (!sdr->record.genloc->entity.logical) {
+		/*
+		 * handle physical entity
+		 */
+
+		res = sunoem_led_get(intf, sdr->record.genloc, ledtype, &rsp);
+
+		if (res == SUNOEM_EC_SUCCESS && rsp && rsp->data_len == 1) {
+			led_print((const char *) sdr->record.genloc->id_string,
+					PRINT_NORMAL, rsp->data[0]);
+
+		} else {
+			led_print((const char *) sdr->record.genloc->id_string, PRINT_ERROR,
+					0);
+			if (res != SUNOEM_EC_BMC_CCODE_NONZERO|| !rsp
+			|| rsp->ccode != CC_DEST_UNAVAILABLE) {
+				ret_get = -1;
+			}
+		}
+
+		if (ret_get == -1)
+			return (-1);
+
+		return (0);
+	}
+
+	/*
+	 * handle logical entity for LED grouping
+	 */
+
+	lprintf(LOG_INFO, "LED %s is logical device", argv[0]);
+
+	/* get entity assoc records */
+	alist = ipmi_sdr_find_sdr_bytype(intf, SDR_RECORD_TYPE_ENTITY_ASSOC);
+
+	if (alist == NULL)
+		return (-1);
+
+	for (a = alist; a != NULL; a = a->next) {
+		if (a->type != SDR_RECORD_TYPE_ENTITY_ASSOC)
+			continue;
+		assoc = a->record.entassoc;
+		if (assoc == NULL)
+			continue;
+
+		/* check that the entity id/instance matches our generic record */
+		if (assoc->entity.id != sdr->record.genloc->entity.id
+				|| assoc->entity.instance
+						!= sdr->record.genloc->entity.instance)
+			continue;
+
+		if (assoc->flags.isrange) {
+			/*
+			 * handle ranged entity associations
+			 *
+			 * the test for non-zero entity id is handled in
+			 * sunoem_led_get_byentity()
+			 */
+
+			/* first range set - id 1 and 2 must be equal */
+			if (assoc->entity_id_1 == assoc->entity_id_2)
+				for (i = assoc->entity_inst_1; i <= assoc->entity_inst_2; i++)
+					sunoem_led_get_byentity(intf, assoc->entity_id_1, i,
+							ledtype);
+
+			/* second range set - id 3 and 4 must be equal */
+			if (assoc->entity_id_3 == assoc->entity_id_4)
+				for (i = assoc->entity_inst_3; i <= assoc->entity_inst_4; i++)
+					sunoem_led_get_byentity(intf, assoc->entity_id_3, i,
+							ledtype);
+		} else {
+			/*
+			 * handle entity list
+			 */
+			sunoem_led_get_byentity(intf, assoc->entity_id_1,
+					assoc->entity_inst_1, ledtype);
+			sunoem_led_get_byentity(intf, assoc->entity_id_2,
+					assoc->entity_inst_2, ledtype);
+			sunoem_led_get_byentity(intf, assoc->entity_id_3,
+					assoc->entity_inst_3, ledtype);
+			sunoem_led_get_byentity(intf, assoc->entity_id_4,
+					assoc->entity_inst_4, ledtype);
+		}
+	}
+
+	__sdr_list_empty(alist);
+
+	if (ret_get == -1)
+		return (-1);
+
+	return (0);
+}
+
+/*
+ * IPMI Request Data: 7 bytes
+ *
+ * [byte 0]  devAddr     Value from the "Device Slave Address" field in
+ *                       LED's Generic Device Locator record in the SDR
+ * [byte 1]  led         LED Type: OK2RM, ACT, LOCATE, SERVICE
+ * [byte 2]  ctrlrAddr   Controller address; value from the "Device
+ *                       Access Address" field, 0x20 if the LED is local
+ * [byte 3]  hwInfo      The OEM field from the SDR record
+ * [byte 4]  mode        LED Mode: OFF, ON, STANDBY, SLOW, FAST
+ * [byte 5]  force       TRUE - directly access the device
+ *                       FALSE - go thru its controller
+ *                       Ignored if LED is local
+ * [byte 6]  role        Used by BMC for authorization purposes
+ *
+ * The format below is for Sun Blade Modular systems only
+ * [byte 5]  entityID    The entityID field from the SDR record
+ * [byte 6]  entityIns   The entityIns field from the SDR record
+ * [byte 7]  force       TRUE - directly access the device
+ *                       FALSE - go thru its controller
+ *                       Ignored if LED is local
+ * [byte 8]  role        Used by BMC for authorization purposes
+ *
+ *
+ * IPMI Response Data: 1 byte
+ *
+ * [byte 0]  mode     LED Mode: OFF, ON, STANDBY, SLOW, FAST
+ */
+
+static int
+ipmi_sunoem_led_set(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_rs * rsp;
+	struct sdr_record_list *sdr;
+	struct sdr_record_list *alist, *a;
+	struct sdr_record_entity_assoc *assoc;
+	int ledmode;
+	int ledtype = 0xFF;
+	int i;
+
+	/*
+	 * sunoem led/sbled set <id> <mode> [type]
+	 */
+
+	if (argc < 2 || strncmp(argv[0], "help", 4) == 0) {
+		ipmi_sunoem_usage();
+		return (0);
+	}
+
+	ledmode = str2val(argv[1], sunoem_led_mode_vals);
+	if (ledmode == 0xFF) {
+		ledmode = str2val(argv[1], sunoem_led_mode_optvals);
+		if (ledmode == 0xFF) {
+			lprintf(LOG_NOTICE, "Invalid LED Mode: %s", argv[1]);
+			return (-1);
+		}
+	}
+
+	if (argc > 3) {
+		ledtype = str2val(argv[2], sunoem_led_type_vals);
+		if (ledtype == 0xFF)
+			lprintf(LOG_ERR,
+					"Unknown ledtype, will use data from the SDR oem field");
+	}
+
+	if (strncasecmp(argv[0], "all", 3) == 0) {
+		/* do all generic sensors */
+		alist = ipmi_sdr_find_sdr_bytype(intf,
+		SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
+
+		if (alist == NULL)
+			return (-1);
+
+		for (a = alist; a != NULL; a = a->next) {
+			if (a->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR)
+				continue;
+			if (a->record.genloc->entity.logical)
+				continue;
+			rsp = sunoem_led_set(intf, a->record.genloc, ledtype, ledmode);
+			if (rsp && rsp->ccode == 0)
+				led_print((const char *) a->record.genloc->id_string,
+						PRINT_NORMAL, ledmode);
+			else
+				ret_set = -1;
+		}
+		__sdr_list_empty(alist);
+
+		if (ret_set == -1)
+			return (-1);
+
+		return (0);
+	}
+
+	/* look up generic device locator records in SDR */
+	sdr = ipmi_sdr_find_sdr_byid(intf, argv[0]);
+
+	if (sdr == NULL) {
+		lprintf(LOG_ERR, "No Sensor Data Record found for %s", argv[0]);
+		return (-1);
+	}
+
+	if (sdr->type != SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR) {
+		lprintf(LOG_ERR, "Invalid SDR type %d", sdr->type);
+		return (-1);
+	}
+
+	if (!sdr->record.genloc->entity.logical) {
+		/*
+		 * handle physical entity
+		 */
+		rsp = sunoem_led_set(intf, sdr->record.genloc, ledtype, ledmode);
+		if (rsp && rsp->ccode == 0)
+			led_print(argv[0], PRINT_NORMAL, ledmode);
+		else
+			return (-1);
+
+		return (0);
+	}
+
+	/*
+	 * handle logical entity for LED grouping
+	 */
+
+	lprintf(LOG_INFO, "LED %s is logical device", argv[0]);
+
+	/* get entity assoc records */
+	alist = ipmi_sdr_find_sdr_bytype(intf, SDR_RECORD_TYPE_ENTITY_ASSOC);
+
+	if (alist == NULL)
+		return (-1);
+
+	for (a = alist; a != NULL; a = a->next) {
+		if (a->type != SDR_RECORD_TYPE_ENTITY_ASSOC)
+			continue;
+		assoc = a->record.entassoc;
+		if (assoc == NULL)
+			continue;
+
+		/* check that the entity id/instance matches our generic record */
+		if (assoc->entity.id != sdr->record.genloc->entity.id
+				|| assoc->entity.instance
+						!= sdr->record.genloc->entity.instance)
+			continue;
+
+		if (assoc->flags.isrange) {
+			/*
+			 * handle ranged entity associations
+			 *
+			 * the test for non-zero entity id is handled in
+			 * sunoem_led_get_byentity()
+			 */
+
+			/* first range set - id 1 and 2 must be equal */
+			if (assoc->entity_id_1 == assoc->entity_id_2)
+				for (i = assoc->entity_inst_1; i <= assoc->entity_inst_2; i++)
+					sunoem_led_set_byentity(intf, assoc->entity_id_1, i,
+							ledtype, ledmode);
+
+			/* second range set - id 3 and 4 must be equal */
+			if (assoc->entity_id_3 == assoc->entity_id_4)
+				for (i = assoc->entity_inst_3; i <= assoc->entity_inst_4; i++)
+					sunoem_led_set_byentity(intf, assoc->entity_id_3, i,
+							ledtype, ledmode);
+		} else {
+			/*
+			 * handle entity list
+			 */
+			sunoem_led_set_byentity(intf, assoc->entity_id_1,
+					assoc->entity_inst_1, ledtype, ledmode);
+			sunoem_led_set_byentity(intf, assoc->entity_id_2,
+					assoc->entity_inst_2, ledtype, ledmode);
+			sunoem_led_set_byentity(intf, assoc->entity_id_3,
+					assoc->entity_inst_3, ledtype, ledmode);
+			sunoem_led_set_byentity(intf, assoc->entity_id_4,
+					assoc->entity_inst_4, ledtype, ledmode);
+		}
+	}
+
+	__sdr_list_empty(alist);
+
+	if (ret_set == -1)
+		return (-1);
+
+	return (0);
+}
+
+static int
+ipmi_sunoem_sshkey_del(struct ipmi_intf * intf, uint8_t uid)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(struct ipmi_rq));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_DEL_SSH_KEY;
+	req.msg.data = &uid;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to delete ssh key for UID %d", uid);
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Unable to delete ssh key for UID %d: %s", uid,
+				val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+
+	printf("Deleted SSH key for user id %d\n", uid);
+	return (0);
+}
+
+#define SSHKEY_BLOCK_SIZE	64
+static int
+ipmi_sunoem_sshkey_set(struct ipmi_intf * intf, uint8_t uid, char * ifile)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	FILE * fp;
+	int count = 0;
+	uint8_t wbuf[SSHKEY_BLOCK_SIZE + 3];
+	int32_t i_size = 0;
+	int32_t r = 0;
+	int32_t size = 0;
+
+	if (ifile == NULL) {
+		lprintf(LOG_ERR, "Invalid or misisng input filename.");
+		return (-1);
+	}
+
+	fp = ipmi_open_file_read(ifile);
+	if (fp == NULL) {
+		lprintf(LOG_ERR, "Unable to open file '%s' for reading.", ifile);
+		return (-1);
+	}
+
+	memset(&req, 0, sizeof(struct ipmi_rq));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_SET_SSH_KEY;
+	req.msg.data = wbuf;
+
+	if (fseek(fp, 0, SEEK_END) == (-1)) {
+		lprintf(LOG_ERR, "Failed to seek in file '%s'.", ifile);
+		if (fp != NULL)
+			fclose(fp);
+
+		return (-1);
+	}
+
+	size = (int32_t) ftell(fp);
+	if (size < 0) {
+		lprintf(LOG_ERR, "Failed to seek in file '%s'.", ifile);
+		if (fp != NULL)
+			fclose(fp);
+
+		return (-1);
+	} else if (size == 0) {
+		lprintf(LOG_ERR, "File '%s' is empty.", ifile);
+		if (fp != NULL)
+			fclose(fp);
+
+		return (-1);
+	}
+
+	if (fseek(fp, 0, SEEK_SET) == (-1)) {
+		lprintf(LOG_ERR, "Failed to seek in file '%s'.", ifile);
+		if (fp != NULL)
+			fclose(fp);
+
+		return (-1);
+	}
+
+	printf("Setting SSH key for user id %d...", uid);
+
+	for (r = 0; r < size; r += i_size) {
+		i_size = size - r;
+		if (i_size > SSHKEY_BLOCK_SIZE)
+			i_size = SSHKEY_BLOCK_SIZE;
+
+		memset(wbuf, 0, SSHKEY_BLOCK_SIZE);
+		fseek(fp, r, SEEK_SET);
+		count = fread(wbuf + 3, 1, i_size, fp);
+		if (count != i_size) {
+			printf("failed\n");
+			lprintf(LOG_ERR, "Unable to read %ld bytes from file '%s'.", i_size,
+					ifile);
+			if (fp != NULL)
+				fclose(fp);
+
+			return (-1);
+		}
+
+		printf(".");
+		fflush(stdout);
+
+		wbuf[0] = uid;
+		if ((r + SSHKEY_BLOCK_SIZE) >= size)
+			wbuf[1] = 0xff;
+		else {
+			if ((r / SSHKEY_BLOCK_SIZE) > UINT8_MAX) {
+				printf("failed\n");
+				lprintf(LOG_ERR, "Unable to pack byte %ld from file '%s'.", r,
+						ifile);
+				if (fp != NULL)
+					fclose(fp);
+
+				return (-1);
+			}
+			wbuf[1] = (uint8_t) (r / SSHKEY_BLOCK_SIZE);
+		}
+
+		wbuf[2] = (uint8_t) i_size;
+
+		req.msg.data_len = i_size + 3;
+
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			printf("failed\n");
+			lprintf(LOG_ERR, "Unable to set ssh key for UID %d.", uid);
+			if (fp != NULL)
+				fclose(fp);
+
+			return (-1);
+		} /* if (rsp == NULL) */
+		if (rsp->ccode != 0) {
+			printf("failed\n");
+			lprintf(LOG_ERR, "Unable to set ssh key for UID %d, %s.", uid,
+					val2str(rsp->ccode, completion_code_vals));
+			if (fp != NULL)
+				fclose(fp);
+
+			return (-1);
+		} /* if (rsp->ccode != 0) */
+	}
+
+	printf("done\n");
+
+	fclose(fp);
+	return (0);
+}
+
+/*
+ * This structure is used in both the request to and response from the BMC.
+ */
+#define SUNOEM_CLI_LEGACY_VERSION       1
+#define SUNOEM_CLI_SEQNUM_VERSION       2
+#define SUNOEM_CLI_VERSION       SUNOEM_CLI_SEQNUM_VERSION
+#define SUNOEM_CLI_HEADER        8 /* command + spare + handle */
+#define SUNOEM_CLI_BUF_SIZE      (80 - SUNOEM_CLI_HEADER) /* Total 80 bytes */
+#define SUNOEM_CLI_MSG_SIZE(msg) (SUNOEM_CLI_HEADER + strlen((msg).buf) + 1)
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	/*
+	 * Set version to SUNOEM_CLI_VERSION.
+	 */
+	uint8_t version;
+	/*
+	 * The command in a request, or in a response indicates an error if
+	 * non-zero.
+	 */
+	uint8_t command_response;
+	uint8_t seqnum;
+	uint8_t spare;
+	/*
+	 * Opaque 4-byte handle, supplied in the response to an OPEN request,
+	 * and used in all subsequent POLL and CLOSE requests.
+	 */
+	uint8_t handle[4];
+	/*
+	 * The client data in a request, or the server data in a response. Must
+	 * by null terminated, i.e., it must be at least one byte, but can be
+	 * smaller if there's less data.
+	 */
+	char buf[SUNOEM_CLI_BUF_SIZE];
+}__attribute__((packed)) sunoem_cli_msg_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * Command codes for the command_request field in each request.
+ */
+#define SUNOEM_CLI_CMD_OPEN   0 /* Open a new connection */
+#define SUNOEM_CLI_CMD_FORCE  1 /* Close any existing connection, then open */
+#define SUNOEM_CLI_CMD_CLOSE  2 /* Close the current connection */
+#define SUNOEM_CLI_CMD_POLL   3 /* Poll for new data to/from the server */
+#define SUNOEM_CLI_CMD_EOF    4 /* Poll, client is out of data */
+
+#define SUNOEM_CLI_MAX_RETRY  3 /* Maximum number of retries */
+
+#define SUNOEM_CLI_INVALID_VER_ERR "Invalid version"
+#define SUNOEM_CLI_BUSY_ERR        "Busy"
+
+typedef enum
+{
+	C_CTL_B = 0x02, /* same as left arrow */
+	C_CTL_C = 0x03,
+	C_CTL_D = 0x04,
+	C_CTL_F = 0x06, /* same as right arrow */
+	C_CTL_N = 0x0E, /* same as down arrow */
+	C_CTL_P = 0x10, /* same as up arrow */
+	C_DEL = 0x7f
+} canon_char_t;
+
+static int
+sunoem_cli_unbufmode_start(FILE *f, struct termios *orig_ts)
+{
+	struct termios ts;
+	int rc;
+
+	if ((rc = tcgetattr(fileno(f), &ts))) {
+		return (rc);
+	}
+	*orig_ts = ts;
+	ts.c_lflag &= ~(ICANON | ECHO | ISIG);
+	ts.c_cc[VMIN] = 1;
+	if ((rc = tcsetattr(fileno(f), TCSAFLUSH, &ts))) {
+		return (rc);
+	}
+
+	return (0);
+}
+
+static int
+sunoem_cli_unbufmode_stop(FILE *f, struct termios *ts)
+{
+	int rc;
+
+	if ((rc = tcsetattr(fileno(f), TCSAFLUSH, ts))) {
+		return (rc);
+	}
+
+	return (0);
+}
+
+static int
+ipmi_sunoem_cli(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_cli_msg_t cli_req;
+	sunoem_cli_msg_t *cli_rsp;
+	int arg_num = 0;
+	int arg_pos = 0;
+	time_t wait_time = 0;
+	int retries;
+	static uint8_t SunOemCliActingVersion = SUNOEM_CLI_VERSION;
+
+	unsigned short first_char = 0; /*first char on the line*/
+	struct termios orig_ts;
+	int error = 0;
+
+	time_t now = 0;
+	int delay = 0;
+
+	/* Prepare to open an SP shell session */
+	memset(&cli_req, 0, sizeof(cli_req));
+	cli_req.version = SunOemCliActingVersion;
+	cli_req.command_response = SUNOEM_CLI_CMD_OPEN;
+	if (argc > 0 && strcmp(argv[0], "force") == 0) {
+		cli_req.command_response = SUNOEM_CLI_CMD_FORCE;
+		argc--;
+		argv++;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_CLI;
+	req.msg.data = (uint8_t *) &cli_req;
+	req.msg.data_len = SUNOEM_CLI_HEADER + 1;
+	retries = 0;
+	while (1) {
+		cli_req.version = SunOemCliActingVersion;
+		rsp = intf->sendrecv(intf, &req);
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM cli command failed");
+			return (-1);
+		}
+		cli_rsp = (sunoem_cli_msg_t *) rsp->data;
+		if ((cli_rsp->command_response != 0) || (rsp->ccode != 0)) {
+			if (strncmp(cli_rsp->buf, SUNOEM_CLI_INVALID_VER_ERR,
+					sizeof(SUNOEM_CLI_INVALID_VER_ERR) - 1) == 0
+					|| strncmp(&(cli_rsp->buf[1]), SUNOEM_CLI_INVALID_VER_ERR,
+							sizeof(SUNOEM_CLI_INVALID_VER_ERR) - 1) == 0) {
+				if (SunOemCliActingVersion == SUNOEM_CLI_VERSION) {
+					/* Server doesn't support version SUNOEM_CLI_VERSION
+					 Fall back to legacy version, and try again*/
+					SunOemCliActingVersion = SUNOEM_CLI_LEGACY_VERSION;
+					continue;
+				}
+				/* Server doesn't support legacy version either */
+				lprintf(LOG_ERR, "Failed to connect: %s", cli_rsp->buf);
+				return (-1);
+			} else if (strncmp(cli_rsp->buf, SUNOEM_CLI_BUSY_ERR,
+					sizeof(SUNOEM_CLI_BUSY_ERR) - 1) == 0) {
+				if (retries++ < SUNOEM_CLI_MAX_RETRY) {
+					lprintf(LOG_INFO, "Failed to connect: %s, retrying",
+							cli_rsp->buf);
+					sleep(2);
+					continue;
+				}
+				lprintf(LOG_ERR, "Failed to connect: %s", cli_rsp->buf);
+				return (-1);
+			} else {
+				lprintf(LOG_ERR, "Failed to connect: %s", cli_rsp->buf);
+				return (-1);
+			}
+		}
+		break;
+	}
+	if (SunOemCliActingVersion == SUNOEM_CLI_SEQNUM_VERSION) {
+		/*
+		 * Bit 1 of seqnum is used as an alternating sequence number
+		 * to allow a server that supports it to detect when a retry is being sent from the host IPMI driver.
+		 * Typically when this occurs, the server's last response message would have been dropped.
+		 * Once the server detects this condition, it will know that it should retry sending the response.
+		 */
+		cli_req.seqnum ^= 0x1;
+	}
+	printf("Connected. Use ^D to exit.\n");
+	fflush(NULL);
+
+	/*
+	 * Remember the handle provided in the response, and issue a
+	 * series of "poll" commands to send and get data
+	 */
+	memcpy(cli_req.handle, cli_rsp->handle, 4);
+	cli_req.command_response = SUNOEM_CLI_CMD_POLL;
+	/*
+	 * If no arguments make input unbuffered and so interactive
+	 */
+	if (argc == 0) {
+		if (sunoem_cli_unbufmode_start(stdin, &orig_ts)) {
+			lprintf(LOG_ERR, "Failed to set interactive mode: %s",
+					strerror(errno));
+			return (-1);
+		}
+	}
+	while (rsp->ccode == 0 && cli_rsp->command_response == 0) {
+		int rc = 0;
+		int count = 0;
+		cli_req.buf[0] = '\0';
+		if (argc == 0) {
+			/*
+			 * Accept input from stdin. Use select so we don't hang if
+			 * there's no input to read. Select timeout is 500 msec.
+			 */
+			struct timeval tv = { 0, 500000 }; /* 500 msec */
+			fd_set rfds;
+			FD_ZERO(&rfds);
+			FD_SET(0, &rfds);
+			rc = select(1, &rfds, NULL, NULL, &tv);
+			if (rc < 0) {
+				/* Select returned an error so close and exit */
+				printf("Broken pipe\n");
+				cli_req.command_response = SUNOEM_CLI_CMD_CLOSE;
+			} else if (rc > 0) {
+				/* Read data from stdin */
+				count = read(0, cli_req.buf, 1 /* sizeof (cli_req.buf) - 1 */);
+				/*
+				 * If select said there was data but there was nothing to
+				 * read. This implies user hit ^D.
+				 * Also handle ^D input when pressed as first char at a new line.
+				 */
+				if (count <= 0 || (first_char && cli_req.buf[0] == C_CTL_D)) {
+					cli_req.command_response = SUNOEM_CLI_CMD_EOF;
+					count = 0;
+				}
+				first_char = cli_req.buf[0] == '\n' || cli_req.buf[0] == '\r';
+			}
+		} else {
+			/*
+			 * Get data from command line arguments
+			 */
+			now = time(NULL);
+			if (now < wait_time) {
+				/* Do nothing; we're waiting */
+			} else if (arg_num >= argc) {
+				/* Last arg was sent. Set EOF */
+				cli_req.command_response = SUNOEM_CLI_CMD_EOF;
+			} else if (strncmp(argv[arg_num], "@wait=", 6) == 0) {
+				/* This is a wait command */
+				char *s = &argv[arg_num][6];
+				delay = 0;
+				if (*s != '\0') {
+					if (str2int(s, &delay)) {
+						delay = 0;
+					}
+					if (delay < 0) {
+						delay = 0;
+					}
+				}
+				wait_time = now + delay;
+				arg_num++;
+			} else {
+				/*
+				 * Take data from args. It may be that the argument is larger
+				 * than the request buffer can hold. So pull off BUF_SIZE
+				 * number of characters at a time. When we've consumed the
+				 * entire arg, append a newline and advance to the next arg.
+				 */
+				int i;
+				char *s = argv[arg_num];
+				for (i = arg_pos;
+						s[i] != '\0' && count < (SUNOEM_CLI_BUF_SIZE - 2);
+						i++, count++) {
+					cli_req.buf[count] = s[i];
+				}
+				if (s[i] == '\0') {
+					/* Reached end of the arg string, so append a newline */
+					cli_req.buf[count++] = '\n';
+					/* Reset pos to 0 and advance to the next arg next time */
+					arg_pos = 0;
+					arg_num++;
+				} else {
+					/*
+					 * Otherwise, there's still more characters in the arg
+					 * to send, so remember where we left off
+					 */
+					arg_pos = i;
+				}
+			}
+		}
+		/*
+		 * Now send the clients's data (if any) and get data back from the
+		 * server. Loop while the server is giving us data until we suck
+		 * it dry.
+		 */
+		do {
+			cli_req.buf[count++] = '\0'; /* Terminate the string */
+			memset(&req, 0, sizeof(req));
+			req.msg.netfn = IPMI_NETFN_SUNOEM;
+			req.msg.cmd = 0x19;
+			req.msg.data = (uint8_t *) &cli_req;
+			req.msg.data_len = SUNOEM_CLI_HEADER + count;
+			for (retries = 0; retries <= SUNOEM_CLI_MAX_RETRY; retries++) {
+				rsp = intf->sendrecv(intf, &req);
+				if (rsp == NULL) {
+					lprintf(LOG_ERR, "Communication error.");
+					error = 1;
+					goto cleanup;
+				}
+				if (rsp->ccode == IPMI_CC_TIMEOUT) { /* Retry if timed out. */
+					if (retries == SUNOEM_CLI_MAX_RETRY) { /* If it's the last retry. */
+						lprintf(LOG_ERR, "Excessive timeout.");
+						error = 1;
+						goto cleanup;
+					}
+					continue;
+				}
+				break;
+			} /* for (retries = 0; retries <= SUNOEM_CLI_MAX_RETRY; retries++) */
+
+			if (SunOemCliActingVersion == SUNOEM_CLI_SEQNUM_VERSION) {
+				cli_req.seqnum ^= 0x1; /* Toggle sequence number after request is sent */
+			}
+
+			cli_rsp = (sunoem_cli_msg_t *) rsp->data;
+			/* Make sure response string is null terminated */
+			cli_rsp->buf[sizeof(cli_rsp->buf) - 1] = '\0';
+			printf("%s", cli_rsp->buf);
+			fflush(NULL); /* Flush partial lines to stdout */
+			count = 0; /* Don't re-send the client's data */
+			if (cli_req.command_response == SUNOEM_CLI_CMD_EOF
+					&& cli_rsp->command_response != 0 && rsp->ccode == 0) {
+				cli_rsp->command_response = 1;
+			}
+		} while (cli_rsp->command_response == 0 && cli_rsp->buf[0] != '\0');
+	}
+
+cleanup:
+	/* Restore original input mode if cli was running interactively */
+	if (argc == 0) {
+		if (sunoem_cli_unbufmode_stop(stdin, &orig_ts)) {
+			lprintf(LOG_ERR, "Failed to restore interactive mode: %s",
+					strerror(errno));
+			return (-1);
+		}
+	}
+
+	return ((error == 0 && cli_rsp->command_response == SUNOEM_SUCCESS) ? 0 : -1);
+}
+#define ECHO_DATA_SIZE 64
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	uint16_t seq_num;
+	unsigned char data[ECHO_DATA_SIZE];
+}__attribute__((packed)) sunoem_echo_msg_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * Send and receive X packets to the BMC. Each packet has a
+ * payload size of (sunoem_echo_msg_t) bytes. Each packet is tagged with a
+ * sequence number
+ */
+static int
+ipmi_sunoem_echo(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_echo_msg_t echo_req;
+	sunoem_echo_msg_t *echo_rsp;
+	struct timeval start_time;
+	struct timeval end_time;
+
+	int rc = 0;
+	int received = 0;
+	int transmitted = 0;
+	int quiet_mode = 0;
+
+	uint16_t num, i, j;
+	uint32_t total_time, resp_time, min_time, max_time;
+
+	if (argc < 1) {
+		return (1);
+	}
+
+	if (argc == 2) {
+		if (*(argv[1]) == 'q') {
+			quiet_mode = 1;
+		} else {
+			lprintf(LOG_ERR, "Unknown option '%s' given.", argv[1]);
+			return (-1);
+		}
+	} else if (argc > 2) {
+		lprintf(LOG_ERR,
+				"Too many parameters given. See help for more information.");
+		return (-1);
+	}
+	/* The number of packets to send/receive */
+	if (str2ushort(argv[0], &num) != 0) {
+		lprintf(LOG_ERR,
+				"Given number of packets is either invalid or out of range.");
+		return (-1);
+	}
+
+	/* Fill in data packet */
+	for (i = 0; i < ECHO_DATA_SIZE; i++) {
+		echo_req.data[i] = (uint8_t) i;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_ECHO;
+	req.msg.data = (uint8_t *) &echo_req;
+	req.msg.data_len = sizeof(sunoem_echo_msg_t);
+	echo_req.seq_num = i;
+	min_time = INT_MAX;
+	max_time = 0;
+	total_time = 0;
+	for (i = 0; i < num; i++) {
+		echo_req.seq_num = i;
+		transmitted++;
+		gettimeofday(&start_time, NULL);
+		rsp = intf->sendrecv(intf, &req);
+		gettimeofday(&end_time, NULL);
+		resp_time = ((end_time.tv_sec - start_time.tv_sec) * 1000)
+				+ ((end_time.tv_usec - start_time.tv_usec) / 1000);
+		if ((rsp == NULL) || (rsp->ccode != 0)) {
+			lprintf(LOG_ERR, "Sun OEM echo command failed. Seq # %d",
+					echo_req.seq_num);
+			rc = (-2);
+			break;
+		}
+		echo_rsp = (sunoem_echo_msg_t *) rsp->data;
+
+		/* Test if sequence # is valid */
+		if (echo_rsp->seq_num != echo_req.seq_num) {
+			printf("Invalid Seq # Expecting %d Received %d\n", echo_req.seq_num,
+					echo_rsp->seq_num);
+			rc = (-2);
+			break;
+		}
+
+		/* Test if response length is valid */
+		if (rsp->session.msglen == req.msg.data_len) {
+			printf("Invalid payload size for seq # %d. "
+					"Expecting %d Received %d\n", echo_rsp->seq_num,
+					req.msg.data_len, rsp->session.msglen);
+			rc = (-2);
+			break;
+		}
+
+		/* Test if the data is valid */
+		for (j = 0; j < ECHO_DATA_SIZE; j++) {
+			if (echo_rsp->data[j] != j) {
+				printf("Corrupt data packet. Seq # %d Offset %d\n",
+						echo_rsp->seq_num, j);
+				break;
+			}
+		} /* for (j = 0; j < ECHO_DATA_SIZE; j++) */
+
+		/* If the for loop terminated early - data is corrupt */
+		if (j != ECHO_DATA_SIZE) {
+			rc = (-2);
+			break;
+		}
+
+		/* cumalative time */
+		total_time += resp_time;
+
+		/* min time */
+		if (resp_time < min_time) {
+			min_time = resp_time;
+		}
+
+		/* max time */
+		if (resp_time > max_time) {
+			max_time = resp_time;
+		}
+
+		received++;
+		if (!quiet_mode) {
+			printf("Receive %lu Bytes - Seq. # %d time=%d ms\n",
+					sizeof(sunoem_echo_msg_t), echo_rsp->seq_num, resp_time);
+		}
+	} /* for (i = 0; i < num; i++) */
+	printf("%d packets transmitted, %d packets received\n", transmitted,
+			received);
+	if (received) {
+		printf("round-trip min/avg/max = %d/%d/%d ms\n", min_time,
+				total_time / received, max_time);
+	}
+
+	return (rc);
+} /* ipmi_sunoem_echo(...) */
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char oem_record_ver_num;
+	unsigned char major;
+	unsigned char minor;
+	unsigned char update;
+	unsigned char micro;
+	char nano[10];
+	char revision[10];
+	char version[40];
+	/*
+	 * When adding new fields (using the spare bytes),
+	 * add it immediately after the spare field to
+	 * ensure backward compatability.
+	 *
+	 * e.g.   char version[40];
+	 *        unsigned char spare[11];
+	 *        int new_item;
+	 *    } sunoem_version_response_t;
+	 */
+	unsigned char spare[15];
+}__attribute__((packed)) sunoem_version_response_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+typedef struct
+{
+	unsigned char major;
+	unsigned char minor;
+	unsigned char update;
+	unsigned char micro;
+} supported_version_t;
+
+static int
+ipmi_sunoem_getversion(struct ipmi_intf * intf,
+		sunoem_version_response_t **version_rsp)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_VERSION;
+	req.msg.data = NULL;
+	req.msg.data_len = 0;
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Sun OEM Get SP Version Failed.");
+		return (-1);
+	}
+	if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Sun OEM Get SP Version Failed: %d", rsp->ccode);
+		return (-1);
+	}
+
+	*version_rsp = (sunoem_version_response_t *) rsp->data;
+
+	return (0);
+}
+
+static void
+ipmi_sunoem_print_required_version(const supported_version_t* supp_ver)
+{
+	lprintf(LOG_ERR, "Command is not supported by this version of ILOM,"
+			" required at least: %d.%d.%d.%d", supp_ver->major, supp_ver->minor,
+			supp_ver->update, supp_ver->micro);
+}
+
+/*
+ * Function checks current version result against required version.
+ * Returns:
+ *  - negative value if current ILOM version is smaller than required or
+ *    in case of error
+ *  - positive value if current ILOM version is greater than required
+ *  - 0 if there is an exact ILOM version match
+ */
+static int
+ipmi_sunoem_checkversion(struct ipmi_intf * intf, supported_version_t* supp_ver)
+{
+	sunoem_version_response_t *version_rsp;
+	int i = 1;
+
+	if (ipmi_sunoem_getversion(intf, &version_rsp)) {
+		lprintf(LOG_ERR, "Unable to get ILOM version");
+		return (-1);
+	}
+
+	if (version_rsp->major < supp_ver->major) return (-i);
+	if (version_rsp->major > supp_ver->major) return (i);
+	/*version_rsp->major == supp_ver->major*/
+	++i;
+
+	if (version_rsp->minor < supp_ver->minor) return (-i);
+	if (version_rsp->minor > supp_ver->minor) return (i);
+	/*version_rsp->minor == supp_ver->minor*/
+	++i;
+
+	if (version_rsp->update < supp_ver->update) return (-i);
+	if (version_rsp->update > supp_ver->update) return (i);
+	/*version_rsp->update == supp_ver->update*/
+	++i;
+
+	if (version_rsp->micro < supp_ver->micro) return (-i);
+	if (version_rsp->micro > supp_ver->micro) return (i);
+	/*version_rsp->micro == supp_ver->micro*/
+
+	return (0);
+}
+
+/*
+ * Extract the SP version data including
+ * - major #
+ * - minor #
+ * - update #
+ * - micro #
+ * - nano #
+ * - Revision/Build #
+ */
+static int
+ipmi_sunoem_version(struct ipmi_intf * intf)
+{
+	sunoem_version_response_t *version_rsp;
+	int rc = ipmi_sunoem_getversion(intf, &version_rsp);
+
+	if (!rc) {
+		printf("Version: %s\n", version_rsp->version);
+	}
+
+	return (rc);
+}
+
+/*
+ * IPMI Max string length is 16 bytes
+ * define in usr/src/common/include/ami/IPMI_SDRRecord.h
+ */
+#define MAX_ID_STR_LEN  16
+#define MAX_SUNOEM_NAC_SIZE 64
+#define LUAPI_MAX_OBJ_PATH_LEN 256
+#define LUAPI_MAX_OBJ_VAL_LEN 1024
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char seq_num;
+	char nac_name[MAX_SUNOEM_NAC_SIZE];
+}__attribute__((packed)) sunoem_nacname_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * Retrieve the full NAC name of the IPMI target.
+ *
+ * The returned nac name may be larger than the payload size.
+ * In which case, it make take several request/payload to retrieve
+ * the entire full path name
+ *
+ * The initial seq_num is set to 0. If the return seq_num is incremented,
+ * only the 1st 72 bytes of the nac name is returned and the caller
+ * needs to get the next set of string data.
+ * If the returned seq_num is identical to the input seq_num, all data
+ * has been returned.
+ */
+static int
+ipmi_sunoem_nacname(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_nacname_t nacname_req;
+	sunoem_nacname_t *nacname_rsp;
+	char full_nac_name[LUAPI_MAX_OBJ_PATH_LEN];
+
+	if (argc < 1) {
+		return (1);
+	}
+
+	if (strlen(argv[0]) > MAX_ID_STR_LEN) {
+		lprintf(LOG_ERR,
+				"Sun OEM nacname command failed: Max size on IPMI name");
+		return (-1);
+	}
+
+	nacname_req.seq_num = 0;
+	strcpy(nacname_req.nac_name, argv[0]);
+
+	full_nac_name[0] = '\0';
+	while (1) {
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_SUNOEM;
+		req.msg.cmd = IPMI_SUNOEM_NACNAME;
+		req.msg.data = (uint8_t *) &nacname_req;
+		req.msg.data_len = sizeof(sunoem_nacname_t);
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM nacname command failed.");
+			return (-1);
+		}
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM nacname command failed: %d", rsp->ccode);
+			return (-1);
+		}
+
+		nacname_rsp = (sunoem_nacname_t *) rsp->data;
+		strncat(full_nac_name, nacname_rsp->nac_name, MAX_SUNOEM_NAC_SIZE);
+
+		/*
+		 * break out of the loop if there is no more data
+		 * In most cases, if not all, the NAC name fits into a
+		 * single payload
+		 */
+		if (nacname_req.seq_num == nacname_rsp->seq_num) {
+			break;
+		}
+
+		/* Get the next seq of string bytes */
+		nacname_req.seq_num = nacname_rsp->seq_num;
+
+		/* Check if we exceeded the size of the full nac name */
+		if ((nacname_req.seq_num * MAX_SUNOEM_NAC_SIZE) > LUAPI_MAX_OBJ_PATH_LEN) {
+			lprintf(LOG_ERR,
+					"Sun OEM nacname command failed: invalid path length");
+			return (-1);
+		}
+	}
+
+	printf("NAC Name: %s\n", full_nac_name);
+	return (0);
+}
+
+/* Constants used by ipmi_sunoem_getval */
+#define MAX_SUNOEM_VAL_PAYLOAD 79
+#define MAX_SUNOEM_VAL_COMPACT_PAYLOAD 56
+
+/*
+ * SUNOEM GET/SET LUAPI Commands
+ *
+ * SUNOEM_REQ_VAL - Request LUAPI Property Value
+ * SUNOEM_GET_VAL - Return the value from  SUNOEM_REQ_VAL
+ * SUNOEM_SET_VAL - Set the LUAPI Property value
+ * SUNOEM_GET_STATUS - Return the Status from SUNOEM_SET_VAL
+ */
+#define SUNOEM_REQ_VAL 1
+#define SUNOEM_GET_VAL 2
+#define SUNOEM_SET_VAL 3
+#define SUNOEM_GET_STATUS 4
+
+/* Status Code */
+#define SUNOEM_REQ_RECV 1
+#define SUNOEM_REQ_FAILED 2
+#define SUNOEM_DATA_READY 3
+#define SUNOEM_DATA_NOT_READY 4
+#define SUNOEM_DATA_NOT_FOUND 5
+#define GETVAL_MAX_RETRIES 5
+
+/* Parameter type Codes */
+#define SUNOEM_LUAPI_TARGET 0
+#define SUNOEM_LUAPI_VALUE  1
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char cmd_code;
+	unsigned char luapi_value[MAX_SUNOEM_VAL_PAYLOAD];
+}__attribute__((packed)) sunoem_getval_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * REQUEST PAYLOAD
+ *
+ * cmd_code - SUNOEM GET/SET LUAPI Cmds - see above
+ * param_type: 0: luapi_data contains the luapi property name
+ *             1: luapi_data contains the luapi value
+ * luapi_data: Either luapi property name or value
+ * tid: Transaction ID. If 0. This is the initial request for the
+ *      param_type. If tid > 0, this luapi_data string is a concatenation
+ *      of the previous request. Handle cases where the LUAPI target name
+ *      or value is > MAX_SUNOEM_VAL_COMPACT_PAYLOAD
+ * eof: If non zero, this is the last payload for the request
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char cmd_code;
+	unsigned char param_type;
+	unsigned char tid;
+	unsigned char eof;
+	char luapi_data[MAX_SUNOEM_VAL_COMPACT_PAYLOAD];
+}__attribute__((packed)) sunoem_setval_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * RESPONSE PAYLOAD
+ *
+ * status_code - see above for code definitions
+ * tid - transaction ID - assigned ny the ILOM stack
+ */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char status_code;
+	unsigned char tid;
+}__attribute__((packed)) sunoem_setval_resp_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+/*
+ * Return the ILOM target property value
+ */
+static int
+ipmi_sunoem_getval(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_getval_t getval_req;
+	sunoem_getval_t *getval_rsp;
+	int i;
+
+	const char* sp_path = "/SP";
+	supported_version_t supp_ver = { 3, 2, 0, 0 };
+
+	if (argc < 1) {
+		return (1);
+	}
+
+	if (strlen(argv[0]) > MAX_SUNOEM_VAL_PAYLOAD) {
+		lprintf(LOG_ERR,
+				"Sun OEM get value command failed: Max size on IPMI name");
+		return (-1);
+	}
+
+	if ((ipmi_sunoem_checkversion(intf, &supp_ver) < 0)
+			&& (!strncmp(argv[0], sp_path, strlen(sp_path)))) {
+		argv[0][1] = 'X'; /*replace SP by X to gain access to hidden properties*/
+		memmove(&argv[0][2], &argv[0][3], strlen(argv[0]) - 2);
+	}
+
+	/*
+	 * Setup the initial request to fetch the data.
+	 * Upon function return, the next cmd (SUNOEM_GET_VAL)
+	 * can be requested.
+	 */
+	memset(&getval_req, 0, sizeof(getval_req));
+	strncpy((char*) getval_req.luapi_value, argv[0], MAX_SUNOEM_VAL_PAYLOAD);
+	getval_req.cmd_code = SUNOEM_REQ_VAL;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_GETVAL;
+	req.msg.data = (uint8_t *) &getval_req;
+	req.msg.data_len = sizeof(sunoem_getval_t);
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Sun OEM getval1 command failed.");
+		return (-1);
+	}
+	if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Sun OEM getval1 command failed: %d", rsp->ccode);
+		return (-1);
+	}
+
+	/*
+	 * Fetch the data value - if it is not ready,
+	 * retry the request up to GETVAL_MAX_RETRIES
+	 */
+	for (i = 0; i < GETVAL_MAX_RETRIES; i++) {
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_SUNOEM;
+		req.msg.cmd = IPMI_SUNOEM_GETVAL;
+		getval_req.cmd_code = SUNOEM_GET_VAL;
+		req.msg.data = (uint8_t *) &getval_req;
+		req.msg.data_len = sizeof(sunoem_getval_t);
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM getval2 command failed.");
+			return (-1);
+		}
+
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM getval2 command failed: %d", rsp->ccode);
+			return (-1);
+		}
+
+		getval_rsp = (sunoem_getval_t *) rsp->data;
+
+		if (getval_rsp->cmd_code == SUNOEM_DATA_READY) {
+			printf("Target Value: %s\n", getval_rsp->luapi_value);
+			return (0);
+		} else if (getval_rsp->cmd_code == SUNOEM_DATA_NOT_FOUND) {
+			lprintf(LOG_ERR, "Target: %s not found", getval_req.luapi_value);
+			return (-1);
+		}
+
+		sleep(1);
+	}
+
+	lprintf(LOG_ERR, "Unable to retrieve target value.");
+	return (-1);
+}
+
+static int
+send_luapi_prop_name(struct ipmi_intf * intf, int len, char *prop_name,
+		unsigned char *tid_num)
+{
+	int i = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_setval_t setval_req;
+	sunoem_setval_resp_t *setval_rsp;
+
+	*tid_num = 0;
+	while (i < len) {
+		/*
+		 * Setup the request,
+		 * Upon function return, the next cmd (SUNOEM_SET_VAL)
+		 * can be requested.
+		 */
+		memset(&req, 0, sizeof(req));
+		memset(&setval_req, 0, sizeof(sunoem_setval_t));
+		req.msg.netfn = IPMI_NETFN_SUNOEM;
+		req.msg.cmd = IPMI_SUNOEM_SETVAL;
+		setval_req.cmd_code = SUNOEM_SET_VAL;
+		setval_req.param_type = SUNOEM_LUAPI_TARGET;
+		setval_req.tid = *tid_num;
+		setval_req.eof = 0;
+		/*
+		 * If the property name is > payload, only copy
+		 * the payload size and increment the string offset (i)
+		 * for the next payload
+		 */
+		if (strlen(&(prop_name[i])) > MAX_SUNOEM_VAL_COMPACT_PAYLOAD) {
+			strncpy(setval_req.luapi_data, &(prop_name[i]),
+			MAX_SUNOEM_VAL_COMPACT_PAYLOAD);
+		} else {
+			strncpy(setval_req.luapi_data, &(prop_name[i]),
+					strlen(&(prop_name[i])));
+		}
+		req.msg.data = (uint8_t *) &setval_req;
+		req.msg.data_len = sizeof(sunoem_setval_t);
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM setval prop name: response is NULL");
+			return (-1);
+		}
+
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM setval prop name: request failed: %d",
+					rsp->ccode);
+			return (-1);
+		}
+
+		setval_rsp = (sunoem_setval_resp_t *) rsp->data;
+
+		/*
+		 * If the return code is other than data received, the
+		 * request failed
+		 */
+		if (setval_rsp->status_code != SUNOEM_REQ_RECV) {
+			lprintf(LOG_ERR,
+					"Sun OEM setval prop name: invalid status code: %d",
+					setval_rsp->status_code);
+			return (-1);
+		}
+		/* Use the tid returned by ILOM */
+		*tid_num = setval_rsp->tid;
+		/* Increment the string offset */
+		i += MAX_SUNOEM_VAL_COMPACT_PAYLOAD;
+	}
+
+	return (0);
+}
+
+static int
+send_luapi_prop_value(struct ipmi_intf * intf, int len,	char *prop_value,
+		unsigned char tid_num)
+{
+	int i = 0;
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_setval_t setval_req;
+	sunoem_setval_resp_t *setval_rsp;
+
+	while (i < len) {
+		/*
+		 * Setup the request,
+		 * Upon function return, the next cmd (SUNOEM_GET_VAL)
+		 * can be requested.
+		 */
+		memset(&req, 0, sizeof(req));
+		memset(&setval_req, 0, sizeof(sunoem_setval_t));
+		req.msg.netfn = IPMI_NETFN_SUNOEM;
+		req.msg.cmd = IPMI_SUNOEM_SETVAL;
+		setval_req.cmd_code = SUNOEM_SET_VAL;
+		setval_req.param_type = SUNOEM_LUAPI_VALUE;
+		setval_req.tid = tid_num;
+		/*
+		 * If the property name is > payload, only copy the
+		 * the payload size and increment the string offset
+		 * for the next payload
+		 */
+		if (strlen(&(prop_value[i])) > MAX_SUNOEM_VAL_COMPACT_PAYLOAD) {
+			strncpy(setval_req.luapi_data, &(prop_value[i]),
+			MAX_SUNOEM_VAL_COMPACT_PAYLOAD);
+		} else {
+			/* Captured the entire string, mark this as the last payload */
+			strncpy(setval_req.luapi_data, &(prop_value[i]),
+					strlen(&(prop_value[i])));
+			setval_req.eof = 1;
+		}
+		req.msg.data = (uint8_t *) &setval_req;
+		req.msg.data_len = sizeof(sunoem_setval_t);
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM setval prop value: response is NULL");
+			return (-1);
+		}
+
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM setval prop value: request failed: %d",
+					rsp->ccode);
+			return (-1);
+		}
+
+		setval_rsp = (sunoem_setval_resp_t *) rsp->data;
+
+		/*
+		 * If the return code is other than data received, the
+		 * request failed
+		 */
+		if (setval_rsp->status_code != SUNOEM_REQ_RECV) {
+			lprintf(LOG_ERR,
+					"Sun OEM setval prop value: invalid status code: %d",
+					setval_rsp->status_code);
+			return (-1);
+		}
+
+		/* Increment the string offset */
+		i += MAX_SUNOEM_VAL_COMPACT_PAYLOAD;
+	}
+	return (0);
+}
+
+static int
+ipmi_sunoem_setval(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	sunoem_setval_t setval_req;
+	sunoem_setval_resp_t *setval_rsp;
+	int prop_len;
+	int value_len;
+	int i;
+	unsigned char tid_num;
+	int retries;
+
+	prop_len = strlen(argv[0]);
+	value_len = strlen(argv[1]);
+	if (prop_len > LUAPI_MAX_OBJ_PATH_LEN) {
+		lprintf(LOG_ERR,
+				"Sun OEM set value command failed: Max size on property name");
+		return (-1);
+	}
+	if (value_len > LUAPI_MAX_OBJ_VAL_LEN) {
+		lprintf(LOG_ERR,
+				"Sun OEM set value command failed: Max size on property value");
+		return (-1);
+	}
+
+	/* Test if there is a timeout specified */
+	if (argc == 3) {
+		if ((str2int(argv[2], &retries) != 0) || retries < 0) {
+			lprintf(LOG_ERR,
+					"Invalid input given or out of range for time-out parameter.");
+			return (-1);
+		}
+	} else {
+		retries = GETVAL_MAX_RETRIES;
+	}
+
+	/* Send the property name 1st */
+	if (send_luapi_prop_name(intf, prop_len, argv[0], &tid_num) != 0) {
+		/* return if there is an error */
+		return (-1);
+	}
+
+	if (send_luapi_prop_value(intf, value_len, argv[1], tid_num) != 0) {
+		/* return if there is an error */
+		return (-1);
+	}
+
+	/*
+	 * Get The status of the command.
+	 * if it is not ready, retry the request up to
+	 * GETVAL_MAX_RETRIES
+	 */
+	for (i = 0; i < retries; i++) {
+		memset(&req, 0, sizeof(req));
+		req.msg.netfn = IPMI_NETFN_SUNOEM;
+		req.msg.cmd = IPMI_SUNOEM_SETVAL;
+		setval_req.cmd_code = SUNOEM_GET_STATUS;
+		setval_req.tid = tid_num;
+		req.msg.data = (uint8_t *) &setval_req;
+		req.msg.data_len = sizeof(sunoem_setval_t);
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM setval command failed.");
+			return (-1);
+		}
+
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM setval command failed: %d", rsp->ccode);
+			return (-1);
+		}
+
+		setval_rsp = (sunoem_setval_resp_t *) rsp->data;
+
+		if (setval_rsp->status_code == SUNOEM_DATA_READY) {
+			printf("Sun OEM setval command successful.\n");
+			return (0);
+		} else if (setval_rsp->status_code != SUNOEM_DATA_NOT_READY) {
+			lprintf(LOG_ERR, "Sun OEM setval command failed.");
+			return (-1);
+		}
+
+		sleep(1);
+	}
+	/* If we reached here, retries exceeded */
+	lprintf(LOG_ERR, "Sun OEM setval command failed: Command Timed Out");
+
+	return (-1);
+}
+
+#define MAX_FILE_DATA_SIZE            1024
+#define MAX_FILEID_LEN                16
+#define CORE_TUNNEL_SUBCMD_GET_FILE   11
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char cmd_code;
+	unsigned char file_id[MAX_FILEID_LEN];
+	unsigned int block_num;
+}__attribute__((packed)) getfile_req_t;
+
+typedef struct
+{
+	unsigned int block_num;
+	unsigned int data_size;
+	unsigned char eof;
+	unsigned char data[MAX_FILE_DATA_SIZE];
+}__attribute__((packed)) getfile_rsp_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+static int
+ipmi_sunoem_getfile(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	getfile_req_t getfile_req;
+	getfile_rsp_t *getfile_rsp;
+	int block_num = 0;
+	int nbo_blk_num; /* Network Byte Order Block Num */
+	FILE *fp;
+	unsigned data_size;
+	supported_version_t supp_ver = IPMI_SUNOEM_GETFILE_VERSION;
+
+	if (argc < 1) {
+		return (-1);
+	}
+
+	/*check if command is supported by this version of ilom*/
+	if (ipmi_sunoem_checkversion(intf, &supp_ver) < 0) {
+		ipmi_sunoem_print_required_version(&supp_ver);
+		return (-1);
+	}
+
+	/*
+	 * File ID is < MAX_FILEID_LEN
+	 * Save 1 byte for null Terminated string
+	 */
+	if (strlen(argv[0]) >= MAX_FILE_DATA_SIZE) {
+		lprintf(LOG_ERR, "File ID >= %d characters", MAX_FILEID_LEN);
+		return (-1);
+	}
+
+	memset(&getfile_req, 0, sizeof(getfile_req));
+	strncpy((char*) getfile_req.file_id, argv[0], MAX_FILEID_LEN - 1);
+
+	/* Create the destination file */
+	fp = ipmi_open_file_write(argv[1]);
+	if (fp == NULL) {
+		lprintf(LOG_ERR, "Unable to open file: %s", argv[1]);
+		return (-1);
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_CORE_TUNNEL;
+	req.msg.data = (uint8_t *) &getfile_req;
+	req.msg.data_len = sizeof(getfile_req_t);
+	getfile_req.cmd_code = CORE_TUNNEL_SUBCMD_GET_FILE;
+
+	do {
+
+		nbo_blk_num = htonl(block_num);
+		/* Block Num must be in network byte order */
+		memcpy(&(getfile_req.block_num), &nbo_blk_num,
+				sizeof(getfile_req.block_num));
+
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Sun OEM getfile command failed.");
+			fclose(fp);
+			return (-1);
+		}
+		if (rsp->ccode != 0) {
+			lprintf(LOG_ERR, "Sun OEM getfile command failed: %d", rsp->ccode);
+			fclose(fp);
+			return (-1);
+		}
+
+		getfile_rsp = (getfile_rsp_t *) rsp->data;
+
+		memcpy(&data_size, &(getfile_rsp->data_size),
+				sizeof(getfile_rsp->data_size));
+		data_size = ntohl(data_size);
+
+		if (data_size > MAX_FILE_DATA_SIZE) {
+			lprintf(LOG_ERR, "Sun OEM getfile invalid data size: %d",
+					data_size);
+			fclose(fp);
+			return (-1);
+		}
+
+		/* Check if Block Num matches */
+		if (memcmp(&(getfile_req.block_num), &(getfile_rsp->block_num),
+				sizeof(getfile_req.block_num)) != 0) {
+			lprintf(LOG_ERR, "Sun OEM getfile Incorrect Block Num Returned");
+			lprintf(LOG_ERR, "Expecting: %x Received: %x",
+					getfile_req.block_num, getfile_rsp->block_num);
+			fclose(fp);
+			return (-1);
+		}
+
+		if (fwrite(getfile_rsp->data, 1, data_size, fp) != data_size) {
+			lprintf(LOG_ERR, "Sun OEM getfile write failed: %d", rsp->ccode);
+			fclose(fp);
+			return (-1);
+		}
+
+		block_num++;
+	} while (getfile_rsp->eof == 0);
+
+	fclose(fp);
+
+	return (0);
+}
+
+/*
+ * Query BMC for capability/behavior.
+ */
+
+#define CORE_TUNNEL_SUBCMD_GET_BEHAVIOR   15
+#define SUNOEM_BEHAVIORID_SIZE            32
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(push, 1)
+#endif
+typedef struct
+{
+	unsigned char cmd_code;
+	unsigned char behavior_id[SUNOEM_BEHAVIORID_SIZE];
+}__attribute__((packed)) getbehavior_req_t;
+
+typedef struct
+{
+	unsigned char enabled;
+}__attribute__((packed)) getbehavior_rsp_t;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(pop)
+#endif
+
+static int
+ipmi_sunoem_getbehavior(struct ipmi_intf * intf, int argc, char *argv[])
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	getbehavior_req_t getbehavior_req;
+	getbehavior_rsp_t *getbehavior_rsp;
+	supported_version_t supp_ver = IPMI_SUNOEM_GETBEHAVIOR_VERSION;
+
+	if (argc < 1) {
+		return (-1);
+	}
+
+	/*check if command is supported by this version of ilom*/
+	if (ipmi_sunoem_checkversion(intf, &supp_ver) < 0) {
+		ipmi_sunoem_print_required_version(&supp_ver);
+		return (-1);
+	}
+
+	/*
+	 * Behavior ID is < SUNOEM_BEHAVIORID_SIZE.
+	 * Save 1 byte for null terminated string
+	 */
+	if (strlen(argv[0]) >= SUNOEM_BEHAVIORID_SIZE) {
+		lprintf(LOG_ERR, "Behavior ID >= %d characters",
+		SUNOEM_BEHAVIORID_SIZE);
+		return (-1);
+	}
+
+	memset(&getbehavior_req, 0, sizeof(getbehavior_req));
+	strncpy(getbehavior_req.behavior_id, argv[0], SUNOEM_BEHAVIORID_SIZE - 1);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_SUNOEM;
+	req.msg.cmd = IPMI_SUNOEM_CORE_TUNNEL;
+	req.msg.data = (uint8_t *) &getbehavior_req;
+	req.msg.data_len = sizeof(getbehavior_req_t);
+	getbehavior_req.cmd_code = CORE_TUNNEL_SUBCMD_GET_BEHAVIOR;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Sun OEM getbehavior command failed.");
+		return (-1);
+	}
+
+	if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Sun OEM getbehavior command failed: %d", rsp->ccode);
+		return (-1);
+	}
+
+	getbehavior_rsp = (getbehavior_rsp_t *) rsp->data;
+	printf("ILOM behavior %s %s enabled\n", getbehavior_req.behavior_id,
+			getbehavior_rsp->enabled ? "is" : "is not");
+
+	return (0);
+}
+
+int
+ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int rc = 0;
+
+	if (argc == 0 || strcmp(argv[0], "help") == 0) {
+		ipmi_sunoem_usage();
+		return (0);
+	} /* if (argc == 0 || strcmp(argv[0], "help") == 0) */
+
+	if (strcmp(argv[0], "cli") == 0) {
+		rc = ipmi_sunoem_cli(intf, argc - 1, &argv[1]);
+	} else if ((strcmp(argv[0], "led") == 0) || (strcmp(argv[0], "sbled") == 0)) {
+		if (argc < 2) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+
+		if (strcmp(argv[1], "get") == 0) {
+			if (argc < 3) {
+				char * arg[] = { "all" };
+				rc = ipmi_sunoem_led_get(intf, 1, arg);
+			} else {
+				rc = ipmi_sunoem_led_get(intf, argc - 2, &(argv[2]));
+			}
+		} else if (strcmp(argv[1], "set") == 0) {
+			if (argc < 4) {
+				ipmi_sunoem_usage();
+				return (-1);
+			}
+			rc = ipmi_sunoem_led_set(intf, argc - 2, &(argv[2]));
+		} else {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+	} else if (strcmp(argv[0], "sshkey") == 0) {
+		uint8_t uid = 0;
+		if (argc < 3) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = str2uchar(argv[2], &uid);
+		if (rc == 0) {
+			/* conversion should be OK. */
+		} else if (rc == 2) {
+			lprintf(LOG_NOTICE, "Invalid interval given.");
+			return (-1);
+		} else {
+			/* defaults to rc = 3 */
+			lprintf(LOG_NOTICE, "Given interval is too big.");
+			return (-1);
+		}
+
+		if (strcmp(argv[1], "del") == 0) {
+			/* number of arguments, three, is already checked at this point */
+			rc = ipmi_sunoem_sshkey_del(intf, uid);
+		} else if (strcmp(argv[1], "set") == 0) {
+			if (argc < 4) {
+				ipmi_sunoem_usage();
+				return (-1);
+			}
+			rc = ipmi_sunoem_sshkey_set(intf, uid, argv[3]);
+		} else {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+	} else if (strcmp(argv[0], "ping") == 0) {
+		if (argc < 2) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_echo(intf, argc - 1, &(argv[1]));
+	} else if (strcmp(argv[0], "version") == 0) {
+		rc = ipmi_sunoem_version(intf);
+	} else if (strcmp(argv[0], "nacname") == 0) {
+		if (argc < 2) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_nacname(intf, argc - 1, &(argv[1]));
+	} else if (strcmp(argv[0], "getval") == 0) {
+		if (argc < 2) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_getval(intf, argc - 1, &(argv[1]));
+	} else if (strcmp(argv[0], "setval") == 0) {
+		if (argc < 3) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_setval(intf, argc - 1, &(argv[1]));
+	} else if (strcmp(argv[0], "getfile") == 0) {
+		if (argc < 3) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_getfile(intf, argc - 1, &(argv[1]));
+	} else if (strcmp(argv[0], "getbehavior") == 0) {
+		if (argc < 2) {
+			ipmi_sunoem_usage();
+			return (-1);
+		}
+		rc = ipmi_sunoem_getbehavior(intf, argc - 1, &(argv[1]));
+	} else {
+		lprintf(LOG_ERR, "Invalid sunoem command: %s", argv[0]);
+		return (-1);
+	} /* if (strcmp(argv[0], "cli") == 0) */
+
+	return (rc);
+}
diff --git a/lib/ipmi_tsol.c b/lib/ipmi_tsol.c
new file mode 100644
index 0000000..d89bcfd
--- /dev/null
+++ b/lib/ipmi_tsol.c
@@ -0,0 +1,609 @@
+/*
+ * Copyright (c) 2005 Tyan Computer Corp.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _DEFAULT_SOURCE
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <poll.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <signal.h>
+
+#include <sys/select.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#if defined(HAVE_TERMIOS_H)
+# include <termios.h>
+#elif defined (HAVE_SYS_TERMIOS_H)
+# include <sys/termios.h>
+#endif
+
+#include <ipmitool/log.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_tsol.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/bswap.h>
+
+static struct timeval _start_keepalive;
+static struct termios _saved_tio;
+static struct winsize _saved_winsize;
+static int _in_raw_mode = 0;
+static int _altterm = 0;
+
+extern int verbose;
+
+static int
+ipmi_tsol_command(struct ipmi_intf *intf, char *recvip, int port,
+		unsigned char cmd)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq	req;
+	unsigned char data[6];
+	unsigned ip1, ip2, ip3, ip4;
+
+	if (sscanf(recvip, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4) != 4) {
+		lprintf(LOG_ERR, "Invalid IP address: %s", recvip);
+		return (-1);
+	}
+	memset(&req, 0, sizeof(struct ipmi_rq));
+	req.msg.netfn = IPMI_NETFN_TSOL;
+	req.msg.cmd = cmd;
+	req.msg.data_len = 6;
+	req.msg.data = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = ip1;
+	data[1] = ip2;
+	data[2] = ip3;
+	data[3] = ip4;
+	data[4] = (port & 0xff00) >> 8;
+	data[5] = (port & 0xff);
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Unable to perform TSOL command");
+		return (-1);
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Unable to perform TSOL command: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		return (-1);
+	}
+	return 0;
+}
+
+static int
+ipmi_tsol_start(struct ipmi_intf *intf, char *recvip, int port)
+{
+	return ipmi_tsol_command(intf, recvip, port, IPMI_TSOL_CMD_START);
+}
+
+static int
+ipmi_tsol_stop(struct ipmi_intf *intf, char *recvip, int port)
+{
+	return ipmi_tsol_command(intf, recvip, port, IPMI_TSOL_CMD_STOP);
+}
+
+static int
+ipmi_tsol_send_keystroke(struct ipmi_intf *intf, char *buff, int length)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char data[16];
+	static unsigned char keyseq = 0;
+
+	memset(&req, 0, sizeof(struct ipmi_rq));
+	req.msg.netfn = IPMI_NETFN_TSOL;
+	req.msg.cmd = IPMI_TSOL_CMD_SENDKEY;
+	req.msg.data_len = length + 2;
+	req.msg.data = data;
+
+	memset(data, 0, sizeof(data));
+	data[0] = length + 1;
+	memcpy(data + 1, buff, length);
+	data[length + 1] = keyseq++;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (verbose) {
+		if (rsp == NULL) {
+			lprintf(LOG_ERR, "Unable to send keystroke");
+			return -1;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_ERR, "Unable to send keystroke: %s",
+					val2str(rsp->ccode, completion_code_vals));
+			return -1;
+		}
+	}
+	return length;
+}
+
+static int
+tsol_keepalive(struct ipmi_intf *intf)
+{
+	struct timeval end;
+	gettimeofday(&end, 0);
+	if (end.tv_sec - _start_keepalive.tv_sec <= 30) {
+		return 0;
+	}
+	intf->keepalive(intf);
+	gettimeofday(&_start_keepalive, 0);
+	return 0;
+}
+
+static void
+print_escape_seq(struct ipmi_intf *intf)
+{
+	lprintf(LOG_NOTICE,
+"       %c.  - terminate connection\n"
+"       %c^Z - suspend ipmitool\n"
+"       %c^X - suspend ipmitool, but don't restore tty on restart\n"
+"       %c?  - this message\n"
+"       %c%c  - send the escape character by typing it twice\n"
+"       (Note that escapes are only recognized immediately after newline.)",
+			intf->ssn_params.sol_escape_char,
+			intf->ssn_params.sol_escape_char,
+			intf->ssn_params.sol_escape_char,
+			intf->ssn_params.sol_escape_char,
+			intf->ssn_params.sol_escape_char,
+			intf->ssn_params.sol_escape_char);
+}
+
+static int
+leave_raw_mode(void)
+{
+	if (!_in_raw_mode) {
+		return -1;
+	} else if (tcsetattr(fileno(stdin), TCSADRAIN, &_saved_tio) == -1) {
+		lperror(LOG_ERR, "tcsetattr(stdin)");
+	} else if (tcsetattr(fileno(stdout), TCSADRAIN, &_saved_tio) == -1) {
+		lperror(LOG_ERR, "tcsetattr(stdout)");
+	} else {
+		_in_raw_mode = 0;
+	}
+	return 0;
+}
+
+static int
+enter_raw_mode(void)
+{
+	struct termios tio;
+	if (tcgetattr(fileno(stdout), &_saved_tio) < 0) {
+		lperror(LOG_ERR, "tcgetattr failed");
+		return -1;
+	}
+
+	tio = _saved_tio;
+	if (_altterm) {
+		tio.c_iflag &= (ISTRIP | IGNBRK);
+		tio.c_cflag &= ~(CSIZE | PARENB | IXON | IXOFF | IXANY);
+		tio.c_cflag |= (CS8 |CREAD) | (IXON|IXOFF|IXANY);
+		tio.c_lflag &= 0;
+		tio.c_cc[VMIN] = 1;
+		tio.c_cc[VTIME] = 0;
+	} else {
+		tio.c_iflag |= IGNPAR;
+		tio.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+		tio.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL | IEXTEN);
+		tio.c_oflag &= ~OPOST;
+		tio.c_cc[VMIN] = 1;
+		tio.c_cc[VTIME] = 0;
+	}
+
+	if (tcsetattr(fileno(stdin), TCSADRAIN, &tio) < 0) {
+		lperror(LOG_ERR, "tcsetattr(stdin)");
+	} else if (tcsetattr(fileno(stdout), TCSADRAIN, &tio) < 0) {
+		lperror(LOG_ERR, "tcsetattr(stdout)");
+	} else {
+		_in_raw_mode = 1;
+	}
+	return 0;
+}
+
+static void
+suspend_self(int restore_tty)
+{
+	leave_raw_mode();
+	kill(getpid(), SIGTSTP);
+	if (restore_tty) {
+		enter_raw_mode();
+	}
+}
+
+static int
+do_inbuf_actions(struct ipmi_intf *intf, char *in_buff, int len)
+{
+	static int in_esc = 0;
+	static int last_was_cr = 1;
+	int i;
+
+	for(i = 0; i < len ;) {
+		if (!in_esc) {
+			if (last_was_cr &&
+					(in_buff[i] == intf->ssn_params.sol_escape_char)) {
+				in_esc = 1;
+				memmove(in_buff, in_buff + 1, len - i - 1);
+				len--;
+				continue;
+			}
+		}
+		if (in_esc) {
+			if (in_buff[i] == intf->ssn_params.sol_escape_char) {
+				in_esc = 0;
+				i++;
+				continue;
+			}
+
+			switch (in_buff[i]) {
+			case '.':
+				printf("%c. [terminated ipmitool]\n",
+						intf->ssn_params.sol_escape_char);
+				return -1;
+			case 'Z' - 64:
+				printf("%c^Z [suspend ipmitool]\n",
+						intf->ssn_params.sol_escape_char);
+				/* Restore tty back to raw */
+				suspend_self(1);
+				break;
+			case 'X' - 64:
+				printf("%c^X [suspend ipmitool]\n",
+						intf->ssn_params.sol_escape_char);
+				/* Don't restore to raw mode */
+				suspend_self(0);
+				break;
+			case '?':
+				printf("%c? [ipmitool help]\n",
+						intf->ssn_params.sol_escape_char);
+				print_escape_seq(intf);
+				break;
+			}
+
+			memmove(in_buff, (in_buff + 1), (len - i - 1));
+			len--;
+			in_esc = 0;
+			continue;
+		}
+		last_was_cr = (in_buff[i] == '\r' || in_buff[i] == '\n');
+		i++;
+	}
+	return len;
+}
+
+
+static void
+do_terminal_cleanup(void)
+{
+	if (_saved_winsize.ws_row > 0 && _saved_winsize.ws_col > 0) {
+		ioctl(fileno(stdout), TIOCSWINSZ, &_saved_winsize);
+	}
+	leave_raw_mode();
+	if (errno) {
+		lprintf(LOG_ERR, "Exiting due to error %d -> %s",
+			errno, strerror(errno));
+	}
+}
+
+static void
+set_terminal_size(int rows, int cols)
+{
+	struct winsize winsize;
+	if (rows <= 0 || cols <= 0) {
+		return;
+	}
+	/* save initial winsize */
+	ioctl(fileno(stdout), TIOCGWINSZ, &_saved_winsize);
+	/* set new winsize */
+	winsize.ws_row = rows;
+	winsize.ws_col = cols;
+	ioctl(fileno(stdout), TIOCSWINSZ, &winsize);
+}
+
+static void
+print_tsol_usage(void)
+{
+	struct winsize winsize;
+	lprintf(LOG_NOTICE,
+"Usage: tsol [recvip] [port=NUM] [ro|rw] [rows=NUM] [cols=NUM] [altterm]");
+	lprintf(LOG_NOTICE,
+"       recvip       Receiver IP Address             [default=local]");
+	lprintf(LOG_NOTICE,
+"       port=NUM     Receiver UDP Port               [default=%d]",
+			IPMI_TSOL_DEF_PORT);
+	lprintf(LOG_NOTICE,
+"       ro|rw        Set Read-Only or Read-Write     [default=rw]");
+			ioctl(fileno(stdout), TIOCGWINSZ, &winsize);
+	lprintf(LOG_NOTICE,
+"       rows=NUM     Set terminal rows               [default=%d]",
+			winsize.ws_row);
+	lprintf(LOG_NOTICE,
+"       cols=NUM     Set terminal columns            [default=%d]",
+			winsize.ws_col);
+	lprintf(LOG_NOTICE,
+"       altterm      Alternate terminal setup        [default=off]");
+}
+
+int
+ipmi_tsol_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct pollfd fds_wait[3], fds_data_wait[3], *fds;
+	struct sockaddr_in sin, myaddr, *sa_in;
+	socklen_t mylen;
+	char *recvip = NULL;
+	char in_buff[IPMI_BUF_SIZE];
+	char out_buff[IPMI_BUF_SIZE * 8];
+	char buff[IPMI_BUF_SIZE + 4];
+	int fd_socket, result, i;
+	int out_buff_fill, in_buff_fill;
+	int ip1, ip2, ip3, ip4;
+	int read_only = 0, rows = 0, cols = 0;
+	int port = IPMI_TSOL_DEF_PORT;
+
+	if (strlen(intf->name) < 3 || strncmp(intf->name, "lan", 3) != 0) {
+		lprintf(LOG_ERR, "Error: Tyan SOL is only available over lan interface");
+		return (-1);
+	}
+
+	for (i = 0; i<argc; i++) {
+		if (sscanf(argv[i], "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4) == 4) {
+			/* not free'd ...*/
+			/* recvip = strdup(argv[i]); */
+			recvip = argv[i];
+		} else if (sscanf(argv[i], "port=%d", &ip1) == 1) {
+			port = ip1;
+		} else if (sscanf(argv[i], "rows=%d", &ip1) == 1) {
+			rows = ip1;
+		} else if (sscanf(argv[i], "cols=%d", &ip1) == 1) {
+			cols = ip1;
+		} else if (strlen(argv[i]) == 2
+				&& strncmp(argv[i], "ro", 2) == 0) {
+			read_only = 1;
+		} else if (strlen(argv[i]) == 2
+				&& strncmp(argv[i], "rw", 2) == 0) {
+			read_only = 0;
+		} else if (strlen(argv[i]) == 7
+				&& strncmp(argv[i], "altterm", 7) == 0) {
+			_altterm = 1;
+		} else if (strlen(argv[i]) == 4
+				&& strncmp(argv[i], "help", 4) == 0) {
+			print_tsol_usage();
+			return 0;
+		} else {
+			lprintf(LOG_ERR, "Invalid tsol command: '%s'\n",
+					argv[i]);
+			print_tsol_usage();
+			return (-1);
+		}
+	}
+
+	/* create udp socket to receive the packet */
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_family = AF_INET;
+	sin.sin_port = htons(port);
+
+	sa_in = (struct sockaddr_in *)&intf->session->addr;
+	result = inet_pton(AF_INET, (const char *)intf->ssn_params.hostname,
+			&sa_in->sin_addr);
+
+	if (result <= 0) {
+		struct hostent *host = gethostbyname((const char *)intf->ssn_params.hostname);
+		if (host == NULL ) {
+			lprintf(LOG_ERR, "Address lookup for %s failed",
+				intf->ssn_params.hostname);
+			return -1;
+		}
+		if (host->h_addrtype != AF_INET) {
+			lprintf(LOG_ERR,
+					"Address lookup for %s failed. Got %s, expected IPv4 address.",
+					intf->ssn_params.hostname,
+					(host->h_addrtype == AF_INET6) ? "IPv6" : "Unknown");
+			return (-1);
+		}
+		sa_in->sin_family = host->h_addrtype;
+		memcpy(&sa_in->sin_addr, host->h_addr_list[0], host->h_length);
+	}
+
+	fd_socket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	if (fd_socket < 0) {
+		lprintf(LOG_ERR, "Can't open port %d", port);
+		return -1;
+	}
+	if (bind(fd_socket, (struct sockaddr *)&sin, sizeof(sin)) == (-1)) {
+		lprintf(LOG_ERR, "Failed to bind socket.");
+		close(fd_socket);
+		return -1;
+	}
+
+	/*
+	 * retrieve local IP address if not supplied on command line
+	 */
+	if (recvip == NULL) {
+		/* must connect first */
+		result = intf->open(intf);
+		if (result < 0) {
+			close(fd_socket);
+			return -1;
+		}
+
+		mylen = sizeof(myaddr);
+		if (getsockname(intf->fd, (struct sockaddr *)&myaddr, &mylen) < 0) {
+			lperror(LOG_ERR, "getsockname failed");
+			close(fd_socket);
+			return -1;
+		}
+
+		recvip = inet_ntoa(myaddr.sin_addr);
+		if (recvip == NULL) {
+			lprintf(LOG_ERR, "Unable to find local IP address");
+			close(fd_socket);
+			return -1;
+		}
+	}
+
+	printf("[Starting %sSOL with receiving address %s:%d]\n",
+			read_only ? "Read-only " : "", recvip, port);
+
+	set_terminal_size(rows, cols);
+	enter_raw_mode();
+
+	/*
+	 * talk to smdc to start Console redirect - IP address and port as parameter
+	 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x06 0xC0 0xA8 0xA8 0x78 0x1A 0x0A
+	 */
+	result = ipmi_tsol_start(intf, recvip, port);
+	if (result < 0) {
+		lprintf(LOG_ERR, "Error starting SOL");
+		close(fd_socket);
+		return (-1);
+	}
+
+	printf("[SOL Session operational.  Use %c? for help]\n",
+			intf->ssn_params.sol_escape_char);
+
+	gettimeofday(&_start_keepalive, 0);
+
+	fds_wait[0].fd = fd_socket;
+	fds_wait[0].events = POLLIN;
+	fds_wait[0].revents = 0;
+	fds_wait[1].fd = fileno(stdin);
+	fds_wait[1].events = POLLIN;
+	fds_wait[1].revents = 0;
+	fds_wait[2].fd = -1;
+	fds_wait[2].events = 0;
+	fds_wait[2].revents = 0;
+
+	fds_data_wait[0].fd = fd_socket;
+	fds_data_wait[0].events = POLLIN | POLLOUT;
+	fds_data_wait[0].revents = 0;
+	fds_data_wait[1].fd = fileno(stdin);
+	fds_data_wait[1].events = POLLIN;
+	fds_data_wait[1].revents = 0;
+	fds_data_wait[2].fd = fileno(stdout);
+	fds_data_wait[2].events = POLLOUT;
+	fds_data_wait[2].revents = 0;
+
+	out_buff_fill = 0;
+	in_buff_fill = 0;
+	fds = fds_wait;
+	for (;;) {
+		result = poll(fds, 3, 15 * 1000);
+		if (result < 0) {
+			break;
+		}
+
+		/* send keepalive packet */
+		tsol_keepalive(intf);
+
+		if ((fds[0].revents & POLLIN) && (sizeof(out_buff) > out_buff_fill)) {
+			socklen_t sin_len = sizeof(sin);
+			int buff_size = sizeof(buff);
+			if ((sizeof(out_buff) - out_buff_fill + 4) < buff_size) {
+				buff_size = (sizeof(out_buff) - out_buff_fill) + 4;
+				if ((buff_size - 4) <= 0) {
+					buff_size = 0;
+				}
+			}
+			result = recvfrom(fd_socket, buff,
+					buff_size, 0,
+					(struct sockaddr *)&sin, &sin_len);
+			/* read the data from udp socket,
+			 * skip some bytes in the head
+			 */
+			if ((result - 4) > 0) {
+				int length = result - 4;
+				memcpy(out_buff + out_buff_fill, buff + 4, length);
+				out_buff_fill += length;
+			}
+		}
+		if ((fds[1].revents & POLLIN) && (sizeof(in_buff) > in_buff_fill)) {
+			/* Read from keyboard */
+			result = read(fileno(stdin), in_buff + in_buff_fill,
+					sizeof(in_buff) - in_buff_fill);
+			if (result > 0) {
+				int bytes;
+				bytes = do_inbuf_actions(intf,
+						in_buff + in_buff_fill, result);
+				if (bytes < 0) {
+					result = ipmi_tsol_stop(intf, recvip, port);
+					do_terminal_cleanup();
+					return result;
+				}
+				if (read_only) {
+					bytes = 0;
+				}
+				in_buff_fill += bytes;
+			}
+		}
+		if ((fds[2].revents & POLLOUT) && out_buff_fill) {
+			/* To screen */
+			result = write(fileno(stdout), out_buff, out_buff_fill);
+			if (result > 0) {
+				out_buff_fill -= result;
+				if (out_buff_fill) {
+					memmove(out_buff, out_buff + result, out_buff_fill);
+				}
+			}
+		}
+		if ((fds[0].revents & POLLOUT) && in_buff_fill) {
+			/*
+			 * translate key and send that to SMDC using IPMI
+			 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x03 0x04 0x1B 0x5B 0x43
+			 */
+			result = ipmi_tsol_send_keystroke(intf,
+					in_buff, __min(in_buff_fill, 14));
+			if (result > 0) {
+				gettimeofday(&_start_keepalive, 0);
+				in_buff_fill -= result;
+				if (in_buff_fill) {
+					memmove(in_buff, in_buff + result, in_buff_fill);
+				}
+			}
+		}
+		fds = (in_buff_fill || out_buff_fill )?
+			fds_data_wait : fds_wait;
+	}
+	return 0;
+}
diff --git a/lib/ipmi_user.c b/lib/ipmi_user.c
new file mode 100644
index 0000000..2780e61
--- /dev/null
+++ b/lib/ipmi_user.c
@@ -0,0 +1,761 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _BSD_SOURCE || \
+	(_XOPEN_SOURCE >= 500 || \
+	_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+	!(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_user.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/bswap.h>
+
+
+extern int verbose;
+extern int csv_output;
+
+
+/* _ipmi_get_user_access - Get User Access for given channel. Results are stored
+ * into passed struct.
+ *
+ * @intf - IPMI interface
+ * @user_access_rsp - ptr to user_access_t with UID and Channel set
+ *
+ * returns - negative number means error, positive is a ccode
+ */
+int
+_ipmi_get_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_rsp)
+{
+	struct ipmi_rq req = {0};
+	struct ipmi_rs *rsp;
+	uint8_t data[2];
+	if (user_access_rsp == NULL) {
+		return (-3);
+	}
+	data[0] = user_access_rsp->channel & 0x0F;
+	data[1] = user_access_rsp->user_id & 0x3F;
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_USER_ACCESS;
+	req.msg.data = data;
+	req.msg.data_len = 2;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode != 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 4) {
+		return (-2);
+	}
+	user_access_rsp->max_user_ids = rsp->data[0] & 0x3F;
+	user_access_rsp->enable_status = rsp->data[1] & 0xC0;
+	user_access_rsp->enabled_user_ids = rsp->data[1] & 0x3F;
+	user_access_rsp->fixed_user_ids = rsp->data[2] & 0x3F;
+	user_access_rsp->callin_callback = rsp->data[3] & 0x40;
+	user_access_rsp->link_auth = rsp->data[3] & 0x20;
+	user_access_rsp->ipmi_messaging = rsp->data[3] & 0x10;
+	user_access_rsp->privilege_limit = rsp->data[3] & 0x0F;
+	return rsp->ccode;
+}
+
+/* _ipmi_get_user_name - Fetch User Name for given User ID. User Name is stored
+ * into passed structure.
+ *
+ * @intf - ipmi interface
+ * @user_name - user_name_t struct with UID set
+ *
+ * returns - negative number means error, positive is a ccode
+ */
+int
+_ipmi_get_user_name(struct ipmi_intf *intf, struct user_name_t *user_name_ptr)
+{
+	struct ipmi_rq req = {0};
+	struct ipmi_rs *rsp;
+	uint8_t data[1];
+	if (user_name_ptr == NULL) {
+		return (-3);
+	}
+	data[0] = user_name_ptr->user_id & 0x3F;
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_GET_USER_NAME;
+	req.msg.data = data;
+	req.msg.data_len = 1;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else if (rsp->ccode > 0) {
+		return rsp->ccode;
+	} else if (rsp->data_len != 16) {
+		return (-2);
+	}
+	memset(user_name_ptr->user_name, '\0', 17);
+	memcpy(user_name_ptr->user_name, rsp->data, 16);
+	return rsp->ccode;
+}
+
+/* _ipmi_set_user_access - Set User Access for given channel.
+ *
+ * @intf - IPMI interface
+ * @user_access_req - ptr to user_access_t with desired User Access.
+ * @change_priv_limit_only - change User's privilege limit only
+ *
+ * returns - negative number means error, positive is a ccode
+ */
+int
+_ipmi_set_user_access(struct ipmi_intf *intf,
+		struct user_access_t *user_access_req,
+		uint8_t change_priv_limit_only)
+{
+	uint8_t data[4];
+	struct ipmi_rq req = {0};
+	struct ipmi_rs *rsp;
+	if (user_access_req == NULL) {
+		return (-3);
+	}
+	data[0] = change_priv_limit_only ? 0x00 : 0x80;
+	if (user_access_req->callin_callback) {
+		data[0] |= 0x40;
+	}
+	if (user_access_req->link_auth) {
+		data[0] |= 0x20;
+	}
+	if (user_access_req->ipmi_messaging) {
+		data[0] |= 0x10;
+	}
+	data[0] |= (user_access_req->channel & 0x0F);
+	data[1] = user_access_req->user_id & 0x3F;
+	data[2] = user_access_req->privilege_limit & 0x0F;
+	data[3] = user_access_req->session_limit & 0x0F;
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_SET_USER_ACCESS;
+	req.msg.data = data;
+	req.msg.data_len = 4;
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		return (-1);
+	} else {
+		return rsp->ccode;
+	}
+}
+
+/* _ipmi_set_user_password - Set User Password command.
+ *
+ * @intf - IPMI interface
+ * @user_id - IPMI User ID
+ * @operation - which operation to perform(en/disable user, set/test password)
+ * @password - User Password
+ * @is_twenty_byte - 0 = store as 16byte, otherwise store as 20byte password
+ *
+ * returns - negative number means error, positive is a ccode
+ */
+int
+_ipmi_set_user_password(struct ipmi_intf *intf, uint8_t user_id,
+		uint8_t operation, const char *password,
+		uint8_t is_twenty_byte)
+{
+	struct ipmi_rq req = {0};
+	struct ipmi_rs *rsp;
+	uint8_t *data;
+	uint8_t data_len = (is_twenty_byte) ? 22 : 18;
+	data = malloc(sizeof(uint8_t) * data_len);
+	if (data == NULL) {
+		return (-4);
+	}
+	memset(data, 0, data_len);
+	data[0] = (is_twenty_byte) ? 0x80 : 0x00;
+	data[0] |= (0x0F & user_id);
+	data[1] = 0x03 & operation;
+	if (password != NULL) {
+		size_t copy_len = strlen(password);
+		if (copy_len > (data_len - 2)) {
+			copy_len = data_len - 2;
+		} else if (copy_len < 1) {
+			copy_len = 0;
+		}
+		strncpy((char *)(data + 2), password, copy_len);
+	}
+
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = IPMI_SET_USER_PASSWORD;
+	req.msg.data = data;
+	req.msg.data_len = data_len;
+	rsp = intf->sendrecv(intf, &req);
+	free(data);
+	data = NULL;
+	if (rsp == NULL) {
+		return (-1);
+	}
+	return rsp->ccode;
+}
+
+static void
+dump_user_access(const char *user_name,
+		struct user_access_t *user_access)
+{
+	static int printed_header = 0;
+	if (!printed_header) {
+		printf("ID  Name	     Callin  Link Auth	IPMI Msg   "
+				"Channel Priv Limit\n");
+		printed_header = 1;
+	}
+	printf("%-4d%-17s%-8s%-11s%-11s%-s\n",
+			user_access->user_id,
+			user_name,
+			user_access->callin_callback? "false": "true ",
+			user_access->link_auth? "true ": "false",
+			user_access->ipmi_messaging? "true ": "false",
+			val2str(user_access->privilege_limit,
+				ipmi_privlvl_vals));
+}
+
+
+
+static void
+dump_user_access_csv(const char *user_name,
+		struct user_access_t *user_access)
+{
+	printf("%d,%s,%s,%s,%s,%s\n",
+			user_access->user_id,
+			user_name,
+			user_access->callin_callback? "false": "true",
+			user_access->link_auth? "true": "false",
+			user_access->ipmi_messaging? "true": "false",
+			val2str(user_access->privilege_limit,
+				ipmi_privlvl_vals));
+}
+
+/* ipmi_print_user_list - List IPMI Users and their ACLs for given channel.
+ *
+ * @intf - IPMI interface
+ * @channel_number - IPMI channel
+ *
+ * returns - 0 on success, (-1) on error
+ */
+static int
+ipmi_print_user_list(struct ipmi_intf *intf, uint8_t channel_number)
+{
+	struct user_access_t user_access = {0};
+	struct user_name_t user_name = {0};
+	int ccode = 0;
+	uint8_t current_user_id = 1;
+	do {
+		memset(&user_access, 0, sizeof(user_access));
+		user_access.user_id = current_user_id;
+		user_access.channel = channel_number;
+		ccode = _ipmi_get_user_access(intf, &user_access);
+		if (eval_ccode(ccode) != 0) {
+			return (-1);
+		}
+		memset(&user_name, 0, sizeof(user_name));
+		user_name.user_id = current_user_id;
+		ccode = _ipmi_get_user_name(intf, &user_name);
+		if (ccode == 0xCC) {
+			user_name.user_id = current_user_id;
+			memset(&user_name.user_name, '\0', 17);
+		} else if (eval_ccode(ccode) != 0) {
+			return (-1);
+		}
+		if (csv_output) {
+			dump_user_access_csv((char *)user_name.user_name,
+					&user_access);
+		} else {
+			dump_user_access((char *)user_name.user_name,
+					&user_access);
+		}
+		++current_user_id;
+	} while ((current_user_id <= user_access.max_user_ids)
+			&& (current_user_id <= IPMI_UID_MAX));
+	return 0;
+}
+
+/* ipmi_print_user_summary - print User statistics for given channel
+ *
+ * @intf - IPMI interface
+ * @channel_number - channel number
+ *
+ * returns - 0 on success, (-1) on error
+ */
+static int
+ipmi_print_user_summary(struct ipmi_intf *intf, uint8_t channel_number)
+{
+	struct user_access_t user_access = {0};
+	int ccode = 0;
+	user_access.channel = channel_number;
+	user_access.user_id = 1;
+	ccode = _ipmi_get_user_access(intf, &user_access);
+	if (eval_ccode(ccode) != 0) {
+		return (-1);
+	}
+	if (csv_output) {
+		printf("%" PRIu8 ",%" PRIu8 ",%" PRIu8 "\n",
+				user_access.max_user_ids,
+				user_access.enabled_user_ids,
+				user_access.fixed_user_ids);
+	} else {
+		printf("Maximum IDs	    : %" PRIu8 "\n",
+				user_access.max_user_ids);
+		printf("Enabled User Count  : %" PRIu8 "\n",
+				user_access.enabled_user_ids);
+		printf("Fixed Name Count    : %" PRIu8 "\n",
+				user_access.fixed_user_ids);
+	}
+	return 0;
+}
+
+/*
+ * ipmi_user_set_username
+ */
+static int
+ipmi_user_set_username(
+		       struct ipmi_intf *intf,
+		       uint8_t user_id,
+		       const char *name)
+{
+	struct ipmi_rs	     * rsp;
+	struct ipmi_rq	       req;
+	uint8_t	       msg_data[17];
+
+	/*
+	 * Ensure there is space for the name in the request message buffer
+	 */
+	if (strlen(name) >= sizeof(msg_data)) {
+		return -1;
+	}
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;	     /* 0x06 */
+	req.msg.cmd	     = IPMI_SET_USER_NAME;   /* 0x45 */
+	req.msg.data     = msg_data;
+	req.msg.data_len = sizeof(msg_data);
+	memset(msg_data, 0, sizeof(msg_data));
+
+	/* The channel number will remain constant throughout this function */
+	msg_data[0] = user_id;
+	strncpy((char *)(msg_data + 1), name, strlen(name));
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set User Name command failed (user %d, name %s)",
+			user_id, name);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set User Name command failed (user %d, name %s): %s",
+			user_id, name, val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	return 0;
+}
+
+/* ipmi_user_test_password - Call _ipmi_set_user_password() with operation bit
+ * set to test password and interpret result.
+ */
+static int
+ipmi_user_test_password(struct ipmi_intf *intf, uint8_t user_id,
+		const char *password, uint8_t is_twenty_byte_password)
+{
+	int ret = 0;
+	ret = _ipmi_set_user_password(intf, user_id,
+			IPMI_PASSWORD_TEST_PASSWORD, password,
+			is_twenty_byte_password);
+
+	switch (ret) {
+	case 0:
+		printf("Success\n");
+		break;
+	case 0x80:
+		printf("Failure: password incorrect\n");
+		break;
+	case 0x81:
+		printf("Failure: wrong password size\n");
+		break;
+	default:
+		printf("Unknown error\n");
+	}
+
+	return ((ret == 0) ? 0 : -1);
+}
+
+
+/*
+ * print_user_usage
+ */
+static void
+print_user_usage(void)
+{
+	lprintf(LOG_NOTICE,
+"User Commands:");
+	lprintf(LOG_NOTICE,
+"               summary      [<channel number>]");
+	lprintf(LOG_NOTICE,
+"               list         [<channel number>]");
+	lprintf(LOG_NOTICE,
+"               set name     <user id> <username>");
+	lprintf(LOG_NOTICE,
+"               set password <user id> [<password> <16|20>]");
+	lprintf(LOG_NOTICE,
+"               disable      <user id>");
+	lprintf(LOG_NOTICE,
+"               enable       <user id>");
+	lprintf(LOG_NOTICE,
+"               priv         <user id> <privilege level> [<channel number>]");
+	lprintf(LOG_NOTICE,
+"                     Privilege levels:");
+	lprintf(LOG_NOTICE,
+"                      * 0x1 - Callback");
+	lprintf(LOG_NOTICE,
+"                      * 0x2 - User");
+	lprintf(LOG_NOTICE,
+"                      * 0x3 - Operator");
+	lprintf(LOG_NOTICE,
+"                      * 0x4 - Administrator");
+	lprintf(LOG_NOTICE,
+"                      * 0x5 - OEM Proprietary");
+	lprintf(LOG_NOTICE,
+"                      * 0xF - No Access");
+	lprintf(LOG_NOTICE, "");
+	lprintf(LOG_NOTICE,
+"               test         <user id> <16|20> [<password]>");
+	lprintf(LOG_NOTICE, "");
+}
+
+
+const char *
+ipmi_user_build_password_prompt(uint8_t user_id)
+{
+	static char prompt[128];
+	memset(prompt, 0, 128);
+	snprintf(prompt, 128, "Password for user %d: ", user_id);
+	return prompt;
+}
+
+/* ask_password - ask user for password
+ *
+ * @user_id: User ID which will be built-in into text
+ *
+ * @returns pointer to char with password
+ */
+char *
+ask_password(uint8_t user_id)
+{
+	const char *password_prompt =
+		ipmi_user_build_password_prompt(user_id);
+# ifdef HAVE_GETPASSPHRASE
+	return getpassphrase(password_prompt);
+# else
+	return (char*)getpass(password_prompt);
+# endif
+}
+
+int
+ipmi_user_summary(struct ipmi_intf *intf, int argc, char **argv)
+{
+	/* Summary*/
+	uint8_t channel;
+	if (argc == 1) {
+		channel = 0x0E; /* Ask about the current channel */
+	} else if (argc == 2) {
+		if (is_ipmi_channel_num(argv[1], &channel) != 0) {
+			return (-1);
+		}
+	} else {
+		print_user_usage();
+		return (-1);
+	}
+	return ipmi_print_user_summary(intf, channel);
+}
+
+int
+ipmi_user_list(struct ipmi_intf *intf, int argc, char **argv)
+{
+	/* List */
+	uint8_t channel;
+	if (argc == 1) {
+		channel = 0x0E; /* Ask about the current channel */
+	} else if (argc == 2) {
+		if (is_ipmi_channel_num(argv[1], &channel) != 0) {
+			return (-1);
+		}
+	} else {
+		print_user_usage();
+		return (-1);
+	}
+	return ipmi_print_user_list(intf, channel);
+}
+
+int
+ipmi_user_test(struct ipmi_intf *intf, int argc, char **argv)
+{
+	/* Test */
+	char *password = NULL;
+	int password_length = 0;
+	uint8_t user_id = 0;
+	/* a little irritating, isn't it */
+	if (argc != 3 && argc != 4) {
+		print_user_usage();
+		return (-1);
+	}
+	if (is_ipmi_user_id(argv[1], &user_id)) {
+		return (-1);
+	}
+	if (str2int(argv[2], &password_length) != 0
+			|| (password_length != 16 && password_length != 20)) {
+		lprintf(LOG_ERR,
+				"Given password length '%s' is invalid.",
+				argv[2]);
+		lprintf(LOG_ERR, "Expected value is either 16 or 20.");
+		return (-1);
+	}
+	if (argc == 3) {
+		/* We need to prompt for a password */
+		password = ask_password(user_id);
+		if (password == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return (-1);
+		}
+	} else {
+		password = argv[3];
+	}
+	return ipmi_user_test_password(intf,
+					 user_id,
+					 password,
+					 password_length == 20);
+}
+
+int
+ipmi_user_priv(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct user_access_t user_access = {0};
+	int ccode = 0;
+
+	if (argc != 3 && argc != 4) {
+		print_user_usage();
+		return (-1);
+	}
+	if (argc == 4) {
+		if (is_ipmi_channel_num(argv[3], &user_access.channel) != 0) {
+			return (-1);
+		}
+	} else {
+		/* Use channel running on */
+		user_access.channel = 0x0E;
+	}
+	if (is_ipmi_user_priv_limit(argv[2], &user_access.privilege_limit) != 0
+			|| is_ipmi_user_id(argv[1], &user_access.user_id) != 0) {
+		return (-1);
+	}
+	ccode = _ipmi_set_user_access(intf, &user_access, 1);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Set Privilege Level command failed (user %d)",
+				user_access.user_id);
+		return (-1);
+	} else {
+		printf("Set Privilege Level command successful (user %d)\n",
+				user_access.user_id);
+		return 0;
+	}
+}
+
+int
+ipmi_user_mod(struct ipmi_intf *intf, int argc, char **argv)
+{
+	/* Disable / Enable */
+	uint8_t user_id;
+	uint8_t operation;
+	uint8_t ccode;
+
+	if (argc != 2) {
+		print_user_usage();
+		return (-1);
+	}
+	if (is_ipmi_user_id(argv[1], &user_id)) {
+		return (-1);
+	}
+	operation = (strncmp(argv[0], "disable", 7) == 0) ?
+		IPMI_PASSWORD_DISABLE_USER : IPMI_PASSWORD_ENABLE_USER;
+
+	ccode = _ipmi_set_user_password(intf, user_id, operation,
+			(char *)NULL, 0);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Set User Password command failed (user %d)",
+			user_id);
+		return (-1);
+	}
+	return 0;
+}
+
+int
+ipmi_user_password(struct ipmi_intf *intf, int argc, char **argv)
+{
+	char *password = NULL;
+	int ccode = 0;
+	uint8_t password_type = 16;
+	uint8_t user_id = 0;
+	if (is_ipmi_user_id(argv[2], &user_id)) {
+		return (-1);
+	}
+
+	if (argc == 3) {
+		/* We need to prompt for a password */
+		char *tmp;
+		password = ask_password(user_id);
+		if (password == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return (-1);
+		}
+		tmp = ask_password(user_id);
+		if (tmp == NULL) {
+			lprintf(LOG_ERR, "ipmitool: malloc failure");
+			return (-1);
+		}
+		if (strlen(password) != strlen(tmp)
+				|| strncmp(password, tmp, strlen(tmp))) {
+			lprintf(LOG_ERR, "Passwords do not match.");
+			return (-1);
+		}
+	} else {
+		password = argv[3];
+		if (argc > 4) {
+			if ((str2uchar(argv[4], &password_type) != 0)
+					|| (password_type != 16 && password_type != 20)) {
+				lprintf(LOG_ERR, "Invalid password length '%s'", argv[4]);
+				return (-1);
+			}
+		} else {
+			password_type = 16;
+		}
+	}
+
+	if (password == NULL) {
+		lprintf(LOG_ERR, "Unable to parse password argument.");
+		return (-1);
+	} else if (strlen(password) > 20) {
+		lprintf(LOG_ERR, "Password is too long (> 20 bytes)");
+		return (-1);
+	}
+
+	ccode = _ipmi_set_user_password(intf, user_id,
+			IPMI_PASSWORD_SET_PASSWORD, password,
+			password_type > 16);
+	if (eval_ccode(ccode) != 0) {
+		lprintf(LOG_ERR, "Set User Password command failed (user %d)",
+			user_id);
+		return (-1);
+	} else {
+		printf("Set User Password command successful (user %d)\n",
+				user_id);
+		return 0;
+	}
+}
+
+int
+ipmi_user_name(struct ipmi_intf *intf, int argc, char **argv)
+{
+	/* Set Name */
+	uint8_t user_id = 0;
+	if (argc != 4) {
+		print_user_usage();
+		return (-1);
+	}
+	if (is_ipmi_user_id(argv[2], &user_id)) {
+		return (-1);
+	}
+	if (strlen(argv[3]) > 16) {
+		lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
+		return (-1);
+	}
+
+	return ipmi_user_set_username(intf, user_id, argv[3]);
+}
+
+/*
+ * ipmi_user_main
+ *
+ * Upon entry to this function argv should contain our arguments
+ * specific to this subcommand
+ */
+int
+ipmi_user_main(struct ipmi_intf *intf, int argc, char **argv)
+{
+	if (argc == 0) {
+		lprintf(LOG_ERR, "Not enough parameters given.");
+		print_user_usage();
+		return (-1);
+	}
+	if (strncmp(argv[0], "help", 4) == 0) {
+		/* Help */
+		print_user_usage();
+		return 0;
+	} else if (strncmp(argv[0], "summary", 7) == 0) {
+		return ipmi_user_summary(intf, argc, argv);
+	} else if (strncmp(argv[0], "list", 4) == 0) {
+		return ipmi_user_list(intf, argc, argv);
+	} else if (strncmp(argv[0], "test", 4) == 0) {
+		return ipmi_user_test(intf, argc, argv);
+	} else if (strncmp(argv[0], "set", 3) == 0) {
+		/* Set */
+		if ((argc >= 3)
+				&& (strncmp("password", argv[1], 8) == 0)) {
+			return ipmi_user_password(intf, argc, argv);
+		} else if ((argc >= 2)
+				&& (strncmp("name", argv[1], 4) == 0)) {
+			return ipmi_user_name(intf, argc, argv);
+		} else {
+			print_user_usage();
+			return (-1);
+		}
+	} else if (strncmp(argv[0], "priv", 4) == 0) {
+		return ipmi_user_priv(intf, argc, argv);
+	} else if ((strncmp(argv[0], "disable", 7) == 0)
+			|| (strncmp(argv[0], "enable",  6) == 0)) {
+		return ipmi_user_mod(intf, argc, argv);
+	} else {
+		lprintf(LOG_ERR, "Invalid user command: '%s'\n", argv[0]);
+		print_user_usage();
+		return (-1);
+	}
+}
diff --git a/lib/ipmi_vita.c b/lib/ipmi_vita.c
new file mode 100644
index 0000000..3900974
--- /dev/null
+++ b/lib/ipmi_vita.c
@@ -0,0 +1,1012 @@
+/*
+ * Copyright (c) 2014 Pigeon Point Systems. All right reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pigeon Point Systems, or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS, " without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_picmg.h>
+#include <ipmitool/ipmi_vita.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/log.h>
+
+/* Handled VITA 46.11 commands */
+#define VITA_CMD_HELP		0
+#define VITA_CMD_PROPERTIES	1
+#define VITA_CMD_FRUCONTROL	2
+#define VITA_CMD_ADDRINFO	3
+#define VITA_CMD_ACTIVATE	4
+#define VITA_CMD_DEACTIVATE	5
+#define VITA_CMD_POLICY_GET	6
+#define VITA_CMD_POLICY_SET	7
+#define VITA_CMD_LED_PROP	8
+#define VITA_CMD_LED_CAP	9
+#define VITA_CMD_LED_GET	10
+#define VITA_CMD_LED_SET	11
+#define VITA_CMD_UNKNOWN	255
+
+/* VITA 46.11 Site Type strings */
+static struct valstr vita_site_types[] = {
+	{ VITA_FRONT_VPX_MODULE, "Front Loading VPX Plug-In Module" },
+	{ VITA_POWER_ENTRY, "Power Entry Module" },
+	{ VITA_CHASSIS_FRU, "Chassic FRU Information Module" },
+	{ VITA_DEDICATED_CHMC, "Dedicated Chassis Manager" },
+	{ VITA_FAN_TRAY, "Fan Tray" },
+	{ VITA_FAN_TRAY_FILTER, "Fan Tray Filter" },
+	{ VITA_ALARM_PANEL, "Alarm Panel" },
+	{ VITA_XMC, "XMC" },
+	{ VITA_VPX_RTM, "VPX Rear Transition Module" },
+	{ VITA_FRONT_VME_MODULE, "Front Loading VME Plug-In Module" },
+	{ VITA_FRONT_VXS_MODULE, "Front Loading VXS Plug-In Module" },
+	{ VITA_POWER_SUPPLY, "Power Supply" },
+	{ VITA_FRONT_VITA62_MODULE, "Front Loading VITA 62 Module\n" },
+	{ VITA_71_MODULE, "VITA 71 Module\n" },
+	{ VITA_FMC, "FMC\n" },
+	{ 0, NULL }
+};
+
+/* VITA 46.11 command help strings */
+static struct valstr vita_help_strings[] = {
+	{
+		VITA_CMD_HELP,
+		"VITA commands:\n"
+		"    properties        - get VSO properties\n"
+		"    frucontrol        - FRU control\n"
+		"    addrinfo          - get address information\n"
+		"    activate          - activate a FRU\n"
+		"    deactivate        - deactivate a FRU\n"
+		"    policy get        - get the FRU activation policy\n"
+		"    policy set        - set the FRU activation policy\n"
+		"    led prop          - get led properties\n"
+		"    led cap           - get led color capabilities\n"
+		"    led get           - get led state\n"
+		"    led set           - set led state"
+	},
+	{
+		VITA_CMD_FRUCONTROL,
+		"usage: frucontrol <FRU-ID> <OPTION>\n"
+		"    OPTION: 0 - Cold Reset\n"
+		"            1 - Warm Reset\n"
+		"            2 - Graceful Reboot\n"
+		"            3 - Issue Diagnostic Interrupt"
+	},
+	{
+		VITA_CMD_ADDRINFO,
+		"usage: addrinfo [<FRU-ID>]"
+	},
+	{
+		VITA_CMD_ACTIVATE,
+		"usage: activate <FRU-ID>"
+	},
+	{
+		VITA_CMD_DEACTIVATE,
+		"usage: deactivate <FRU-ID>"
+	},
+    	{
+		VITA_CMD_POLICY_GET,
+		"usage: policy get <FRU-ID>"
+	},
+	{
+		VITA_CMD_POLICY_SET,
+		"usage: policy set <FRU-ID> <MASK> <VALUE>\n"
+		"    MASK:  [3] affect the Default-Activation-Locked Policy Bit\n"
+		"           [2] affect the Commanded-Deactivation-Ignored Policy Bit\n"
+		"           [1] affect the Deactivation-Locked Policy Bit\n"
+		"           [0] affect the Activation-Locked Policy Bit\n"
+		"    VALUE: [3] value for the Default-Activation-Locked Policy Bit\n"
+		"           [2] value for the Commanded-Deactivation-Ignored Policy Bit\n"
+		"           [1] value for the Deactivation-Locked Policy Bit\n"
+		"           [0] value for the Activation-Locked Policy Bit"
+	},
+	{
+		VITA_CMD_LED_PROP,
+		"usage: led prop <FRU-ID>"
+	},
+	{
+		VITA_CMD_LED_CAP,
+		"usage: led cap <FRU-ID> <LED-ID"
+	},
+	{
+		VITA_CMD_LED_GET,
+		"usage: led get <FRU-ID> <LED-ID",
+	},
+	{
+		VITA_CMD_LED_SET,
+		"usage: led set <FRU-ID> <LED-ID> <FUNCTION> <DURATION> <COLOR>\n"
+		"    <FRU-ID>\n"
+		"    <LED-ID>   0-0xFE:    Specified LED\n"
+		"               0xFF:      All LEDs under management control\n"
+		"    <FUNCTION> 0:       LED OFF override\n"
+		"               1 - 250: LED blinking override (off duration)\n"
+		"               251:     LED Lamp Test\n"
+		"               252:     LED restore to local control\n"
+		"               255:     LED ON override\n"
+		"    <DURATION> 1 - 127: LED Lamp Test / on duration\n"
+		"    <COLOR>    1:   BLUE\n"
+		"               2:   RED\n"
+		"               3:   GREEN\n"
+		"               4:   AMBER\n"
+		"               5:   ORANGE\n"
+		"               6:   WHITE\n"
+		"               0xE: do not change\n"
+		"               0xF: use default color"
+	},
+	{
+		VITA_CMD_UNKNOWN,
+		"Unknown command"
+	},
+	{ 0, NULL }
+};
+
+/* check if VITA 46.11 is supported */
+uint8_t
+vita_discover(struct ipmi_intf *intf)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	unsigned char msg_data;
+	int vita_avail = 0;
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_VSO_CAPABILITIES_CMD;
+	req.msg.data = &msg_data;
+	req.msg.data_len = 1;
+
+	msg_data = GROUP_EXT_VITA;
+
+	lprintf(LOG_INFO, "Running Get VSO Capabilities my_addr %#x, "
+		"transit %#x, target %#x",
+		intf->my_addr, intf->transit_addr, intf->target_addr);
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received");
+	} else if (rsp->ccode == 0xC1) {
+		lprintf(LOG_INFO, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+	} else if (rsp->ccode == 0xCC) {
+		lprintf(LOG_INFO, "Invalid data field received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_INFO, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+	} else if (rsp->data_len < 5) {
+		lprintf(LOG_INFO, "Invalid response length %d",
+			rsp->data_len);
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_INFO, "Invalid group extension %#x",
+			rsp->data[0]);
+	} else if ((rsp->data[3] & 0x03) != 0) {
+		lprintf(LOG_INFO, "Unknown VSO Standard %d",
+			(rsp->data[3] & 0x03));
+	} else if ((rsp->data[4] & 0x0F) != 1) {
+		lprintf(LOG_INFO, "Unknown VSO Specification Revision %d.%d",
+			(rsp->data[4] & 0x0F), (rsp->data[4] >> 4));
+	} else {
+		vita_avail = 1;
+		lprintf(LOG_INFO, "Discovered VITA 46.11 Revision %d.%d",
+			(rsp->data[4] & 0x0F), (rsp->data[4] >> 4));
+	}
+
+	return vita_avail;
+}
+
+uint8_t
+ipmi_vita_ipmb_address(struct ipmi_intf *intf)
+{
+	struct ipmi_rq req;
+	struct ipmi_rs *rsp;
+	unsigned char msg_data;
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_FRU_ADDRESS_INFO_CMD;
+	req.msg.data = &msg_data;
+	req.msg.data_len = 1;
+
+	msg_data = GROUP_EXT_VITA;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received");
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+	} else if (rsp->data_len < 7) {
+		lprintf(LOG_ERR, "Invalid response length %d",
+			rsp->data_len);
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x",
+			rsp->data[0]);
+	} else {
+		return rsp->data[2];
+	}
+
+	return 0;
+}
+
+static int
+ipmi_vita_getaddr(struct ipmi_intf *intf, int argc, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[2];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_FRU_ADDRESS_INFO_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = GROUP_EXT_VITA;		/* VITA identifier */
+	msg_data[1] = 0;			/* default FRU ID */
+
+	if (argc > 0) {
+		/* validate and get FRU Device ID */
+		if (is_fru_id(argv[0], &msg_data[1]) != 0) {
+			return -1;
+		}
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 7) {
+		lprintf(LOG_ERR, "Invalid response length %d",
+			rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x",
+			rsp->data[0]);
+		return -1;
+	}
+
+	printf("Hardware Address : 0x%02x\n", rsp->data[1]);
+	printf("IPMB-0 Address   : 0x%02x\n", rsp->data[2]);
+	printf("FRU ID           : 0x%02x\n", rsp->data[4]);
+	printf("Site ID          : 0x%02x\n", rsp->data[5]);
+	printf("Site Type        : %s\n", val2str(rsp->data[6],
+		vita_site_types));
+	if (rsp->data_len > 8) {
+		printf("Channel 7 Address: 0x%02x\n", rsp->data[8]);
+	}
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_vso_capabilities(struct ipmi_intf *intf)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data, tmp;
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_VSO_CAPABILITIES_CMD;
+	req.msg.data = &msg_data;
+	req.msg.data_len = 1;
+
+	msg_data = GROUP_EXT_VITA;		/* VITA identifier */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 5) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("VSO Identifier    : 0x%02x\n", rsp->data[0]);
+	printf("IPMC Identifier   : 0x%02x\n", rsp->data[1]);
+	printf("    Tier  %d\n", (rsp->data[1] & 0x03) + 1);
+	printf("    Layer %d\n", ((rsp->data[1] & 0x30) >> 4) + 1);
+
+	printf("IPMB Capabilities : 0x%02x\n", rsp->data[2]);
+
+	tmp = (rsp->data[2] & 0x30) >> 4;
+
+	printf("    Frequency  %skHz\n",
+		tmp == 0 ? "100" : tmp == 1 ? "400" : "RESERVED");
+
+	tmp = rsp->data[2] & 3;
+
+	if (tmp == 1) {
+		printf("    2 IPMB interfaces supported\n");
+	} else if (tmp == 0) {
+		printf("    1 IPMB interface supported\n");
+	}
+
+	printf("VSO Standard      : %s\n",
+		(rsp->data[3] & 0x3) == 0 ? "VITA 46.11" : "RESERVED");
+
+	printf("VSO Spec Revision : %d.%d\n", rsp->data[4] & 0xf,
+		rsp->data[4] >> 4);
+
+	printf("Max FRU Device ID : 0x%02x\n", rsp->data[5]);
+	printf("FRU Device ID     : 0x%02x\n", rsp->data[6]);
+
+	return 0;
+}
+
+static int
+ipmi_vita_set_fru_activation(struct ipmi_intf *intf,
+	char **argv, unsigned char command)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[3];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_SET_FRU_ACTIVATION_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0]	= GROUP_EXT_VITA;		/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	msg_data[2]	= command;			/* command */
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 1) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("FRU has been successfully %s\n",
+		command ? "activated" : "deactivated");
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_fru_state_policy_bits(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[2];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_FRU_STATE_POLICY_BITS_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 2) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("FRU State Policy Bits:	%xh\n", rsp->data[1]);
+	printf("    Default-Activation-Locked Policy Bit is %d\n",
+		rsp->data[1] & 0x08 ? 1 : 0);
+	printf("    Commanded-Deactivation-Ignored Policy Bit is %d\n",
+		rsp->data[1] & 0x04 ? 1 : 0);
+	printf("    Deactivation-Locked Policy Bit is %d\n",
+		rsp->data[1] & 0x02 ? 1 : 0);
+	printf("    Activation-Locked Policy Bit is %d\n",
+		rsp->data[1] & 0x01);
+
+	return 0;
+}
+
+static int
+ipmi_vita_set_fru_state_policy_bits(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[4];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_SET_FRU_STATE_POLICY_BITS_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 4;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0) {	/* bits mask */
+		return -1;
+	}
+	if (str2uchar(argv[2], &msg_data[3]) != 0) {	/* bits */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 1) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("FRU state policy bits have been updated\n");
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_led_properties(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[2];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_FRU_LED_PROPERTIES_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 2;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 3) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("LED Count:	   %#x\n", rsp->data[2]);
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_led_color_capabilities(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[3];
+	int i;
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_LED_COLOR_CAPABILITIES_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0) {	/* LED-ID */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 4) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("LED Color Capabilities: ");
+	for (i = 0; i < 8; i++) {
+		if (rsp->data[1] & (0x01 << i)) {
+			printf("%s, ", led_color_str[i]);
+		}
+	}
+	putchar('\n');
+
+	printf("Default LED Color in\n");
+	printf("      LOCAL control:  %s\n", led_color_str[rsp->data[2]]);
+	printf("      OVERRIDE state: %s\n", led_color_str[rsp->data[3]]);
+
+	if (rsp->data_len == 5) {
+		printf("LED flags:\n");
+		if (rsp->data[4] & 2) {
+			printf("      [HW RESTRICT]\n");
+		}
+		if (rsp->data[4] & 1) {
+			printf("      [PAYLOAD PWR]\n");
+		}
+	}
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_led_state(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[3];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_GET_FRU_LED_STATE_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0) {	/* LED-ID */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 5
+		|| ((rsp->data[1] & 0x2) && rsp->data_len < 8)
+		|| ((rsp->data[1] & 0x4) && rsp->data_len < 9)) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("LED states:                   %x\t", rsp->data[1]);
+	if (rsp->data[1] & 0x1) {
+		printf("[LOCAL CONTROL] ");
+	}
+	if (rsp->data[1] & 0x2) {
+		printf("[OVERRIDE] ");
+	}
+	if (rsp->data[1] & 0x4) {
+		printf("[LAMPTEST] ");
+	}
+	if (rsp->data[1] & 0x8) {
+		printf("[HW RESTRICT] ");
+	}
+	putchar('\n');
+
+	if (rsp->data[1] & 1) {
+		printf("  Local Control function:     %x\t", rsp->data[2]);
+		if (rsp->data[2] == 0x0) {
+			printf("[OFF]\n");
+		} else if (rsp->data[2] == 0xff) {
+			printf("[ON]\n");
+		} else {
+			printf("[BLINKING]\n");
+		}
+		printf("  Local Control On-Duration:  %x\n", rsp->data[3]);
+		printf("  Local Control Color:        %x\t[%s]\n",
+			rsp->data[4], led_color_str[rsp->data[4] & 7]);
+	}
+
+	/* override state or lamp test */
+	if (rsp->data[1] & 0x06) {
+		printf("  Override function:     %x\t", rsp->data[5]);
+		if (rsp->data[5] == 0x0) {
+			printf("[OFF]\n");
+		} else if (rsp->data[5] == 0xff) {
+			printf("[ON]\n");
+		} else {
+			printf("[BLINKING]\n");
+		}
+		printf("  Override On-Duration:  %x\n", rsp->data[6]);
+		printf("  Override Color:        %x\t[%s]\n",
+			rsp->data[7], led_color_str[rsp->data[7] & 7]);
+		if (rsp->data[1] == 0x04) {
+			printf("  Lamp test duration:    %x\n", rsp->data[8]);
+		}
+	}
+
+	return 0;
+}
+
+static int
+ipmi_vita_set_led_state(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[6];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_SET_FRU_LED_STATE_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 6;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0) {	/* LED-ID */
+		return -1;
+	}
+	if (str2uchar(argv[2], &msg_data[3]) != 0) {	/* LED function */
+		return -1;
+	}
+	if (str2uchar(argv[3], &msg_data[4]) != 0) {	/* LED on duration */
+		return -1;
+	}
+	if (str2uchar(argv[4], &msg_data[5]) != 0) {	/* LED color */
+		return -1;
+	}
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 1) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("LED state has been updated\n");
+
+	return 0;
+}
+
+static int
+ipmi_vita_fru_control(struct ipmi_intf *intf, char **argv)
+{
+	struct ipmi_rs *rsp;
+	struct ipmi_rq req;
+	unsigned char msg_data[3];
+
+	memset(&req, 0, sizeof(req));
+
+	req.msg.netfn = IPMI_NETFN_PICMG;
+	req.msg.cmd = VITA_FRU_CONTROL_CMD;
+	req.msg.data = msg_data;
+	req.msg.data_len = 3;
+
+	msg_data[0] = GROUP_EXT_VITA;			/* VITA identifier */
+	if (is_fru_id(argv[0], &msg_data[1]) != 0) {	/* FRU ID */
+		return -1;
+	}
+	if (str2uchar(argv[1], &msg_data[2]) != 0) {	/* control option */
+		return -1;
+	}
+
+	printf("FRU Device Id: %d FRU Control Option: %s\n", msg_data[1],
+		val2str(msg_data[2], picmg_frucontrol_vals));
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "No valid response received.");
+		return -1;
+	} else if (rsp->ccode != 0) {
+		lprintf(LOG_ERR, "Invalid completion code received: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	} else if (rsp->data_len < 1) {
+		lprintf(LOG_ERR, "Invalid response length %d", rsp->data_len);
+		return -1;
+	} else if (rsp->data[0] != GROUP_EXT_VITA) {
+		lprintf(LOG_ERR, "Invalid group extension %#x", rsp->data[0]);
+		return -1;
+	}
+
+	printf("FRU Control: ok\n");
+
+	return 0;
+}
+
+static int
+ipmi_vita_get_cmd(int argc, char **argv)
+{
+	if (argc < 1 || !strncmp(argv[0], "help", 4)) {
+		return VITA_CMD_HELP;
+	}
+
+	/* Get VSO Properties */
+	if (!strncmp(argv[0], "properties", 10)) {
+		return VITA_CMD_PROPERTIES;
+	}
+
+	/* FRU Control command */
+	if (!strncmp(argv[0], "frucontrol", 10)) {
+		return VITA_CMD_FRUCONTROL;
+	}
+
+	/* Get FRU Address Info command */
+	if (!strncmp(argv[0], "addrinfo", 8)) {
+		return VITA_CMD_ADDRINFO;
+	}
+
+	/* Set FRU Activation (activate) command */
+	if (!strncmp(argv[0], "activate", 8)) {
+		return VITA_CMD_ACTIVATE;
+	}
+
+	/* Set FRU Activation (deactivate) command */
+	if (!strncmp(argv[0], "deactivate", 10)) {
+		return VITA_CMD_DEACTIVATE;
+	}
+
+	/* FRU State Policy Bits commands */
+	if (!strncmp(argv[0], "policy", 6)) {
+		if (argc < 2) {
+			return VITA_CMD_UNKNOWN;
+		}
+
+		/* Get FRU State Policy Bits command */
+		if (!strncmp(argv[1], "get", 3)) {
+			return VITA_CMD_POLICY_GET;
+		}
+
+		/* Set FRU State Policy Bits command */
+		if (!strncmp(argv[1], "set", 3)) {
+			return VITA_CMD_POLICY_SET;
+		}
+
+		/* unknown command */
+		return VITA_CMD_UNKNOWN;
+	}
+
+	/* FRU LED commands */
+	if (!strncmp(argv[0], "led", 3)) {
+		if (argc < 2) {
+			return VITA_CMD_UNKNOWN;
+		}
+
+		/* FRU LED Get Properties */
+		if (!strncmp(argv[1], "prop", 4)) {
+			return VITA_CMD_LED_PROP;
+		}
+
+		/* FRU LED Get Capabilities */
+		if (!strncmp(argv[1], "cap", 3)) {
+			return VITA_CMD_LED_CAP;
+		}
+
+		/* FRU LED Get State */
+		if (!strncmp(argv[1], "get", 3)) {
+			return VITA_CMD_LED_GET;
+		}
+
+		/* FRU LED Set State */
+		if (!strncmp(argv[1], "set", 3)) {
+			return VITA_CMD_LED_SET;
+		}
+
+		/* unknown command */
+		return VITA_CMD_UNKNOWN;
+	}
+
+	/* unknown command */
+	return VITA_CMD_UNKNOWN;
+}
+
+int
+ipmi_vita_main (struct ipmi_intf *intf, int argc, char **argv)
+{
+	int rc = -1, show_help = 0;
+	int cmd = ipmi_vita_get_cmd(argc, argv);
+
+	switch (cmd) {
+	case VITA_CMD_HELP:
+		cmd = ipmi_vita_get_cmd(argc - 1, &argv[1]);
+		show_help = 1;
+		rc = 0;
+		break;
+
+	case VITA_CMD_PROPERTIES:
+		rc = ipmi_vita_get_vso_capabilities(intf);
+		break;
+
+	case VITA_CMD_FRUCONTROL:
+		if (argc > 2) {
+			rc = ipmi_vita_fru_control(intf, &argv[1]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_ADDRINFO:
+		rc = ipmi_vita_getaddr(intf, argc - 1, &argv[1]);
+		break;
+
+	case VITA_CMD_ACTIVATE:
+		if (argc > 1) {
+			rc = ipmi_vita_set_fru_activation(intf, &argv[1], 1);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_DEACTIVATE:
+		if (argc > 1) {
+			rc = ipmi_vita_set_fru_activation(intf, &argv[1], 0);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_POLICY_GET:
+		if (argc > 2) {
+			rc = ipmi_vita_get_fru_state_policy_bits(intf,
+				&argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_POLICY_SET:
+		if (argc > 4) {
+			rc = ipmi_vita_set_fru_state_policy_bits(intf,
+				&argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_LED_PROP:
+		if (argc > 2) {
+			rc = ipmi_vita_get_led_properties(intf, &argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_LED_CAP:
+		if (argc > 3) {
+			rc = ipmi_vita_get_led_color_capabilities(intf,
+				&argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_LED_GET:
+		if (argc > 3) {
+			rc = ipmi_vita_get_led_state(intf, &argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+
+	case VITA_CMD_LED_SET:
+		if (argc > 6) {
+			rc = ipmi_vita_set_led_state(intf, &argv[2]);
+		} else {
+			show_help = 1;
+		}
+		break;
+	default:
+		lprintf(LOG_NOTICE, "Unknown command");
+		cmd = VITA_CMD_HELP;
+		show_help = 1;
+		break;
+	}
+
+	if (show_help) {
+		lprintf(LOG_NOTICE, "%s", val2str(cmd, vita_help_strings));
+	}
+
+	return rc;
+}
diff --git a/lib/log.c b/lib/log.c
new file mode 100644
index 0000000..2738e18
--- /dev/null
+++ b/lib/log.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _SVID_SOURCE || _BSD_SOURCE || _XOPEN_SOURCE >= 500 || \
+	_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED || \
+	/* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include <ipmitool/log.h>
+
+struct logpriv_s {
+	char * name;
+	int daemon;
+	int level;
+};
+struct logpriv_s *logpriv;
+
+static void log_reinit(void)
+{
+	log_init(NULL, 0, 0);
+}
+
+void lprintf(int level, const char * format, ...)
+{
+	static char logmsg[LOG_MSG_LENGTH];
+	va_list vptr;
+
+	if (!logpriv)
+		log_reinit();
+
+	if (logpriv->level < level)
+		return;
+
+	va_start(vptr, format);
+	vsnprintf(logmsg, LOG_MSG_LENGTH, format, vptr);
+	va_end(vptr);
+
+	if (logpriv->daemon)
+		syslog(level, "%s", logmsg);
+	else
+		fprintf(stderr, "%s\n", logmsg);
+	return;
+}
+
+void lperror(int level, const char * format, ...)
+{
+	static char logmsg[LOG_MSG_LENGTH];
+	va_list vptr;
+
+	if (!logpriv)
+		log_reinit();
+
+	if (logpriv->level < level)
+		return;
+
+	va_start(vptr, format);
+	vsnprintf(logmsg, LOG_MSG_LENGTH, format, vptr);
+	va_end(vptr);
+
+	if (logpriv->daemon)
+		syslog(level, "%s: %s", logmsg, strerror(errno));
+	else
+		fprintf(stderr, "%s: %s\n", logmsg, strerror(errno));
+	return;
+}
+
+/*
+ * open connection to syslog if daemon
+ */
+void log_init(const char * name, int isdaemon, int verbose)
+{
+	if (logpriv)
+		return;
+
+	logpriv = malloc(sizeof(struct logpriv_s));
+	if (!logpriv)
+		return;
+
+	if (name != NULL)
+		logpriv->name = strdup(name);
+	else
+		logpriv->name = strdup(LOG_NAME_DEFAULT);
+
+	if (logpriv->name == NULL)
+		fprintf(stderr, "ipmitool: malloc failure\n");
+
+	logpriv->daemon = isdaemon;
+	logpriv->level = verbose + LOG_NOTICE;
+
+	if (logpriv->daemon)
+		openlog(logpriv->name, LOG_CONS, LOG_LOCAL4);
+}
+
+/*
+ * stop syslog logging if daemon mode,
+ * free used memory that stored log service
+ */
+void log_halt(void)
+{
+	if (!logpriv)
+		return;
+
+	if (logpriv->name) {
+		free(logpriv->name);
+		logpriv->name = NULL;
+	}
+
+	if (logpriv->daemon)
+		closelog();
+
+	free(logpriv);
+	logpriv = NULL;
+}
+
+int log_level_get(void)
+{
+	return logpriv->level;
+}
+
+void log_level_set(int level)
+{
+	logpriv->level = level;
+}
+
diff --git a/ltmain.sh b/ltmain.sh
new file mode 100644
index 0000000..bffda54
--- /dev/null
+++ b/ltmain.sh
@@ -0,0 +1,9661 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.2 Debian-2.4.2-1.11"
+TIMESTAMP=""
+package_revision=1.3337
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+nonopt=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS="$save_ifs"
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
+      else
+	odir="$dir/$objdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/missing b/missing
new file mode 100755
index 0000000..db98974
--- /dev/null
+++ b/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..cedf63d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,43 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+SUBDIRS			= plugins
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+ipmitool_SOURCES	= ipmitool.c ipmishell.c
+ipmitool_LDADD		= $(top_builddir)/lib/libipmitool.la plugins/libintf.la
+
+ipmievd_SOURCES		= ipmievd.c
+ipmievd_LDADD		= $(top_builddir)/lib/libipmitool.la plugins/libintf.la
+
+bin_PROGRAMS		= ipmitool
+sbin_PROGRAMS		= ipmievd
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..07e255d
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,860 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = ipmitool$(EXEEXT)
+sbin_PROGRAMS = ipmievd$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+am_ipmievd_OBJECTS = ipmievd.$(OBJEXT)
+ipmievd_OBJECTS = $(am_ipmievd_OBJECTS)
+ipmievd_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la \
+	plugins/libintf.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_ipmitool_OBJECTS = ipmitool.$(OBJEXT) ipmishell.$(OBJEXT)
+ipmitool_OBJECTS = $(am_ipmitool_OBJECTS)
+ipmitool_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la \
+	plugins/libintf.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(ipmievd_SOURCES) $(ipmitool_SOURCES)
+DIST_SOURCES = $(ipmievd_SOURCES) $(ipmitool_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+SUBDIRS = plugins
+MAINTAINERCLEANFILES = Makefile.in
+ipmitool_SOURCES = ipmitool.c ipmishell.c
+ipmitool_LDADD = $(top_builddir)/lib/libipmitool.la plugins/libintf.la
+ipmievd_SOURCES = ipmievd.c
+ipmievd_LDADD = $(top_builddir)/lib/libipmitool.la plugins/libintf.la
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+ipmievd$(EXEEXT): $(ipmievd_OBJECTS) $(ipmievd_DEPENDENCIES) $(EXTRA_ipmievd_DEPENDENCIES) 
+	@rm -f ipmievd$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(ipmievd_OBJECTS) $(ipmievd_LDADD) $(LIBS)
+
+ipmitool$(EXEEXT): $(ipmitool_OBJECTS) $(ipmitool_DEPENDENCIES) $(EXTRA_ipmitool_DEPENDENCIES) 
+	@rm -f ipmitool$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(ipmitool_OBJECTS) $(ipmitool_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmievd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmishell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmitool.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+	clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-sbinPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/ipmievd.c b/src/ipmievd.c
new file mode 100644
index 0000000..67788e5
--- /dev/null
+++ b/src/ipmievd.c
@@ -0,0 +1,883 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE 700
+#define _BSD_SOURCE
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#if defined(HAVE_SYS_IOCCOM_H)
+# include <sys/ioccom.h>
+#endif
+
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#endif
+
+#ifndef _PATH_VARRUN 
+# define _PATH_VARRUN "/var/run/"
+#endif
+
+#ifdef IPMI_INTF_OPEN
+# if defined(HAVE_OPENIPMI_H)
+#  if defined(HAVE_LINUX_COMPILER_H)
+#   include <linux/compiler.h>
+#  endif
+#  include <linux/ipmi.h>
+# elif defined(HAVE_FREEBSD_IPMI_H)
+#  include <sys/ipmi.h>
+# else
+#  include "plugins/open/open.h"
+# endif
+#  include <poll.h>
+#endif /* IPMI_INTF_OPEN */
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_main.h>
+
+#define WARNING_THRESHOLD	80
+#define DEFAULT_PIDFILE		_PATH_VARRUN "ipmievd.pid"
+char pidfile[64];
+
+/* global variables */
+int verbose = 0;
+int csv_output = 0;
+uint16_t selwatch_count = 0;	/* number of entries in the SEL */
+uint16_t selwatch_lastid = 0;	/* current last entry in the SEL */
+int selwatch_pctused = 0;	/* current percent usage in the SEL */
+int selwatch_overflow = 0;	/* SEL overflow */
+int selwatch_timeout = 10;	/* default to 10 seconds */
+
+/* event interface definition */
+struct ipmi_event_intf {
+	char name[16];
+	char desc[128];
+	char prefix[72];
+	int (*setup)(struct ipmi_event_intf * eintf);
+	int (*wait)(struct ipmi_event_intf * eintf);
+	int (*read)(struct ipmi_event_intf * eintf);
+	int (*check)(struct ipmi_event_intf * eintf);
+	void (*log)(struct ipmi_event_intf * eintf, struct sel_event_record * evt);
+	struct ipmi_intf * intf;
+};
+
+/* Data from SEL we are interested in */
+typedef struct sel_data {
+	uint16_t entries;
+	int pctused;
+	int overflow;
+} sel_data;
+
+static void log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt);
+
+/* ~~~~~~~~~~~~~~~~~~~~~~ openipmi ~~~~~~~~~~~~~~~~~~~~ */
+#ifdef IPMI_INTF_OPEN
+static int openipmi_setup(struct ipmi_event_intf * eintf);
+static int openipmi_wait(struct ipmi_event_intf * eintf);
+static int openipmi_read(struct ipmi_event_intf * eintf);
+static struct ipmi_event_intf openipmi_event_intf = {
+	.name = "open",
+	.desc = "OpenIPMI asyncronous notification of events",
+	.prefix = "",
+	.setup = openipmi_setup,
+	.wait = openipmi_wait,
+	.read = openipmi_read,
+	.log = log_event,
+};
+#endif
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+/* ~~~~~~~~~~~~~~~~~~~~~~ selwatch ~~~~~~~~~~~~~~~~~~~~ */
+static int selwatch_setup(struct ipmi_event_intf * eintf);
+static int selwatch_wait(struct ipmi_event_intf * eintf);
+static int selwatch_read(struct ipmi_event_intf * eintf);
+static int selwatch_check(struct ipmi_event_intf * eintf);
+static struct ipmi_event_intf selwatch_event_intf = {
+	.name = "sel",
+	.desc = "Poll SEL for notification of events",
+	.setup = selwatch_setup,
+	.wait = selwatch_wait,
+	.read = selwatch_read,
+	.check = selwatch_check,
+	.log = log_event,
+};
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+struct ipmi_event_intf * ipmi_event_intf_table[] = {
+#ifdef IPMI_INTF_OPEN
+	&openipmi_event_intf,
+#endif
+	&selwatch_event_intf,
+	NULL
+};
+
+/*************************************************************************/
+
+static void
+ipmievd_usage(void)
+{
+	lprintf(LOG_NOTICE, "Options:");
+	lprintf(LOG_NOTICE, "\ttimeout=#     Time between checks for SEL polling method [default=10]");
+	lprintf(LOG_NOTICE, "\tdaemon        Become a daemon [default]");
+	lprintf(LOG_NOTICE, "\tnodaemon      Do NOT become a daemon");
+}
+
+/* ipmi_intf_load  -  Load an event interface from the table above
+ *                    If no interface name is given return first entry
+ *
+ * @name:	interface name to try and load
+ *
+ * returns pointer to inteface structure if found
+ * returns NULL on error
+ */
+static struct ipmi_event_intf *
+ipmi_event_intf_load(char * name)
+{
+	struct ipmi_event_intf ** intf;
+	struct ipmi_event_intf * i;
+
+	if (name == NULL) {
+		i = ipmi_event_intf_table[0];
+		return i;
+	}
+
+	for (intf = ipmi_event_intf_table;
+	     ((intf != NULL) && (*intf != NULL));
+	     intf++) {
+		i = *intf;
+		if (strncmp(name, i->name, strlen(name)) == 0) {
+			return i;
+		}
+	}
+
+	return NULL;
+}
+
+static int
+compute_pctfull(uint16_t entries, uint16_t freespace)
+{
+	int pctfull = 0;
+
+	if (entries) {
+		entries *= 16;
+		freespace += entries;
+		pctfull = (int)(100 * ( (double)entries / (double)freespace ));
+	}
+	return pctfull;
+}
+
+
+static void
+log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
+{
+	char *desc;
+	const char *type;
+	struct sdr_record_list * sdr;
+	struct ipmi_intf * intf = eintf->intf;
+	float trigger_reading = 0.0;
+	float threshold_reading = 0.0;
+
+	if (evt == NULL)
+		return;
+
+	if (evt->record_type == 0xf0) {
+		lprintf(LOG_ALERT, "%sLinux kernel panic: %.11s",
+			eintf->prefix, (char *) evt + 5);
+		return;
+	}
+	else if (evt->record_type >= 0xc0) {
+		lprintf(LOG_NOTICE, "%sIPMI Event OEM Record %02x",
+			eintf->prefix, evt->record_type);
+		return;
+	}
+
+	type = ipmi_get_sensor_type(intf, evt->sel_type.standard_type.sensor_type);
+
+	ipmi_get_event_desc(intf, evt, &desc);
+
+	sdr = ipmi_sdr_find_sdr_bynumtype(intf, evt->sel_type.standard_type.gen_id, evt->sel_type.standard_type.sensor_num,
+					  evt->sel_type.standard_type.sensor_type);
+
+	if (sdr == NULL) {
+		/* could not find matching SDR record */
+		if (desc) {
+			lprintf(LOG_NOTICE, "%s%s sensor - %s",
+				eintf->prefix, type, desc);
+			free(desc);
+			desc = NULL;
+		} else {
+			lprintf(LOG_NOTICE, "%s%s sensor %02x",
+				eintf->prefix, type,
+				evt->sel_type.standard_type.sensor_num);
+		}
+		return;
+	}
+
+	switch (sdr->type) {
+	case SDR_RECORD_TYPE_FULL_SENSOR:
+		if (evt->sel_type.standard_type.event_type == 1) {
+			/*
+			 * Threshold Event
+			 */
+
+			/* trigger reading in event data byte 2 */
+			if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) {
+				trigger_reading = sdr_convert_sensor_reading(
+					sdr->record.full, evt->sel_type.standard_type.event_data[1]);
+			}
+
+			/* trigger threshold in event data byte 3 */
+			if (((evt->sel_type.standard_type.event_data[0] >> 4) & 3) == 1) {
+				threshold_reading = sdr_convert_sensor_reading(
+					sdr->record.full, evt->sel_type.standard_type.event_data[2]);
+			}
+
+			lprintf(LOG_NOTICE, "%s%s sensor %s %s %s (Reading %.*f %s Threshold %.*f %s)",
+				eintf->prefix,
+				type,
+				sdr->record.full->id_string,
+				desc ? desc : "",
+				(evt->sel_type.standard_type.event_dir
+				 ? "Deasserted" : "Asserted"),
+				(trigger_reading==(int)trigger_reading) ? 0 : 2,
+				trigger_reading,
+				((evt->sel_type.standard_type.event_data[0] & 0xf) % 2) ? ">" : "<",
+				(threshold_reading==(int)threshold_reading) ? 0 : 2,
+				threshold_reading,
+				ipmi_sdr_get_unit_string(sdr->record.common->unit.pct,
+							 sdr->record.common->unit.modifier,
+							 sdr->record.common->unit.type.base,
+							 sdr->record.common->unit.type.modifier));
+		}
+		else if ((evt->sel_type.standard_type.event_type >= 0x2 && evt->sel_type.standard_type.event_type <= 0xc) ||
+			 (evt->sel_type.standard_type.event_type == 0x6f)) {
+			/*
+			 * Discrete Event
+			 */
+			lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
+				eintf->prefix, type,
+				sdr->record.full->id_string, desc ? desc : "",
+				(evt->sel_type.standard_type.event_dir
+				 ? "Deasserted" : "Asserted"));
+			if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) {
+				/* previous state and/or severity in event data byte 2 */
+			}
+		}
+		else if (evt->sel_type.standard_type.event_type >= 0x70 && evt->sel_type.standard_type.event_type <= 0x7f) {
+			/*
+			 * OEM Event
+			 */
+			lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
+				eintf->prefix, type,
+				sdr->record.full->id_string, desc ? desc : "",
+				(evt->sel_type.standard_type.event_dir
+				 ? "Deasserted" : "Asserted"));
+		}
+		break;
+
+	case SDR_RECORD_TYPE_COMPACT_SENSOR:
+		lprintf(LOG_NOTICE, "%s%s sensor %s - %s %s",
+			eintf->prefix, type,
+			sdr->record.compact->id_string, desc ? desc : "",
+			(evt->sel_type.standard_type.event_dir
+			 ? "Deasserted" : "Asserted"));
+		break;
+
+	default:
+		lprintf(LOG_NOTICE, "%s%s sensor (0x%02x) - %s",
+			eintf->prefix, type,
+			evt->sel_type.standard_type.sensor_num, desc ? desc : "");
+		break;
+	}
+
+	if (desc) {
+		free(desc);
+		desc = NULL;
+	}
+}
+/*************************************************************************/
+
+
+/*************************************************************************/
+/**                         OpenIPMI Functions                          **/
+/*************************************************************************/
+#ifdef IPMI_INTF_OPEN
+static int
+openipmi_enable_event_msg_buffer(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t bmc_global_enables;
+
+	/* we must read/modify/write bmc global enables */
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = 0x2f;	/* Get BMC Global Enables */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get BMC Global Enables command failed");
+		return -1;
+	}
+	else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get BMC Global Enables command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	bmc_global_enables = rsp->data[0] | 0x04;
+	req.msg.cmd = 0x2e;	/* Set BMC Global Enables */
+	req.msg.data = &bmc_global_enables;
+	req.msg.data_len = 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set BMC Global Enables command failed");
+		return -1;
+	}
+	else if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set BMC Global Enables command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "BMC Event Message Buffer enabled");
+
+	return 0;
+}
+
+static int
+openipmi_setup(struct ipmi_event_intf * eintf)
+{
+	int i, r;
+
+	/* enable event message buffer */
+	lprintf(LOG_DEBUG, "Enabling event message buffer");
+	r = openipmi_enable_event_msg_buffer(eintf->intf);
+	if (r < 0) {
+		lprintf(LOG_ERR, "Could not enable event message buffer");
+		return -1;
+	}
+
+	/* enable OpenIPMI event receiver */
+	lprintf(LOG_DEBUG, "Enabling event receiver");
+	i = 1;
+	r = ioctl(eintf->intf->fd, IPMICTL_SET_GETS_EVENTS_CMD, &i);
+	if (r != 0) {
+		lperror(LOG_ERR, "Could not enable event receiver");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int
+openipmi_read(struct ipmi_event_intf * eintf)
+{
+	struct ipmi_addr addr;
+	struct ipmi_recv recv;
+	uint8_t data[80];
+	int rv;
+
+	recv.addr = (unsigned char *) &addr;
+	recv.addr_len = sizeof(addr);
+	recv.msg.data = data;
+	recv.msg.data_len = sizeof(data);
+
+	rv = ioctl(eintf->intf->fd, IPMICTL_RECEIVE_MSG_TRUNC, &recv);
+	if (rv < 0) {
+		switch (errno) {
+		case EINTR:
+			return 0; /* abort */
+		case EMSGSIZE:
+			recv.msg.data_len = sizeof(data); /* truncated */
+			break;
+		default:
+			lperror(LOG_ERR, "Unable to receive IPMI message");
+			return -1;
+		}
+	}
+
+	if (!recv.msg.data || recv.msg.data_len == 0) {
+		lprintf(LOG_ERR, "No data in event");
+		return -1;
+	}
+	if (recv.recv_type != IPMI_ASYNC_EVENT_RECV_TYPE) {
+		lprintf(LOG_ERR, "Type %x is not an event", recv.recv_type);
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "netfn:%x cmd:%x ccode:%d",
+	    recv.msg.netfn, recv.msg.cmd, recv.msg.data[0]);
+
+	eintf->log(eintf, (struct sel_event_record *)recv.msg.data);
+
+	return 0;
+}
+
+static int
+openipmi_wait(struct ipmi_event_intf * eintf)
+{
+	struct pollfd pfd;
+	int r;
+
+	for (;;) {
+		pfd.fd = eintf->intf->fd; /* wait on openipmi device */
+		pfd.events = POLLIN;      /* wait for input */
+		r = poll(&pfd, 1, -1);
+
+		switch (r) {
+		case 0:
+			/* timeout is disabled */
+			break;
+		case -1:
+			lperror(LOG_CRIT, "Unable to read from IPMI device");
+			return -1;
+		default:
+			if (pfd.revents & POLLIN)
+				eintf->read(eintf);
+		}
+	}
+
+	return 0;
+}
+#endif /* IPMI_INTF_OPEN */
+/*************************************************************************/
+
+
+/*************************************************************************/
+/**                         SEL Watch Functions                         **/
+/*************************************************************************/
+static int
+selwatch_get_data(struct ipmi_intf * intf, struct sel_data *data)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint16_t freespace;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_STORAGE;
+	req.msg.cmd = IPMI_CMD_GET_SEL_INFO;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get SEL Info command failed");
+		return 0;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Get SEL Info command failed: %s",
+		       val2str(rsp->ccode, completion_code_vals));
+		return 0;
+	}
+
+	freespace = buf2short(rsp->data + 3);
+	data->entries  = buf2short(rsp->data + 1);
+	data->pctused  = compute_pctfull (data->entries, freespace);
+    data->overflow = rsp->data[13] & 0x80;
+
+	lprintf(LOG_DEBUG, "SEL count is %d", data->entries);
+	lprintf(LOG_DEBUG, "SEL freespace is %d", freespace);
+	lprintf(LOG_DEBUG, "SEL Percent Used: %d%%\n", data->pctused);
+	lprintf(LOG_DEBUG, "SEL Overflow: %s", data->overflow ? "true" : "false");
+
+	return 1;
+}
+
+static uint16_t
+selwatch_get_lastid(struct ipmi_intf * intf)
+{
+	int next_id = 0;
+	uint16_t curr_id = 0;
+	struct sel_event_record evt;
+
+	if (selwatch_count == 0)
+		return 0;
+
+	while (next_id != 0xffff) {
+		curr_id = next_id;
+		lprintf(LOG_DEBUG, "SEL Next ID: %04x", curr_id);
+
+		next_id = ipmi_sel_get_std_entry(intf, curr_id, &evt);
+		if (next_id < 0)
+			break;
+		if (next_id == 0) {
+			/*
+			 * usually next_id of zero means end but
+			 * retry because some hardware has quirks
+			 * and will return 0 randomly.
+			 */
+			next_id = ipmi_sel_get_std_entry(intf, curr_id, &evt);
+			if (next_id <= 0)
+				break;
+		}
+	}
+
+	lprintf(LOG_DEBUG, "SEL lastid is %04x", curr_id);
+
+	return curr_id;
+}
+
+static int
+selwatch_setup(struct ipmi_event_intf * eintf)
+{
+	struct sel_data data;
+
+	/* save current sel record count */	
+	if (selwatch_get_data(eintf->intf, &data)) {
+		selwatch_count = data.entries;
+		selwatch_pctused = data.pctused;
+		selwatch_overflow = data.overflow;
+		lprintf(LOG_DEBUG, "Current SEL count is %d", selwatch_count);
+		/* save current last record ID */
+		selwatch_lastid = selwatch_get_lastid(eintf->intf);
+		lprintf(LOG_DEBUG, "Current SEL lastid is %04x", selwatch_lastid);
+		/* display alert/warning immediatly as startup if relevant */
+		if (selwatch_pctused >= WARNING_THRESHOLD) {
+			lprintf(LOG_WARNING, "SEL buffer used at %d%%, please consider clearing the SEL buffer", selwatch_pctused);
+		}
+		if (selwatch_overflow) {
+			lprintf(LOG_ALERT, "SEL buffer overflow, no SEL message can be logged until the SEL buffer is cleared");
+		}
+		
+		return 1;
+	}
+
+	lprintf(LOG_ERR, "Unable to retrieve SEL data");
+	return 0;
+}
+
+/* selwatch_check  -  check for waiting events
+ *
+ * this is done by reading sel info and comparing
+ * the sel count value to what we currently know
+ */
+static int
+selwatch_check(struct ipmi_event_intf * eintf)
+{
+	uint16_t old_count = selwatch_count;
+	int old_pctused = selwatch_pctused;
+	int old_overflow = selwatch_overflow;
+	struct sel_data data;
+
+	if (selwatch_get_data(eintf->intf, &data)) {
+		selwatch_count = data.entries;
+		selwatch_pctused = data.pctused;
+		selwatch_overflow = data.overflow;
+		if (old_overflow && !selwatch_overflow) {
+			lprintf(LOG_NOTICE, "SEL overflow is cleared");
+		} else if (!old_overflow && selwatch_overflow) {
+			lprintf(LOG_ALERT, "SEL buffer overflow, no new SEL message will be logged until the SEL buffer is cleared");
+		}
+		if ((selwatch_pctused >= WARNING_THRESHOLD) && (selwatch_pctused > old_pctused)) {
+			lprintf(LOG_WARNING, "SEL buffer is %d%% full, please consider clearing the SEL buffer", selwatch_pctused);
+		}		
+		if (selwatch_count == 0) {
+			lprintf(LOG_DEBUG, "SEL count is 0 (old=%d), resetting lastid to 0", old_count);
+			selwatch_lastid = 0;
+		} else if (selwatch_count < old_count) {
+			selwatch_lastid = selwatch_get_lastid(eintf->intf);
+			lprintf(LOG_DEBUG, "SEL count lowered, new SEL lastid is %04x", selwatch_lastid);
+		}
+	}
+	return (selwatch_count > old_count);
+}
+
+static int
+selwatch_read(struct ipmi_event_intf * eintf)
+{
+	uint16_t curr_id = 0;
+	int next_id = selwatch_lastid;
+	struct sel_event_record evt;
+
+	if (selwatch_count == 0)
+		return -1;
+
+	while (next_id != 0xffff) {
+		curr_id = next_id;
+		lprintf(LOG_DEBUG, "SEL Read ID: %04x", curr_id);
+
+		next_id = ipmi_sel_get_std_entry(eintf->intf, curr_id, &evt);
+		if (next_id < 0)
+			break;
+		if (next_id == 0) {
+			/*
+			 * usually next_id of zero means end but
+			 * retry because some hardware has quirks
+			 * and will return 0 randomly.
+			 */
+			next_id = ipmi_sel_get_std_entry(eintf->intf, curr_id, &evt);
+			if (next_id <= 0)
+				break;
+		}
+
+		if (curr_id != selwatch_lastid)
+			eintf->log(eintf, &evt);
+		else if (curr_id == 0)
+			eintf->log(eintf, &evt);
+	}
+
+	selwatch_lastid = curr_id;
+	return 0;
+}
+
+static int
+selwatch_wait(struct ipmi_event_intf * eintf)
+{
+	for (;;) {
+		if (eintf->check(eintf) > 0) {
+			lprintf(LOG_DEBUG, "New Events");
+			eintf->read(eintf);
+		}
+		sleep(selwatch_timeout);
+	}
+	return 0;
+}
+/*************************************************************************/
+
+static void
+ipmievd_cleanup(int signal)
+{
+	struct stat st1;
+
+	if (lstat(pidfile, &st1) == 0) {
+		/* cleanup daemon pidfile */
+		(void)unlink(pidfile);
+	}
+
+	exit(EXIT_SUCCESS);
+}
+
+int
+ipmievd_main(struct ipmi_event_intf * eintf, int argc, char ** argv)
+{
+	int i, rc;
+	int daemon = 1;
+	struct sigaction act;
+
+	memset(pidfile, 0, 64);
+	sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum);
+
+	for (i = 0; i < argc; i++) {
+		if (strncasecmp(argv[i], "help", 4) == 0) {
+			ipmievd_usage();
+			return 0;
+		}
+		if (strncasecmp(argv[i], "daemon", 6) == 0) {
+			daemon = 1;
+		}
+		else if (strncasecmp(argv[i], "nodaemon", 8) == 0) {
+			daemon = 0;
+		}
+		else if (strncasecmp(argv[i], "daemon=", 7) == 0) {
+			if (strncasecmp(argv[i]+7, "on", 2) == 0 ||
+			    strncasecmp(argv[i]+7, "yes", 3) == 0)
+				daemon = 1;
+			else if (strncasecmp(argv[i]+7, "off", 3) == 0 ||
+				 strncasecmp(argv[i]+7, "no", 2) == 0)
+				daemon = 0;
+		}
+		else if (strncasecmp(argv[i], "timeout=", 8) == 0) {
+			if ( (str2int(argv[i]+8, &selwatch_timeout) != 0) || 
+					selwatch_timeout < 0) {
+				lprintf(LOG_ERR, "Invalid input given or out of range for time-out.");
+				return (-1);
+			}
+		}
+		else if (strncasecmp(argv[i], "pidfile=", 8) == 0) {
+			memset(pidfile, 0, 64);
+			strncpy(pidfile, argv[i]+8,
+				__min(strlen((const char *)(argv[i]+8)), 63));
+		}
+	}
+
+	lprintf(LOG_DEBUG, "ipmievd: using pidfile %s", pidfile);
+
+	/*
+	 * We need to open interface before forking daemon
+	 * so error messages are not lost to syslog and
+	 * return code is successfully returned to initscript
+	 */
+	if (eintf->intf->open(eintf->intf) < 0) {
+		lprintf(LOG_ERR, "Unable to open interface");
+		return -1;
+	}
+
+	if (daemon) {
+		FILE *fp;
+		struct stat st1;
+
+		if (lstat(pidfile, &st1) == 0) {
+				/* PID file already exists -> exit. */
+				lprintf(LOG_ERR, "PID file '%s' already exists.", pidfile);
+				lprintf(LOG_ERR, "Perhaps another instance is already running.");
+				return (-1);
+		}
+
+		ipmi_start_daemon(eintf->intf);
+
+		umask(022);
+		fp = ipmi_open_file_write(pidfile);
+		if (fp == NULL) {
+			/* Failed to get fp on PID file -> exit. */
+			log_halt();
+			log_init("ipmievd", daemon, verbose);
+			lprintf(LOG_ERR,
+					"Failed to open PID file '%s' for writing. Check file permission.",
+					pidfile);
+			exit(EXIT_FAILURE);
+		}
+		fprintf(fp, "%d\n", (int)getpid());
+		fclose(fp);
+	}
+
+	/* register signal handler for cleanup */
+	act.sa_handler = ipmievd_cleanup;
+	act.sa_flags = 0;
+	sigemptyset(&act.sa_mask);
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGQUIT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
+
+	log_halt();
+	log_init("ipmievd", daemon, verbose);
+
+	/* generate SDR cache for fast lookups */
+	lprintf(LOG_NOTICE, "Reading sensors...");
+	ipmi_sdr_list_cache(eintf->intf);
+	lprintf(LOG_DEBUG, "Sensors cached");
+
+	/* call event handler setup routine */
+
+	if (eintf->setup != NULL) {
+		rc = eintf->setup(eintf);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error setting up Event Interface %s", eintf->name);
+			return -1;
+		}
+	}
+
+	lprintf(LOG_NOTICE, "Waiting for events...");
+
+	/* now launch event wait loop */
+	if (eintf->wait != NULL) {
+		rc = eintf->wait(eintf);
+		if (rc < 0) {
+			lprintf(LOG_ERR, "Error waiting for events!");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int
+ipmievd_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_event_intf * eintf;
+
+	eintf = ipmi_event_intf_load("sel");
+	if (eintf == NULL) {
+		lprintf(LOG_ERR, "Unable to load event interface");
+		return -1;
+	}
+
+	eintf->intf = intf;
+
+	if (intf->session != NULL) {
+		snprintf(eintf->prefix,
+			 strlen((const char *)intf->ssn_params.hostname) + 3,
+			 "%s: ", intf->ssn_params.hostname);
+	}
+
+	return ipmievd_main(eintf, argc, argv);
+}
+
+int
+ipmievd_open_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	struct ipmi_event_intf * eintf;
+
+	/* only one interface works for this */
+	if (strncmp(intf->name, "open", 4) != 0) {
+		lprintf(LOG_ERR, "Invalid Interface for OpenIPMI Event Handler: %s", intf->name);
+		return -1;
+	}
+
+	eintf = ipmi_event_intf_load("open");
+	if (eintf == NULL) {
+		lprintf(LOG_ERR, "Unable to load event interface");
+		return -1;
+	}
+
+	eintf->intf = intf;
+
+	return ipmievd_main(eintf, argc, argv);
+}
+
+struct ipmi_cmd ipmievd_cmd_list[] = {
+#ifdef IPMI_INTF_OPEN
+	{ ipmievd_open_main,	"open",   "Use OpenIPMI for asyncronous notification of events" },
+#endif
+	{ ipmievd_sel_main,	"sel",    "Poll SEL for notification of events" },
+	{ NULL }
+};
+
+int main(int argc, char ** argv)
+{
+	int rc;
+
+	rc = ipmi_main(argc, argv, ipmievd_cmd_list, NULL);
+
+	if (rc < 0)
+		exit(EXIT_FAILURE);
+	else
+		exit(EXIT_SUCCESS);
+}
diff --git a/src/ipmishell.c b/src/ipmishell.c
new file mode 100644
index 0000000..205cbf9
--- /dev/null
+++ b/src/ipmishell.c
@@ -0,0 +1,517 @@
+/*
+ * Copyright (c) 2003, 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _SVID_SOURCE || _BSD_SOURCE || _XOPEN_SOURCE >= 500 || \
+	_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED || \
+	/* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
+
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_session.h>
+#include <ipmitool/ipmi_main.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define EXEC_BUF_SIZE	2048
+#define EXEC_ARG_SIZE	64
+#define MAX_PORT	65535
+
+extern const struct valstr ipmi_privlvl_vals[];
+extern const struct valstr ipmi_authtype_session_vals[];
+
+#ifdef HAVE_READLINE
+
+/* avoid warnings errors due to non-ANSI type declarations in readline.h */
+#define _FUNCTION_DEF
+#define USE_VARARGS
+#define PREFER_STDARG
+
+#include <readline/readline.h>
+#include <readline/history.h>
+#define RL_PROMPT		"ipmitool> "
+#define RL_TIMEOUT		30
+
+static struct ipmi_intf * shell_intf;
+
+/* This function attempts to keep lan sessions active
+ * so they do not time out waiting for user input.  The
+ * readline timeout is set to 1 second but lan session
+ * timeout is ~60 seconds.
+ */
+static int rl_event_keepalive(void)
+{
+	static int internal_timer = 0;
+
+	if (shell_intf == NULL)
+		return -1;
+	if (shell_intf->keepalive == NULL)
+		return 0;
+#if defined (RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0402
+	if (internal_timer++ < RL_TIMEOUT)
+#else
+	/* In readline < 4.2 keyboard timeout hardcoded to 0.1 second */
+	if (internal_timer++ < RL_TIMEOUT * 10)
+#endif
+		return 0;
+
+	internal_timer = 0;
+	shell_intf->keepalive(shell_intf);
+
+	return 0;
+}
+
+int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	char *ptr, *pbuf, **ap, *__argv[EXEC_ARG_SIZE];
+	int __argc, rc=0;
+
+	rl_readline_name = "ipmitool";
+
+	/* this essentially disables command completion
+	 * until its implemented right, otherwise we get
+	 * the current directory contents... */
+	rl_bind_key('\t', rl_insert);
+
+	if (intf->keepalive) {
+		/* hook to keep lan sessions active */
+		shell_intf = intf;
+		rl_event_hook = rl_event_keepalive;
+#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0402
+		/* There is a bug in readline 4.2 and later (at least on FreeBSD and NetBSD):
+		 * timeout equal or greater than 1 second causes an infinite loop. */
+		rl_set_keyboard_input_timeout(1000 * 1000 - 1);
+#endif
+	}
+
+	while ((pbuf = (char *)readline(RL_PROMPT)) != NULL) {
+		if (strlen(pbuf) == 0) {
+			free(pbuf);
+			pbuf = NULL;
+			continue;
+		}
+		if (strncmp(pbuf, "quit", 4) == 0 ||
+		    strncmp(pbuf, "exit", 4) == 0) {
+			free(pbuf);
+			pbuf = NULL;
+			return 0;
+		}
+		if (strncmp(pbuf, "help", 4) == 0 ||
+		    strncmp(pbuf, "?", 1) == 0) {
+			ipmi_cmd_print(intf->cmdlist);
+			free(pbuf);
+			pbuf = NULL;
+			continue;
+		}
+
+		/* for the all-important up arrow :) */
+		add_history(pbuf);
+
+		/* change "" and '' with spaces in the middle to ~ */
+		ptr = pbuf;
+		while (*ptr != '\0') {
+			if (*ptr == '"') {
+				ptr++;
+				while (*ptr != '"' && *ptr != '\0') {
+					if (isspace((int)*ptr))
+						*ptr = '~';
+					ptr++;
+				}
+			}
+			if (*ptr == '\'') {
+				ptr++;
+				while (*ptr != '\'' && *ptr != '\0') {
+					if (isspace((int)*ptr))
+						*ptr = '~';
+					ptr++;
+				}
+			}
+			ptr++;
+		}
+
+		__argc = 0;
+		ap = __argv;
+
+		for (*ap = strtok(pbuf, " \t");
+		     *ap != NULL;
+		     *ap = strtok(NULL, " \t")) {
+			__argc++;
+
+			ptr = *ap;
+			if (*ptr == '\'') {
+				memmove(ptr, ptr+1, strlen(ptr));
+				while (*ptr != '\'' && *ptr != '\0') {
+					if (*ptr == '~')
+						*ptr = ' ';
+					ptr++;
+				}
+				*ptr = '\0';
+			}
+			if (*ptr == '"') {
+				memmove(ptr, ptr+1, strlen(ptr));
+				while (*ptr != '"' && *ptr != '\0') {
+					if (*ptr == '~')
+						*ptr = ' ';
+					ptr++;
+				}
+				*ptr = '\0';
+			}
+
+			if (**ap != '\0') {
+				if (++ap >= &__argv[EXEC_ARG_SIZE])
+					break;
+			}
+		}
+
+		if (__argc && __argv[0])
+			rc = ipmi_cmd_run(intf,
+					  __argv[0],
+					  __argc-1,
+					  &(__argv[1]));
+
+		free(pbuf);
+		pbuf = NULL;
+	}
+	printf("\n");
+	return rc;
+}
+
+#else  /* HAVE_READLINE */
+
+int
+ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	lprintf(LOG_ERR, "Compiled without readline, shell is disabled");
+	return -1;
+}
+
+#endif /* HAVE_READLINE */
+
+int ipmi_echo_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	int i;
+
+	for (i=0; i<argc; i++) {
+		printf("%s ", argv[i]);
+	}
+	printf("\n");
+
+	return 0;
+}
+
+static void
+ipmi_set_usage(void)
+{
+	lprintf(LOG_NOTICE, "Usage: set <option> <value>\n");
+	lprintf(LOG_NOTICE, "Options are:");
+	lprintf(LOG_NOTICE, "    hostname <host>        Session hostname");
+	lprintf(LOG_NOTICE, "    username <user>        Session username");
+	lprintf(LOG_NOTICE, "    password <pass>        Session password");
+	lprintf(LOG_NOTICE, "    privlvl <level>        Session privilege level force");
+	lprintf(LOG_NOTICE, "    authtype <type>        Authentication type force");
+	lprintf(LOG_NOTICE, "    localaddr <addr>       Local IPMB address");
+	lprintf(LOG_NOTICE, "    targetaddr <addr>      Remote target IPMB address");
+	lprintf(LOG_NOTICE, "    port <port>            Remote RMCP port");
+	lprintf(LOG_NOTICE, "    csv [level]            enable output in comma separated format");
+	lprintf(LOG_NOTICE, "    verbose [level]        Verbose level");
+	lprintf(LOG_NOTICE, "");
+}
+
+int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	if (argc == 0 || strncmp(argv[0], "help", 4) == 0) {
+		ipmi_set_usage();
+		return -1;
+	}
+
+	/* these options can have no arguments */
+	if (strncmp(argv[0], "verbose", 7) == 0) {
+		if (argc > 1) {
+			if (str2int(argv[1], &verbose) != 0) {
+				lprintf(LOG_ERR,
+						"Given verbose '%s' argument is invalid.",
+						argv[1]);
+				return (-1);
+			}
+		} else {
+			verbose = verbose + 1;
+		}
+		return 0;
+	}
+	if (strncmp(argv[0], "csv", 3) == 0) {
+		if (argc > 1) {
+			if (str2int(argv[1], &csv_output) != 0) {
+				lprintf(LOG_ERR,
+						"Given csv '%s' argument is invalid.",
+						argv[1]);
+				return (-1);
+			}
+		} else {
+			csv_output = 1;
+		}
+		return 0;
+	}
+
+	/* the rest need an argument */
+	if (argc == 1) {
+		ipmi_set_usage();
+		return -1;
+	}
+
+	if (strncmp(argv[0], "host", 4) == 0 ||
+	    strncmp(argv[0], "hostname", 8) == 0) {
+		ipmi_intf_session_set_hostname(intf, argv[1]);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR, "Failed to set session hostname.");
+			return (-1);
+		}
+		printf("Set session hostname to %s\n",
+				intf->ssn_params.hostname);
+	}
+	else if (strncmp(argv[0], "user", 4) == 0 ||
+		 strncmp(argv[0], "username", 8) == 0) {
+		ipmi_intf_session_set_username(intf, argv[1]);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR, "Failed to set session username.");
+			return (-1);
+		}
+		printf("Set session username to %s\n",
+				intf->ssn_params.username);
+	}
+	else if (strncmp(argv[0], "pass", 4) == 0 ||
+		 strncmp(argv[0], "password", 8) == 0) {
+		ipmi_intf_session_set_password(intf, argv[1]);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR, "Failed to set session password.");
+			return (-1);
+		}
+		printf("Set session password\n");
+	}
+	else if (strncmp(argv[0], "authtype", 8) == 0) {
+		int authtype;
+		authtype = str2val(argv[1], ipmi_authtype_session_vals);
+		if (authtype == 0xFF) {
+			lprintf(LOG_ERR, "Invalid authtype: %s",
+					argv[1]);
+			return (-1);
+		}
+		ipmi_intf_session_set_authtype(intf, authtype);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR, "Failed to set session authtype.");
+			return (-1);
+		}
+		printf("Set session authtype to %s\n",
+		       val2str(intf->ssn_params.authtype_set,
+				   ipmi_authtype_session_vals));
+	}
+	else if (strncmp(argv[0], "privlvl", 7) == 0) {
+		int privlvl;
+		privlvl = str2val(argv[1], ipmi_privlvl_vals);
+		if (privlvl == 0xFF) {
+			lprintf(LOG_ERR, "Invalid privilege level: %s",
+					argv[1]);
+			return (-1);
+		}
+		ipmi_intf_session_set_privlvl(intf, privlvl);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR,
+					"Failed to set session privilege level.");
+			return (-1);
+		}
+		printf("Set session privilege level to %s\n",
+		       val2str(intf->ssn_params.privlvl,
+				   ipmi_privlvl_vals));
+	}
+	else if (strncmp(argv[0], "port", 4) == 0) {
+		int port = 0;
+		if (str2int(argv[1], &port) != 0 || port > MAX_PORT) {
+			lprintf(LOG_ERR, "Given port '%s' is invalid.",
+					argv[1]);
+			return (-1);
+		}
+		ipmi_intf_session_set_port(intf, port);
+		if (intf->session == NULL) {
+			lprintf(LOG_ERR, "Failed to set session port.");
+			return (-1);
+		}
+		printf("Set session port to %d\n", intf->ssn_params.port);
+	}
+	else if (strncmp(argv[0], "localaddr", 9) == 0) {
+		uint8_t my_addr = 0;
+		if (str2uchar(argv[1], &my_addr) != 0) {
+			lprintf(LOG_ERR, "Given localaddr '%s' is invalid.",
+					argv[1]);
+			return (-1);
+		}
+		intf->my_addr = my_addr;
+		printf("Set local IPMB address to 0x%02x\n", intf->my_addr);
+	}
+	else if (strncmp(argv[0], "targetaddr", 10) == 0) {
+		uint8_t target_addr = 0;
+		if (str2uchar(argv[1], &target_addr) != 0) {
+			lprintf(LOG_ERR, "Given targetaddr '%s' is invalid.",
+					argv[1]);
+			return (-1);
+		}
+		intf->target_addr = target_addr;
+		printf("Set remote IPMB address to 0x%02x\n", intf->target_addr);
+	}
+	else {
+		ipmi_set_usage();
+		return -1;
+	}
+	return 0;
+}
+
+int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+	FILE * fp;
+	char buf[EXEC_BUF_SIZE];
+	char * ptr, * tok, * ret, * tmp;
+	int __argc, i, r;
+	char * __argv[EXEC_ARG_SIZE];
+	int rc=0;
+
+	if (argc < 1) {
+		lprintf(LOG_ERR, "Usage: exec <filename>");
+		return -1;
+	}
+
+	fp = ipmi_open_file_read(argv[0]);
+	if (fp == NULL)
+		return -1;
+
+	while (feof(fp) == 0) {
+		ret = fgets(buf, EXEC_BUF_SIZE, fp);
+		if (ret == NULL)
+			continue;
+
+		/* clip off optional comment tail indicated by # */
+		ptr = strchr(buf, '#');
+		if (ptr)
+			*ptr = '\0';
+		else
+			ptr = buf + strlen(buf);
+
+		/* change "" and '' with spaces in the middle to ~ */
+		ptr = buf;
+		while (*ptr != '\0') {
+			if (*ptr == '"') {
+				ptr++;
+				while (*ptr != '"' && *ptr != '\0') {
+					if (isspace((int)*ptr))
+						*ptr = '~';
+					ptr++;
+				}
+			}
+			if (*ptr == '\'') {
+				ptr++;
+				while (*ptr != '\'' && *ptr != '\0') {
+					if (isspace((int)*ptr))
+						*ptr = '~';
+					ptr++;
+				}
+			}
+			ptr++;
+		}
+
+		/* clip off trailing and leading whitespace */
+		ptr--;
+		while (isspace((int)*ptr) && ptr >= buf)
+			*ptr-- = '\0';
+		ptr = buf;
+		while (isspace((int)*ptr))
+			ptr++;
+		if (strlen(ptr) == 0)
+			continue;
+
+		/* parse it and make argument list */
+		__argc = 0;
+		for (tok = strtok(ptr, " "); tok != NULL; tok = strtok(NULL, " ")) {
+			if (__argc < EXEC_ARG_SIZE) {
+				__argv[__argc++] = strdup(tok);
+				if (__argv[__argc-1] == NULL) {
+					lprintf(LOG_ERR, "ipmitool: malloc failure");
+					if (fp) {
+						fclose(fp);
+						fp = NULL;
+					}
+					return -1;
+				}
+				tmp = __argv[__argc-1];
+				if (*tmp == '\'') {
+					memmove(tmp, tmp+1, strlen(tmp));
+					while (*tmp != '\'' && *tmp != '\0') {
+						if (*tmp == '~')
+							*tmp = ' ';
+						tmp++;
+					}
+					*tmp = '\0';
+				}
+				if (*tmp == '"') {
+					memmove(tmp, tmp+1, strlen(tmp));
+					while (*tmp != '"' && *tmp != '\0') {
+						if (*tmp == '~')
+							*tmp = ' ';
+						tmp++;
+					}
+					*tmp = '\0';
+				}
+			}
+		}
+
+		/* now run the command, save the result if not successful */
+		r = ipmi_cmd_run(intf, __argv[0], __argc-1, &(__argv[1]));
+		if (r != 0)
+			rc = r;
+
+		/* free argument list */
+		for (i=0; i<__argc; i++) {
+			if (__argv[i] != NULL) {
+				free(__argv[i]);
+				__argv[i] = NULL;
+			}
+		}
+	}
+
+	fclose(fp);
+	return rc;
+}
diff --git a/src/ipmitool.c b/src/ipmitool.c
new file mode 100644
index 0000000..5e19c6e
--- /dev/null
+++ b/src/ipmitool.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_main.h>
+
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/ipmi_gendev.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_fru.h>
+#include <ipmitool/ipmi_sol.h>
+#include <ipmitool/ipmi_isol.h>
+#include <ipmitool/ipmi_tsol.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_chassis.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_sensor.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_session.h>
+#include <ipmitool/ipmi_event.h>
+#include <ipmitool/ipmi_user.h>
+#include <ipmitool/ipmi_raw.h>
+#include <ipmitool/ipmi_pef.h>
+#include <ipmitool/ipmi_oem.h>
+#include <ipmitool/ipmi_sunoem.h>
+#include <ipmitool/ipmi_fwum.h>
+#include <ipmitool/ipmi_picmg.h>
+#include <ipmitool/ipmi_kontronoem.h>
+#include <ipmitool/ipmi_firewall.h>
+#include <ipmitool/ipmi_hpmfwupg.h>
+#include <ipmitool/ipmi_delloem.h>
+#include <ipmitool/ipmi_ekanalyzer.h>
+#include <ipmitool/ipmi_ime.h>
+#include <ipmitool/ipmi_dcmi.h>
+#include <ipmitool/ipmi_vita.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_READLINE
+extern int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv);
+#endif
+extern int ipmi_echo_main(struct ipmi_intf * intf, int argc, char ** argv);
+extern int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv);
+extern int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv);
+extern int ipmi_lan6_main(struct ipmi_intf *intf, int argc, char **argv);
+
+
+int csv_output = 0;
+int verbose = 0;
+
+struct ipmi_cmd ipmitool_cmd_list[] = {
+	{ ipmi_raw_main,     "raw",     "Send a RAW IPMI request and print response" },
+	{ ipmi_rawi2c_main,  "i2c",     "Send an I2C Master Write-Read command and print response" },
+	{ ipmi_rawspd_main,  "spd",     "Print SPD info from remote I2C device" },
+	{ ipmi_lanp_main,    "lan",     "Configure LAN Channels" },
+	{ ipmi_chassis_main, "chassis", "Get chassis status and set power state" },
+	{ ipmi_power_main,   "power",   "Shortcut to chassis power commands" },
+	{ ipmi_event_main,   "event",   "Send pre-defined events to MC" },
+	{ ipmi_mc_main,      "mc",      "Management Controller status and global enables" },
+	{ ipmi_mc_main,      "bmc",     NULL },	/* for backwards compatibility */
+	{ ipmi_sdr_main,     "sdr",     "Print Sensor Data Repository entries and readings" },
+	{ ipmi_sensor_main,  "sensor",  "Print detailed sensor information" },
+	{ ipmi_fru_main,     "fru",     "Print built-in FRU and scan SDR for FRU locators" },
+	{ ipmi_gendev_main,  "gendev",  "Read/Write Device associated with Generic Device locators sdr" },
+	{ ipmi_sel_main,     "sel",     "Print System Event Log (SEL)" },
+	{ ipmi_pef_main,     "pef",     "Configure Platform Event Filtering (PEF)" },
+	{ ipmi_sol_main,     "sol",     "Configure and connect IPMIv2.0 Serial-over-LAN" },
+	{ ipmi_tsol_main,    "tsol",    "Configure and connect with Tyan IPMIv1.5 Serial-over-LAN" },
+	{ ipmi_isol_main,    "isol",    "Configure IPMIv1.5 Serial-over-LAN" },
+	{ ipmi_user_main,    "user",    "Configure Management Controller users" },
+	{ ipmi_channel_main, "channel", "Configure Management Controller channels" },
+	{ ipmi_session_main, "session", "Print session information" },
+	{ ipmi_dcmi_main,    "dcmi",    "Data Center Management Interface"},
+	{ ipmi_nm_main,      "nm",      "Node Manager Interface"},
+	{ ipmi_sunoem_main,  "sunoem",  "OEM Commands for Sun servers" },
+	{ ipmi_kontronoem_main, "kontronoem", "OEM Commands for Kontron devices"},
+	{ ipmi_picmg_main,   "picmg",   "Run a PICMG/ATCA extended cmd"},
+	{ ipmi_fwum_main,    "fwum",	"Update IPMC using Kontron OEM Firmware Update Manager" },
+	{ ipmi_firewall_main,"firewall","Configure Firmware Firewall" },
+	{ ipmi_delloem_main, "delloem", "OEM Commands for Dell systems" },
+#ifdef HAVE_READLINE
+	{ ipmi_shell_main,   "shell",   "Launch interactive IPMI shell" },
+#endif
+	{ ipmi_exec_main,    "exec",    "Run list of commands from file" },
+	{ ipmi_set_main,     "set",     "Set runtime variable for shell and exec" },
+	{ ipmi_echo_main,    "echo",    NULL }, /* for echoing lines to stdout in scripts */
+	{ ipmi_hpmfwupg_main,"hpm", "Update HPM components using PICMG HPM.1 file"},
+	{ ipmi_ekanalyzer_main,"ekanalyzer", "run FRU-Ekeying analyzer using FRU files"},
+	{ ipmi_ime_main,          "ime", "Update Intel Manageability Engine Firmware"},
+	{ ipmi_vita_main,   "vita",   "Run a VITA 46.11 extended cmd"},
+	{ ipmi_lan6_main,   "lan6",   "Configure IPv6 LAN Channels"},
+	{ NULL },
+};
+
+int
+main(int argc, char ** argv)
+{
+	int rc;
+
+	rc = ipmi_main(argc, argv, ipmitool_cmd_list, NULL);
+
+	if (rc < 0)
+		exit(EXIT_FAILURE);
+	else
+		exit(EXIT_SUCCESS);
+}
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
new file mode 100644
index 0000000..7ad8173
--- /dev/null
+++ b/src/plugins/Makefile.am
@@ -0,0 +1,43 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES		= Makefile.in
+
+AM_CPPFLAGS			= -I$(top_srcdir)/include
+
+SUBDIRS				= @INTF_LAN@ @INTF_LANPLUS@ @INTF_OPEN@ @INTF_LIPMI@ @INTF_IMB@ @INTF_BMC@ @INTF_FREE@ @INTF_SERIAL@ @INTF_DUMMY@ @INTF_USB@
+DIST_SUBDIRS			= lan lanplus open lipmi imb bmc free serial dummy usb
+
+noinst_LTLIBRARIES		= libintf.la
+libintf_la_SOURCES		= ipmi_intf.c
+libintf_la_LDFLAGS		= -export-dynamic
+libintf_la_LIBADD		= @IPMITOOL_INTF_LIB@
+libintf_la_DEPENDENCIES		= @IPMITOOL_INTF_LIB@
+
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
new file mode 100644
index 0000000..262ff90
--- /dev/null
+++ b/src/plugins/Makefile.in
@@ -0,0 +1,757 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am_libintf_la_OBJECTS = ipmi_intf.lo
+libintf_la_OBJECTS = $(am_libintf_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libintf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libintf_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_la_SOURCES)
+DIST_SOURCES = $(libintf_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+SUBDIRS = @INTF_LAN@ @INTF_LANPLUS@ @INTF_OPEN@ @INTF_LIPMI@ @INTF_IMB@ @INTF_BMC@ @INTF_FREE@ @INTF_SERIAL@ @INTF_DUMMY@ @INTF_USB@
+DIST_SUBDIRS = lan lanplus open lipmi imb bmc free serial dummy usb
+noinst_LTLIBRARIES = libintf.la
+libintf_la_SOURCES = ipmi_intf.c
+libintf_la_LDFLAGS = -export-dynamic
+libintf_la_LIBADD = @IPMITOOL_INTF_LIB@
+libintf_la_DEPENDENCIES = @IPMITOOL_INTF_LIB@
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf.la: $(libintf_la_OBJECTS) $(libintf_la_DEPENDENCIES) $(EXTRA_libintf_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libintf_la_LINK)  $(libintf_la_OBJECTS) $(libintf_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipmi_intf.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/bmc/Makefile.am b/src/plugins/bmc/Makefile.am
new file mode 100644
index 0000000..f9374fe
--- /dev/null
+++ b/src/plugins/bmc/Makefile.am
@@ -0,0 +1,41 @@
+# Copyright (c) 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_bmc.la
+noinst_LTLIBRARIES	= @INTF_BMC_LIB@
+libintf_bmc_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_bmc_la_SOURCES	= \
+				bmc.c bmc.h \
+				bmc_intf.h
+
diff --git a/src/plugins/bmc/Makefile.in b/src/plugins/bmc/Makefile.in
new file mode 100644
index 0000000..3cb831b
--- /dev/null
+++ b/src/plugins/bmc/Makefile.in
@@ -0,0 +1,640 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2004 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/bmc
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_bmc_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_bmc_la_OBJECTS = bmc.lo
+libintf_bmc_la_OBJECTS = $(am_libintf_bmc_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_bmc_la_SOURCES)
+DIST_SOURCES = $(libintf_bmc_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_bmc.la
+noinst_LTLIBRARIES = @INTF_BMC_LIB@
+libintf_bmc_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_bmc_la_SOURCES = \
+				bmc.c bmc.h \
+				bmc_intf.h
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/bmc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/bmc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_bmc.la: $(libintf_bmc_la_OBJECTS) $(libintf_bmc_la_DEPENDENCIES) $(EXTRA_libintf_bmc_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_bmc_la_OBJECTS) $(libintf_bmc_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmc.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/bmc/bmc.c b/src/plugins/bmc/bmc.c
new file mode 100644
index 0000000..b88b077
--- /dev/null
+++ b/src/plugins/bmc/bmc.c
@@ -0,0 +1,351 @@
+/*
+ * Copyright (c) 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+/*
+ * interface routines between ipmitool and the bmc kernel driver
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stropts.h>
+#include <stddef.h>
+#include <stropts.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include "bmc_intf.h"
+
+#include "bmc.h"
+
+static int	curr_seq;
+static int bmc_method(int fd, int *if_type);
+struct ipmi_rs *(*sendrecv_fn)(struct ipmi_intf *, struct ipmi_rq *) = NULL;
+extern int	verbose;
+
+static void dump_request(bmc_req_t *request);
+static void dump_response(bmc_rsp_t *response);
+static struct ipmi_rs *ipmi_bmc_send_cmd_ioctl(struct ipmi_intf *intf,
+	struct ipmi_rq *req);
+static struct ipmi_rs *ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf,
+	struct ipmi_rq *req);
+
+#define	MESSAGE_BUFSIZE 1024
+
+struct ipmi_intf ipmi_bmc_intf = {
+	name:		"bmc",
+	desc:		"IPMI v2.0 BMC interface",
+	open:		ipmi_bmc_open,
+	close:		ipmi_bmc_close,
+	sendrecv:	ipmi_bmc_send_cmd};
+
+void
+ipmi_bmc_close(struct ipmi_intf *intf)
+{
+	if (intf && intf->fd >= 0)
+		close(intf->fd);
+
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+	intf->fd = -1;
+}
+
+int
+ipmi_bmc_open(struct ipmi_intf *intf)
+{
+	int method;
+
+	if (!intf)
+                return -1;
+
+	/* Open local device */
+	intf->fd = open(BMC_DEV, O_RDWR);
+
+	if (intf->fd <= 0) {
+		perror("Could not open bmc device");
+		return (-1);
+	}
+	curr_seq = 0;
+
+	intf->opened = 1;
+
+	if (bmc_method(intf->fd, &method) < 0) {
+		perror("Could not determine bmc messaging interface");
+		return (-1);
+	}
+
+	sendrecv_fn = (method == BMC_PUTMSG_METHOD) ?
+	    ipmi_bmc_send_cmd_putmsg : ipmi_bmc_send_cmd_ioctl;
+
+	intf->manufacturer_id = ipmi_get_oem(intf);
+	return (intf->fd);
+}
+
+struct ipmi_rs *
+ipmi_bmc_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
+{
+	/* If not already opened open the device or network connection */
+	if (!intf->opened && intf->open && intf->open(intf) < 0)
+		return NULL;
+
+	/* sendrecv_fn cannot be NULL at this point */
+	return ((*sendrecv_fn)(intf, req));
+}
+
+static struct ipmi_rs *
+ipmi_bmc_send_cmd_ioctl(struct ipmi_intf *intf, struct ipmi_rq *req)
+{
+	struct strioctl istr;
+	static struct bmc_reqrsp reqrsp;
+	static struct ipmi_rs rsp;
+
+	memset(&reqrsp, 0, sizeof (reqrsp));
+	reqrsp.req.fn = req->msg.netfn;
+	reqrsp.req.lun = 0;
+	reqrsp.req.cmd = req->msg.cmd;
+	reqrsp.req.datalength = req->msg.data_len;
+	memcpy(reqrsp.req.data, req->msg.data, req->msg.data_len);
+	reqrsp.rsp.datalength = RECV_MAX_PAYLOAD_SIZE;
+
+	istr.ic_cmd = IOCTL_IPMI_KCS_ACTION;
+	istr.ic_timout = 0;
+	istr.ic_dp = (char *)&reqrsp;
+	istr.ic_len = sizeof (struct bmc_reqrsp);
+
+	if (verbose) {
+		printf("--\n");
+		dump_request(&reqrsp.req);
+		printf("--\n");
+	}
+
+	if (ioctl(intf->fd, I_STR, &istr) < 0) {
+		perror("BMC IOCTL: I_STR");
+		return (NULL);
+	}
+
+	if (verbose > 2) {
+		dump_response(&reqrsp.rsp);
+		printf("--\n");
+	}
+
+	memset(&rsp, 0, sizeof (struct ipmi_rs));
+	rsp.ccode = reqrsp.rsp.ccode;
+	rsp.data_len = reqrsp.rsp.datalength;
+
+	/* Decrement for sizeof lun, cmd and ccode */
+	rsp.data_len -= 3;
+
+	if (!rsp.ccode && (rsp.data_len > 0))
+		memcpy(rsp.data, reqrsp.rsp.data, rsp.data_len);
+
+	return (&rsp);
+}
+
+static struct ipmi_rs *
+ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf, struct ipmi_rq *req)
+{
+	struct strbuf sb;
+	int flags = 0;
+	static uint32_t msg_seq = 0;
+
+	/*
+	 * The length of the message structure is equal to the size of the
+	 * bmc_req_t structure, PLUS any additional data space in excess of
+	 * the data space already reserved in the data member + <n> for
+	 * the rest of the members in the bmc_msg_t structure.
+	 */
+	int msgsz = offsetof(bmc_msg_t, msg) + sizeof(bmc_req_t) +
+		((req->msg.data_len > SEND_MAX_PAYLOAD_SIZE) ?
+			(req->msg.data_len - SEND_MAX_PAYLOAD_SIZE) : 0);
+	bmc_msg_t *msg = malloc(msgsz);
+	bmc_req_t *request = (bmc_req_t *)&msg->msg[0];
+	bmc_rsp_t *response;
+	static struct ipmi_rs rsp;
+	struct ipmi_rs *ret = NULL;
+
+	msg->m_type = BMC_MSG_REQUEST;
+	msg->m_id = msg_seq++;
+	request->fn = req->msg.netfn;
+	request->lun = 0;
+	request->cmd = req->msg.cmd;
+	request->datalength = req->msg.data_len;
+	memcpy(request->data, req->msg.data, req->msg.data_len);
+
+	sb.len = msgsz;
+	sb.buf = (unsigned char *)msg;
+
+	if (verbose) {
+		printf("--\n");
+		dump_request(request);
+		printf("--\n");
+	}
+
+	if (putmsg(intf->fd, NULL, &sb, 0) < 0) {
+		perror("BMC putmsg: ");
+		free(msg);
+		msg = NULL;
+		return (NULL);
+	}
+
+	free(msg);
+	msg = NULL;
+
+	sb.buf = malloc(MESSAGE_BUFSIZE);
+	sb.maxlen = MESSAGE_BUFSIZE;
+
+	if (getmsg(intf->fd, NULL, &sb, &flags) < 0) {
+		perror("BMC getmsg: ");
+		free(sb.buf);
+		sb.buf = NULL;
+		return (NULL);
+	}
+
+	msg = (bmc_msg_t *)sb.buf;
+
+	if (verbose > 3) {
+		printf("Got msg (id 0x%x) type 0x%x\n", msg->m_id, msg->m_type);
+	}
+
+
+	/* Did we get an error back from the stream? */
+	switch (msg->m_type) {
+
+	case BMC_MSG_RESPONSE:
+		response = (bmc_rsp_t *)&msg->msg[0];
+
+		if (verbose > 2) {
+			dump_response(response);
+			printf("--\n");
+		}
+
+		memset(&rsp, 0, sizeof (struct ipmi_rs));
+		rsp.ccode = response->ccode;
+		rsp.data_len = response->datalength;
+
+		if (!rsp.ccode && (rsp.data_len > 0))
+			memcpy(rsp.data, response->data, rsp.data_len);
+
+		ret = &rsp;
+		break;
+
+	case BMC_MSG_ERROR:
+		/* In case of an error, msg->msg[0] has the error code */
+		printf("bmc_send_cmd: %s\n", strerror(msg->msg[0]));
+		break;
+
+	}
+	
+	free(sb.buf);
+	sb.buf = NULL;
+	return (ret);
+}
+
+/*
+ * Determine which interface to use.  Returns the interface method
+ * to use.
+ */
+static int
+bmc_method(int fd, int *if_type)
+{
+	struct strioctl istr;
+	int retval = 0;
+	uint8_t method = BMC_PUTMSG_METHOD;
+
+	istr.ic_cmd = IOCTL_IPMI_INTERFACE_METHOD;
+	istr.ic_timout = 0;
+	istr.ic_dp = (uint8_t *)&method;
+	istr.ic_len = 1;
+
+	/*
+	 * If the ioctl doesn't exist, we should get an EINVAL back.
+	 * Bail out on any other error.
+	 */
+	if (ioctl(fd, I_STR, &istr) < 0) {
+
+		if (errno != EINVAL)
+			retval = -1;
+		else
+			method = BMC_IOCTL_METHOD;
+	}
+
+	if (retval == 0)
+		*if_type = method;
+
+	return (retval);
+}
+
+static void
+dump_request(bmc_req_t *request)
+{
+	int i;
+
+	printf("BMC req.fn         : 0x%x\n", request->fn);
+	printf("BMC req.lun        : 0x%x\n", request->lun);
+	printf("BMC req.cmd        : 0x%x\n", request->cmd);
+	printf("BMC req.datalength : 0x%x\n", request->datalength);
+	printf("BMC req.data       : ");
+
+	if (request->datalength > 0) {
+		for (i = 0; i < request->datalength; i++)
+			printf("0x%x ", request->data[i]);
+	} else {
+		printf("<NONE>");
+	}
+	printf("\n");
+}
+
+static void
+dump_response(bmc_rsp_t *response)
+{
+	int i;
+
+	printf("BMC rsp.fn         : 0x%x\n", response->fn);
+	printf("BMC rsp.lun        : 0x%x\n", response->lun);
+	printf("BMC rsp.cmd        : 0x%x\n", response->cmd);
+	printf("BMC rsp.ccode      : 0x%x\n", response->ccode);
+	printf("BMC rsp.datalength : 0x%x\n", response->datalength);
+	printf("BMC rsp.data       : ");
+
+	if (response->datalength > 0) {
+		for (i = 0; i < response->datalength; i++)
+			printf("0x%x ", response->data[i]);
+	} else {
+		printf("<NONE>");
+	}
+	printf("\n");
+}
diff --git a/src/plugins/bmc/bmc.h b/src/plugins/bmc/bmc.h
new file mode 100644
index 0000000..0138710
--- /dev/null
+++ b/src/plugins/bmc/bmc.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _IPMI_BMC_H_
+#define	_IPMI_BMC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ipmitool/ipmi.h>
+
+#define	BMC_DEV	"/dev/bmc"
+
+struct ipmi_rs *ipmi_bmc_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req);
+int ipmi_bmc_open(struct ipmi_intf *intf);
+void ipmi_bmc_close(struct ipmi_intf *intf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _IPMI_BMC_H_ */
diff --git a/src/plugins/bmc/bmc_intf.h b/src/plugins/bmc/bmc_intf.h
new file mode 100644
index 0000000..c73e4c1
--- /dev/null
+++ b/src/plugins/bmc/bmc_intf.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef _BMC_INTF_H
+#define	_BMC_INTF_H
+
+#pragma ident	"@(#)bmc_intf.h	1.2	05/03/07 SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	BMC_SUCCESS		0x0
+#define	BMC_FAILURE		0x1
+
+#define	BMC_NETFN_CHASSIS		0x0
+#define	BMC_NETFN_BRIDGE		0x2
+#define	BMC_NETFN_SE			0x4
+#define	BMC_NETFN_APP			0x6
+#define	BMC_NETFN_FIRMWARE		0x8
+#define	BMC_NETFN_STORAGE		0xa
+#define	BMC_NETFN_TRANSPORT		0xc
+
+#define	SEND_MAX_PAYLOAD_SIZE		34	/* MAX payload */
+#define	RECV_MAX_PAYLOAD_SIZE		33	/* MAX payload */
+#define	BMC_MIN_RESPONSE_SIZE		3
+#define	BMC_MIN_REQUEST_SIZE		2
+#define	BMC_MAX_RESPONSE_SIZE   (BMC_MIN_RESPONSE_SIZE + RECV_MAX_PAYLOAD_SIZE)
+#define	BMC_MAX_REQUEST_SIZE	(BMC_MIN_REQUEST_SIZE + BMC_MAX_RESPONSE_SIZE)
+
+#define	BUF_SIZE 256
+#define	MAX_BUF_SIZE			256
+
+/*
+ * Useful macros
+ */
+#define	FORM_NETFNLUN(net, lun)	((((net) << 2) | ((lun) & 0x3)))
+#define	GET_NETFN(netfn)	(((netfn) >> 2) & 0x3f)
+#define	GET_LUN(netfn)		(netfn & 0x3)
+#define	RESP_NETFN(nflun)	((nflun) | 1)
+#define	ISREQUEST(nl)		(((nl) & 1) == 0)	/* test for request */
+#define	ISRESPONSE(nl)		(((nl) & 1) == 1)	/* test for response */
+
+
+/* for checking BMC specific stuff */
+#define	BMC_GET_DEVICE_ID		0x1	/* GET DEVICE ID COMMAND */
+#define	BMC_IPMI_15_VER		0x51	/* IPMI 1.5 definion */
+
+/* BMC Completion Code and OEM Completion Code */
+#define	BMC_IPMI_UNSPECIFIC_ERROR	0xFF	/* Unspecific Error */
+#define	BMC_IPMI_INVALID_COMMAND	0xC1	/* Invalid Command */
+#define	BMC_IPMI_COMMAND_TIMEOUT	0xC3	/* Command Timeout */
+#define	BMC_IPMI_DATA_LENGTH_EXCEED	0xC8	/* DataLength exceeded limit */
+#define	BMC_IPMI_OEM_FAILURE_SENDBMC	0x7E	/* Cannot send BMC req */
+
+
+#define	IOCTL_IPMI_KCS_ACTION		0x01
+#define	IOCTL_IPMI_INTERFACE_METHOD	0x02
+
+/* Interface methods returned from IOCTL_IPMI_INTERFACE_METHOD ioctl: */
+
+#define	BMC_IOCTL_METHOD		0	/* Not returned from ioctl, */
+						/* but can be used by	*/
+						/* applications that want to */
+						/* compare against an	*/
+						/* alternative method.	*/
+#define	BMC_PUTMSG_METHOD		1
+
+/*
+ * bmc_req_t is the data structure to send
+ * request packet from applications to the driver
+ * module.
+ *
+ * the request pkt is mainly for KCS-interface-BMC
+ * messages. Since the system interface is session-less
+ * connections, the packet won't have any session
+ * information.
+ *
+ * the data payload will be 2 bytes less than max
+ * BMC supported packet size.
+ * the address of the responder is always BMC and so
+ * rsSa field is not required.
+ */
+typedef struct bmc_req {
+	uint8_t fn;			/* netFn for command */
+	uint8_t lun;			/* logical unit on responder */
+	uint8_t cmd;			/* command */
+	uint8_t datalength;		/* length of following data */
+	uint8_t data[SEND_MAX_PAYLOAD_SIZE]; /* request data */
+} bmc_req_t;
+
+/*
+ * bmc_rsp_t is the data structure to send
+ * respond packet from applications to the driver
+ * module.
+ *
+ * the respond pkt is mainly for KCS-interface-BMC
+ * messages. Since the system interface is session-less
+ * connections, the packet won't have any session
+ * information.
+ *
+ * the data payload will be 2 bytes less than max
+ * BMC supported packet size.
+ */
+typedef struct bmc_rsp {
+	uint8_t	fn;			/* netFn for command */
+	uint8_t	lun;			/* logical unit on responder */
+	uint8_t	cmd;			/* command */
+	uint8_t	ccode;			/* completion code */
+	uint8_t	datalength;		/* Length */
+	uint8_t	data[RECV_MAX_PAYLOAD_SIZE]; /* response */
+} bmc_rsp_t;
+
+/*
+ * the data structure for synchronous operation via ioctl (DEPRECATED)
+ */
+typedef struct bmc_reqrsp {
+	bmc_req_t	req;			/* request half */
+	bmc_rsp_t	rsp;			/* response half */
+} bmc_reqrsp_t;
+
+
+/*
+ * The new way of communicating with the bmc driver is to use putmsg() to
+ * send a message of a particular type.  Replies from the driver also have this
+ * form, and will require the user to process the type field before examining
+ * the rest of the reply.
+ *
+ * The only change that must be observed when using the request and response
+ * structures defined above is as follows:
+ * when sending messages to the bmc driver, the data portion is now variable
+ * (the caller must allocate enough space to store the all structure members,
+ * plus enough space to cover the amount of data in the request), e.g.:
+ *
+ * bmc_msg_t *msg = malloc(offsetof(bmc_msg_t, msg) + sizeof(bmc_req_t) + 10);
+ *
+ * The amount allocated for the message is (# of bytes before the msg field) +
+ * the size of a bmc_req_t (which includes SEND_MAX_PAYLOAD_SIZE
+ * bytes in the data field), plus an additional 10 bytes for the data
+ * field (so the data field would occupy (SEND_MAX_PAYLOAD_SIZE + 10)
+ * bytes).  The datalength member must reflect the amount of data in the
+ * request's data field (as was required when using the ioctl interface).
+ */
+typedef struct bmc_msg {
+	uint8_t		m_type;		/* Message type (see below) */
+	uint32_t	m_id;		/* Message ID */
+	uint8_t		reserved[32];
+	uint8_t		msg[1];		/* Variable length message data */
+} bmc_msg_t;
+
+
+/*
+ * An error response passed back from the bmc driver will have its m_id
+ * field set to BMC_UNKNOWN_MSG_ID if a message is sent to it that is not
+ * at least as large as a bmc_msg_t.
+ */
+#define	BMC_UNKNOWN_MSG_ID	~((uint32_t)0)
+
+
+/*
+ * Possible values for the m_type field in bmc_msg_t:
+ */
+#define	BMC_MSG_REQUEST		1	/* BMC request (as above, sent to the */
+					/* driver by the user), bmc_msg.msg */
+					/* begins with the bmc_req_t	*/
+					/* structure.			*/
+#define	BMC_MSG_RESPONSE	2	/* BMC response (sent by the driver) */
+					/* bmc_msg.msg begins with the	*/
+					/* bmc_rsp_t structure.		*/
+#define	BMC_MSG_ERROR		3	/* Error while processing a user msg */
+					/* msg[0] is the error code	*/
+					/* (interpret as an errno value) */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _BMC_INTF_H */
diff --git a/src/plugins/dummy/Makefile.am b/src/plugins/dummy/Makefile.am
new file mode 100644
index 0000000..bbc8048
--- /dev/null
+++ b/src/plugins/dummy/Makefile.am
@@ -0,0 +1,8 @@
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_dummy.la
+noinst_LTLIBRARIES	= @INTF_DUMMY_LIB@
+libintf_dummy_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_dummy_la_SOURCES	= dummy.c dummy.h
diff --git a/src/plugins/dummy/Makefile.in b/src/plugins/dummy/Makefile.in
new file mode 100644
index 0000000..1850430
--- /dev/null
+++ b/src/plugins/dummy/Makefile.in
@@ -0,0 +1,607 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/dummy
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_dummy_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_dummy_la_OBJECTS = dummy.lo
+libintf_dummy_la_OBJECTS = $(am_libintf_dummy_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_dummy_la_SOURCES)
+DIST_SOURCES = $(libintf_dummy_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_dummy.la
+noinst_LTLIBRARIES = @INTF_DUMMY_LIB@
+libintf_dummy_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_dummy_la_SOURCES = dummy.c dummy.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/dummy/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/dummy/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_dummy.la: $(libintf_dummy_la_OBJECTS) $(libintf_dummy_la_DEPENDENCIES) $(EXTRA_libintf_dummy_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_dummy_la_OBJECTS) $(libintf_dummy_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/dummy/dummy.c b/src/plugins/dummy/dummy.c
new file mode 100644
index 0000000..8600a84
--- /dev/null
+++ b/src/plugins/dummy/dummy.c
@@ -0,0 +1,298 @@
+/* Copyright (c) 2013 Zdenek Styblik, All Rights Reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Zdenek Styblik or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * Zdenek Styblik SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * Zdenek Styblik BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF Zdenek Styblik HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+
+#include "dummy.h"
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+extern int verbose;
+
+/* data_read - read data from socket
+ *
+ * @data_ptr - pointer to memory where to store read data
+ * @data_len - how much to read from socket
+ *
+ * return 0 on success, otherwise (-1)
+ */
+int
+data_read(int fd, void *data_ptr, int data_len)
+{
+	int rc = 0;
+	int data_read = 0;
+	int data_total = 0;
+	int try = 1;
+	int errno_save = 0;
+	if (data_len < 0) {
+		return (-1);
+	}
+	while (data_total < data_len && try < 4) {
+		errno = 0;
+		/* TODO - add poll() */
+		data_read = read(fd, data_ptr, data_len);
+		errno_save = errno;
+		if (data_read > 0) {
+			data_total+= data_read;
+		}
+		if (errno_save != 0) {
+			if (errno_save == EINTR || errno_save == EAGAIN) {
+				try++;
+				sleep(2);
+				continue;
+			} else {
+				errno = errno_save;
+				perror("dummy failed on read(): ");
+				rc = (-1);
+				break;
+			}
+		}
+	}
+	if (try > 3 && data_total != data_len) {
+		rc = (-1);
+	}
+	return rc;
+}
+
+/* data_write - write data to the socket
+ *
+ * @data_ptr - ptr to data to send
+ * @data_len - how long is the data to send
+ *
+ * returns 0 on success, otherwise (-1)
+ */
+int
+data_write(int fd, void *data_ptr, int data_len)
+{
+	int rc = 0;
+	int data_written = 0;
+	int data_total = 0;
+	int try = 1;
+	int errno_save = 0;
+	if (data_len < 0) {
+		return (-1);
+	}
+	while (data_total < data_len && try < 4) {
+		errno = 0;
+		/* TODO - add poll() */
+		data_written = write(fd, data_ptr, data_len);
+		errno_save = errno;
+		if (data_written > 0) {
+			data_total+= data_written;
+		}
+		if (errno_save != 0) {
+			if (errno_save == EINTR || errno_save == EAGAIN) {
+				try++;
+				sleep(2);
+				continue;
+			} else {
+				errno = errno_save;
+				perror("dummy failed on read(): ");
+				rc = (-1);
+				break;
+			}
+		}
+	}
+	if (try > 3 && data_total != data_len) {
+		rc = (-1);
+	}
+	return rc;
+}
+
+/* ipmi_dummyipmi_close - send "BYE" and close socket
+ *
+ * @intf - ptr to initialize ipmi_intf struct
+ *
+ * returns void
+ */
+static void
+ipmi_dummyipmi_close(struct ipmi_intf *intf)
+{
+	struct dummy_rq req;
+	if (intf->fd < 0) {
+		return;
+	}
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = 0x3f;
+	req.msg.cmd = 0xff;
+	if (data_write(intf->fd, &req, sizeof(req)) != 0) {
+		lprintf(LOG_ERR, "dummy failed to send 'BYE'");
+	}
+	close(intf->fd);
+	intf->fd = (-1);
+	intf->opened = 0;
+}
+
+/* ipmi_dummyipmi_open - open socket and prepare ipmi_intf struct
+ *
+ * @intf - ptr to ipmi_inf struct
+ *
+ * returns 0 on success, (-1) on error
+ */
+static int
+ipmi_dummyipmi_open(struct ipmi_intf *intf)
+{
+	struct sockaddr_un address;
+	int len;
+	int rc;
+	char *dummy_sock_path;
+
+	dummy_sock_path = getenv("IPMI_DUMMY_SOCK");
+	if (dummy_sock_path == NULL) {
+		lprintf(LOG_DEBUG, "No IPMI_DUMMY_SOCK set. Dummy mode ON.");
+		intf->opened = 1;
+		return intf->fd;
+	}
+
+	if (intf->opened == 1) {
+		return intf->fd;
+	}
+	intf->fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (intf->fd == (-1)) {
+		lprintf(LOG_ERR, "dummy failed on socket()");
+		return (-1);
+	}
+	address.sun_family = AF_UNIX;
+	strcpy(address.sun_path, dummy_sock_path);
+	len = sizeof(address);
+	rc = connect(intf->fd, (struct sockaddr *)&address, len);
+	if (rc != 0) {
+		perror("dummy failed on connect(): ");
+		return (-1);
+	}
+	intf->opened = 1;
+	return intf->fd;
+}
+
+/* ipmi_dummyipmi_send_cmd - send IPMI payload and await reply
+ *
+ * @intf - ptr to initialized ipmi_intf struct
+ * @req - ptr to ipmi_rq struct to send
+ *
+ * return pointer to struct ipmi_rs OR NULL on error
+ */
+static struct ipmi_rs*
+ipmi_dummyipmi_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
+{
+	static struct ipmi_rs rsp;
+	struct dummy_rq req_dummy;
+	struct dummy_rs rsp_dummy;
+	char *dummy_sock_path;
+	dummy_sock_path = getenv("IPMI_DUMMY_SOCK");
+	if (dummy_sock_path == NULL) {
+		lprintf(LOG_DEBUG, "No IPMI_DUMMY_SOCK set. Dummy mode ON.");
+		return NULL;
+	}
+	if (intf == NULL || intf->fd < 0 || intf->opened != 1) {
+		lprintf(LOG_ERR, "dummy failed on intf check.");
+		return NULL;
+	}
+
+	memset(&req_dummy, 0, sizeof(req_dummy));
+	req_dummy.msg.netfn = req->msg.netfn;
+	req_dummy.msg.lun = req->msg.lun;
+	req_dummy.msg.cmd = req->msg.cmd;
+	req_dummy.msg.target_cmd = req->msg.target_cmd;
+	req_dummy.msg.data_len = req->msg.data_len;
+	req_dummy.msg.data = req->msg.data;
+	if (verbose) {
+		lprintf(LOG_NOTICE, ">>> IPMI req");
+		lprintf(LOG_NOTICE, "msg.data_len: %i",
+				req_dummy.msg.data_len);
+		lprintf(LOG_NOTICE, "msg.netfn: %x", req_dummy.msg.netfn);
+		lprintf(LOG_NOTICE, "msg.cmd: %x", req_dummy.msg.cmd);
+		lprintf(LOG_NOTICE, "msg.target_cmd: %x",
+				req_dummy.msg.target_cmd);
+		lprintf(LOG_NOTICE, "msg.lun: %x", req_dummy.msg.lun);
+		lprintf(LOG_NOTICE, ">>>");
+	}
+	if (data_write(intf->fd, &req_dummy,
+				sizeof(struct dummy_rq)) != 0) {
+		return NULL;
+	}
+	if (req->msg.data_len > 0) {
+		if (data_write(intf->fd, (uint8_t *)(req->msg.data),
+					req_dummy.msg.data_len) != 0) {
+			return NULL;
+		}
+	}
+
+	memset(&rsp_dummy, 0, sizeof(rsp_dummy));
+	if (data_read(intf->fd, &rsp_dummy, sizeof(struct dummy_rs)) != 0) {
+		return NULL;
+	}
+	if (rsp_dummy.data_len > 0) {
+		if (data_read(intf->fd, (uint8_t *)&rsp.data,
+					rsp_dummy.data_len) != 0) {
+			return NULL;
+		}
+	}
+	rsp.ccode = rsp_dummy.ccode;
+	rsp.data_len = rsp_dummy.data_len;
+	rsp.msg.netfn = rsp_dummy.msg.netfn;
+	rsp.msg.cmd = rsp_dummy.msg.cmd;
+	rsp.msg.seq = rsp_dummy.msg.seq;
+	rsp.msg.lun = rsp_dummy.msg.lun;
+	if (verbose) {
+		lprintf(LOG_NOTICE, "<<< IPMI rsp");
+		lprintf(LOG_NOTICE, "ccode: %x", rsp.ccode);
+		lprintf(LOG_NOTICE, "data_len: %i", rsp.data_len);
+		lprintf(LOG_NOTICE, "msg.netfn: %x", rsp.msg.netfn);
+		lprintf(LOG_NOTICE, "msg.cmd: %x", rsp.msg.cmd);
+		lprintf(LOG_NOTICE, "msg.seq: %x", rsp.msg.seq);
+		lprintf(LOG_NOTICE, "msg.lun: %x", rsp.msg.lun);
+		lprintf(LOG_NOTICE, "<<<");
+	}
+	return &rsp;
+}
+
+struct ipmi_intf ipmi_dummy_intf = {
+	.name = "dummy",
+	.desc = "Linux DummyIPMI Interface",
+	.open = ipmi_dummyipmi_open,
+	.close = ipmi_dummyipmi_close,
+	.sendrecv = ipmi_dummyipmi_send_cmd,
+	.my_addr = IPMI_BMC_SLAVE_ADDR,
+	.target_addr = IPMI_BMC_SLAVE_ADDR,
+};
diff --git a/src/plugins/dummy/dummy.h b/src/plugins/dummy/dummy.h
new file mode 100644
index 0000000..bbe3aa3
--- /dev/null
+++ b/src/plugins/dummy/dummy.h
@@ -0,0 +1,28 @@
+#ifndef IPMI_DUMMYIPMI_H
+# define IPMI_DUMMYIPMI_H
+
+struct dummy_rq {
+	struct {
+		uint8_t netfn;
+		uint8_t lun;
+		uint8_t cmd;
+		uint8_t target_cmd;
+		uint16_t data_len;
+		uint8_t *data;
+	} msg;
+};
+
+struct dummy_rs {
+	struct {
+		uint8_t netfn;
+		uint8_t cmd;
+		uint8_t seq;
+		uint8_t lun;
+	} msg;
+
+	uint8_t ccode;
+	int data_len;
+	uint8_t *data;
+};
+
+#endif
diff --git a/src/plugins/free/Makefile.am b/src/plugins/free/Makefile.am
new file mode 100644
index 0000000..7a3a84e
--- /dev/null
+++ b/src/plugins/free/Makefile.am
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES           = Makefile.in
+
+AM_CPPFLAGS                       = -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES              = libintf_free.la
+noinst_LTLIBRARIES             = @INTF_FREE_LIB@
+libintf_free_la_LIBADD         = $(top_builddir)/lib/libipmitool.la
+libintf_free_la_SOURCES        = free.c
+libintf_free_la_LDFLAGS        = -lfreeipmi
diff --git a/src/plugins/free/Makefile.in b/src/plugins/free/Makefile.in
new file mode 100644
index 0000000..cc33b93
--- /dev/null
+++ b/src/plugins/free/Makefile.in
@@ -0,0 +1,612 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/free
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_free_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_free_la_OBJECTS = free.lo
+libintf_free_la_OBJECTS = $(am_libintf_free_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libintf_free_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libintf_free_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_free_la_SOURCES)
+DIST_SOURCES = $(libintf_free_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_free.la
+noinst_LTLIBRARIES = @INTF_FREE_LIB@
+libintf_free_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_free_la_SOURCES = free.c
+libintf_free_la_LDFLAGS = -lfreeipmi
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/free/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/free/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_free.la: $(libintf_free_la_OBJECTS) $(libintf_free_la_DEPENDENCIES) $(EXTRA_libintf_free_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libintf_free_la_LINK)  $(libintf_free_la_OBJECTS) $(libintf_free_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/free/free.c b/src/plugins/free/free.c
new file mode 100644
index 0000000..56c8157
--- /dev/null
+++ b/src/plugins/free/free.c
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * 
+ * You acknowledge that this software is not designed or intended for use
+ * in the design, construction, operation or maintenance of any nuclear
+ * facility.
+ */
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+
+#include <freeipmi/freeipmi.h>
+#if IPMI_INTF_FREE_0_3_0 || IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0
+#include <freeipmi/udm/ipmi-udm.h>
+#endif
+
+#if IPMI_INTF_FREE_0_6_0
+ipmi_ctx_t dev = NULL;
+#else  /* !IPMI_INTF_FREE_0_6_0 */
+ipmi_device_t dev = NULL;
+#endif  /* !IPMI_INTF_FREE_0_6_0 */
+
+extern int verbose;
+
+static int ipmi_free_open(struct ipmi_intf * intf)
+{
+        int kcs_ret = -1, ssif_ret = -1;
+
+        if (getuid() != 0) {
+                fprintf(stderr, "Permission denied, must be root\n");
+                return -1;
+        }
+
+#if IPMI_INTF_FREE_0_3_0
+        if (!(dev = ipmi_open_inband (IPMI_DEVICE_KCS,
+                                      0,
+                                      0,
+                                      0,
+                                      NULL,
+                                      IPMI_FLAGS_DEFAULT))) {
+                if (!(dev = ipmi_open_inband (IPMI_DEVICE_SSIF,
+                                              0,
+                                              0,
+                                              0,
+                                              NULL,
+                                              IPMI_FLAGS_DEFAULT))) {
+                        perror("ipmi_open_inband()");
+                        goto cleanup;
+                }
+        }
+#elif IPMI_INTF_FREE_0_4_0
+        if (!(dev = ipmi_device_create())) {
+                perror("ipmi_device_create");
+                goto cleanup;
+        }
+        if (ipmi_open_inband (dev,
+                              IPMI_DEVICE_KCS,
+                              0,
+                              0,
+                              0,
+                              NULL,
+                              IPMI_FLAGS_DEFAULT) < 0) {
+                if (ipmi_open_inband (dev,
+                                      IPMI_DEVICE_SSIF,
+                                      0,
+                                      0,
+                                      0,
+                                      NULL,
+                                      IPMI_FLAGS_DEFAULT) < 0) {
+                       fprintf(stderr, 
+                               "ipmi_open_inband(): %s\n",
+                               ipmi_device_strerror(ipmi_device_errnum(dev)));
+                       goto cleanup;
+                }
+        }
+#elif IPMI_INTF_FREE_0_5_0
+        if (!(dev = ipmi_device_create())) {
+                perror("ipmi_device_create");
+                goto cleanup;
+        }
+        if (ipmi_open_inband (dev,
+                              IPMI_DEVICE_KCS,
+                              0,
+                              0,
+                              0,
+                              NULL,
+                              0,
+                              IPMI_FLAGS_DEFAULT) < 0) {
+                if (ipmi_open_inband (dev,
+                                      IPMI_DEVICE_SSIF,
+                                      0,
+                                      0,
+                                      0,
+                                      NULL,
+                                      0,
+                                      IPMI_FLAGS_DEFAULT) < 0) {
+                       fprintf(stderr, 
+                               "ipmi_open_inband(): %s\n",
+                               ipmi_device_strerror(ipmi_device_errnum(dev)));
+                       goto cleanup;
+                }
+        }
+#elif IPMI_INTF_FREE_0_6_0
+        if (!(dev = ipmi_ctx_create())) {
+                perror("ipmi_ctx_create");
+                goto cleanup;
+        }
+        if (ipmi_ctx_open_inband (dev,
+                                  IPMI_DEVICE_KCS,
+                                  0,
+                                  0,
+                                  0,
+                                  NULL,
+                                  0,
+                                  IPMI_FLAGS_DEFAULT) < 0) {
+                if (ipmi_ctx_open_inband (dev,
+                                          IPMI_DEVICE_SSIF,
+                                          0,
+                                          0,
+                                          0,
+                                          NULL,
+                                          0,
+                                          IPMI_FLAGS_DEFAULT) < 0) {
+                       fprintf(stderr, 
+                               "ipmi_open_inband(): %s\n",
+                               ipmi_ctx_strerror(ipmi_ctx_errnum(dev)));
+                       goto cleanup;
+                }
+        }
+#endif
+
+	intf->opened = 1;
+	intf->manufacturer_id = ipmi_get_oem(intf);
+	return 0;
+ cleanup:
+        if (dev) {
+#if IPMI_INTF_FREE_0_3_0
+                ipmi_close_device(dev);
+#elif IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0
+                ipmi_close_device(dev);
+                ipmi_device_destroy(dev);
+#elif IPMI_INTF_FREE_0_6_0
+                ipmi_ctx_close(dev);
+                ipmi_ctx_destroy(dev);
+#endif
+        }
+        return -1;
+}
+
+static void ipmi_free_close(struct ipmi_intf * intf)
+{
+        if (dev) {
+#if IPMI_INTF_FREE_0_3_0
+                ipmi_close_device(dev);
+#elif IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0
+                ipmi_close_device(dev);
+                ipmi_device_destroy(dev);
+#elif IPMI_INTF_FREE_0_6_0
+                ipmi_ctx_close(dev);
+                ipmi_ctx_destroy(dev);
+#endif
+        }
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+}
+
+static struct ipmi_rs * ipmi_free_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+        uint8_t lun = req->msg.lun;
+        uint8_t cmd = req->msg.cmd;
+        uint8_t netfn = req->msg.netfn;
+        uint8_t rq_buf[IPMI_BUF_SIZE];
+        uint8_t rs_buf[IPMI_BUF_SIZE];
+        uint32_t rs_buf_len = IPMI_BUF_SIZE;
+        int32_t rs_len;
+
+	static struct ipmi_rs rsp;	
+
+        /* achu: FreeIPMI requests have the cmd as the first byte of
+         * the data.  Responses have cmd as the first byte and
+         * completion code as the second byte.  This differs from some
+         * other APIs, so it must be compensated for within the ipmitool
+         * interface.
+         */
+
+	if (!intf || !req)
+		return NULL;
+
+	if (!intf->opened && intf->open && intf->open(intf) < 0)
+		return NULL;
+
+        if (req->msg.data_len > IPMI_BUF_SIZE)
+                return NULL;
+
+        memset(rq_buf, '\0', IPMI_BUF_SIZE);
+        memset(rs_buf, '\0', IPMI_BUF_SIZE);
+        memcpy(rq_buf, &cmd, 1);
+
+        if (req->msg.data)
+               memcpy(rq_buf + 1, req->msg.data, req->msg.data_len);
+
+        if (intf->target_addr != 0
+            && intf->target_addr != IPMI_BMC_SLAVE_ADDR) {
+#if IPMI_INTF_FREE_BRIDGING
+                if ((rs_len = ipmi_cmd_raw_ipmb(dev,
+                                                intf->target_channel,
+                                                intf->target_addr,
+                                                lun, 
+                                                netfn,                    
+                                                rq_buf, 
+                                                req->msg.data_len + 1,
+                                                rs_buf, 
+                                                rs_buf_len)) < 0) {
+			if (verbose > 3)
+                      	        fprintf(stderr,
+                                	"ipmi_cmd_raw_ipmb: %s\n",
+                                	ipmi_ctx_strerror(ipmi_ctx_errnum(dev)));
+			/* Compared to FreeIPMI, user is expected to input
+			 * the target channel on the command line, it is not automatically
+			 * discovered.  So that is the likely cause of an error.
+			 *
+			 * Instead of returning an error, return a bad response so output
+			 * of ipmitool commands looks like other interfaces
+			 */
+			rs_len = 2;
+			rs_buf[0] = 0;
+			rs_buf[1] = 0xC1; /* invalid command */
+                }
+#else  /* !IPMI_INTF_FREE_BRIDGING */
+                if (verbose > 3)
+                        fprintf(stderr, "sensor bridging not supported in this driver version");
+		/* instead of returning an error, return a bad response so output
+	 	 * of ipmitool commands looks like other interfaces
+		 */
+		rs_len = 2;
+		rs_buf[0] = 0;
+		rs_buf[1] = 0xC1; /* invalid command */
+#endif  /* !IPMI_INTF_FREE_BRIDGING */
+        }
+        else {
+                if ((rs_len = ipmi_cmd_raw(dev,
+                                           lun, 
+                                           netfn,                    
+                                           rq_buf, 
+                                           req->msg.data_len + 1,
+                                           rs_buf, 
+                                           rs_buf_len)) < 0) {
+#if IPMI_INTF_FREE_0_3_0
+                        perror("ipmi_cmd_raw");
+#elif IPMI_INTF_FREE_0_4_0 || IPMI_INTF_FREE_0_5_0
+                        fprintf(stderr,
+                                "ipmi_cmd_raw: %s\n",
+                                ipmi_device_strerror(ipmi_device_errnum(dev)));
+#elif IPMI_INTF_FREE_0_6_0
+                        fprintf(stderr,
+                                "ipmi_cmd_raw: %s\n",
+                                ipmi_ctx_strerror(ipmi_ctx_errnum(dev)));
+#endif
+                        return NULL;
+                }
+        }
+
+        memset(&rsp, 0, sizeof(struct ipmi_rs));
+	rsp.ccode = (unsigned char)rs_buf[1];
+	rsp.data_len = (int)rs_len - 2;
+
+	if (!rsp.ccode && rsp.data_len)
+		memcpy(rsp.data, rs_buf + 2, rsp.data_len);
+
+	return &rsp;
+}
+
+struct ipmi_intf ipmi_free_intf = {
+	name:		"free",
+	desc:		"FreeIPMI IPMI Interface",
+	open:		ipmi_free_open,
+	close:		ipmi_free_close,
+	sendrecv:	ipmi_free_send_cmd,
+	target_addr:	IPMI_BMC_SLAVE_ADDR,
+};
+
diff --git a/src/plugins/imb/Makefile.am b/src/plugins/imb/Makefile.am
new file mode 100644
index 0000000..6f1b68c
--- /dev/null
+++ b/src/plugins/imb/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS 		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_imb.la
+noinst_LTLIBRARIES	= @INTF_IMB_LIB@
+libintf_imb_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_imb_la_SOURCES	= imbapi.c imbapi.h imb.c
+
diff --git a/src/plugins/imb/Makefile.in b/src/plugins/imb/Makefile.in
new file mode 100644
index 0000000..1e40e15
--- /dev/null
+++ b/src/plugins/imb/Makefile.in
@@ -0,0 +1,638 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/imb
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_imb_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_imb_la_OBJECTS = imbapi.lo imb.lo
+libintf_imb_la_OBJECTS = $(am_libintf_imb_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_imb_la_SOURCES)
+DIST_SOURCES = $(libintf_imb_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_imb.la
+noinst_LTLIBRARIES = @INTF_IMB_LIB@
+libintf_imb_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_imb_la_SOURCES = imbapi.c imbapi.h imb.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/imb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/imb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_imb.la: $(libintf_imb_la_OBJECTS) $(libintf_imb_la_DEPENDENCIES) $(EXTRA_libintf_imb_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_imb_la_OBJECTS) $(libintf_imb_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imbapi.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/imb/imb.c b/src/plugins/imb/imb.c
new file mode 100644
index 0000000..1514fa7
--- /dev/null
+++ b/src/plugins/imb/imb.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/ipmi_sel.h>
+
+#include "imbapi.h"
+
+#define IPMI_IMB_TIMEOUT	(1000 * 1000)
+#define IPMI_IMB_MAX_RETRY	3
+#define IPMI_IMB_DEV		"/dev/imb"
+#define IPMI_IMB_BUF_SIZE	64
+
+extern int verbose;
+
+static int ipmi_imb_open(struct ipmi_intf * intf)
+{
+	struct stat stbuf;
+
+	if (stat(IPMI_IMB_DEV, &stbuf) < 0) {
+		printf("Error: no IMB driver found at %s!\n", IPMI_IMB_DEV);
+		return -1;
+	}
+		
+	intf->opened = 1;
+	intf->manufacturer_id = ipmi_get_oem(intf);
+
+	return 0;
+}
+
+static void ipmi_imb_close(struct ipmi_intf * intf)
+{
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+}
+
+static struct ipmi_rs * ipmi_imb_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	IMBPREQUESTDATA imbreq;
+	static struct ipmi_rs rsp;	
+	int status, i;
+	unsigned char ccode;
+
+	imbreq.rsSa	= IPMI_BMC_SLAVE_ADDR;
+	imbreq.rsLun	= 0;
+	imbreq.busType	= 0;
+	imbreq.netFn	= req->msg.netfn;
+	imbreq.cmdType	= req->msg.cmd;
+
+	imbreq.data = req->msg.data;
+	imbreq.dataLength = req->msg.data_len;
+
+	if (verbose > 1) {
+		printf("IMB rsSa       : %x\n", imbreq.rsSa);
+		printf("IMB netFn      : %x\n", imbreq.netFn);
+		printf("IMB cmdType    : %x\n", imbreq.cmdType);
+		printf("IMB dataLength : %d\n", imbreq.dataLength);
+	}
+
+	rsp.data_len = IPMI_IMB_BUF_SIZE;
+	memset(rsp.data, 0, rsp.data_len);
+
+	for (i=0; i<IPMI_IMB_MAX_RETRY; i++) {
+		if (verbose > 2)
+			printbuf(imbreq.data, imbreq.dataLength, "ipmi_imb request");
+		status = SendTimedImbpRequest(&imbreq, IPMI_IMB_TIMEOUT,
+					      rsp.data, &rsp.data_len, &ccode);
+		if (status == 0) {
+			if (verbose > 2)
+				printbuf(rsp.data, rsp.data_len, "ipmi_imb response");
+			break;
+		}
+		/* error */
+		printf("Error sending IMB request, status=%x ccode=%x\n",
+		       status, ccode);
+	}
+
+	rsp.ccode = ccode;
+
+	return &rsp;
+}
+
+struct ipmi_intf ipmi_imb_intf = {
+	.name = "imb",
+	.desc = "Intel IMB Interface",
+	.open = ipmi_imb_open,
+	.close = ipmi_imb_close,
+	.sendrecv = ipmi_imb_send_cmd,
+	.target_addr = IPMI_BMC_SLAVE_ADDR,
+};
+
diff --git a/src/plugins/imb/imbapi.c b/src/plugins/imb/imbapi.c
new file mode 100644
index 0000000..34c9c82
--- /dev/null
+++ b/src/plugins/imb/imbapi.c
@@ -0,0 +1,1473 @@
+/*
+ * Copyright (c) 2002, Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Purpose: This file contains the entry point that opens the IMB device in
+ * order to issue the  IMB driver API related IOCTLs. This file implements the
+ * IMB driver API for the Server Management Agents
+ */
+
+
+/* Use -DLINUX_DEBUG_MAX in the Makefile, resp. CFLAGS if you want a dump of the
+ * memory to debug mmap system call in MapPhysicalMemory() below.
+ */
+
+#define IMB_API
+
+#ifdef WIN32
+# define NO_MACRO_ARGS  1
+# include <stdio.h>
+# include <windows.h>
+#else /* LINUX, SCO_UW, UNIX */
+# include <fcntl.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <string.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/param.h>
+# include <sys/stat.h>
+# include <sys/types.h>
+# include <unistd.h>
+#endif
+
+#include "imbapi.h"
+#include <sys/socket.h>
+#include <ipmitool/log.h>
+
+#ifdef SCO_UW
+# define NO_MACRO_ARGS  1
+# define __FUNCTION__ "func"
+# define IMB_DEVICE "/dev/instru/mismic"
+#else
+# define IMB_DEVICE "/dev/imb"
+#endif
+
+#if !defined(PAGESIZE) && defined(PAGE_SIZE)
+# define PAGESIZE PAGE_SIZE
+#endif
+
+#if !defined(_SC_PAGESIZE) && defined(_SC_PAGE_SIZE)
+# define _SC_PAGESIZE _SC_PAGE_SIZE
+#endif
+
+HANDLE AsyncEventHandle = 0;
+static int  IpmiVersion;
+
+/* GLOBAL VARIABLES */
+/* dummy place holder. See deviceiocontrol. */
+IO_STATUS_BLOCK NTstatus;
+static HANDLE   hDevice1;
+static HANDLE   hDevice;
+static int fDriverTyp; /* from ipmicmd.c */
+
+/* open_imb - Open IMB device. Called from each routine to make sure that open
+ * is done.
+ *
+ * Returns: returns 0 for Fail and 1 for Success, sets hDevice to open handle.
+ */
+#ifdef WIN32
+int
+open_imb(void)
+{
+	/* This routine will be called from all other routines before doing any
+	 * interfacing with imb driver. It will open only once.
+	 */
+	IMBPREQUESTDATA requestData;
+	BYTE respBuffer[16];
+	DWORD respLength;
+	BYTE completionCode;
+
+	if (hDevice1 != 0) {
+		return 1;
+	}
+
+	/* Open IMB driver device */
+	hDevice = CreateFile("\\\\.\\Imb",
+			GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE,
+			NULL,
+			OPEN_EXISTING,
+			FILE_ATTRIBUTE_NORMAL,
+			NULL);
+	if (hDevice == NULL || hDevice == INVALID_HANDLE_VALUE) {
+		return 0;
+	}
+	/* Detect the IPMI version for processing requests later. This
+	 * is a crude but most reliable method to differentiate between
+	 * old IPMI versions and the 1.0 version. If we had used the
+	 * version field instead then we would have had to revalidate
+	 * all the older platforms (pai 4/27/99)
+	 */
+	requestData.cmdType = GET_DEVICE_ID;
+	requestData.rsSa = BMC_SA;
+	requestData.rsLun = BMC_LUN;
+	requestData.netFn = APP_NETFN ;
+	requestData.busType = PUBLIC_BUS;
+	requestData.data = NULL;
+	requestData.dataLength = 0;
+	respLength = 16;
+	if ((SendTimedImbpRequest(&requestData, (DWORD)400, respBuffer,
+					&respLength, &completionCode) != ACCESN_OK)
+			|| (completionCode != 0)) {
+		CloseHandle(hDevice);
+		return 0;
+	}
+        hDevice1 = hDevice;
+        if (respLength < (IPMI10_GET_DEVICE_ID_RESP_LENGTH - 1)) {
+		IpmiVersion = IPMI_09_VERSION;
+	} else {
+		if (respBuffer[4] == 0x51) {
+			IpmiVersion = IPMI_15_VERSION;
+		} else {
+			IpmiVersion = IPMI_10_VERSION;
+		}
+	}
+	return 1;
+} /* end open_imb for Win32 */
+
+#else  /* LINUX, SCO_UW, etc. */
+
+int
+open_imb(void)
+{
+	/* This routine will be called from all other routines before doing any
+	 * interfacing with imb driver. It will open only once.
+	 */
+	IMBPREQUESTDATA requestData;
+	BYTE respBuffer[16];
+	DWORD respLength;
+	BYTE completionCode;
+	int my_ret_code;
+
+	if (hDevice1 != 0) {
+		return 1;
+	}
+	lprintf(LOG_DEBUG, "%s: opening the driver", __FUNCTION__);
+	/*  printf("open_imb: "
+	"IOCTL_IMB_SEND_MESSAGE =%x \n" "IOCTL_IMB_GET_ASYNC_MSG=%x \n"
+	"IOCTL_IMB_MAP_MEMORY  = %x \n" "IOCTL_IMB_UNMAP_MEMORY= %x \n"
+	"IOCTL_IMB_SHUTDOWN_CODE=%x \n" "IOCTL_IMB_REGISTER_ASYNC_OBJ  =%x \n"
+	"IOCTL_IMB_DEREGISTER_ASYNC_OBJ=%x \n"
+	"IOCTL_IMB_CHECK_EVENT  =%x \n" "IOCTL_IMB_POLL_ASYNC   =%x \n",
+		IOCTL_IMB_SEND_MESSAGE, IOCTL_IMB_GET_ASYNC_MSG,
+	IOCTL_IMB_MAP_MEMORY, IOCTL_IMB_UNMAP_MEMORY, IOCTL_IMB_SHUTDOWN_CODE,
+	IOCTL_IMB_REGISTER_ASYNC_OBJ, IOCTL_IMB_DEREGISTER_ASYNC_OBJ,
+	IOCTL_IMB_CHECK_EVENT , IOCTL_IMB_POLL_ASYNC);
+	*/
+
+	/* O_NDELAY flag will cause problems later when driver makes
+	 * you wait. Hence removing it.
+	 */
+	if ((hDevice1 = open(IMB_DEVICE, O_RDWR)) < 0) {
+		char buf[128];
+		hDevice1 = 0;
+		if (fDriverTyp != 0) {
+			/* not 1st time */
+			sprintf(buf,"%s %s: open(%s) failed",
+					__FILE__, __FUNCTION__, IMB_DEVICE);
+			perror(buf);
+		}
+		return 0;
+	}
+
+	/* Detect the IPMI version for processing requests later.
+	 * This is a crude but most reliable method to differentiate
+	 * between old IPMI versions and the 1.0 version. If we had used the
+	 * version field instead then we would have had to revalidate all
+	 * the older platforms (pai 4/27/99)
+	 */
+	requestData.cmdType = GET_DEVICE_ID;
+	requestData.rsSa = BMC_SA;
+	requestData.rsLun = BMC_LUN;
+	requestData.netFn = APP_NETFN ;
+	requestData.busType = PUBLIC_BUS;
+	requestData.data = NULL;
+	requestData.dataLength = 0;
+	respLength = 16;
+	lprintf(LOG_DEBUG, "%s: opened driver, getting IPMI version", __FUNCTION__);
+	if (((my_ret_code = SendTimedImbpRequest(&requestData, (DWORD)400,
+						respBuffer,
+						(int *)&respLength,
+						&completionCode)) != ACCESN_OK)
+			|| (completionCode != 0)) {
+		printf("%s: SendTimedImbpRequest error. Ret = %d CC = 0x%X\n",
+				__FUNCTION__, my_ret_code, completionCode);
+				close(hDevice1);
+				hDevice1 = 0;
+				return 0;
+	}
+	if (respLength < (IPMI10_GET_DEVICE_ID_RESP_LENGTH - 1)) {
+		IpmiVersion = IPMI_09_VERSION;
+	} else {
+		if (respBuffer[4] == 0x51) {
+			IpmiVersion = IPMI_15_VERSION;
+		} else {
+			IpmiVersion = IPMI_10_VERSION;
+		}
+	}
+	lprintf(LOG_DEBUG, "%s: IPMI version 0x%x", __FUNCTION__,
+			IpmiVersion);
+	return 1;
+} /* end open_imb() */
+#endif  
+
+/* ipmi_open_ia */
+int
+ipmi_open_ia(void)
+{
+	int rc = 0;
+	/* sets hDevice1 */
+	rc = open_imb();
+	if (rc == 1) {
+		rc = 0;
+	} else {
+		rc = -1;
+	}
+	return rc;
+}
+
+/* ipmi_close_ia */
+int
+ipmi_close_ia(void)
+{
+	int rc = 0;
+	if (hDevice1 != 0) {
+#ifdef WIN32
+		CloseHandle(hDevice1);
+#else
+		rc = close(hDevice1);
+#endif
+	}
+	return rc;
+}
+
+#ifndef WIN32
+/* DeviceIoControl - Simulate NT DeviceIoControl using unix calls and structures.
+ *
+ * @dummy_hDevice - handle of device
+ * @dwIoControlCode - control code of operation to perform
+ * @lpvInBuffer, address of buffer for input data
+ * @cbInBuffer, size of input buffer
+ * @lpvOutBuffer, address of output buffer
+ * @cbOutBuffer, size of output buffer
+ * @lpcbBytesReturned, address of actual bytes of output
+ * @lpoOverlapped address of overlapped struct
+ *
+ * returns - FALSE for fail and TRUE for success. Same as standarad NTOS call as
+ * it also sets Ntstatus.status.
+ */
+static BOOL
+DeviceIoControl(HANDLE dummey_hDevice, DWORD dwIoControlCode, LPVOID
+		lpvInBuffer, DWORD cbInBuffer, LPVOID lpvOutBuffer,
+		DWORD cbOutBuffer, LPDWORD lpcbBytesReturned,
+		LPOVERLAPPED lpoOverlapped)
+{
+	struct smi s;
+	int rc;
+	int ioctl_status;
+
+	rc = open_imb();
+	if (rc == 0) {
+		return FALSE;
+	}
+	lprintf(LOG_DEBUG, "%s: ioctl cmd = 0x%lx", __FUNCTION__,
+			dwIoControlCode);
+	lprintf(LOG_DEBUG, "cbInBuffer %d cbOutBuffer %d", cbInBuffer,
+			cbOutBuffer);
+	if (cbInBuffer > 41) {
+		cbInBuffer = 41; /* Intel driver max buf */
+	}
+
+	s.lpvInBuffer = lpvInBuffer;
+	s.cbInBuffer = cbInBuffer;
+	s.lpvOutBuffer = lpvOutBuffer;
+	s.cbOutBuffer = cbOutBuffer;
+	s.lpcbBytesReturned = lpcbBytesReturned;
+	s.lpoOverlapped = lpoOverlapped;
+	/* dummy place holder. Linux IMB driver doesnt return status or info
+	 * via it
+	 */
+	s.ntstatus = (LPVOID)&NTstatus;
+
+	if ((ioctl_status = ioctl(hDevice1, dwIoControlCode,&s)) < 0) {
+		lprintf(LOG_DEBUG, "%s %s: ioctl cmd = 0x%x failed",
+				__FILE__, __FUNCTION__, dwIoControlCode);
+		return FALSE;
+	}
+	lprintf(LOG_DEBUG, "%s: ioctl_status %d bytes returned = %d",
+			__FUNCTION__, ioctl_status, *lpcbBytesReturned);
+	if (ioctl_status == STATUS_SUCCESS) {
+		lprintf(LOG_DEBUG, "%s returning true", __FUNCTION__);
+		return (TRUE);
+	} else {
+		lprintf(LOG_DEBUG, "%s returning false", __FUNCTION__);
+		return (FALSE);
+	}
+}
+#endif
+
+/* Used only by UW. Left here for now. IMB driver will not accept this ioctl. */
+ACCESN_STATUS
+StartAsyncMesgPoll()
+{
+	DWORD retLength;
+	BOOL status;
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl cmd = %x",
+			__FUNCTION__, IOCTL_IMB_POLL_ASYNC);
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_POLL_ASYNC, NULL, 0, NULL,
+			0, &retLength, 0);
+
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status == TRUE) {
+		return ACCESN_OK;
+	} else {
+		return ACCESN_ERROR;
+	}
+}
+
+/* SendTimedI2cRequest - This function sends a request to a I2C device. Used by
+ * Upper level agents (sis modules) to access dumb I2c devices.
+ *
+ * @reqPtr - pointer to I2C request
+ * timeOut - how long to wait, mSec units
+ * @respDataPtr - where to put response data
+ * @respDataLen - size of response buffer and size of returned data
+ * @completionCode - request status from BMC
+ *
+ * returns - ACCESN_OK else error status code
+ */
+ACCESN_STATUS
+SendTimedI2cRequest(I2CREQUESTDATA *reqPtr, int timeOut, BYTE *respDataPtr,
+		int *respDataLen, BYTE *completionCode)
+{
+/* size of write/read request minus any data */
+# define MIN_WRI2C_SIZE  3
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	ImbResponseBuffer *resp = (ImbResponseBuffer *)responseData;
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+
+	/* format of a write/read I2C request */
+	struct WriteReadI2C {
+		BYTE    busType;
+		BYTE    rsSa;
+		BYTE    count;
+		BYTE    data[1];
+	} *wrReq = (struct WriteReadI2C *)req->req.data;
+
+	/* If the IMB driver is not present return AccessFailed */
+	req->req.rsSa = BMC_SA;
+	req->req.cmd = WRITE_READ_I2C;
+	req->req.netFn = APP_NETFN;
+	req->req.rsLun = BMC_LUN;
+	req->req.dataLength = reqPtr->dataLength + MIN_WRI2C_SIZE;
+
+	wrReq->busType = reqPtr->busType;
+	wrReq->rsSa = reqPtr->rsSa;
+	wrReq->count = reqPtr->numberOfBytesToRead;
+
+	memcpy(wrReq->data, reqPtr->data, reqPtr->dataLength);
+
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), &responseData,
+			sizeof(responseData), &respLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status != TRUE) {
+		DWORD error;
+		error = GetLastError();
+		return error;
+	}
+	if (respLength == 0) {
+		return ACCESN_ERROR;
+	}
+	/* give the caller his response */
+	*completionCode = resp->cCode;
+	*respDataLen = respLength - 1;
+	if ((*respDataLen) && (respDataPtr)) {
+		memcpy(respDataPtr, resp->data, *respDataLen);
+	}
+	return ACCESN_OK;
+}
+
+/* SendTimedEmpMessageResponse - This function sends a response message to the
+ * EMP port.
+ *
+ * @ptr - pointer to the original request from EMP
+ * @responseDataBuf
+ * @responseDataLen
+ * @timeOut - how long to wait, in mSec units
+ *
+ * retruns - OK  else error status code
+ */
+ACCESN_STATUS
+SendTimedEmpMessageResponse (ImbPacket *ptr, char *responseDataBuf,
+		int responseDataLen, int timeOut)
+{
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+	int i;
+	int j;
+	/* form the response packet first */
+	req->req.rsSa = BMC_SA;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.cmd = WRITE_EMP_BUFFER;
+	} else {
+		req->req.cmd = SEND_MESSAGE;
+	}
+	req->req.netFn = APP_NETFN;
+	req->req.rsLun = 0;
+
+	i = 0;
+	if (IpmiVersion != IPMI_09_VERSION) {
+		req->req.data[i++] = EMP_CHANNEL;
+	}
+
+	req->req.data[i++] = ptr->rqSa;
+	req->req.data[i++] = (((ptr->nfLn & 0xfc) | 0x4) | ((ptr->seqLn) & 0x3));
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.data[i++] = ((~(req->req.data[0] + req->req.data[1])) + 1);
+	} else {
+		req->req.data[i++] = ((~(req->req.data[1] + req->req.data[2])) + 1);
+	}
+	/* though software is responding, we have to provide BMCs slave address
+	 * as responder address.
+	 */
+	req->req.data[i++] = BMC_SA;
+	req->req.data[i++] = ((ptr->seqLn & 0xfc) | (ptr->nfLn & 0x3));
+	req->req.data[i++] = ptr->cmd;
+	for (j = 0; j < responseDataLen; ++j, ++i) {
+		req->req.data[i] = responseDataBuf[j];
+	}
+
+	req->req.data[i] = 0;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		j = 0;
+	} else {
+		j = 1;
+	}
+	for (; j < (i - 3); ++j) {
+		req->req.data[i] += req->req.data[j + 3];
+	}
+	req->req.data[i] = ~(req->req.data[i]) + 1;
+	++i;
+	req->req.dataLength = i;
+
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), responseData, sizeof(responseData),
+			&respLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if ((status != TRUE) || (respLength != 1) || (responseData[0] != 0)) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* SendTimedEmpMessageResponse_Ex - sends response message to the EMP port.
+ *
+ * @ptr - pointer to the original request from EMP
+ * @responseDataBuf
+ * @responseDataLen
+ * @timeOut - how long to wait, in mSec units
+ * @sessionHandle - This is introduced in IPMI1.5,this is required to be sent in
+ * sendd message command as a parameter, which is then used by BMC
+ * to identify the correct DPC session to send the mesage to.
+ * @channelNumber - There are 3 different channels on which DPC communication
+ * goes on:
+ *   * Emp - 1
+ *   * Lan channel one - 6,
+ *   * Lan channel two(primary channel) - 7
+ *
+ * returns - OK else error status code
+ */
+ACCESN_STATUS
+SendTimedEmpMessageResponse_Ex (ImbPacket *ptr, char *responseDataBuf, int
+		responseDataLen, int timeOut, BYTE sessionHandle, BYTE
+		channelNumber)
+{
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+	int i;
+	int j;
+	/*form the response packet first */
+	req->req.rsSa =  BMC_SA;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.cmd = WRITE_EMP_BUFFER;
+	} else {
+		req->req.cmd = SEND_MESSAGE;
+	}
+	req->req.netFn = APP_NETFN;
+	req->req.rsLun = 0;
+
+	i = 0;
+	/* checking for the IPMI version & then assigning the channel number for
+	 * EMP. Actually the channel number is same in both the versions.This is
+	 * just to  maintain the consistancy with the same method for LAN. This
+	 * is the 1st byte of the SEND MESSAGE command.
+	 */
+	if (IpmiVersion == IPMI_10_VERSION) {
+		req->req.data[i++] = EMP_CHANNEL;
+	} else if (IpmiVersion == IPMI_15_VERSION) {
+		req->req.data[i++] = channelNumber;
+	}
+
+	/* The second byte of data for SEND MESSAGE starts with session
+	 * handle
+	 */
+	req->req.data[i++] = sessionHandle;
+	/* Then it is the response slave address for SEND MESSAGE. */
+	req->req.data[i++] = ptr->rqSa;
+	/* Then the net function + lun for SEND MESSAGE command. */
+	req->req.data[i++] = (((ptr->nfLn & 0xfc) | 0x4) | ((ptr->seqLn) & 0x3));
+	/* Here the checksum is calculated.The checksum calculation starts after
+	 * the channel number. So for the IPMI 1.5 version its a checksum of 3
+	 * bytes that is session handle,response slave address & netfun+lun.
+	 */
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.data[i++] = ((~(req->req.data[0] + req->req.data[1])) +1);
+	} else {
+		if (IpmiVersion == IPMI_10_VERSION) {
+			req->req.data[i++] = ((~(req->req.data[1] + req->req.data[2])) + 1);
+		} else {
+			req->req.data[i++] = ((~(req->req.data[2] + req->req.data[3])) + 1);
+		}
+	}
+	/* This is the next byte of the message data for SEND MESSAGE command.It
+	 * is the request slave address.
+	 */
+	/* though software is responding, we have to provide BMCs slave address
+	 * as responder address.
+	 */
+	req->req.data[i++] = BMC_SA;
+	/* This is just the sequence number,which is the next byte of data for
+	 * SEND MESSAGE
+	 */
+	req->req.data[i++] = ((ptr->seqLn & 0xfc) | (ptr->nfLn & 0x3));
+	/* The next byte is the command like get software ID(00). */
+	req->req.data[i++] = ptr->cmd;
+	/* after the cmd the data, which is sent by DPC & is retrived using the
+	 * get message earlier is sent back to DPC.
+	 */
+	for (j = 0; j < responseDataLen; ++j, ++i) {
+		req->req.data[i] = responseDataBuf[j];
+	}
+
+	req->req.data[i] = 0;
+	/* The last byte of data for SEND MESSAGE command is the check sum, which
+	 * is calculated from the next byte of the previous checksum that is the
+	 * request slave address.
+	 */
+	if (IpmiVersion == IPMI_09_VERSION) {
+		j = 0;
+	} else {
+		if (IpmiVersion == IPMI_10_VERSION) {
+			j = 1;
+		} else {
+			j = 2;
+		}
+	}
+	for (; j < (i - 3); ++j) {
+		req->req.data[i] += req->req.data[j + 3];
+	}
+	req->req.data[i] = ~(req->req.data[i]) + 1;
+	++i;
+	req->req.dataLength = i;
+	/* The flags & timeouts are used by the driver internally. */
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), responseData, sizeof(responseData),
+			&respLength, NULL);
+
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if ((status != TRUE) || (respLength != 1) || (responseData[0] != 0)) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* SendTimedLanMessageResponse - sends a response message to the DPC Over Lan
+ *
+ * @ptr - pointer to the original request from EMP
+ * @responseDataBuf
+ * @responseDataLen,
+ * @timeOut - how long to wait, in mSec units
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+SendTimedLanMessageResponse(ImbPacket *ptr, char *responseDataBuf,
+		int responseDataLen, int timeOut)
+{
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+	int i;
+	int j;
+	/* Form the response packet first */
+	req->req.rsSa =  BMC_SA;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.cmd = WRITE_EMP_BUFFER;
+	} else {
+		req->req.cmd = SEND_MESSAGE;
+	}
+	req->req.netFn = APP_NETFN;
+	/* After discussion with firmware team (Shailendra), the lun number
+	 * needs to stay at 0 even though the DPC over Lan firmware EPS states
+	 * that the lun should be 1 for DPC Over Lan. - Simont (5/17/00)
+	 */
+	req->req.rsLun = 0;
+
+	i = 0;
+	if (IpmiVersion != IPMI_09_VERSION) {
+		req->req.data[i++] = LAN_CHANNEL;
+	}
+
+	req->req.data[i++] = ptr->rqSa;
+	req->req.data[i++] = (((ptr->nfLn & 0xfc) | 0x4) | ((ptr->seqLn) & 0x3));
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.data[i++] = ((~(req->req.data[0] + req->req.data[1])) + 1);
+	} else {
+		req->req.data[i++] = ((~(req->req.data[1] + req->req.data[2])) + 1);
+	}
+	/* Though software is responding, we have to provide BMCs slave address
+	 * as responder address.
+	 */
+	req->req.data[i++] = BMC_SA;
+	req->req.data[i++] = ((ptr->seqLn & 0xfc) | (ptr->nfLn & 0x3));
+	req->req.data[i++] = ptr->cmd;
+	for (j = 0; j < responseDataLen; ++j, ++i) {
+		req->req.data[i] = responseDataBuf[j];
+	}
+
+	req->req.data[i] = 0;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		j = 0;
+	} else {
+		j = 1;
+	}
+
+	for (; j < (i - 3); ++j) {
+		req->req.data[i] += req->req.data[j + 3];
+	}
+	req->req.data[i] = ~(req->req.data[i]) + 1;
+	++i;
+	req->req.dataLength = i;
+
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), responseData, sizeof(responseData),
+			&respLength, NULL);
+
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if ((status != TRUE) || (respLength != 1) || (responseData[0] != 0)) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* SendTimedLanMessageResponse_Ex - sends a response message to the DPC Over
+ * LAN.
+ *
+ * @ptr - pointer to the original request from EMP
+ * @responseDataBuf
+ * @responseDataLen
+ * @timeOut - how long to wait, in mSec units
+ * @sessionHandle - This is introduced in IPMI1.5,this is required to be sent in
+ * send message command as a parameter,which is then used by BMC to identify the
+ * correct DPC session to send the mesage to.
+ * @channelNumber - There are 3 different channels on which DPC communication
+ * goes on:
+ *	* Emp - 1
+ *	* Lan channel one - 6
+ *	* Lan channel two(primary channel) - 7
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+SendTimedLanMessageResponse_Ex(ImbPacket *ptr, char *responseDataBuf, int
+		responseDataLen, int timeOut, BYTE sessionHandle, BYTE
+		channelNumber)
+{
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+	int i;
+	int j;
+	/* form the response packet first */
+	req->req.rsSa = BMC_SA;
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.cmd = WRITE_EMP_BUFFER;
+	} else {
+		req->req.cmd = SEND_MESSAGE;
+	}
+	req->req.netFn = APP_NETFN;
+	/* After discussion with firmware team (Shailendra), the lun number
+	 * needs to stay at 0 even though the DPC over Lan firmware EPS states
+	 * that the lun should be 1 for DPC Over Lan. - Simont (5/17/00)
+	 */
+	req->req.rsLun = 0;
+
+	i = 0;
+	/* checking for the IPMI version & then assigning the channel number for
+	 * LAN accordingly.
+	 * This is the 1st byte of the SEND MESSAGE command.
+	 */
+	if (IpmiVersion == IPMI_10_VERSION) {
+		req->req.data[i++] = LAN_CHANNEL;
+	} else if (IpmiVersion == IPMI_15_VERSION) {
+		req->req.data[i++] = channelNumber;
+	}
+	/* The second byte of data for SEND MESSAGE starts with session handle
+	 */
+	req->req.data[i++] = sessionHandle;
+	/* Then it is the response slave address for SEND MESSAGE. */
+	req->req.data[i++] = ptr->rqSa;
+	/* Then the net function + lun for SEND MESSAGE command. */
+	req->req.data[i++] = (((ptr->nfLn & 0xfc) | 0x4) | ((ptr->seqLn) & 0x3));
+	/* Here the checksum is calculated.The checksum calculation starts after
+	 * the channel number. So for the IPMI 1.5 version its a checksum of 3
+	 * bytes that is session handle,response slave address & netfun+lun.
+	 */
+	if (IpmiVersion == IPMI_09_VERSION) {
+		req->req.data[i++] = ((~(req->req.data[0] +  req->req.data[1])) + 1);
+	} else {
+		if (IpmiVersion == IPMI_10_VERSION) {
+			req->req.data[i++] = ((~(req->req.data[1] + req->req.data[2])) + 1);
+		} else {
+			req->req.data[i++] = ((~(req->req.data[2] + req->req.data[3])) + 1);
+		}
+	}
+	/* This is the next byte of the message data for SEND MESSAGE command.It
+	 * is the request slave address.
+	 */
+	/* Though software is responding, we have to provide BMC's slave address
+	 * as responder address.
+	 */
+	req->req.data[i++] =  BMC_SA;
+	/* This is just the sequence number,which is the next byte of data for
+	 * SEND MESSAGE
+	 */
+	req->req.data[i++] = ((ptr->seqLn & 0xfc) | (ptr->nfLn & 0x3));
+	/* The next byte is the command like get software ID(00). */
+	req->req.data[i++] = ptr->cmd;
+	/* After the cmd the data ,which is sent by DPC & is retrived using the
+	 * get message earlier is sent back to DPC.
+	 */
+	for (j = 0; j < responseDataLen; ++j, ++i) {
+		req->req.data[i] = responseDataBuf[j];
+	}
+	req->req.data[i] = 0;
+	/* The last byte of data for SEND MESSAGE command is the check sum which
+	 * is calculated from the next byte of the previous checksum that is the
+	 * request slave address.
+	 */
+	if (IpmiVersion == IPMI_09_VERSION) {
+		j = 0;
+	} else {
+		if (IpmiVersion == IPMI_10_VERSION) {
+			j = 1;
+		} else {
+			j = 2;
+		}
+	}
+	for (; j < (i - 3); ++j) {
+		req->req.data[i] += req->req.data[j + 3];
+	}
+	req->req.data[i] = ~(req->req.data[i]) + 1;
+	++i;
+	req->req.dataLength = i;
+	/* The flags & timeouts are used by the driver internally */
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), responseData, sizeof(responseData),
+			&respLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if ((status != TRUE) || (respLength != 1) || (responseData[0] != 0)) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* SendTimedImbpRequest - This function sends a request for BMC implemented function
+ *
+ * @reqPtr - request info and data
+ * @timeOut - how long to wait, in mSec units
+ * @respDataPtr - where to put response data
+ * @respDataLen - how much response data there is
+ * @completionCode - request status from dest controller
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+SendTimedImbpRequest(IMBPREQUESTDATA *reqPtr, int timeOut, BYTE *respDataPtr,
+		int *respDataLen, BYTE *completionCode)
+{
+	BYTE responseData[MAX_BUFFER_SIZE];
+	ImbResponseBuffer *resp = (ImbResponseBuffer *)responseData;
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_BUFFER_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+	BOOL status;
+
+	req->req.rsSa = reqPtr->rsSa;
+	req->req.cmd = reqPtr->cmdType;
+	req->req.netFn = reqPtr->netFn;
+	req->req.rsLun = reqPtr->rsLun;
+	req->req.dataLength = reqPtr->dataLength;
+
+	lprintf(LOG_DEBUG, "cmd=%02x, pdata=%p, datalen=%x", req->req.cmd,
+			reqPtr->data, reqPtr->dataLength);
+	memcpy(req->req.data, reqPtr->data, reqPtr->dataLength);
+
+	req->flags = 0;
+	/* convert to uSec units */
+	req->timeOut = timeOut * 1000;
+	lprintf(LOG_DEBUG, "%s: rsSa 0x%x cmd 0x%x netFn 0x%x rsLun 0x%x",
+			__FUNCTION__, req->req.rsSa, req->req.cmd,
+			req->req.netFn, req->req.rsLun);
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), &responseData,
+			sizeof(responseData), &respLength, NULL);
+
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl returned status = %d",
+			__FUNCTION__, status);
+#ifdef DBG_IPMI
+	/* TODO */
+	printf("%s: rsSa %x cmd %x netFn %x lun %x, status=%d, cc=%x, rlen=%d\n",
+			__FUNCTION__, req->req.rsSa, req->req.cmd,
+			req->req.netFn, req->req.rsLun, status, resp->cCode,
+			respLength);
+#endif
+
+	if (status != TRUE) {
+		DWORD error;
+		error = GetLastError();
+		return error;
+	} else if (respLength == 0) {
+		return ACCESN_ERROR;
+	}
+	/* give the caller his response */
+	*completionCode = resp->cCode;
+	*respDataLen = 0;
+
+	if ((respLength > 1) && (respDataPtr)) {
+		*respDataLen = respLength - 1;
+		memcpy(respDataPtr,resp->data, *respDataLen);
+	}
+	return ACCESN_OK;
+}
+
+/* SendAsyncImbpRequest - sends a request for Asynchronous IMB implemented function.
+ *
+ * @reqPtr - Pointer to Async IMB request
+ * @seqNo -Sequence Munber
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+SendAsyncImbpRequest(IMBPREQUESTDATA *reqPtr, BYTE *seqNo)
+{
+	BOOL status;
+	BYTE responseData[MAX_IMB_RESP_SIZE];
+	ImbResponseBuffer *resp = (ImbResponseBuffer *)responseData;
+	DWORD respLength = sizeof(responseData);
+	BYTE requestData[MAX_IMB_RESP_SIZE];
+	ImbRequestBuffer *req = (ImbRequestBuffer *)requestData;
+
+	req->req.rsSa = reqPtr->rsSa;
+	req->req.cmd = reqPtr->cmdType;
+	req->req.netFn = reqPtr->netFn;
+	req->req.rsLun = reqPtr->rsLun;
+	req->req.dataLength = reqPtr->dataLength;
+	memcpy(req->req.data, reqPtr->data, reqPtr->dataLength);
+
+	req->flags = NO_RESPONSE_EXPECTED;
+	/* no timeouts for async sends */
+	req->timeOut = 0;
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SEND_MESSAGE, requestData,
+			sizeof(requestData), &responseData,
+			sizeof(responseData), &respLength, NULL);
+
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status != TRUE) {
+		DWORD error;
+		error = GetLastError();
+		return error;
+	} else if (respLength != 2) {
+		return ACCESN_ERROR;
+	}
+	/* give the caller his sequence number */
+	*seqNo = resp->data[0];
+	return ACCESN_OK;
+}
+
+/* GetAsyncImbpMessage - This function gets the next available async message
+ * with a message ID greater than SeqNo. The message looks like an IMB packet
+ * and the length and Sequence number is returned.
+ *
+ * @msgPtr - request info and data
+ * @msgLen - IN - length of buffer, OUT - msg len
+ * @timeOut - how long to wait for the message
+ * @seqNo - previously returned seq number(or ASYNC_SEQ_START)
+ * @channelNumber
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+GetAsyncImbpMessage (ImbPacket *msgPtr, DWORD *msgLen, DWORD timeOut,
+		ImbAsyncSeq *seqNo, DWORD channelNumber)
+{
+	BOOL status;
+	BYTE responseData[MAX_ASYNC_RESP_SIZE];
+	BYTE lun;
+	ImbAsyncResponse *resp = (ImbAsyncResponse *)responseData;
+	DWORD respLength = sizeof(responseData);
+	ImbAsyncRequest req;
+
+	while (1) {
+		if ((msgPtr == NULL) || (msgLen == NULL) || ( seqNo == NULL)) {
+			return ACCESN_ERROR;
+		}
+		/* convert to uSec units */
+		req.timeOut = timeOut * 1000;
+		req.lastSeq = *seqNo;
+
+		status = DeviceIoControl(hDevice, IOCTL_IMB_GET_ASYNC_MSG, &req,
+				sizeof(req), &responseData,
+				sizeof(responseData), &respLength, NULL);
+
+		lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d",
+				__FUNCTION__, status);
+		if (status != TRUE) {
+			DWORD error = GetLastError();
+			/* handle "msg not available" specially. it is different
+			 * from a random old error.
+			 */
+			switch (error) {
+			case IMB_MSG_NOT_AVAILABLE:
+				return ACCESN_END_OF_DATA;
+				break;
+			default:
+				return ACCESN_ERROR;
+				break;
+			}
+		} else if (respLength < MIN_ASYNC_RESP_SIZE) {
+			return ACCESN_ERROR;
+		}
+		respLength -= MIN_ASYNC_RESP_SIZE;
+
+		if (*msgLen < respLength) {
+			return ACCESN_ERROR;
+		}
+
+		/* same code as in NT section */
+		if (IpmiVersion == IPMI_09_VERSION) {
+			switch (channelNumber) {
+			case IPMB_CHANNEL:
+				lun = IPMB_LUN;
+				break;
+			case  EMP_CHANNEL:
+				lun = EMP_LUN;
+				break;
+			default:
+				lun = RESERVED_LUN;
+				break;
+			}
+			if ((lun == RESERVED_LUN)
+					|| (lun != ((((ImbPacket *)(resp->data))->nfLn) & 0x3 ))) {
+				*seqNo = resp->thisSeq;
+				continue;
+			}
+			memcpy(msgPtr, resp->data, respLength);
+			*msgLen = respLength;
+		} else {
+			/* it is version 1.0 or better */
+			if (resp->data[0] != (BYTE)channelNumber) {
+				*seqNo = resp->thisSeq;
+				continue;
+			}
+			memcpy(msgPtr, &(resp->data[1]), (respLength - 1));
+			*msgLen = respLength - 1;
+		}
+		/* give the caller his sequence number */
+		*seqNo = resp->thisSeq;
+		return ACCESN_OK;
+	}
+}
+
+/* GetAsyncImbpMessage_Ex - gets the next available async message with a message
+ * ID greater than SeqNo. The message looks like an IMB packet and the length
+ * and Sequence number is returned.
+ *
+ * @msgPtr - request info and data
+ * @msgLen - IN - length of buffer, OUT - msg len
+ * @timeOut - how long to wait for the message
+ * @seqNo -  previously returned seq number(or ASYNC_SEQ_START)
+ * @channelNumber
+ * @sessionHandle
+ * @privilege
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+GetAsyncImbpMessage_Ex(ImbPacket *msgPtr, DWORD *msgLen, DWORD timeOut,
+		ImbAsyncSeq *seqNo, DWORD channelNumber, BYTE *sessionHandle,
+		BYTE *privilege)
+{
+	BOOL status;
+	BYTE responseData[MAX_ASYNC_RESP_SIZE];
+	BYTE lun;
+	ImbAsyncResponse *resp = (ImbAsyncResponse *)responseData;
+	DWORD respLength = sizeof(responseData);
+	ImbAsyncRequest req;
+
+	while (1) {
+		if ((msgPtr == NULL) || (msgLen == NULL) || ( seqNo == NULL)) {
+			return ACCESN_ERROR;
+		}
+
+		/* convert to uSec units */
+		req.timeOut = timeOut * 1000;
+		req.lastSeq = *seqNo;
+		status = DeviceIoControl(hDevice, IOCTL_IMB_GET_ASYNC_MSG, &req,
+				sizeof(req), &responseData,
+				sizeof(responseData), &respLength, NULL);
+
+		lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d",
+				__FUNCTION__, status);
+		if (status != TRUE) {
+			DWORD error = GetLastError();
+			/* handle "msg not available" specially. it is
+			 * different from a random old error.
+			 */
+			switch (error) {
+			case IMB_MSG_NOT_AVAILABLE:
+				return ACCESN_END_OF_DATA;
+				break;
+			default:
+				return ACCESN_ERROR;
+				break;
+			}
+		}
+		if (respLength < MIN_ASYNC_RESP_SIZE) {
+			return ACCESN_ERROR;
+		}
+
+		respLength -= MIN_ASYNC_RESP_SIZE;
+		if (*msgLen < respLength) {
+			return ACCESN_ERROR;
+		}
+
+		/* same code as in NT section */
+		if (IpmiVersion == IPMI_09_VERSION) {
+			switch (channelNumber) {
+			case IPMB_CHANNEL:
+				lun = IPMB_LUN;
+				break;
+			case  EMP_CHANNEL:
+				lun = EMP_LUN;
+				break;
+			default:
+				lun = RESERVED_LUN;
+				break;
+			}
+
+			if ((lun == RESERVED_LUN)
+					|| (lun != ((((ImbPacket *)(resp->data))->nfLn) & 0x3))) {
+				*seqNo = resp->thisSeq;
+				continue;
+			}
+
+			memcpy(msgPtr, resp->data, respLength);
+			*msgLen = respLength;
+		} else {
+			if ((sessionHandle ==NULL) || (privilege ==NULL)) {
+				return ACCESN_ERROR;
+			}
+			/* With the new IPMI version the get message command
+			 * returns the channel number along with the
+			 * privileges.The 1st 4 bits of the second byte of the
+			 * response data for get message command represent the
+			 * channel number & the last 4 bits are the privileges.
+			 */
+			*privilege = (resp->data[0] & 0xf0)>> 4;
+			if ((resp->data[0] & 0x0f) != (BYTE)channelNumber) {
+				*seqNo = resp->thisSeq;
+				continue;
+			}
+			/* The get message command according to IPMI 1.5 spec
+			 * now even returns the session handle.This is required
+			 * to be captured as it is required as request data for
+			 * send message command.
+			 */
+			*sessionHandle = resp->data[1];
+			memcpy(msgPtr, &(resp->data[2]), (respLength - 1));
+			*msgLen = respLength - 1;
+		}
+		/* give the caller his sequence number */
+		*seqNo = resp->thisSeq;
+		return ACCESN_OK;
+	}
+}
+
+/* IsAsyncMessageAvailable - Waits for an Async Message. This call will block
+ * the calling thread if no Async events are are available in the queue.
+ *
+ * @dummy
+ * @respLength
+ * @status
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+IsAsyncMessageAvailable(unsigned int eventId)
+{
+	int dummy;
+	int respLength = 0;
+	BOOL status;
+	/* confirm that app is not using a bad Id */
+	if (AsyncEventHandle != (HANDLE)eventId) {
+		return ACCESN_ERROR;
+	}
+	status = DeviceIoControl(hDevice, IOCTL_IMB_CHECK_EVENT,
+			&AsyncEventHandle, sizeof(HANDLE), &dummy, sizeof(int),
+			(LPDWORD)&respLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status != TRUE) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* RegisterForImbAsyncMessageNotification - This function Registers the calling
+ * application for Asynchronous notification when a sms message is available
+ * with the IMB driver.
+ *
+ *  Notes:      The calling application should use the returned handle to
+ *              get the Async messages..
+ *
+ * @handleId - pointer to the registration handle
+ *
+ * returns: OK else error status code
+ */
+ACCESN_STATUS
+RegisterForImbAsyncMessageNotification(unsigned int *handleId)
+{
+	BOOL status;
+	DWORD respLength ;
+	int dummy;
+	/*allow  only one app to register  */
+	if ((handleId  == NULL ) || (AsyncEventHandle)) {
+		return ACCESN_ERROR;
+	}
+	status = DeviceIoControl(hDevice, IOCTL_IMB_REGISTER_ASYNC_OBJ, &dummy,
+			sizeof(int), &AsyncEventHandle, (DWORD)sizeof(HANDLE),
+			(LPDWORD)&respLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if ((respLength != sizeof(int)) || (status != TRUE)) {
+		return ACCESN_ERROR;
+	}
+	/* printf("imbapi: Register handle = %x\n",AsyncEventHandle); *//*++++*/
+	*handleId = (unsigned int)AsyncEventHandle;
+	lprintf(LOG_DEBUG, "handleId = %x AsyncEventHandle %x", *handleId,
+			AsyncEventHandle);
+	return ACCESN_OK;
+}
+
+/* UnRegisterForImbAsyncMessageNotification - This function un-registers the
+ * calling application for Asynchronous notification when a sms message is
+ * available with the IMB driver. It is used by Upper level agents to
+ * un-register for async. notification of sms messages.
+ *
+ * @handleId - pointer to the registration handle
+ * @iFlag - value used to determine where this function was called from. It is
+ * used currently on in NetWare environment.
+ *
+ * returns - status
+ */
+ACCESN_STATUS
+UnRegisterForImbAsyncMessageNotification(unsigned int handleId, int iFlag)
+{
+	BOOL status;
+	DWORD respLength ;
+	int dummy;
+	/* to keep compiler happy. We are not using this flag*/
+	iFlag = iFlag;
+
+	if (AsyncEventHandle != (HANDLE)handleId) {
+		return ACCESN_ERROR;
+	}
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_DEREGISTER_ASYNC_OBJ,
+			&AsyncEventHandle, (DWORD)sizeof(HANDLE ), &dummy,
+			(DWORD)sizeof(int), (LPDWORD)&respLength, NULL );
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status != TRUE) {
+		return ACCESN_ERROR;
+	}
+	return ACCESN_OK;
+}
+
+/* SetShutDownCode - To set the shutdown action code.
+ *
+ * @code - shutdown action code which can be either SD_NO_ACTION, SD_RESET,
+ * SD_POWER_OFF as defined in imb_if.h
+ * @delayTime - time to delay in 100ms units
+ *
+ * returns - status
+ */
+ACCESN_STATUS
+SetShutDownCode(int delayTime, int code)
+{
+	DWORD retLength;
+	BOOL status;
+	ShutdownCmdBuffer cmd;
+	/* If IMB interface isn't open, return AccessFailed */
+	if (hDevice == INVALID_HANDLE_VALUE) {
+		return ACCESN_ERROR;
+	}
+	cmd.code = code;
+	cmd.delayTime = delayTime;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_SHUTDOWN_CODE, &cmd,
+			sizeof(cmd), NULL, 0, &retLength, NULL);
+	lprintf(LOG_DEBUG, "%s: DeviceIoControl status = %d", __FUNCTION__,
+			status);
+	if (status == TRUE) {
+		return ACCESN_OK;
+	} else {
+		return ACCESN_ERROR;
+	}
+}
+
+/*/////////////////////////////////////////////////////////////////////////
+// MapPhysicalMemory 
+/////////////////////////////////////////////////////////////////////////// */
+/*F*
+//  Name:       MapPhysicalMemory 
+//  Purpose:    This function maps specified range of physical memory in calling
+//              pocesse's address space
+//  Context:    Used by Upper level agents (sis modules) to access 
+//				system physical memory 
+//  Returns:    ACCESN_OK  else error status code
+//  Parameters: 
+//     
+//     startAddress   starting physical address of the  memory to be mapped 
+//     addressLength  length of the physical memory to be mapped
+//     virtualAddress pointer to the mapped virtual address
+//  Notes:      none
+*F*/
+/*///////////////////////////////////////////////////////////////////////////
+// UnmapPhysicalMemory 
+//////////////////////////////////////////////////////////////////////////// */
+/*F*
+//  Name:       UnMapPhysicalMemory 
+//  Purpose:    This function unmaps the previously mapped physical memory
+//  Context:    Used by Upper level agents (sis modules)  
+//  Returns:    ACCESN_OK  else error status code
+//  Parameters: 
+//     
+//     addressLength  length of the physical memory to be mapped
+//     virtualAddress pointer to the mapped virtual address
+//  Notes:      none
+*F*/
+#ifdef WIN32
+ACCESN_STATUS
+MapPhysicalMemory(int startAddress, int addressLength, int *virtualAddress)
+{
+	DWORD retLength;
+	BOOL status;
+	PHYSICAL_MEMORY_INFO pmi;
+   
+	if (startAddress == 0 || addressLength <= 0) {
+		return ACCESN_OUT_OF_RANGE;
+	}
+
+	pmi.InterfaceType = Internal;
+	pmi.BusNumber = 0;
+	pmi.BusAddress.HighPart = (LONG)0x0;
+	pmi.BusAddress.LowPart = (LONG)startAddress;
+	pmi.AddressSpace = (LONG)0;
+	pmi.Length = addressLength;
+
+	status = DeviceIoControl(hDevice, IOCTL_IMB_MAP_MEMORY, &pmi,
+			sizeof(PHYSICAL_MEMORY_INFO), virtualAddress,
+			sizeof(PVOID), &retLength, 0);
+	if (status == TRUE) {
+		return ACCESN_OK;
+	} else {
+		return ACCESN_ERROR;
+	}
+}
+
+ACCESN_STATUS
+UnmapPhysicalMemory(int virtualAddress, int Length)
+{
+	DWORD retLength;
+	BOOL status;
+	status = DeviceIoControl(hDevice, IOCTL_IMB_UNMAP_MEMORY,
+			&virtualAddress, sizeof(PVOID), NULL, 0, &retLength, 0);
+	if (status == TRUE) {
+		return ACCESN_OK;
+	} else {
+		return ACCESN_ERROR;
+	}
+}
+#else /* Linux, SCO, UNIX, etc. */
+ACCESN_STATUS
+MapPhysicalMemory(int startAddress, int addressLength, int *virtualAddress)
+{
+	int fd;
+	unsigned int length = addressLength;
+	off_t startpAddress = (off_t)startAddress;
+	unsigned int diff;
+	char *startvAddress;
+#if defined(PAGESIZE)
+	long int pagesize = PAGESIZE;
+#elif defined(_SC_PAGESIZE)
+	long int pagesize = sysconf(_SC_PAGESIZE);
+	if (pagesize < 1) {
+		perror("Invalid pagesize");
+	}
+#else
+# error PAGESIZE unsupported
+#endif
+	if ((startAddress == 0) || (addressLength <= 0)) {
+		return ACCESN_ERROR;
+	}
+	if ((fd = open("/dev/mem", O_RDONLY)) < 0) {
+		char buf[128];
+		sprintf(buf,"%s %s: open(%s) failed",
+				__FILE__, __FUNCTION__, IMB_DEVICE);
+		perror(buf);
+		return ACCESN_ERROR;
+	}
+	/* aliging the offset to a page boundary and adjusting the length */
+	diff = (int)startpAddress % pagesize;
+	startpAddress -= diff;
+	length += diff;
+	if ((startvAddress = mmap(0, length, PROT_READ, MAP_SHARED, fd,
+					startpAddress)) == MAP_FAILED) {
+		char buf[128];
+		sprintf(buf, "%s %s: mmap failed", __FILE__, __FUNCTION__);
+		perror(buf);
+		close(fd);
+		return ACCESN_ERROR;
+	}
+	lprintf(LOG_DEBUG, "%s: mmap of 0x%x success", __FUNCTION__,
+			startpAddress);
+#ifdef LINUX_DEBUG_MAX
+	for (int i = 0; i < length; i++) {
+		printf("0x%x ", (startvAddress[i]));
+		if(isascii(startvAddress[i])) {
+			printf("%c ", (startvAddress[i]));
+		}
+	}
+#endif /* LINUX_DEBUG_MAX */
+	*virtualAddress = (long)(startvAddress + diff);
+	close(fd);
+	return ACCESN_OK;
+}
+
+ACCESN_STATUS
+UnmapPhysicalMemory(int virtualAddress, int Length)
+{
+	unsigned int diff = 0;
+#if defined(PAGESIZE)
+	long int pagesize = PAGESIZE;
+#elif defined(_SC_PAGESIZE)
+	long int pagesize = sysconf(_SC_PAGESIZE);
+	if (pagesize < 1) {
+		perror("Invalid pagesize");
+	}
+#else
+# error PAGESIZE unsupported
+#endif
+	/* page align the virtual address and adjust length accordingly  */
+	diff = ((unsigned int)virtualAddress) % pagesize;
+	virtualAddress -= diff;
+	Length += diff;
+	lprintf(LOG_DEBUG, "%s: calling munmap(0x%x,%d)", __FUNCTION__,
+			virtualAddress,Length);
+	if (munmap(&virtualAddress, Length) != 0) {
+		char buf[128];
+		sprintf(buf, "%s %s: munmap failed", __FILE__, __FUNCTION__);
+		perror(buf);
+		return ACCESN_ERROR;
+	}
+	lprintf(LOG_DEBUG, "%s: munmap(0x%x,%d) success", __FUNCTION__,
+			virtualAddress, Length);
+	return ACCESN_OK;
+}
+#endif /* unix */
+
+/* GetIpmiVersion - returns current IPMI version. */
+BYTE
+GetIpmiVersion()
+{
+	return IpmiVersion;
+}
diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h
new file mode 100644
index 0000000..6ba4121
--- /dev/null
+++ b/src/plugins/imb/imbapi.h
@@ -0,0 +1,649 @@
+/*M*
+//  PVCS:
+//      $Workfile:   imb_api.h  $
+//      $Revision: 1.2 $
+//      $Modtime:   Jul 22 2002 16:40:32  $
+//      $Author: iceblink $
+// 
+//  Combined include files needed for imbapi.c
+//
+ *M*/
+/*----------------------------------------------------------------------* 
+The BSD License 
+Copyright (c) 2002, Intel Corporation
+All rights reserved.
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+  a.. Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer. 
+  b.. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution. 
+  c.. Neither the name of Intel Corporation nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *----------------------------------------------------------------------*/
+#ifndef	_WINDEFS_H
+#define	_WINDEFS_H
+#ifndef FALSE
+#define FALSE   0
+#endif
+#ifndef TRUE
+#define TRUE    1
+#endif
+#ifndef NULL
+#define NULL 0
+#endif
+#ifndef WIN32   
+/* WIN32 defines this in stdio.h */
+#include <wchar.h>
+#endif
+#define far
+#define near
+#define FAR                 far
+#define NEAR                near
+#ifndef CONST
+#define CONST               const
+#endif
+typedef unsigned long       DWORD;
+typedef int                 BOOL;
+typedef unsigned char       BYTE;
+typedef unsigned short      WORD;
+typedef float               FLOAT;
+typedef FLOAT               *PFLOAT;
+typedef BOOL near           *PBOOL;
+typedef BOOL far            *LPBOOL;
+typedef BYTE near           *PBYTE;
+typedef BYTE far            *LPBYTE;
+typedef int near            *PINT;
+typedef int far             *LPINT;
+typedef WORD near           *PWORD;
+typedef WORD far            *LPWORD;
+typedef long far            *LPLONG;
+typedef DWORD near          *PDWORD;
+typedef DWORD far           *LPDWORD;
+typedef void far            *LPVOID;
+typedef CONST void far      *LPCVOID;
+typedef int                 INT;
+typedef unsigned int        UINT;
+typedef unsigned int        *PUINT;
+typedef DWORD NTSTATUS;
+/*
+  File structures
+*/
+#ifndef WIN32
+typedef struct _OVERLAPPED {
+    DWORD   Internal;
+    DWORD   InternalHigh;
+    DWORD   Offset;
+    DWORD   OffsetHigh;
+/*    HANDLE  hEvent; */
+} OVERLAPPED, *LPOVERLAPPED;
+#endif
+/*
+ * Data structure redefines
+ */
+typedef char CHAR;
+typedef short SHORT;
+typedef long LONG;
+typedef char * PCHAR;
+typedef short * PSHORT;
+typedef long * PLONG;
+typedef unsigned char UCHAR;
+typedef unsigned short USHORT;
+typedef unsigned long ULONG;
+typedef unsigned char * PUCHAR;
+typedef unsigned short * PUSHORT;
+typedef unsigned long * PULONG;
+typedef char CCHAR;
+typedef short CSHORT;
+typedef ULONG CLONG;
+typedef CCHAR * PCCHAR;
+typedef CSHORT * PCSHORT;
+typedef CLONG * PCLONG;
+typedef void * PVOID;
+#ifndef WIN32
+typedef void VOID;
+typedef struct _LARGE_INTEGER {
+	ULONG LowPart;
+	LONG HighPart;
+} LARGE_INTEGER;
+typedef struct _ULARGE_INTEGER {
+	ULONG LowPart;
+	ULONG HighPart;
+} ULARGE_INTEGER;
+#endif
+typedef LARGE_INTEGER * PLARGE_INTEGER;
+typedef LARGE_INTEGER PHYSICAL_ADDRESS;
+typedef LARGE_INTEGER * PPHYSICAL_ADDRESS;
+typedef ULARGE_INTEGER * PULARGE_INTEGER;
+typedef UCHAR BOOLEAN;
+typedef BOOLEAN *PBOOLEAN;
+typedef wchar_t		    WCHAR;
+typedef WCHAR		    *PWCHAR, *PWSTR;
+typedef CONST WCHAR	    *LPCWSTR, *PCWSTR;
+
+#ifndef _SYS_TYPES_H
+#ifndef _CADDR_T
+#define _CADDR_T
+  typedef char *        caddr_t;
+#endif
+#endif
+/*
+ Unicode strings are counted 16-bit character strings. If they are
+ NULL terminated, Length does not include trailing NULL.
+*/
+typedef struct _UNICODE_STRING {
+    USHORT Length;
+    USHORT MaximumLength;
+    PWSTR  Buffer;
+} UNICODE_STRING;
+typedef UNICODE_STRING *PUNICODE_STRING;
+#define UNICODE_NULL ((WCHAR)0)   /* winnt*/
+#define IN	/* */
+#define OUT	/* */
+#define OPTIONAL	/* */
+
+#ifndef WIN32
+#define FIELD_OFFSET(type, field)    ((LONG)&(((type *)0)->field))
+#define UNREFERENCED_PARAMETER(x)
+typedef	int HANDLE;
+#define	INVALID_HANDLE_VALUE	((HANDLE)-1)
+#endif
+typedef	HANDLE	*PHANDLE;
+/*
+ Define the method codes for how buffers are passed for I/O and FS controls
+*/
+#define METHOD_BUFFERED                 0
+/*
+ Define the access check value for any access
+ The FILE_READ_ACCESS and FILE_WRITE_ACCESS constants are also defined in
+ ntioapi.h as FILE_READ_DATA and FILE_WRITE_DATA. The values for these
+ constants *MUST* always be in sync.
+*/
+#define FILE_ANY_ACCESS                 0
+/*
+  These are the generic rights.
+*/
+#define    MAX_PATH        260
+#define	GetLastError()	(NTstatus.Status)
+/*
+ Macro definition for defining IOCTL and FSCTL function control codes.  Note
+ that function codes 0-2047 are reserved for Microsoft Corporation, and
+ 2048-4095 are reserved for customers.
+*/
+/*
+ * Linux drivers expect ioctls defined using macros defined in ioctl.h.
+ * So, instead of using the CTL_CODE defined for NT and UW, I define CTL_CODE
+ * using these macros. That way imb_if.h, where the ioctls are defined get
+ * to use the correct ioctl command we expect. 
+ * Notes: I am using the generic _IO macro instead of the more specific
+ * ones. The macros expect 8bit entities, so I am cleaning what is sent to
+ * us from imb_if.h  - Mahendra
+ */
+#ifndef WIN32
+#define CTL_CODE(DeviceType, Function, Method, Access)\
+		_IO(DeviceType & 0x00FF, Function & 0x00FF)
+#else
+#define CTL_CODE( DeviceType, Function, Method, Access ) ((ULONG)(	\
+    ((ULONG)(DeviceType) << 16) | ((ULONG)(Access) << 14) | ((ULONG)(Function) << 2) | ((ULONG)Method) \
+))
+#endif
+#endif /*_WINDEFS_H */
+/*----------------------------------------------------------------------*/
+#ifndef	_SMI_H
+#define	_SMI_H
+#define SMI_Version1_00	0x00001000
+struct smi {
+    DWORD smi_VersionNo;
+    DWORD smi_Reserved1;
+    DWORD smi_Reserved2;
+    LPVOID ntstatus;	/* address of NT status block*/
+    LPVOID  lpvInBuffer;        /* address of buffer for input data*/
+    DWORD  cbInBuffer;  /* size of input buffer*/
+    LPVOID  lpvOutBuffer;       /* address of output buffer*/
+    DWORD  cbOutBuffer; /* size of output buffer*/
+    LPDWORD  lpcbBytesReturned; /* address of actual bytes of output*/
+    LPOVERLAPPED  lpoOverlapped;         /* address of overlapped structure*/
+};
+#ifndef STATUS_SUCCESS
+typedef struct _IO_STATUS_BLOCK {
+    ULONG Status;
+    ULONG Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+/*
+ * I2C ioctl's return NTStatus codes
+ */
+#define STATUS_SUCCESS                   (0x00000000U)
+#define STATUS_UNSUCCESSFUL              (0xC0000001U)
+#define STATUS_DEVICE_BUSY               (0x80000011U)
+#ifndef WIN32
+#define STATUS_PENDING                   (0x00000103U)
+// see <win2000ddk>\inc\winnt.h(1171)
+#endif
+#define STATUS_INVALID_PARAMETER         (0xC000000DU)
+#define STATUS_INVALID_DEVICE_REQUEST    (0xC0000010U)
+#define STATUS_BUFFER_TOO_SMALL          (0xC0000023U)
+#define STATUS_FILE_CLOSED               (0xC0000128U)
+#define STATUS_INSUFFICIENT_RESOURCES    (0xC000009AU)
+#define STATUS_NO_DATA_DETECTED          (0x80000022U)
+#define STATUS_NO_SUCH_DEVICE            (0xC000000EU)
+#define STATUS_ALLOTTED_EXCEEDED         (0xC000000FU)
+#define STATUS_IO_DEVICE_ERROR           (0xC0000185U)
+#define STATUS_TOO_MANY_OPEN_FILES       (0xC000011FU)
+#define STATUS_ACCESS_DENIED             (0xC0000022U)
+#define STATUS_BUFFER_OVERFLOW           (0x80000005U)
+#define STATUS_CANCELLED                 (0xC0000120U)
+#endif	/* STATUS_SUCCESS*/
+#endif	/* _SMI_H*/
+/*----------------------------------------------------------------------*/
+#ifndef IMB_IF__
+#define IMB_IF__
+/*
+ * This is the structure passed in to the IOCTL_IMB_SHUTDOWN_CODE request
+ */
+typedef struct {
+	int	code;		
+	int	delayTime;  
+} ShutdownCmdBuffer;
+#define		SD_NO_ACTION				0
+#define		SD_RESET				1
+#define		SD_POWER_OFF				2
+#pragma pack(1)
+/*
+ * This is the generic IMB packet format, the final checksum cant be
+ * represented in this structure and will show up as the last data byte
+ */
+typedef struct {
+	BYTE rsSa;
+	BYTE nfLn;
+	BYTE cSum1;
+	BYTE rqSa;
+	BYTE seqLn;
+	BYTE cmd;
+	BYTE data[1];
+} ImbPacket;
+#define MIN_IMB_PACKET_SIZE	7 	
+#define MAX_IMB_PACKET_SIZE	33
+/*
+ * This is the standard IMB response format where the first byte of
+ * IMB packet data is interpreted as a command completion code.
+*/
+typedef struct {
+	BYTE rsSa;
+	BYTE nfLn;
+	BYTE cSum1;
+	BYTE rqSa;
+	BYTE seqLn;
+	BYTE cmd;
+	BYTE cCode;
+	BYTE data[1];
+} ImbRespPacket;
+#define MIN_IMB_RESPONSE_SIZE	7	/* min packet + completion code */
+#define MAX_IMB_RESPONSE_SIZE	MAX_IMB_PACKET_SIZE
+/************************
+ *  ImbRequestBuffer
+ ************************/
+/*D*
+//  Name:       ImbRequestBuffer
+//  Purpose:    Structure definition for holding IMB message data
+//  Context:    Used by SendTimedImbpMessage and SendTimedI2cMessge
+//              functions in the library interface. In use, it is overlayed on a
+//				char buffer of size MIN_IMB_REQ_BUF_SIZE + 
+//  Fields:     
+//              respBufSize     size of the response buffer
+//
+//              timeout         timeout value in milli seconds   
+//                     
+//              req		body of request to send
+//              
+*D*/			
+typedef struct {
+	BYTE rsSa;
+	BYTE cmd;
+	BYTE netFn;
+	BYTE rsLun;	
+	BYTE dataLength;
+	BYTE data[1];	
+} ImbRequest;
+typedef struct {
+   DWORD	flags;			/* request flags*/
+#define NO_RESPONSE_EXPECTED	0x01	/*dont wait around for an IMB response*/
+   DWORD	timeOut;		/* in uSec units*/
+   ImbRequest	req;			/* message buffer*/
+} ImbRequestBuffer;
+#define MIN_IMB_REQ_BUF_SIZE	13	/* a buffer without any request data*/
+/************************
+ *  ImbResponseBuffer
+ ************************/
+/*D*
+//  Name:       ImbResponseBuffer
+//  Purpose:    Structure definition for response of a previous send 
+//  Context:    Used by DeviceIoControl to pass the message to be sent to
+//              MISSMIC port
+//  Fields:     
+//  		cCode		completion code returned by firmware
+//              data		buffer for  response data from firmware
+*D*/
+typedef struct {
+	BYTE       cCode;	
+	BYTE       data[1];	
+} ImbResponseBuffer;
+#define MIN_IMB_RESP_BUF_SIZE	1	
+#define MAX_IMB_RESP_SIZE		(MIN_IMB_RESP_BUF_SIZE + MAX_IMB_RESPONSE_SIZE)
+#pragma pack()
+/*
+ * Async message access structures and types
+ */
+typedef DWORD	ImbAsyncSeq;
+/*
+ * This is the structure passed in to IOCTL_IMB_GET_ASYNC_MSG
+*/
+typedef struct {
+	DWORD		timeOut;   
+	ImbAsyncSeq	lastSeq;   
+} ImbAsyncRequest;
+#define ASYNC_SEQ_START		0
+typedef struct {
+	ImbAsyncSeq	thisSeq;
+	BYTE data[1];
+} ImbAsyncResponse;
+#define MIN_ASYNC_RESP_SIZE	sizeof( ImbAsyncSeq )
+#define MAX_ASYNC_RESP_SIZE	(MIN_ASYNC_RESP_SIZE + MAX_IMB_PACKET_SIZE)
+/*
+** Driver Ioctls
+** In Linux, these calculate to:
+** IOCTL_IMB_SEND_MESSAGE    =1082
+** IOCTL_IMB_GET_ASYNC_MSG   =1088
+** IOCTL_IMB_MAP_MEMORY      =108e
+** IOCTL_IMB_UNMAP_MEMORY    =1090
+** IOCTL_IMB_SHUTDOWN_CODE   =1092
+** IOCTL_IMB_REGISTER_ASYNC_OBJ  =1098
+** IOCTL_IMB_DEREGISTER_ASYNC_OBJ=109a
+** IOCTL_IMB_CHECK_EVENT     =109c
+** IOCTL_IMB_POLL_ASYNC      =1094
+*/
+#define FILE_DEVICE_IMB			0x00008010
+#define IOCTL_IMB_BASE			0x00000880
+#define IOCTL_IMB_SEND_MESSAGE		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 2),  METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_GET_ASYNC_MSG		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 8),  METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_MAP_MEMORY		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 14), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_UNMAP_MEMORY		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 16), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_SHUTDOWN_CODE		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 18), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_REGISTER_ASYNC_OBJ	CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 24), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_DEREGISTER_ASYNC_OBJ	CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 26), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_CHECK_EVENT		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 28), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_IMB_POLL_ASYNC		CTL_CODE(FILE_DEVICE_IMB, (IOCTL_IMB_BASE + 20), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#endif /* IMB_IF__ */
+/*----------------------------------------------------------------------*/
+/*  No asynchronous messages available */
+#define IMB_MSG_NOT_AVAILABLE            ((NTSTATUS)0xE0070012L)
+#ifdef IMBLOG_H__
+/* Define the facility codes */
+#define FACILITY_RPC_STUBS               0x3
+#define FACILITY_RPC_RUNTIME             0x2
+#define FACILITY_IO_ERROR_CODE           0x4
+#define IMB_IO_ERROR_CODE                0x7
+
+#define STATUS_SEVERITY_WARNING          0x2
+#define STATUS_SEVERITY_SUCCESS          0x0
+#define STATUS_SEVERITY_INFORMATIONAL    0x1
+#define STATUS_SEVERITY_ERROR            0x3
+/*  Not enough memory for internal storage  of device %1. */
+#define INSUFFICIENT_RESOURCES           ((NTSTATUS)0xE0070001L)
+
+#define INVALID_INPUT_BUFFER             ((NTSTATUS)0xE0070002L)
+
+#define INVALID_OUTPUT_BUFFER            ((NTSTATUS)0xE0070003L)
+
+#define IMB_SEND_TIMEOUT                 ((NTSTATUS)0xE0070004L)
+
+#define IMB_RECEIVE_TIMEOUT              ((NTSTATUS)0xE0070005L)
+
+#define IMB_IF_SEND_TIMEOUT              ((NTSTATUS)0xE0070006L)
+
+#define IMB_IF_RECEIVE_TIMEOUT           ((NTSTATUS)0xE0040007L)
+
+#define HARDWARE_FAILURE                 ((NTSTATUS)0xE0040008L)
+
+#define DRIVER_FAILURE                   ((NTSTATUS)0xE0040009L)
+
+#define IMB_INVALID_IF_RESPONSE          ((NTSTATUS)0xE004000AL)
+
+#define IMB_INVALID_PACKET               ((NTSTATUS)0xE004000BL)
+
+#define IMB_RESPONSE_DATA_OVERFLOW       ((NTSTATUS)0xE004000CL)
+
+#define IMB_INVALID_REQUEST              ((NTSTATUS)0xE007000DL)
+
+#define INVALID_DRIVER_IOCTL             ((NTSTATUS)0xE007000EL)
+
+#define INVALID_DRIVER_REQUEST           ((NTSTATUS)0xE007000FL)
+
+#define IMB_CANT_GET_SMS_BUFFER          ((NTSTATUS)0xE0070010L)
+
+#define INPUT_BUFFER_TOO_SMALL           ((NTSTATUS)0xE0070011L)
+
+#define IMB_SEND_ERROR                   ((NTSTATUS)0xE0070013L)
+#endif /* IMBLOG_H__ */
+/*----------------------------------------------------------------------*/
+#ifndef IMBAPI_H__
+#define IMBAPI_H__
+#include <sys/types.h>
+#define	WRITE_READ_I2C		0x52
+#define	WRITE_EMP_BUFFER	0x7a
+#define	GET_DEVICE_ID		0x1
+#define SEND_MESSAGE		0x34
+#define BMC_SA			0x20
+#define BMC_LUN			0
+#define APP_NETFN		0x06
+#define	IPMI_09_VERSION		0x90
+#define	IPMI_10_VERSION		0x01
+
+#define	IPMI_15_VERSION		0x51
+
+#ifndef IPMI10_GET_DEVICE_ID_RESP_LENGTH
+#define IPMI10_GET_DEVICE_ID_RESP_LENGTH	12
+#endif
+
+#define IPMB_CHANNEL			0x0
+#define	EMP_CHANNEL			0x1
+#define LAN_CHANNEL			0x2
+#define	RESERVED_LUN			0x3
+#define	IPMB_LUN			0x2
+#define	EMP_LUN				0x0
+
+#define		PUBLIC_BUS		0
+
+#define BMC_CONTROLLER			0x20
+#define FPC_CONTROLLER			0x22
+typedef enum {
+	ACCESN_OK,
+	ACCESN_ERROR,
+	ACCESN_OUT_OF_RANGE,
+	ACCESN_END_OF_DATA,
+	ACCESN_UNSUPPORTED,
+	ACCESN_INVALID_TRANSACTION,
+	ACCESN_TIMED_OUT
+} ACCESN_STATUS;
+#pragma pack(1)
+/*
+ * Request structure provided to SendTimedImbpRequest()
+*/
+typedef struct {
+	unsigned char	cmdType;
+	unsigned char	rsSa;
+	unsigned char	busType;	
+	unsigned char	netFn;	
+	unsigned char	rsLun;	
+	unsigned char *	data;	
+	int		dataLength;
+} IMBPREQUESTDATA;
+/*
+ * Request structure provided to SendTimedI2cRequest()
+*/
+typedef struct {
+	unsigned char	rsSa;				
+	unsigned char	busType;		
+	unsigned char	numberOfBytesToRead;
+	unsigned char *	data;			
+	int		dataLength;	
+} I2CREQUESTDATA;
+#pragma pack()
+/*#ifdef IMB_API
+ *
+ * This section is provided to be able to compile using imb_if.h
+ *
+ *
+ * function return type. This is also defined in the local instrumentation
+ * so we ifdef here to avoid conflict.
+*/
+#define METHOD_BUFFERED		0
+#define FILE_ANY_ACCESS		0
+/*
+ * This is necessary to compile using memIf.h
+ */
+typedef enum _INTERFACE_TYPE
+{
+    Internal,
+    Isa,
+    Eisa,
+    MicroChannel,
+    TurboChannel,
+    MaximumInterfaceType
+} INTERFACE_TYPE, * PINTERFACE_TYPE;
+#ifdef WIN32
+/* From memIf.h */
+#pragma pack(1)
+typedef struct
+{
+    INTERFACE_TYPE   InterfaceType; // Isa, Eisa, etc....
+    ULONG            BusNumber;     // Bus number
+    PHYSICAL_ADDRESS BusAddress;    // Bus-relative address
+    ULONG            AddressSpace;  // 0 is memory, 1 is I/O
+    ULONG            Length;        // Length of section to map
+} PHYSICAL_MEMORY_INFO, * PPHYSICAL_MEMORY_INFO;
+#pragma pack()
+#endif
+/*#else	// not IMB_API */
+/*
+ * These are defined in imb_if.h but are needed by users of the imbapi library
+*/
+#define ASYNC_SEQ_START		0
+/*
+ * This is the generic IMB packet format, the final checksum cant be
+ * represented in this structure and will show up as the last data byte
+ */
+/*
+ #define MIN_IMB_PACKET_SIZE	7
+ #define MAX_IMB_PACKET_SIZE	33
+*/
+#define	MAX_BUFFER_SIZE		64
+/*#endif // IMB_API */
+/****************************** 
+ *  FUNCTION PROTOTYPES
+ ******************************/
+ACCESN_STATUS
+SendTimedImbpRequest (
+	IMBPREQUESTDATA *reqPtr,
+	int		timeOut,
+	BYTE *		respDataPtr,
+	int *		respDataLen,	
+	BYTE *		completionCode
+	);
+ACCESN_STATUS
+SendTimedI2cRequest (
+	I2CREQUESTDATA *reqPtr,	
+	int		timeOut,
+	BYTE *		respDataPtr,	
+	int *		respDataLen,
+	BYTE *		completionCode	
+	);
+ACCESN_STATUS
+SendAsyncImbpRequest (
+	IMBPREQUESTDATA *reqPtr,
+	BYTE *		 seqNo		
+	);
+ACCESN_STATUS
+GetAsyncImbpMessage (
+	ImbPacket *	msgPtr,	
+	DWORD *		msgLen,	
+	DWORD		timeOut,
+	ImbAsyncSeq *	seqNo,	
+	DWORD		channelNumber 
+	);
+ACCESN_STATUS
+GetAsyncImbpMessage_Ex (
+	ImbPacket *	msgPtr,	
+	DWORD *		msgLen,
+	DWORD		timeOut,
+	ImbAsyncSeq *	seqNo,	
+	DWORD		channelNumber, 
+	BYTE *		sessionHandle, 
+	BYTE *		privilege 
+	);
+ACCESN_STATUS
+UnmapPhysicalMemory( int virtualAddress, int Length );
+ACCESN_STATUS
+StartAsyncMesgPoll(void);
+ACCESN_STATUS
+MapPhysicalMemory (
+	int startAddress,	
+	int addressLength,
+	int *virtualAddress	
+	);
+ACCESN_STATUS
+SetShutDownCode (
+	int delayTime,
+	int code	
+	);
+ACCESN_STATUS
+SendTimedEmpMessageResponse (
+	ImbPacket * ptr,	
+	char      *responseDataBuf,
+	int	  responseDataLen,
+	int 	  timeOut
+	);
+ACCESN_STATUS
+SendTimedEmpMessageResponse_Ex (
+	ImbPacket * ptr,
+	char      *responseDataBuf,
+	int	  responseDataLen,
+	int 	  timeOut,	
+	BYTE	  sessionHandle,
+	BYTE	  channelNumber
+	);
+ACCESN_STATUS
+SendTimedLanMessageResponse (
+	ImbPacket * ptr,
+	char      *responseDataBuf,
+	int	  responseDataLen,
+	int 	  timeOut	
+	);
+ACCESN_STATUS
+SendTimedLanMessageResponse_Ex (
+	ImbPacket * ptr,
+	char      *responseDataBuf,
+	int	  responseDataLen,
+	int 	  timeOut	,
+	BYTE	  sessionHandle,
+	BYTE	  channelNumber
+	);
+ACCESN_STATUS
+IsAsyncMessageAvailable (unsigned int   eventId	);
+ACCESN_STATUS
+RegisterForImbAsyncMessageNotification (unsigned int *handleId);
+ACCESN_STATUS
+UnRegisterForImbAsyncMessageNotification (unsigned int handleId,int iFlag);
+BYTE	GetIpmiVersion(void);
+#endif /* IMBAPI_H__ */
diff --git a/src/plugins/ipmi_intf.c b/src/plugins/ipmi_intf.c
new file mode 100644
index 0000000..9225a34
--- /dev/null
+++ b/src/plugins/ipmi_intf.c
@@ -0,0 +1,624 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _XOPEN_SOURCE 700
+#define _GNU_SOURCE 1
+#define _DARWIN_C_SOURCE 1
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <unistd.h>
+#include <netdb.h>
+#endif
+
+
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sdr.h>
+#include <ipmitool/log.h>
+
+#define IPMI_DEFAULT_PAYLOAD_SIZE   25
+
+#ifdef IPMI_INTF_OPEN
+extern struct ipmi_intf ipmi_open_intf;
+#endif
+#ifdef IPMI_INTF_IMB
+extern struct ipmi_intf ipmi_imb_intf;
+#endif
+#ifdef IPMI_INTF_LIPMI
+extern struct ipmi_intf ipmi_lipmi_intf;
+#endif
+#ifdef IPMI_INTF_BMC
+extern struct ipmi_intf ipmi_bmc_intf;
+#endif
+#ifdef IPMI_INTF_LAN
+extern struct ipmi_intf ipmi_lan_intf;
+#endif
+#ifdef IPMI_INTF_LANPLUS
+extern struct ipmi_intf ipmi_lanplus_intf;
+#endif
+#ifdef IPMI_INTF_FREE
+extern struct ipmi_intf ipmi_free_intf;
+#endif
+#ifdef IPMI_INTF_SERIAL
+extern struct ipmi_intf ipmi_serial_term_intf;
+extern struct ipmi_intf ipmi_serial_bm_intf;
+#endif
+#ifdef IPMI_INTF_DUMMY
+extern struct ipmi_intf ipmi_dummy_intf;
+#endif
+#ifdef IPMI_INTF_USB
+extern struct ipmi_intf ipmi_usb_intf;
+#endif
+
+struct ipmi_intf * ipmi_intf_table[] = {
+#ifdef IPMI_INTF_OPEN
+	&ipmi_open_intf,
+#endif
+#ifdef IPMI_INTF_IMB
+	&ipmi_imb_intf,
+#endif
+#ifdef IPMI_INTF_LIPMI
+	&ipmi_lipmi_intf,
+#endif
+#ifdef IPMI_INTF_BMC
+	&ipmi_bmc_intf,
+#endif
+#ifdef IPMI_INTF_LAN
+	&ipmi_lan_intf,
+#endif
+#ifdef IPMI_INTF_LANPLUS
+	&ipmi_lanplus_intf,
+#endif
+#ifdef IPMI_INTF_FREE
+	&ipmi_free_intf,
+#endif
+#ifdef IPMI_INTF_SERIAL
+	&ipmi_serial_term_intf,
+	&ipmi_serial_bm_intf,
+#endif
+#ifdef IPMI_INTF_DUMMY
+	&ipmi_dummy_intf,
+#endif
+#ifdef IPMI_INTF_USB
+	&ipmi_usb_intf,
+#endif
+	NULL
+};
+
+/* ipmi_intf_print  -  Print list of interfaces
+ *
+ * no meaningful return code
+ */
+void ipmi_intf_print(struct ipmi_intf_support * intflist)
+{
+	struct ipmi_intf ** intf;
+	struct ipmi_intf_support * sup;
+	int def = 1;
+	int found;
+
+	lprintf(LOG_NOTICE, "Interfaces:");
+
+	for (intf = ipmi_intf_table; intf && *intf; intf++) {
+
+		if (intflist != NULL) {
+			found = 0;
+			for (sup=intflist; sup->name != NULL; sup++) {
+				if (strncmp(sup->name, (*intf)->name, strlen(sup->name)) == 0 &&
+				    strncmp(sup->name, (*intf)->name, strlen((*intf)->name)) == 0 &&
+				    sup->supported == 1)
+					found = 1;
+			}
+			if (found == 0)
+				continue;
+		}
+
+		lprintf(LOG_NOTICE, "\t%-12s  %s %s",
+			(*intf)->name, (*intf)->desc,
+			def ? "[default]" : "");
+		def = 0;
+	}
+	lprintf(LOG_NOTICE, "");
+}
+
+/* ipmi_intf_load  -  Load an interface from the interface table above
+ *                    If no interface name is given return first entry
+ *
+ * @name:	interface name to try and load
+ *
+ * returns pointer to inteface structure if found
+ * returns NULL on error
+ */
+struct ipmi_intf * ipmi_intf_load(char * name)
+{
+	struct ipmi_intf ** intf;
+	struct ipmi_intf * i;
+
+	if (name == NULL) {
+		i = ipmi_intf_table[0];
+		if (i->setup != NULL && (i->setup(i) < 0)) {
+			lprintf(LOG_ERR, "Unable to setup "
+				"interface %s", name);
+			return NULL;
+		}
+		return i;
+	}
+
+	for (intf = ipmi_intf_table;
+	     ((intf != NULL) && (*intf != NULL));
+	     intf++) {
+		i = *intf;
+		if (strncmp(name, i->name, strlen(name)) == 0) {
+			if (i->setup != NULL && (i->setup(i) < 0)) {
+				lprintf(LOG_ERR, "Unable to setup "
+					"interface %s", name);
+				return NULL;
+			}
+			return i;
+		}
+	}
+
+	return NULL;
+}
+
+void
+ipmi_intf_session_set_hostname(struct ipmi_intf * intf, char * hostname)
+{
+	if (intf->ssn_params.hostname != NULL) {
+		free(intf->ssn_params.hostname);
+		intf->ssn_params.hostname = NULL;
+	}
+	if (hostname == NULL) {
+		return;
+	}
+	intf->ssn_params.hostname = strdup(hostname);
+}
+
+void
+ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username)
+{
+	memset(intf->ssn_params.username, 0, 17);
+
+	if (username == NULL)
+		return;
+
+	memcpy(intf->ssn_params.username, username, __min(strlen(username), 16));
+}
+
+void
+ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password)
+{
+	memset(intf->ssn_params.authcode_set, 0, IPMI_AUTHCODE_BUFFER_SIZE);
+
+	if (password == NULL) {
+		intf->ssn_params.password = 0;
+		return;
+	}
+
+	intf->ssn_params.password = 1;
+	memcpy(intf->ssn_params.authcode_set, password,
+	       __min(strlen(password), IPMI_AUTHCODE_BUFFER_SIZE));
+}
+
+void
+ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t level)
+{
+	intf->ssn_params.privlvl = level;
+}
+
+void
+ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit)
+{
+	intf->ssn_params.lookupbit = lookupbit;
+}
+
+void
+ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id)
+{
+	intf->ssn_params.cipher_suite_id = cipher_suite_id;
+}
+
+void
+ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char)
+{
+	intf->ssn_params.sol_escape_char = sol_escape_char;
+}
+
+void
+ipmi_intf_session_set_kgkey(struct ipmi_intf *intf, const uint8_t *kgkey)
+{
+	memcpy(intf->ssn_params.kg, kgkey, IPMI_KG_BUFFER_SIZE);
+}
+
+void
+ipmi_intf_session_set_port(struct ipmi_intf * intf, int port)
+{
+	intf->ssn_params.port = port;
+}
+
+void
+ipmi_intf_session_set_authtype(struct ipmi_intf * intf, uint8_t authtype)
+{
+	/* clear password field if authtype NONE specified */
+	if (authtype == IPMI_SESSION_AUTHTYPE_NONE) {
+		memset(intf->ssn_params.authcode_set, 0, IPMI_AUTHCODE_BUFFER_SIZE);
+		intf->ssn_params.password = 0;
+	}
+
+	intf->ssn_params.authtype_set = authtype;
+}
+
+void
+ipmi_intf_session_set_timeout(struct ipmi_intf * intf, uint32_t timeout)
+{
+	intf->ssn_params.timeout = timeout;
+}
+
+void
+ipmi_intf_session_set_retry(struct ipmi_intf * intf, int retry)
+{
+	intf->ssn_params.retry = retry;
+}
+
+void
+ipmi_intf_session_cleanup(struct ipmi_intf *intf)
+{
+	if (intf->session == NULL) {
+		return;
+	}
+
+	free(intf->session);
+	intf->session = NULL;
+}
+
+void
+ipmi_cleanup(struct ipmi_intf * intf)
+{
+	ipmi_sdr_list_empty(intf);
+	ipmi_intf_session_set_hostname(intf, NULL);
+}
+
+#if defined(IPMI_INTF_LAN) || defined (IPMI_INTF_LANPLUS)
+int
+ipmi_intf_socket_connect(struct ipmi_intf * intf)
+{
+	struct ipmi_session_params *params;
+
+	struct sockaddr_storage addr;
+	struct addrinfo hints;
+	struct addrinfo *rp0 = NULL, *rp;
+	char service[NI_MAXSERV];
+
+	if (!intf) {
+		return -1;
+	}
+
+	params = &intf->ssn_params;
+
+	if (params->hostname == NULL || strlen((const char *)params->hostname) == 0) {
+		lprintf(LOG_ERR, "No hostname specified!");
+		return -1;
+	}
+
+	/* open port to BMC */
+	memset(&addr, 0, sizeof(addr));
+
+	sprintf(service, "%d", params->port);
+	/* Obtain address(es) matching host/port */
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family   = intf->ai_family;    /* Allow IPv4 or IPv6 */
+	hints.ai_socktype = SOCK_DGRAM;   /* Datagram socket */
+	hints.ai_flags    = 0;            /* use AI_NUMERICSERV for no name resolution */
+	hints.ai_protocol = IPPROTO_UDP; /*  */
+
+	if (getaddrinfo(params->hostname, service, &hints, &rp0) != 0) {
+		lprintf(LOG_ERR, "Address lookup for %s failed",
+				params->hostname);
+		return -1;
+	}
+
+	/* getaddrinfo() returns a list of address structures.
+	 * Try each address until we successfully connect(2).
+	 * If socket(2) (or connect(2)) fails, we (close the socket
+	 * and) try the next address.
+	 */
+
+	for (rp = rp0; rp != NULL; rp = rp->ai_next) {
+		/* We are only interested in IPv4 and IPv6 */
+		if ((rp->ai_family != AF_INET6) && (rp->ai_family != AF_INET)) {
+			continue;
+		}
+
+		intf->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+		if (intf->fd == -1) {
+			continue;
+		}
+
+		if (rp->ai_family == AF_INET) {
+			if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) {
+				hints.ai_family = rp->ai_family;
+				break;  /* Success */
+			}
+		}  else if (rp->ai_family == AF_INET6) {
+			struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)rp->ai_addr;
+			char hbuf[NI_MAXHOST];
+			socklen_t len;
+
+			/* The scope was specified on the command line e.g. with -H FE80::219:99FF:FEA0:BD95%eth0 */
+			if (addr6->sin6_scope_id != 0) {
+				len = sizeof(struct sockaddr_in6);
+				if (getnameinfo((struct sockaddr *)addr6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) {
+					lprintf(LOG_DEBUG, "Trying address: %s scope=%d",
+						hbuf,
+						addr6->sin6_scope_id);
+				}
+				if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) {
+					hints.ai_family = rp->ai_family;
+					break;  /* Success */
+				}
+			} else {
+				/* No scope specified, try to get this from the list of interfaces */
+				struct ifaddrs *ifaddrs = NULL;
+				struct ifaddrs *ifa = NULL;
+
+				if (getifaddrs(&ifaddrs) < 0) {
+					lprintf(LOG_ERR, "Interface address lookup for %s failed",
+						params->hostname);
+					break;
+				}
+
+				for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
+					if (ifa->ifa_addr == NULL) {
+						continue;
+					}
+
+					if (ifa->ifa_addr->sa_family == AF_INET6) {
+						struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+
+						/* Skip unwanted addresses */
+						if (IN6_IS_ADDR_MULTICAST(&tmp6->sin6_addr)) {
+							continue;
+						}
+						if (IN6_IS_ADDR_LOOPBACK(&tmp6->sin6_addr)) {
+							continue;
+						}
+						len = sizeof(struct sockaddr_in6);
+						if ( getnameinfo((struct sockaddr *)tmp6, len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0) {
+							lprintf(LOG_DEBUG, "Testing %s interface address: %s scope=%d",
+								ifa->ifa_name != NULL ? ifa->ifa_name : "???",
+								hbuf,
+								tmp6->sin6_scope_id);
+						}
+
+						if (tmp6->sin6_scope_id != 0) {
+							addr6->sin6_scope_id = tmp6->sin6_scope_id;
+						} else {
+							/*
+							 * No scope information in interface address information
+							 * On some OS'es, getifaddrs() is returning out the 'kernel' representation
+							 * of scoped addresses which stores the scope in the 3rd and 4th
+							 * byte. See also this page:
+							 * http://www.freebsd.org/doc/en/books/developers-handbook/ipv6.html
+							 */
+							if (IN6_IS_ADDR_LINKLOCAL(&tmp6->sin6_addr)
+									&& (tmp6->sin6_addr.s6_addr[1] != 0)) {
+								addr6->sin6_scope_id = ntohs(tmp6->sin6_addr.s6_addr[1]);
+							}
+						}
+
+						/* OK, now try to connect with the scope id from this interface address */
+						if (addr6->sin6_scope_id != 0 || !IN6_IS_ADDR_LINKLOCAL(&tmp6->sin6_addr)) {
+							if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) {
+								hints.ai_family = rp->ai_family;
+								lprintf(LOG_DEBUG, "Successful connected on %s interface with scope id %d", ifa->ifa_name, tmp6->sin6_scope_id);
+								break;  /* Success */
+							}
+						}
+					}
+				}
+				freeifaddrs(ifaddrs);
+			}
+		}
+		if (hints.ai_family != AF_UNSPEC) {
+			break;
+		}
+		close(intf->fd);
+		intf->fd = -1;
+	}
+
+	/* No longer needed */
+	freeaddrinfo(rp0);
+
+	return ((intf->fd != -1) ? 0 : -1);
+}
+#endif
+
+uint16_t
+ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf)
+{
+	int16_t size;
+
+	size = intf->max_request_data_size;
+
+	/* check if request size is not specified */
+	if (!size) {
+		/*
+		 * The IPMB standard overall message length for �non -bridging�
+		 * messages is specified as 32 bytes, maximum, including slave
+		 * address. This sets the upper limit for typical IPMI messages.
+		 * With the exception of messages used for bridging messages to
+		 * other busses or interfaces (e.g. Master Write-Read and Send Message)
+		 * IPMI messages should be designed to fit within this 32-byte maximum.
+		 * In order to support bridging, the Master Write -Read and Send Message
+		 * commands are allowed to exceed the 32-byte maximum transaction on IPMB
+		 */
+
+		size = IPMI_DEFAULT_PAYLOAD_SIZE;
+
+		/* check if message is forwarded */
+		if (intf->target_addr && intf->target_addr != intf->my_addr) {
+			/* add Send Message request size */
+			size += 8;
+		}
+	}
+
+	/* check if message is forwarded */
+	if (intf->target_addr && intf->target_addr != intf->my_addr) {
+		/* subtract send message request size */
+		size -= 8;
+
+		/*
+		 * Check that forwarded request size is not greater
+		 * than the default payload size.
+		 */
+		if (size > IPMI_DEFAULT_PAYLOAD_SIZE) {
+			size = IPMI_DEFAULT_PAYLOAD_SIZE;
+		}
+
+		/* check for double bridging */
+		if (intf->transit_addr && intf->transit_addr != intf->target_addr) {
+			/* subtract inner send message request size */
+			size -= 8;
+		}
+	}
+
+	/* check for underflow */
+	if (size < 0) {
+		return 0;
+	}
+
+	return size;
+}
+
+uint16_t
+ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf)
+{
+	int16_t size;
+
+	size = intf->max_response_data_size;
+
+	/* check if response size is not specified */
+	if (!size) {
+		/*
+		 * The IPMB standard overall message length for �non -bridging�
+		 * messages is specified as 32 bytes, maximum, including slave
+		 * address. This sets the upper limit for typical IPMI messages.
+		 * With the exception of messages used for bridging messages to
+		 * other busses or interfaces (e.g. Master Write-Read and Send Message)
+		 * IPMI messages should be designed to fit within this 32-byte maximum.
+		 * In order to support bridging, the Master Write -Read and Send Message
+		 * commands are allowed to exceed the 32-byte maximum transaction on IPMB
+		 */
+
+		size = IPMI_DEFAULT_PAYLOAD_SIZE; /* response length with subtracted header and checksum byte */
+
+		/* check if message is forwarded */
+		if (intf->target_addr && intf->target_addr != intf->my_addr) {
+			/* add Send Message header size */
+			size += 7;
+		}
+	}
+
+	/* check if message is forwarded */
+	if (intf->target_addr && intf->target_addr != intf->my_addr) {
+		/*
+		 * Some IPMI controllers like PICMG AMC Carriers embed responses
+		 * to the forwarded messages into the Send Message response.
+		 * In order to be sure that the response is not truncated,
+		 * subtract the internal message header size.
+		 */
+		size -= 8;
+
+		/*
+		 * Check that forwarded response is not greater
+		 * than the default payload size.
+		 */
+		if (size > IPMI_DEFAULT_PAYLOAD_SIZE) {
+			size = IPMI_DEFAULT_PAYLOAD_SIZE;
+		}
+
+		/* check for double bridging */
+		if (intf->transit_addr && intf->transit_addr != intf->target_addr) {
+			/* subtract inner send message header size */
+			size -= 8;
+		}
+	}
+
+	/* check for underflow */
+	if (size < 0) {
+		return 0;
+	}
+
+	return size;
+}
+
+void
+ipmi_intf_set_max_request_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (size < IPMI_DEFAULT_PAYLOAD_SIZE) {
+		lprintf(LOG_ERR, "Request size is too small (%d), leave default size",
+				size);
+		return;
+	}
+
+	if (intf->set_max_request_data_size) {
+		intf->set_max_request_data_size(intf, size);
+	} else {
+		intf->max_request_data_size = size;
+	}
+}
+
+void
+ipmi_intf_set_max_response_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (size < IPMI_DEFAULT_PAYLOAD_SIZE - 1) {
+		lprintf(LOG_ERR, "Response size is too small (%d), leave default size",
+				size);
+		return;
+	}
+
+	if (intf->set_max_response_data_size) {
+		intf->set_max_response_data_size(intf, size);
+	} else {
+		intf->max_response_data_size = size;
+	}
+}
diff --git a/src/plugins/lan/Makefile.am b/src/plugins/lan/Makefile.am
new file mode 100644
index 0000000..f276f38
--- /dev/null
+++ b/src/plugins/lan/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_lan.la
+noinst_LTLIBRARIES	= @INTF_LAN_LIB@
+libintf_lan_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_lan_la_SOURCES	= lan.c lan.h asf.h rmcp.h auth.c auth.h md5.c md5.h
+
diff --git a/src/plugins/lan/Makefile.in b/src/plugins/lan/Makefile.in
new file mode 100644
index 0000000..2abda0d
--- /dev/null
+++ b/src/plugins/lan/Makefile.in
@@ -0,0 +1,639 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/lan
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_lan_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_lan_la_OBJECTS = lan.lo auth.lo md5.lo
+libintf_lan_la_OBJECTS = $(am_libintf_lan_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_lan_la_SOURCES)
+DIST_SOURCES = $(libintf_lan_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_lan.la
+noinst_LTLIBRARIES = @INTF_LAN_LIB@
+libintf_lan_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_lan_la_SOURCES = lan.c lan.h asf.h rmcp.h auth.c auth.h md5.c md5.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/lan/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/lan/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_lan.la: $(libintf_lan_la_OBJECTS) $(libintf_lan_la_DEPENDENCIES) $(EXTRA_libintf_lan_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_lan_la_OBJECTS) $(libintf_lan_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/lan/asf.h b/src/plugins/lan/asf.h
new file mode 100644
index 0000000..ab36d6f
--- /dev/null
+++ b/src/plugins/lan/asf.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_ASF_H
+#define IPMI_ASF_H
+
+#include <ipmitool/helper.h>
+#include "lan.h"
+
+#define ASF_RMCP_IANA		0x000011be
+
+#define ASF_TYPE_PING		0x80
+#define ASF_TYPE_PONG		0x40
+
+static const struct valstr asf_type_vals[] __attribute__((unused)) = {
+	{ 0x10, "Reset" },
+	{ 0x11, "Power-up" },
+	{ 0x12, "Unconditional Power-down" },
+	{ 0x13, "Power Cycle" },
+	{ 0x40, "Presence Pong" },
+	{ 0x41, "Capabilities Response" },
+	{ 0x42, "System State Response" },
+	{ 0x80, "Presence Ping" },
+	{ 0x81, "Capabilities Request" },
+	{ 0x82, "System State Request" },
+	{ 0x00, NULL }
+};
+
+/* ASF message header */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct asf_hdr {
+	uint32_t	iana;
+	uint8_t		type;
+	uint8_t		tag;
+	uint8_t		__reserved;
+	uint8_t		len;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
+
+#endif /* IPMI_ASF_H */
diff --git a/src/plugins/lan/auth.c b/src/plugins/lan/auth.c
new file mode 100644
index 0000000..7410e3c
--- /dev/null
+++ b/src/plugins/lan/auth.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_CRYPTO_MD2
+# include <openssl/md2.h>
+#endif
+
+#ifdef HAVE_CRYPTO_MD5
+# include <openssl/md5.h>
+#else
+# include "md5.h"
+#endif
+
+/*
+ * multi-session authcode generation for MD5
+ * H(password + session_id + msg + session_seq + password)
+ *
+ * Use OpenSSL implementation of MD5 algorithm if found
+ */
+uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len)
+{
+#ifdef HAVE_CRYPTO_MD5
+	MD5_CTX ctx;
+	static uint8_t md[16];
+	uint32_t temp;
+
+#if WORDS_BIGENDIAN
+	temp = BSWAP_32(s->in_seq);
+#else
+	temp = s->in_seq;
+#endif
+	memset(md, 0, 16);
+	memset(&ctx, 0, sizeof(MD5_CTX));
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, (const uint8_t *)s->authcode, 16);
+	MD5_Update(&ctx, (const uint8_t *)&s->session_id, 4);
+	MD5_Update(&ctx, (const uint8_t *)data, data_len);
+	MD5_Update(&ctx, (const uint8_t *)&temp, sizeof(uint32_t));
+	MD5_Update(&ctx, (const uint8_t *)s->authcode, 16);
+	MD5_Final(md, &ctx);
+
+	if (verbose > 3)
+		printf("  MD5 AuthCode    : %s\n", buf2str(md, 16));
+
+	return md;
+#else /*HAVE_CRYPTO_MD5*/
+	md5_state_t state;
+	static md5_byte_t digest[16];
+	uint32_t temp;
+
+	memset(digest, 0, 16);
+	memset(&state, 0, sizeof(md5_state_t));
+
+	md5_init(&state);
+
+	md5_append(&state, (const md5_byte_t *)s->authcode, 16);
+	md5_append(&state, (const md5_byte_t *)&s->session_id, 4);
+	md5_append(&state, (const md5_byte_t *)data, data_len);
+
+#if WORDS_BIGENDIAN
+	temp = BSWAP_32(s->in_seq);
+#else
+	temp = s->in_seq;
+#endif
+	md5_append(&state, (const md5_byte_t *)&temp, 4);
+	md5_append(&state, (const md5_byte_t *)s->authcode, 16);
+
+	md5_finish(&state, digest);
+
+	if (verbose > 3)
+		printf("  MD5 AuthCode    : %s\n", buf2str(digest, 16));
+	return digest;
+#endif /*HAVE_CRYPTO_MD5*/
+}
+
+/* 
+ * multi-session authcode generation for MD2
+ * H(password + session_id + msg + session_seq + password)
+ *
+ * Use OpenSSL implementation of MD2 algorithm if found.
+ * This function is analogous to ipmi_auth_md5
+ */
+uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len)
+{
+#ifdef HAVE_CRYPTO_MD2
+	MD2_CTX ctx;
+	static uint8_t md[16];
+	uint32_t temp;
+
+#if WORDS_BIGENDIAN
+	temp = BSWAP_32(s->in_seq);
+#else
+	temp = s->in_seq;
+#endif
+	memset(md, 0, 16);
+	memset(&ctx, 0, sizeof(MD2_CTX));
+
+	MD2_Init(&ctx);
+	MD2_Update(&ctx, (const uint8_t *)s->authcode, 16);
+	MD2_Update(&ctx, (const uint8_t *)&s->session_id, 4);
+	MD2_Update(&ctx, (const uint8_t *)data, data_len);
+	MD2_Update(&ctx, (const uint8_t *)&temp, sizeof(uint32_t));
+	MD2_Update(&ctx, (const uint8_t *)s->authcode, 16);
+	MD2_Final(md, &ctx);
+
+	if (verbose > 3)
+		printf("  MD2 AuthCode    : %s\n", buf2str(md, 16));
+
+	return md;
+#else /*HAVE_CRYPTO_MD2*/
+	static uint8_t md[16];
+	memset(md, 0, 16);
+	printf("WARNING: No internal support for MD2!  "
+	       "Please re-compile with OpenSSL.\n");
+	return md;
+#endif /*HAVE_CRYPTO_MD2*/
+}
+
+/* special authentication method */
+uint8_t * ipmi_auth_special(struct ipmi_session * s)
+{
+#ifdef HAVE_CRYPTO_MD5
+	MD5_CTX ctx;
+	static uint8_t md[16];
+	uint8_t challenge[16];
+	int i;
+
+	memset(challenge, 0, 16);
+	memset(md, 0, 16);
+	memset(&ctx, 0, sizeof(MD5_CTX));
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, (const uint8_t *)s->authcode, strlen((const char *)s->authcode));
+	MD5_Final(md, &ctx);
+
+	for (i=0; i<16; i++)
+		challenge[i] = s->challenge[i] ^ md[i];
+
+	memset(md, 0, 16);
+	memset(&ctx, 0, sizeof(MD5_CTX));
+
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, (const uint8_t *)challenge, 16);
+	MD5_Final(md, &ctx);
+
+	return md;
+#else  /*HAVE_CRYPTO_MD5*/
+	int i;
+	md5_state_t state;
+	static md5_byte_t digest[16];
+	uint8_t challenge[16];
+
+	memset(challenge, 0, 16);
+	memset(digest, 0, 16);
+	memset(&state, 0, sizeof(md5_state_t));
+
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)s->authcode, strlen(s->authcode));
+	md5_finish(&state, digest);
+
+	for (i=0; i<16; i++)
+		challenge[i] = s->challenge[i] ^ digest[i];
+
+	memset(digest, 0, 16);
+	memset(&state, 0, sizeof(md5_state_t));
+
+	md5_init(&state);
+	md5_append(&state, (const md5_byte_t *)challenge, 16);
+	md5_finish(&state, digest);
+
+	return digest;
+#endif /*HAVE_CRYPTO_MD5*/
+}
+
diff --git a/src/plugins/lan/auth.h b/src/plugins/lan/auth.h
new file mode 100644
index 0000000..b9866ba
--- /dev/null
+++ b/src/plugins/lan/auth.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_AUTH_H
+#define IPMI_AUTH_H
+
+uint8_t * ipmi_auth_md2(struct ipmi_session * s, uint8_t * data, int data_len);
+uint8_t * ipmi_auth_md5(struct ipmi_session * s, uint8_t * data, int data_len);
+uint8_t * ipmi_auth_special(struct ipmi_session * s);
+
+#endif /*IPMI_AUTH_H*/
diff --git a/src/plugins/lan/lan.c b/src/plugins/lan/lan.c
new file mode 100644
index 0000000..40ba233
--- /dev/null
+++ b/src/plugins/lan/lan.c
@@ -0,0 +1,2126 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <fcntl.h>
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_oem.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_constants.h>
+#include <ipmitool/hpm2.h>
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "lan.h"
+#include "rmcp.h"
+#include "asf.h"
+#include "auth.h"
+
+#define IPMI_LAN_TIMEOUT	2
+#define IPMI_LAN_RETRY		4
+#define IPMI_LAN_PORT		0x26f
+#define IPMI_LAN_CHANNEL_E	0x0e
+
+/*
+ * LAN interface is required to support 45 byte request transactions and
+ * 42 byte response transactions.
+ */
+#define IPMI_LAN_MAX_REQUEST_SIZE	38	/* 45 - 7 */
+#define IPMI_LAN_MAX_RESPONSE_SIZE	34	/* 42 - 8 */
+
+extern const struct valstr ipmi_privlvl_vals[];
+extern const struct valstr ipmi_authtype_session_vals[];
+extern int verbose;
+
+struct ipmi_rq_entry * ipmi_req_entries;
+static struct ipmi_rq_entry * ipmi_req_entries_tail;
+static uint8_t bridge_possible = 0;
+
+static int ipmi_lan_send_packet(struct ipmi_intf * intf, uint8_t * data, int data_len);
+static struct ipmi_rs * ipmi_lan_recv_packet(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lan_poll_recv(struct ipmi_intf * intf);
+static int ipmi_lan_setup(struct ipmi_intf * intf);
+static int ipmi_lan_keepalive(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lan_recv_sol(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lan_send_sol(struct ipmi_intf * intf,
+					  struct ipmi_v2_payload * payload);
+static struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
+static int ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp);
+static int ipmi_lan_open(struct ipmi_intf * intf);
+static void ipmi_lan_close(struct ipmi_intf * intf);
+static int ipmi_lan_ping(struct ipmi_intf * intf);
+static void ipmi_lan_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size);
+static void ipmi_lan_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size);
+
+struct ipmi_intf ipmi_lan_intf = {
+	.name = "lan",
+	.desc = "IPMI v1.5 LAN Interface",
+	.setup = ipmi_lan_setup,
+	.open = ipmi_lan_open,
+	.close = ipmi_lan_close,
+	.sendrecv = ipmi_lan_send_cmd,
+	.sendrsp = ipmi_lan_send_rsp,
+	.recv_sol = ipmi_lan_recv_sol,
+	.send_sol = ipmi_lan_send_sol,
+	.keepalive = ipmi_lan_keepalive,
+	.set_max_request_data_size = ipmi_lan_set_max_rq_data_size,
+	.set_max_response_data_size = ipmi_lan_set_max_rp_data_size,
+	.target_addr = IPMI_BMC_SLAVE_ADDR,
+};
+
+static struct ipmi_rq_entry *
+ipmi_req_add_entry(struct ipmi_intf * intf, struct ipmi_rq * req, uint8_t req_seq)
+{
+	struct ipmi_rq_entry * e;
+
+	e = malloc(sizeof(struct ipmi_rq_entry));
+	if (e == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+
+	memset(e, 0, sizeof(struct ipmi_rq_entry));
+	memcpy(&e->req, req, sizeof(struct ipmi_rq));
+
+	e->intf = intf;
+	e->rq_seq = req_seq;
+
+	if (ipmi_req_entries == NULL)
+		ipmi_req_entries = e;
+	else
+		ipmi_req_entries_tail->next = e;
+
+	ipmi_req_entries_tail = e;
+	lprintf(LOG_DEBUG+3, "added list entry seq=0x%02x cmd=0x%02x",
+		e->rq_seq, e->req.msg.cmd);
+	return e;
+}
+
+static struct ipmi_rq_entry *
+ipmi_req_lookup_entry(uint8_t seq, uint8_t cmd)
+{
+	struct ipmi_rq_entry * e = ipmi_req_entries;
+	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
+		if (e->next == NULL || e == e->next)
+			return NULL;
+		e = e->next;
+	}
+	return e;
+}
+
+static void
+ipmi_req_remove_entry(uint8_t seq, uint8_t cmd)
+{
+	struct ipmi_rq_entry * p, * e, * saved_next_entry;
+
+	e = p = ipmi_req_entries;
+
+	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
+		p = e;
+		e = e->next;
+	}
+	if (e) {
+		lprintf(LOG_DEBUG+3, "removed list entry seq=0x%02x cmd=0x%02x",
+			seq, cmd);
+		saved_next_entry = e->next;
+		p->next = (p->next == e->next) ? NULL : e->next;
+		/* If entry being removed is first in list, fix up list head */
+		if (ipmi_req_entries == e) {
+			if (ipmi_req_entries != p)
+				ipmi_req_entries = p;
+			else
+				ipmi_req_entries = saved_next_entry;
+		}
+		/* If entry being removed is last in list, fix up list tail */
+		if (ipmi_req_entries_tail == e) {
+			if (ipmi_req_entries_tail != p)
+				ipmi_req_entries_tail = p;
+			else
+				ipmi_req_entries_tail = NULL;
+		}
+		if (e->msg_data) {
+			free(e->msg_data);
+			e->msg_data = NULL;
+		}
+		free(e);
+		e = NULL;
+	}
+}
+
+static void
+ipmi_req_clear_entries(void)
+{
+	struct ipmi_rq_entry * p, * e;
+
+	e = ipmi_req_entries;
+	while (e) {
+		lprintf(LOG_DEBUG+3, "cleared list entry seq=0x%02x cmd=0x%02x",
+			e->rq_seq, e->req.msg.cmd);
+		if (e->next != NULL) {
+			p = e->next;
+			free(e);
+			e = p;
+		} else {
+			free(e);
+			e = NULL;
+			break;
+		}
+	}
+	ipmi_req_entries = NULL;
+	ipmi_req_entries_tail = NULL;
+}
+
+static int
+get_random(void *data, int len)
+{
+	int fd = open("/dev/urandom", O_RDONLY);
+	int rv;
+
+	if (fd < 0)
+		return errno;
+	if (len < 0) {
+		close(fd);
+		return errno; /* XXX: ORLY? */
+	}
+
+	rv = read(fd, data, len);
+
+	close(fd);
+	return rv;
+}
+
+static int
+ipmi_lan_send_packet(struct ipmi_intf * intf, uint8_t * data, int data_len)
+{
+	if (verbose > 2)
+		printbuf(data, data_len, "send_packet");
+
+	return send(intf->fd, data, data_len, 0);
+}
+
+static struct ipmi_rs *
+ipmi_lan_recv_packet(struct ipmi_intf * intf)
+{
+	static struct ipmi_rs rsp;
+	fd_set read_set;
+	fd_set err_set;
+	struct timeval tmout;
+	int ret;
+
+	FD_ZERO(&read_set);
+	FD_SET(intf->fd, &read_set);
+
+	FD_ZERO(&err_set);
+	FD_SET(intf->fd, &err_set);
+
+	tmout.tv_sec = intf->ssn_params.timeout;
+	tmout.tv_usec = 0;
+
+	ret = select(intf->fd + 1, &read_set, NULL, &err_set, &tmout);
+	if (ret < 0 || FD_ISSET(intf->fd, &err_set) || !FD_ISSET(intf->fd, &read_set))
+		return NULL;
+
+	/* the first read may return ECONNREFUSED because the rmcp ping
+	 * packet--sent to UDP port 623--will be processed by both the
+	 * BMC and the OS.
+	 *
+	 * The problem with this is that the ECONNREFUSED takes
+	 * priority over any other received datagram; that means that
+	 * the Connection Refused shows up _before_ the response packet,
+	 * regardless of the order they were sent out.  (unless the
+	 * response is read before the connection refused is returned)
+	 */
+	ret = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0);
+
+	if (ret < 0) {
+		FD_ZERO(&read_set);
+		FD_SET(intf->fd, &read_set);
+
+		FD_ZERO(&err_set);
+		FD_SET(intf->fd, &err_set);
+
+		tmout.tv_sec = intf->ssn_params.timeout;
+		tmout.tv_usec = 0;
+
+		ret = select(intf->fd + 1, &read_set, NULL, &err_set, &tmout);
+		if (ret < 0 || FD_ISSET(intf->fd, &err_set) || !FD_ISSET(intf->fd, &read_set))
+			return NULL;
+
+		ret = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0);
+		if (ret < 0)
+			return NULL;
+	}
+
+	if (ret == 0)
+		return NULL;
+
+	rsp.data[ret] = '\0';
+	rsp.data_len = ret;
+
+	if (verbose > 2)
+		printbuf(rsp.data, rsp.data_len, "recv_packet");
+
+	return &rsp;
+}
+
+/*
+ * parse response RMCP "pong" packet
+ *
+ * return -1 if ping response not received
+ * returns 0 if IPMI is NOT supported
+ * returns 1 if IPMI is supported
+ *
+ * udp.source	= 0x026f	// RMCP_UDP_PORT
+ * udp.dest	= ?		// udp.source from rmcp-ping
+ * udp.len	= ?
+ * udp.check	= ?
+ * rmcp.ver	= 0x06		// RMCP Version 1.0
+ * rmcp.__res	= 0x00		// RESERVED
+ * rmcp.seq	= 0xff		// no RMCP ACK
+ * rmcp.class	= 0x06		// RMCP_CLASS_ASF
+ * asf.iana	= 0x000011be	// ASF_RMCP_IANA
+ * asf.type	= 0x40		// ASF_TYPE_PONG
+ * asf.tag	= ?		// asf.tag from rmcp-ping
+ * asf.__res	= 0x00		// RESERVED
+ * asf.len	= 0x10		// 16 bytes
+ * asf.data[3:0]= 0x000011be	// IANA# = RMCP_ASF_IANA if no OEM
+ * asf.data[7:4]= 0x00000000	// OEM-defined (not for IPMI)
+ * asf.data[8]	= 0x81		// supported entities
+ * 				// [7]=IPMI [6:4]=RES [3:0]=ASF_1.0
+ * asf.data[9]	= 0x00		// supported interactions (reserved)
+ * asf.data[f:a]= 0x000000000000
+ */
+static int
+ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
+{
+	struct rmcp_pong * pong;
+
+	if (rsp == NULL)
+		return -1;
+
+	pong = (struct rmcp_pong *)rsp->data;
+
+	lprintf(LOG_DEBUG,
+		"Received IPMI/RMCP response packet: \n"
+		"  IPMI%s Supported\n"
+		"  ASF Version %s\n"
+		"  RMCP Version %s\n"
+		"  RMCP Sequence %d\n"
+		"  IANA Enterprise %ld\n",
+		(pong->sup_entities & 0x80) ? "" : " NOT",
+		(pong->sup_entities & 0x01) ? "1.0" : "unknown",
+		(pong->rmcp.ver == 6) ? "1.0" : "unknown",
+		pong->rmcp.seq,
+		ntohl(pong->iana));
+
+	return (pong->sup_entities & 0x80) ? 1 : 0;
+}
+
+/* build and send RMCP presence ping packet
+ *
+ * RMCP ping
+ *
+ * udp.source	= ?
+ * udp.dest	= 0x026f	// RMCP_UDP_PORT
+ * udp.len	= ?
+ * udp.check	= ?
+ * rmcp.ver	= 0x06		// RMCP Version 1.0
+ * rmcp.__res	= 0x00		// RESERVED
+ * rmcp.seq	= 0xff		// no RMCP ACK
+ * rmcp.class	= 0x06		// RMCP_CLASS_ASF
+ * asf.iana	= 0x000011be	// ASF_RMCP_IANA
+ * asf.type	= 0x80		// ASF_TYPE_PING
+ * asf.tag	= ?		// ASF sequence number
+ * asf.__res	= 0x00		// RESERVED
+ * asf.len	= 0x00
+ *
+ */
+static int
+ipmi_lan_ping(struct ipmi_intf * intf)
+{
+	struct asf_hdr asf_ping = {
+		.iana	= htonl(ASF_RMCP_IANA),
+		.type	= ASF_TYPE_PING,
+	};
+	struct rmcp_hdr rmcp_ping = {
+		.ver	= RMCP_VERSION_1,
+		.class	= RMCP_CLASS_ASF,
+		.seq	= 0xff,
+	};
+	uint8_t * data;
+	int len = sizeof(rmcp_ping) + sizeof(asf_ping);
+	int rv;
+
+	data = malloc(len);
+	if (data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return -1;
+	}
+	memset(data, 0, len);
+	memcpy(data, &rmcp_ping, sizeof(rmcp_ping));
+	memcpy(data+sizeof(rmcp_ping), &asf_ping, sizeof(asf_ping));
+
+	lprintf(LOG_DEBUG, "Sending IPMI/RMCP presence ping packet");
+
+	rv = ipmi_lan_send_packet(intf, data, len);
+
+	free(data);
+	data = NULL;
+
+	if (rv < 0) {
+		lprintf(LOG_ERR, "Unable to send IPMI presence ping packet");
+		return -1;
+	}
+
+	if (ipmi_lan_poll_recv(intf) == 0)
+		return 0;
+
+	return 1;
+}
+
+/*
+ * The "thump" functions are used to send an extra packet following each
+ * request message.  This may kick-start some BMCs that get confused with
+ * bad passwords or operate poorly under heavy network load.
+ */
+static void
+ipmi_lan_thump_first(struct ipmi_intf * intf)
+{
+	/* is this random data? */
+	uint8_t data[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				   0x07, 0x20, 0x18, 0xc8, 0xc2, 0x01, 0x01, 0x3c };
+	ipmi_lan_send_packet(intf, data, 16);
+}
+
+static void
+ipmi_lan_thump(struct ipmi_intf * intf)
+{
+	uint8_t data[10] = "thump";
+	ipmi_lan_send_packet(intf, data, 10);
+}
+
+static struct ipmi_rs *
+ipmi_lan_poll_recv(struct ipmi_intf * intf)
+{
+	struct rmcp_hdr rmcp_rsp;
+	struct ipmi_rs * rsp;
+	struct ipmi_rq_entry * entry;
+	int x=0, rv;
+	uint8_t our_address = intf->my_addr;
+
+	if (our_address == 0)
+		our_address = IPMI_BMC_SLAVE_ADDR;
+
+	rsp = ipmi_lan_recv_packet(intf);
+
+	while (rsp != NULL) {
+
+		/* parse response headers */
+		memcpy(&rmcp_rsp, rsp->data, 4);
+
+		switch (rmcp_rsp.class) {
+		case RMCP_CLASS_ASF:
+			/* ping response packet */
+			rv = ipmi_handle_pong(intf, rsp);
+			return (rv <= 0) ? NULL : rsp;
+		case RMCP_CLASS_IPMI:
+			/* handled by rest of function */
+			break;
+		default:
+			lprintf(LOG_DEBUG, "Invalid RMCP class: %x",
+				rmcp_rsp.class);
+			rsp = ipmi_lan_recv_packet(intf);
+			continue;
+		}
+
+		x = 4;
+		rsp->session.authtype = rsp->data[x++];
+		memcpy(&rsp->session.seq, rsp->data+x, 4);
+		x += 4;
+		memcpy(&rsp->session.id, rsp->data+x, 4);
+		x += 4;
+
+		if (rsp->session.id == (intf->session->session_id + 0x10000000)) {
+			/* With SOL, authtype is always NONE, so we have no authcode */
+			rsp->session.payloadtype = IPMI_PAYLOAD_TYPE_SOL;
+	
+			rsp->session.msglen = rsp->data[x++];
+			
+			rsp->payload.sol_packet.packet_sequence_number =
+				rsp->data[x++] & 0x0F;
+
+			rsp->payload.sol_packet.acked_packet_number =
+				rsp->data[x++] & 0x0F;
+
+			rsp->payload.sol_packet.accepted_character_count =
+				rsp->data[x++];
+
+			rsp->payload.sol_packet.is_nack =
+				rsp->data[x] & 0x40;
+
+			rsp->payload.sol_packet.transfer_unavailable =
+				rsp->data[x] & 0x20;
+
+			rsp->payload.sol_packet.sol_inactive = 
+				rsp->data[x] & 0x10;
+
+			rsp->payload.sol_packet.transmit_overrun =
+				rsp->data[x] & 0x08;
+	
+			rsp->payload.sol_packet.break_detected =
+				rsp->data[x++] & 0x04;
+
+			x++; /* On ISOL there's and additional fifth byte before the data starts */
+	
+			lprintf(LOG_DEBUG, "SOL sequence number     : 0x%02x",
+				rsp->payload.sol_packet.packet_sequence_number);
+
+			lprintf(LOG_DEBUG, "SOL acked packet        : 0x%02x",
+				rsp->payload.sol_packet.acked_packet_number);
+			
+			lprintf(LOG_DEBUG, "SOL accepted char count : 0x%02x",
+				rsp->payload.sol_packet.accepted_character_count);
+			
+			lprintf(LOG_DEBUG, "SOL is nack             : %s",
+				rsp->payload.sol_packet.is_nack? "true" : "false");
+			
+			lprintf(LOG_DEBUG, "SOL xfer unavailable    : %s",
+				rsp->payload.sol_packet.transfer_unavailable? "true" : "false");
+			
+			lprintf(LOG_DEBUG, "SOL inactive            : %s",
+				rsp->payload.sol_packet.sol_inactive? "true" : "false");
+			
+			lprintf(LOG_DEBUG, "SOL transmit overrun    : %s",
+				rsp->payload.sol_packet.transmit_overrun? "true" : "false");
+			
+			lprintf(LOG_DEBUG, "SOL break detected      : %s",
+				rsp->payload.sol_packet.break_detected? "true" : "false");
+		}
+		else
+		{
+			/* Standard IPMI 1.5 packet */
+			rsp->session.payloadtype = IPMI_PAYLOAD_TYPE_IPMI;
+			if (intf->session->active && (rsp->session.authtype || intf->session->authtype))
+				x += 16;
+
+			rsp->session.msglen = rsp->data[x++];
+			rsp->payload.ipmi_response.rq_addr = rsp->data[x++];
+			rsp->payload.ipmi_response.netfn   = rsp->data[x] >> 2;
+			rsp->payload.ipmi_response.rq_lun  = rsp->data[x++] & 0x3;
+			x++;		/* checksum */
+			rsp->payload.ipmi_response.rs_addr = rsp->data[x++];
+			rsp->payload.ipmi_response.rq_seq  = rsp->data[x] >> 2;
+			rsp->payload.ipmi_response.rs_lun  = rsp->data[x++] & 0x3;
+			rsp->payload.ipmi_response.cmd     = rsp->data[x++];
+			rsp->ccode          = rsp->data[x++];
+			
+			if (verbose > 2)
+				printbuf(rsp->data, rsp->data_len, "ipmi message header");
+			
+			lprintf(LOG_DEBUG+1, "<< IPMI Response Session Header");
+			lprintf(LOG_DEBUG+1, "<<   Authtype   : %s",
+				val2str(rsp->session.authtype, ipmi_authtype_session_vals));
+			lprintf(LOG_DEBUG+1, "<<   Sequence   : 0x%08lx",
+				(long)rsp->session.seq);
+			lprintf(LOG_DEBUG+1, "<<   Session ID : 0x%08lx",
+				(long)rsp->session.id);
+			lprintf(LOG_DEBUG+1, "<< IPMI Response Message Header");
+			lprintf(LOG_DEBUG+1, "<<   Rq Addr    : %02x",
+				rsp->payload.ipmi_response.rq_addr);
+			lprintf(LOG_DEBUG+1, "<<   NetFn      : %02x",
+				rsp->payload.ipmi_response.netfn);
+			lprintf(LOG_DEBUG+1, "<<   Rq LUN     : %01x",
+				rsp->payload.ipmi_response.rq_lun);
+			lprintf(LOG_DEBUG+1, "<<   Rs Addr    : %02x",
+				rsp->payload.ipmi_response.rs_addr);
+			lprintf(LOG_DEBUG+1, "<<   Rq Seq     : %02x",
+				rsp->payload.ipmi_response.rq_seq);
+			lprintf(LOG_DEBUG+1, "<<   Rs Lun     : %01x",
+				rsp->payload.ipmi_response.rs_lun);
+			lprintf(LOG_DEBUG+1, "<<   Command    : %02x",
+				rsp->payload.ipmi_response.cmd);
+			lprintf(LOG_DEBUG+1, "<<   Compl Code : 0x%02x",
+				rsp->ccode);
+			
+			/* now see if we have outstanding entry in request list */
+			entry = ipmi_req_lookup_entry(rsp->payload.ipmi_response.rq_seq,
+						      rsp->payload.ipmi_response.cmd);
+			if (entry) {
+				lprintf(LOG_DEBUG+2, "IPMI Request Match found");
+				if ((intf->target_addr != our_address) && bridge_possible) {
+					if ((rsp->data_len) && (rsp->payload.ipmi_response.netfn == 7) &&
+					    (rsp->payload.ipmi_response.cmd != 0x34)) {
+						if (verbose > 2)
+							printbuf(&rsp->data[x], rsp->data_len-x,
+								 "bridge command response");
+					}
+					/* bridged command: lose extra header */
+					if (entry->bridging_level &&
+					    rsp->payload.ipmi_response.netfn == 7 &&
+					    rsp->payload.ipmi_response.cmd == 0x34) {
+						entry->bridging_level--;
+						if (rsp->data_len - x - 1 == 0) {
+							rsp = !rsp->ccode ? ipmi_lan_recv_packet(intf) : NULL;
+							if (!entry->bridging_level)
+								entry->req.msg.cmd = entry->req.msg.target_cmd;
+							if (rsp == NULL) {
+								ipmi_req_remove_entry(entry->rq_seq, entry->req.msg.cmd);
+							}
+							continue;
+						} else {
+							/* The bridged answer data are inside the incoming packet */
+							memmove(rsp->data + x - 7,
+								rsp->data + x, 
+								rsp->data_len - x - 1);
+							rsp->data[x - 8] -= 8;
+							rsp->data_len -= 8;
+							entry->rq_seq = rsp->data[x - 3] >> 2;
+							if (!entry->bridging_level)
+								entry->req.msg.cmd = entry->req.msg.target_cmd;
+							continue;
+						}
+					} else {
+						//x += sizeof(rsp->payload.ipmi_response);
+						if (rsp->data[x-1] != 0)
+							lprintf(LOG_DEBUG, "WARNING: Bridged "
+								"cmd ccode = 0x%02x",
+								rsp->data[x-1]);
+					}
+				}
+				ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
+						      rsp->payload.ipmi_response.cmd);
+			} else {
+				lprintf(LOG_INFO, "IPMI Request Match NOT FOUND");
+				rsp = ipmi_lan_recv_packet(intf);
+				continue;
+			}
+		}
+
+		break;
+	}
+
+	/* shift response data to start of array */
+	if (rsp && rsp->data_len > x) {
+		rsp->data_len -= x;
+		if (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_IPMI)
+			rsp->data_len -= 1; /* We don't want the checksum */
+		memmove(rsp->data, rsp->data + x, rsp->data_len);
+		memset(rsp->data + rsp->data_len, 0, IPMI_BUF_SIZE - rsp->data_len);
+	}
+
+	return rsp;
+}
+
+/*
+ * IPMI LAN Request Message Format
+ * +--------------------+
+ * |  rmcp.ver          | 4 bytes
+ * |  rmcp.__reserved   |
+ * |  rmcp.seq          |
+ * |  rmcp.class        |
+ * +--------------------+
+ * |  session.authtype  | 9 bytes
+ * |  session.seq       |
+ * |  session.id        |
+ * +--------------------+
+ * | [session.authcode] | 16 bytes (AUTHTYPE != none)
+ * +--------------------+
+ * |  message length    | 1 byte
+ * +--------------------+
+ * |  message.rs_addr   | 6 bytes
+ * |  message.netfn_lun |
+ * |  message.checksum  |
+ * |  message.rq_addr   |
+ * |  message.rq_seq    |
+ * |  message.cmd       |
+ * +--------------------+
+ * | [request data]     | data_len bytes
+ * +--------------------+
+ * |  checksum          | 1 byte
+ * +--------------------+
+ */
+static struct ipmi_rq_entry *
+ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req, int isRetry)
+{
+	struct rmcp_hdr rmcp = {
+		.ver		= RMCP_VERSION_1,
+		.class		= RMCP_CLASS_IPMI,
+		.seq		= 0xff,
+	};
+	uint8_t * msg, * temp;
+	int cs, mp, tmp;
+	int ap = 0;
+	int len = 0;
+	int cs2 = 0, cs3 = 0;
+	struct ipmi_rq_entry * entry;
+	struct ipmi_session * s = intf->session;
+	static int curr_seq = 0;
+	uint8_t our_address = intf->my_addr;
+
+	if (our_address == 0)
+		our_address = IPMI_BMC_SLAVE_ADDR;
+
+	if (isRetry == 0)
+		curr_seq++;
+
+	if (curr_seq >= 64)
+		curr_seq = 0;
+
+	// Bug in the existing code where it keeps on adding same command/seq pair 
+	// in the lookup entry list.
+	// Check if we have cmd,seq pair already in our list. As we are not changing 
+	// the seq number we have to re-use the node which has existing
+	// command and sequence number. If we add then we will have redundant node with
+	// same cmd,seq pair
+	entry = ipmi_req_lookup_entry(curr_seq, req->msg.cmd);
+	if (entry)
+	{
+		// This indicates that we have already same command and seq in list
+		// No need to add once again and we will re-use the existing node.
+		// Only thing we have to do is clear the msg_data as we create
+		// a new one below in the code for it.
+		if (entry->msg_data) {
+			free(entry->msg_data);
+			entry->msg_data = NULL;
+		}
+	}
+	else
+	{
+		// We dont have this request in the list so we can add it 
+		// to the list
+		entry = ipmi_req_add_entry(intf, req, curr_seq);
+		if (entry == NULL)
+			return NULL;
+	}
+ 
+	len = req->msg.data_len + 29;
+	if (s->active && s->authtype)
+		len += 16;
+	if (intf->transit_addr != intf->my_addr && intf->transit_addr != 0)
+		len += 8;
+	msg = malloc(len);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(msg, 0, len);
+
+	/* rmcp header */
+	memcpy(msg, &rmcp, sizeof(rmcp));
+	len = sizeof(rmcp);
+
+	/* ipmi session header */
+	msg[len++] = s->active ? s->authtype : 0;
+
+	msg[len++] = s->in_seq & 0xff;
+	msg[len++] = (s->in_seq >> 8) & 0xff;
+	msg[len++] = (s->in_seq >> 16) & 0xff;
+	msg[len++] = (s->in_seq >> 24) & 0xff;
+	memcpy(msg+len, &s->session_id, 4);
+	len += 4;
+
+	/* ipmi session authcode */
+	if (s->active && s->authtype) {
+		ap = len;
+		memcpy(msg+len, s->authcode, 16);
+		len += 16;
+	}
+
+	/* message length */
+	if ((intf->target_addr == our_address) || !bridge_possible) {
+		entry->bridging_level = 0;
+		msg[len++] = req->msg.data_len + 7;
+		cs = mp = len;
+	} else {
+		/* bridged request: encapsulate w/in Send Message */
+		entry->bridging_level = 1;
+		msg[len++] = req->msg.data_len + 15 +
+		  (intf->transit_addr != intf->my_addr && intf->transit_addr != 0 ? 8 : 0);
+		cs = mp = len;
+		msg[len++] = IPMI_BMC_SLAVE_ADDR;
+		msg[len++] = IPMI_NETFN_APP << 2;
+		tmp = len - cs;
+		msg[len++] = ipmi_csum(msg+cs, tmp);
+		cs2 = len;
+		msg[len++] = IPMI_REMOTE_SWID;
+		msg[len++] = curr_seq << 2;
+		msg[len++] = 0x34;			/* Send Message rqst */
+		entry->req.msg.target_cmd = entry->req.msg.cmd;	/* Save target command */
+		entry->req.msg.cmd = 0x34;		/* (fixup request entry) */
+
+		if (intf->transit_addr == intf->my_addr || intf->transit_addr == 0) {
+		        msg[len++] = (0x40|intf->target_channel); /* Track request*/
+		} else {
+		        entry->bridging_level++;
+               		msg[len++] = (0x40|intf->transit_channel); /* Track request*/
+			cs = len;
+			msg[len++] = intf->transit_addr;
+			msg[len++] = IPMI_NETFN_APP << 2;
+			tmp = len - cs;
+			msg[len++] = ipmi_csum(msg+cs, tmp);
+			cs3 = len;
+			msg[len++] = intf->my_addr;
+			msg[len++] = curr_seq << 2;
+			msg[len++] = 0x34;			/* Send Message rqst */
+			msg[len++] = (0x40|intf->target_channel); /* Track request */
+		}
+		cs = len;
+	}
+
+	/* ipmi message header */
+	msg[len++] = entry->bridging_level ? intf->target_addr : IPMI_BMC_SLAVE_ADDR;
+	msg[len++] = req->msg.netfn << 2 | (req->msg.lun & 3);
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+	cs = len;
+
+	if (!entry->bridging_level)
+		msg[len++] = IPMI_REMOTE_SWID;
+   /* Bridged message */ 
+	else if (entry->bridging_level) 
+		msg[len++] = intf->my_addr;
+   
+	entry->rq_seq = curr_seq;
+	msg[len++] = entry->rq_seq << 2;
+	msg[len++] = req->msg.cmd;
+
+	lprintf(LOG_DEBUG+1, ">> IPMI Request Session Header (level %d)", entry->bridging_level);
+	lprintf(LOG_DEBUG+1, ">>   Authtype   : %s",
+	       val2str(s->authtype, ipmi_authtype_session_vals));
+	lprintf(LOG_DEBUG+1, ">>   Sequence   : 0x%08lx", (long)s->in_seq);
+	lprintf(LOG_DEBUG+1, ">>   Session ID : 0x%08lx", (long)s->session_id);
+	lprintf(LOG_DEBUG+1, ">> IPMI Request Message Header");
+	lprintf(LOG_DEBUG+1, ">>   Rs Addr    : %02x", intf->target_addr);
+	lprintf(LOG_DEBUG+1, ">>   NetFn      : %02x", req->msg.netfn);
+	lprintf(LOG_DEBUG+1, ">>   Rs LUN     : %01x", 0);
+	lprintf(LOG_DEBUG+1, ">>   Rq Addr    : %02x", IPMI_REMOTE_SWID);
+	lprintf(LOG_DEBUG+1, ">>   Rq Seq     : %02x", entry->rq_seq);
+	lprintf(LOG_DEBUG+1, ">>   Rq Lun     : %01x", 0);
+	lprintf(LOG_DEBUG+1, ">>   Command    : %02x", req->msg.cmd);
+
+	/* message data */
+	if (req->msg.data_len) {
+ 		memcpy(msg+len, req->msg.data, req->msg.data_len);
+		len += req->msg.data_len;
+	}
+
+	/* second checksum */
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+
+	/* bridged request: 2nd checksum */
+	if (entry->bridging_level) {
+		if (intf->transit_addr != intf->my_addr && intf->transit_addr != 0) {
+			tmp = len - cs3;
+			msg[len++] = ipmi_csum(msg+cs3, tmp);
+		}
+		tmp = len - cs2;
+		msg[len++] = ipmi_csum(msg+cs2, tmp);
+	}
+
+	if (s->active) {
+		/*
+		 * s->authcode is already copied to msg+ap but some
+		 * authtypes require portions of the ipmi message to
+		 * create the authcode so they must be done last.
+		 */
+		switch (s->authtype) {
+		case IPMI_SESSION_AUTHTYPE_MD5:
+			temp = ipmi_auth_md5(s, msg+mp, msg[mp-1]);
+			memcpy(msg+ap, temp, 16);
+			break;
+		case IPMI_SESSION_AUTHTYPE_MD2:
+			temp = ipmi_auth_md2(s, msg+mp, msg[mp-1]);
+			memcpy(msg+ap, temp, 16);
+			break;
+		}
+	}
+
+	if (s->in_seq) {
+		s->in_seq++;
+		if (s->in_seq == 0)
+			s->in_seq++;
+	}
+
+	entry->msg_len = len;
+	entry->msg_data = msg;
+
+	return entry;
+}
+
+static struct ipmi_rs *
+ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	struct ipmi_rq_entry * entry;
+	struct ipmi_rs * rsp = NULL;
+	int try = 0;
+	int isRetry = 0;
+
+	lprintf(LOG_DEBUG, "ipmi_lan_send_cmd:opened=[%d], open=[%d]",
+		intf->opened, intf->open);
+
+	if (intf->opened == 0 && intf->open != NULL) {
+		if (intf->open(intf) < 0) {
+			lprintf(LOG_DEBUG, "Failed to open LAN interface");
+			return NULL;
+		}
+		lprintf(LOG_DEBUG, "\topened=[%d], open=[%d]",
+			intf->opened, intf->open);
+	}
+
+	for (;;) {
+		isRetry = ( try > 0 ) ? 1 : 0;
+
+		entry = ipmi_lan_build_cmd(intf, req, isRetry);
+		if (entry == NULL) {
+			lprintf(LOG_ERR, "Aborting send command, unable to build");
+			return NULL;
+		}
+
+		if (ipmi_lan_send_packet(intf, entry->msg_data, entry->msg_len) < 0) {
+			try++;
+			usleep(5000);
+			ipmi_req_remove_entry(entry->rq_seq, entry->req.msg.target_cmd);	
+			continue;
+		}
+
+		/* if we are set to noanswer we do not expect response */
+		if (intf->noanswer)
+			break;
+
+		if (ipmi_oem_active(intf, "intelwv2"))
+			ipmi_lan_thump(intf);
+
+		usleep(100);
+
+		rsp = ipmi_lan_poll_recv(intf);
+
+		/* Duplicate Request ccode most likely indicates a response to
+		   a previous retry. Ignore and keep polling. */
+		if((rsp != NULL) && (rsp->ccode == 0xcf)) {
+			rsp = NULL;
+			rsp = ipmi_lan_poll_recv(intf);
+		}
+		
+		if (rsp)
+			break;
+
+		usleep(5000);
+		if (++try >= intf->ssn_params.retry) {
+			lprintf(LOG_DEBUG, "  No response from remote controller");
+			break;
+		}
+	}
+
+	// We need to cleanup the existing entries from the list. Because if we 
+	// keep it and then when we send the new command and if the response is for
+	// old command it still matches it and then returns success.
+	// This is the corner case where the remote controller responds very slowly.
+	//
+	// Example: We have to send command 23 and 2d.
+	// If we send command,seq as 23,10 and if we dont get any response it will 
+	// retry 4 times with 23,10 and then come out here and indicate that there is no
+	// response from the remote controller and will send the next command for
+	// ie 2d,11. And if the BMC is slow to respond and returns 23,10 then it 
+	// will match it in the list and will take response of command 23 as response 
+	// for command 2d and return success. So ideally when retries are done and 
+	// are out of this function we should be clearing the list to be safe so that
+	// we dont match the old response with new request.
+	//          [23, 10] --> BMC
+	//          [23, 10] --> BMC
+	//          [23, 10] --> BMC
+	//          [23, 10] --> BMC
+	//          [2D, 11] --> BMC
+	//                   <-- [23, 10]
+	//  here if we maintain 23,10 in the list then it will get matched and consider
+	//  23 response as response for 2D.   
+	ipmi_req_clear_entries();
+ 
+	return rsp;
+}
+
+static uint8_t *
+ipmi_lan_build_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp, int * llen)
+{
+	struct rmcp_hdr rmcp = {
+		.ver	= RMCP_VERSION_1,
+		.class	= RMCP_CLASS_IPMI,
+		.seq	= 0xff,
+	};
+	struct ipmi_session * s = intf->session;
+	int cs, mp, ap = 0, tmp;
+	int len;
+	uint8_t * msg;
+
+	len = rsp->data_len + 22;
+	if (s->active)
+		len += 16;
+
+	msg = malloc(len);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(msg, 0, len);
+
+	/* rmcp header */
+	memcpy(msg, &rmcp, 4);
+	len = sizeof(rmcp);
+
+	/* ipmi session header */
+	msg[len++] = s->active ? s->authtype : 0;
+
+	if (s->in_seq) {
+		s->in_seq++;
+		if (s->in_seq == 0)
+			s->in_seq++;
+	}
+	memcpy(msg+len, &s->in_seq, 4);
+	len += 4;
+	memcpy(msg+len, &s->session_id, 4);
+	len += 4;
+
+	/* session authcode, if session active and authtype is not none */
+	if (s->active && s->authtype) {
+		ap = len;
+		memcpy(msg+len, s->authcode, 16);
+		len += 16;
+	}
+
+	/* message length */
+	msg[len++] = rsp->data_len + 8;
+
+	/* message header */
+	cs = mp = len;
+	msg[len++] = IPMI_REMOTE_SWID;
+	msg[len++] = rsp->msg.netfn << 2;
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+	cs = len;
+	msg[len++] = IPMI_BMC_SLAVE_ADDR;
+	msg[len++] = (rsp->msg.seq << 2) | (rsp->msg.lun & 3);
+	msg[len++] = rsp->msg.cmd;
+
+	/* completion code */
+	msg[len++] = rsp->ccode;
+
+	/* message data */
+	if (rsp->data_len) {
+		memcpy(msg+len, rsp->data, rsp->data_len);
+		len += rsp->data_len;
+	}
+
+	/* second checksum */
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+
+	if (s->active) {
+		uint8_t * d;
+		switch (s->authtype) {
+		case IPMI_SESSION_AUTHTYPE_MD5:
+			d = ipmi_auth_md5(s, msg+mp, msg[mp-1]);
+			memcpy(msg+ap, d, 16);
+			break;
+		case IPMI_SESSION_AUTHTYPE_MD2:
+			d = ipmi_auth_md2(s, msg+mp, msg[mp-1]);
+			memcpy(msg+ap, d, 16);
+			break;
+		}
+	}
+
+	*llen = len;
+	return msg;
+}
+
+static int
+ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp)
+{
+	uint8_t * msg;
+	int len = 0;
+	int rv;
+
+	msg = ipmi_lan_build_rsp(intf, rsp, &len);
+	if (len <= 0 || msg == NULL) {
+		lprintf(LOG_ERR, "Invalid response packet");
+		if (msg != NULL) {
+			free(msg);
+			msg = NULL;
+		}
+		return -1;
+	}
+
+	rv = sendto(intf->fd, msg, len, 0,
+		    (struct sockaddr *)&intf->session->addr,
+		    intf->session->addrlen);
+	if (rv < 0) {
+		lprintf(LOG_ERR, "Packet send failed");
+		if (msg != NULL) {
+			free(msg);
+			msg = NULL;
+		}
+		return -1;
+	}
+
+	if (msg != NULL) {
+		free(msg);
+		msg = NULL;
+	}
+	return 0;
+}
+
+/*
+ * IPMI SOL Payload Format
+ * +--------------------+
+ * |  rmcp.ver          | 4 bytes
+ * |  rmcp.__reserved   |
+ * |  rmcp.seq          |
+ * |  rmcp.class        |
+ * +--------------------+
+ * |  session.authtype  | 9 bytes
+ * |  session.seq       |
+ * |  session.id        |
+ * +--------------------+
+ * |  message length    | 1 byte
+ * +--------------------+
+ * |  sol.seq           | 5 bytes
+ * |  sol.ack_seq       |
+ * |  sol.acc_count     |
+ * |  sol.control       |
+ * |  sol.__reserved    |
+ * +--------------------+
+ * | [request data]     | data_len bytes
+ * +--------------------+
+ */
+uint8_t * ipmi_lan_build_sol_msg(struct ipmi_intf * intf,
+				 struct ipmi_v2_payload * payload,
+				 int * llen)
+{
+	struct rmcp_hdr rmcp = {
+		.ver		= RMCP_VERSION_1,
+		.class		= RMCP_CLASS_IPMI,
+		.seq		= 0xff,
+	};
+	struct ipmi_session * session = intf->session;
+
+	/* msg will hold the entire message to be sent */
+	uint8_t * msg;
+
+	int len = 0;
+
+	len =	sizeof(rmcp)                                 +  // RMCP Header (4)
+		10                                           +  // IPMI Session Header
+		5                                            +  // SOL header
+		payload->payload.sol_packet.character_count;    // The actual payload
+
+	msg = malloc(len);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(msg, 0, len);
+
+	/* rmcp header */
+	memcpy(msg, &rmcp, sizeof(rmcp));
+	len = sizeof(rmcp);
+
+	/* ipmi session header */
+	msg[len++] = 0; /* SOL is always authtype = NONE */
+	msg[len++] = session->in_seq & 0xff;
+	msg[len++] = (session->in_seq >> 8) & 0xff;
+	msg[len++] = (session->in_seq >> 16) & 0xff;
+	msg[len++] = (session->in_seq >> 24) & 0xff;
+
+	msg[len++] = session->session_id & 0xff;
+	msg[len++] = (session->session_id >> 8) & 0xff;
+	msg[len++] = (session->session_id >> 16) & 0xff;
+	msg[len++] = ((session->session_id >> 24) + 0x10) & 0xff; /* Add 0x10 to MSB for SOL */
+
+	msg[len++] = payload->payload.sol_packet.character_count + 5;
+	
+	/* sol header */
+	msg[len++] = payload->payload.sol_packet.packet_sequence_number;
+	msg[len++] = payload->payload.sol_packet.acked_packet_number;
+	msg[len++] = payload->payload.sol_packet.accepted_character_count;
+	msg[len]    = payload->payload.sol_packet.is_nack           ? 0x40 : 0;
+	msg[len]   |= payload->payload.sol_packet.assert_ring_wor   ? 0x20 : 0;
+	msg[len]   |= payload->payload.sol_packet.generate_break    ? 0x10 : 0;
+	msg[len]   |= payload->payload.sol_packet.deassert_cts      ? 0x08 : 0;
+	msg[len]   |= payload->payload.sol_packet.deassert_dcd_dsr  ? 0x04 : 0;
+	msg[len]   |= payload->payload.sol_packet.flush_inbound     ? 0x02 : 0;
+	msg[len++] |= payload->payload.sol_packet.flush_outbound    ? 0x01 : 0;
+
+	len++; /* On SOL there's and additional fifth byte before the data starts */
+
+	if (payload->payload.sol_packet.character_count) {
+		/* We may have data to add */
+		memcpy(msg + len,
+		       payload->payload.sol_packet.data,
+		       payload->payload.sol_packet.character_count);
+		len += payload->payload.sol_packet.character_count;		
+	}
+
+	session->in_seq++;
+	if (session->in_seq == 0)
+		session->in_seq++;
+	
+	*llen = len;
+	return msg;
+}
+
+/*
+ * is_sol_packet
+ */
+static int
+is_sol_packet(struct ipmi_rs * rsp)
+{
+	return (rsp                                                           &&
+		(rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL));
+}
+
+
+
+/*
+ * sol_response_acks_packet
+ */
+static int
+sol_response_acks_packet(struct ipmi_rs         * rsp,
+			 struct ipmi_v2_payload * payload)
+{
+	return (is_sol_packet(rsp)                                            &&
+		payload                                                       &&
+		(payload->payload_type    == IPMI_PAYLOAD_TYPE_SOL)           && 
+		(rsp->payload.sol_packet.acked_packet_number ==
+		 payload->payload.sol_packet.packet_sequence_number));
+}
+
+/*
+ * ipmi_lan_send_sol_payload
+ *
+ */
+static struct ipmi_rs *
+ipmi_lan_send_sol_payload(struct ipmi_intf * intf,
+			  struct ipmi_v2_payload * payload)
+{
+	struct ipmi_rs      * rsp = NULL;
+	uint8_t             * msg;
+	int                   len;
+	int                   try = 0;
+
+	if (intf->opened == 0 && intf->open != NULL) {
+		if (intf->open(intf) < 0)
+			return NULL;
+	}
+
+	msg = ipmi_lan_build_sol_msg(intf, payload, &len);
+	if (len <= 0 || msg == NULL) {
+		lprintf(LOG_ERR, "Invalid SOL payload packet");
+		if (msg != NULL) {
+			free(msg);
+			msg = NULL;
+		}
+		return NULL;
+	}
+
+	lprintf(LOG_DEBUG, ">> SENDING A SOL MESSAGE\n");
+
+	for (;;) {
+		if (ipmi_lan_send_packet(intf, msg, len) < 0) {
+			try++;
+			usleep(5000);
+			continue;
+		}
+
+		/* if we are set to noanswer we do not expect response */
+		if (intf->noanswer)
+			break;
+		
+		if (payload->payload.sol_packet.packet_sequence_number == 0) {
+			/* We're just sending an ACK.  No need to retry. */
+			break;
+		}
+
+		usleep(100);
+		
+		rsp = ipmi_lan_recv_sol(intf); /* Grab the next packet */
+
+		if (sol_response_acks_packet(rsp, payload))
+			break;
+
+		else if (is_sol_packet(rsp) && rsp->data_len)
+		{
+			/*
+			 * We're still waiting for our ACK, but we more data from
+			 * the BMC
+			 */
+			intf->session->sol_data.sol_input_handler(rsp);
+		}
+
+		usleep(5000);
+		if (++try >= intf->ssn_params.retry) {
+			lprintf(LOG_DEBUG, "  No response from remote controller");
+			break;
+		}
+	}
+
+	if (msg != NULL) {
+		free(msg);
+		msg = NULL;
+	}
+	return rsp;
+}
+
+/*
+ * is_sol_partial_ack
+ *
+ * Determine if the response is a partial ACK/NACK that indicates
+ * we need to resend part of our packet.
+ *
+ * returns the number of characters we need to resend, or
+ *         0 if this isn't an ACK or we don't need to resend anything
+ */
+static int is_sol_partial_ack(struct ipmi_v2_payload * v2_payload,
+			      struct ipmi_rs         * rsp)
+{
+	int chars_to_resend = 0;
+
+	if (v2_payload                                &&
+	    rsp                                       &&
+	    is_sol_packet(rsp)                        &&
+	    sol_response_acks_packet(rsp, v2_payload) &&
+	    (rsp->payload.sol_packet.accepted_character_count <
+	     v2_payload->payload.sol_packet.character_count))
+	{
+		if (rsp->payload.sol_packet.accepted_character_count == 0) {
+			/* We should not resend data */
+			chars_to_resend = 0;
+		}
+		else
+		{
+			chars_to_resend =
+				v2_payload->payload.sol_packet.character_count -
+				rsp->payload.sol_packet.accepted_character_count;
+		}
+	}
+
+	return chars_to_resend;
+}
+
+/*
+ * set_sol_packet_sequence_number
+ */
+static void set_sol_packet_sequence_number(struct ipmi_intf * intf,
+					   struct ipmi_v2_payload * v2_payload)
+{
+	/* Keep our sequence number sane */
+	if (intf->session->sol_data.sequence_number > 0x0F)
+		intf->session->sol_data.sequence_number = 1;
+
+	v2_payload->payload.sol_packet.packet_sequence_number =
+		intf->session->sol_data.sequence_number++;
+}
+
+/*
+ * ipmi_lan_send_sol
+ *
+ * Sends a SOL packet..  We handle partial ACK/NACKs from the BMC here.
+ *
+ * Returns a pointer to the SOL ACK we received, or
+ *         0 on failure
+ * 
+ */
+struct ipmi_rs *
+ipmi_lan_send_sol(struct ipmi_intf * intf,
+		  struct ipmi_v2_payload * v2_payload)
+{
+	struct ipmi_rs * rsp;
+	int chars_to_resend = 0;
+
+	v2_payload->payload_type   = IPMI_PAYLOAD_TYPE_SOL;
+
+	/*
+	 * Payload length is just the length of the character
+	 * data here.
+	 */
+	v2_payload->payload.sol_packet.acked_packet_number = 0; /* NA */
+
+	set_sol_packet_sequence_number(intf, v2_payload);
+	
+	v2_payload->payload.sol_packet.accepted_character_count = 0; /* NA */
+
+	rsp = ipmi_lan_send_sol_payload(intf, v2_payload);
+
+	/* Determine if we need to resend some of our data */
+	chars_to_resend = is_sol_partial_ack(v2_payload, rsp);
+
+	while (chars_to_resend)
+	{
+		/*
+		 * We first need to handle any new data we might have
+		 * received in our NACK
+		 */
+		if (rsp->data_len)
+			intf->session->sol_data.sol_input_handler(rsp);
+
+		set_sol_packet_sequence_number(intf, v2_payload);
+		
+		/* Just send the required data */
+		memmove(v2_payload->payload.sol_packet.data,
+			v2_payload->payload.sol_packet.data +
+			rsp->payload.sol_packet.accepted_character_count,
+			chars_to_resend);
+
+		v2_payload->payload.sol_packet.character_count = chars_to_resend;
+
+		rsp = ipmi_lan_send_sol_payload(intf, v2_payload);
+
+		chars_to_resend = is_sol_partial_ack(v2_payload, rsp);
+	}
+
+	return rsp;
+}
+
+/*
+ * check_sol_packet_for_new_data
+ *
+ * Determine whether the SOL packet has already been seen
+ * and whether the packet has new data for us.
+ *
+ * This function has the side effect of removing an previously
+ * seen data, and moving new data to the front.
+ *
+ * It also "Remembers" the data so we don't get repeats.
+ *
+ */
+static int
+check_sol_packet_for_new_data(struct ipmi_intf * intf,
+			      struct ipmi_rs *rsp)
+{
+	static uint8_t last_received_sequence_number = 0;
+	static uint8_t last_received_byte_count      = 0;
+	int new_data_size                            = 0;
+
+	if (rsp &&
+	    (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL))
+	    
+	{
+		uint8_t unaltered_data_len = rsp->data_len;
+		if (rsp->payload.sol_packet.packet_sequence_number ==
+		    last_received_sequence_number)
+		{
+			/*
+			 * This is the same as the last packet, but may include
+			 * extra data
+			 */
+			new_data_size = rsp->data_len - last_received_byte_count;
+			
+			if (new_data_size > 0)
+			{
+				/* We have more data to process */
+				memmove(rsp->data,
+					rsp->data +
+					rsp->data_len - new_data_size,
+					new_data_size);
+			}
+			
+			rsp->data_len = new_data_size;
+		}
+	
+		/*
+		 *Rember the data for next round
+		 */
+		if (rsp && rsp->payload.sol_packet.packet_sequence_number)
+		{
+			last_received_sequence_number =
+				rsp->payload.sol_packet.packet_sequence_number;
+			last_received_byte_count = unaltered_data_len;
+		}
+	}
+
+	return new_data_size;
+}
+
+/*
+ * ack_sol_packet
+ *
+ * Provided the specified packet looks reasonable, ACK it.
+ */
+static void
+ack_sol_packet(struct ipmi_intf * intf,
+	       struct ipmi_rs * rsp)
+{
+	if (rsp &&
+	    (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL) &&
+	    (rsp->payload.sol_packet.packet_sequence_number))
+	{
+		struct ipmi_v2_payload ack;
+
+		memset(&ack, 0, sizeof(struct ipmi_v2_payload));
+
+		ack.payload_type = IPMI_PAYLOAD_TYPE_SOL;
+
+		/*
+		 * Payload length is just the length of the character
+		 * data here.
+		 */
+		ack.payload_length = 0;
+
+		/* ACK packets have sequence numbers of 0 */
+		ack.payload.sol_packet.packet_sequence_number = 0;
+
+		ack.payload.sol_packet.acked_packet_number =
+			rsp->payload.sol_packet.packet_sequence_number;
+
+		ack.payload.sol_packet.accepted_character_count = rsp->data_len;
+		
+		ipmi_lan_send_sol_payload(intf, &ack);
+	}
+}
+
+/*
+ * ipmi_recv_sol
+ *
+ * Receive a SOL packet and send an ACK in response.
+ *
+ */
+static struct ipmi_rs *
+ipmi_lan_recv_sol(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp = ipmi_lan_poll_recv(intf);
+
+	ack_sol_packet(intf, rsp);              
+
+	/*
+	 * Remembers the data sent, and alters the data to just
+	 * include the new stuff.
+	 */
+	check_sol_packet_for_new_data(intf, rsp);
+
+	return rsp;
+}
+
+/* send a get device id command to keep session active */
+static int
+ipmi_lan_keepalive(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req = {
+		.msg = {
+			.netfn = IPMI_NETFN_APP,
+			.cmd = 1,
+		}
+	};
+
+	if (!intf->opened)
+		return 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL)
+		return -1;
+	if (rsp->ccode > 0)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * IPMI Get Channel Authentication Capabilities Command
+ */
+static int
+ipmi_get_auth_capabilities_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipmi_session * s = intf->session;
+	struct ipmi_session_params *p = &intf->ssn_params;
+	uint8_t msg_data[2];
+
+	msg_data[0] = IPMI_LAN_CHANNEL_E;
+	msg_data[1] = p->privlvl;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;
+	req.msg.cmd      = 0x38;
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_INFO, "Get Auth Capabilities command failed");
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "get_auth_capabilities");
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_INFO, "Get Auth Capabilities command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Channel %02x Authentication Capabilities:",
+		rsp->data[0]);
+	lprintf(LOG_DEBUG, "  Privilege Level : %s",
+		val2str(req.msg.data[1], ipmi_privlvl_vals));
+	lprintf(LOG_DEBUG, "  Auth Types      : %s%s%s%s%s",
+		(rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE) ? "NONE " : "",
+		(rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD2) ? "MD2 " : "",
+		(rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD5) ? "MD5 " : "",
+		(rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD) ? "PASSWORD " : "",
+		(rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM) ? "OEM " : "");
+	lprintf(LOG_DEBUG, "  Per-msg auth    : %sabled",
+		(rsp->data[2] & IPMI_AUTHSTATUS_PER_MSG_DISABLED) ?
+		"dis" : "en");
+	lprintf(LOG_DEBUG, "  User level auth : %sabled",
+		(rsp->data[2] & IPMI_AUTHSTATUS_PER_USER_DISABLED) ?
+		"dis" : "en");
+	lprintf(LOG_DEBUG, "  Non-null users  : %sabled",
+		(rsp->data[2] & IPMI_AUTHSTATUS_NONNULL_USERS_ENABLED) ?
+		"en" : "dis");
+	lprintf(LOG_DEBUG, "  Null users      : %sabled",
+		(rsp->data[2] & IPMI_AUTHSTATUS_NULL_USERS_ENABLED) ?
+		"en" : "dis");
+	lprintf(LOG_DEBUG, "  Anonymous login : %sabled",
+		(rsp->data[2] & IPMI_AUTHSTATUS_ANONYMOUS_USERS_ENABLED) ?
+		"en" : "dis");
+	lprintf(LOG_DEBUG, "");
+
+	s->authstatus = rsp->data[2];
+
+	if (p->password &&
+	    (p->authtype_set == 0 ||
+	     p->authtype_set == IPMI_SESSION_AUTHTYPE_MD5) &&
+	    (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD5))
+	{
+		s->authtype = IPMI_SESSION_AUTHTYPE_MD5;
+	}
+	else if (p->password &&
+		 (p->authtype_set == 0 ||
+		  p->authtype_set == IPMI_SESSION_AUTHTYPE_MD2) &&
+		 (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_MD2))
+	{
+		s->authtype = IPMI_SESSION_AUTHTYPE_MD2;
+	}
+	else if (p->password &&
+		 (p->authtype_set == 0 ||
+		  p->authtype_set == IPMI_SESSION_AUTHTYPE_PASSWORD) &&
+		 (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_PASSWORD))
+	{
+		s->authtype = IPMI_SESSION_AUTHTYPE_PASSWORD;
+	}
+	else if (p->password &&
+		 (p->authtype_set == 0 ||
+		  p->authtype_set == IPMI_SESSION_AUTHTYPE_OEM) &&
+		 (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_OEM))
+	{
+		s->authtype = IPMI_SESSION_AUTHTYPE_OEM;
+	}
+	else if ((p->authtype_set == 0 ||
+		  p->authtype_set == IPMI_SESSION_AUTHTYPE_NONE) &&
+		 (rsp->data[1] & 1<<IPMI_SESSION_AUTHTYPE_NONE))
+	{
+		s->authtype = IPMI_SESSION_AUTHTYPE_NONE;
+	}
+	else {
+		if (!(rsp->data[1] & 1<<p->authtype_set))
+			lprintf(LOG_ERR, "Authentication type %s not supported",
+			       val2str(p->authtype_set, ipmi_authtype_session_vals));
+		else
+			lprintf(LOG_ERR, "No supported authtypes found");
+
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Proceeding with AuthType %s",
+		val2str(s->authtype, ipmi_authtype_session_vals));
+
+	return 0;
+}
+
+/*
+ * IPMI Get Session Challenge Command
+ * returns a temporary session ID and 16 byte challenge string
+ */
+static int
+ipmi_get_session_challenge_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipmi_session * s = intf->session;
+	uint8_t msg_data[17];
+
+	memset(msg_data, 0, 17);
+	msg_data[0] = s->authtype;
+	memcpy(msg_data+1, intf->ssn_params.username, 16);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn		= IPMI_NETFN_APP;
+	req.msg.cmd		= 0x39;
+	req.msg.data		= msg_data;
+	req.msg.data_len	= 17; /* 1 byte for authtype, 16 for user */
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Get Session Challenge command failed");
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "get_session_challenge");
+
+	if (rsp->ccode > 0) {
+		switch (rsp->ccode) {
+		case 0x81:
+			lprintf(LOG_ERR, "Invalid user name");
+			break;
+		case 0x82:
+			lprintf(LOG_ERR, "NULL user name not enabled");
+			break;
+		default:
+			lprintf(LOG_ERR, "Get Session Challenge command failed: %s",
+				val2str(rsp->ccode, completion_code_vals));
+		}
+		return -1;
+	}
+
+	memcpy(&s->session_id, rsp->data, 4);
+	memcpy(s->challenge, rsp->data + 4, 16);
+
+	lprintf(LOG_DEBUG, "Opening Session");
+	lprintf(LOG_DEBUG, "  Session ID      : %08lx", (long)s->session_id);
+	lprintf(LOG_DEBUG, "  Challenge       : %s", buf2str(s->challenge, 16));
+
+	return 0;
+}
+
+/*
+ * IPMI Activate Session Command
+ */
+static int
+ipmi_activate_session_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	struct ipmi_session * s = intf->session;
+	uint8_t msg_data[22];
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn = IPMI_NETFN_APP;
+	req.msg.cmd = 0x3a;
+
+	msg_data[0] = s->authtype;
+	msg_data[1] = intf->ssn_params.privlvl;
+
+	/* supermicro oem authentication hack */
+	if (ipmi_oem_active(intf, "supermicro")) {
+		uint8_t * special = ipmi_auth_special(s);
+		memcpy(intf->session->authcode, special, 16);
+		memset(msg_data + 2, 0, 16);
+		lprintf(LOG_DEBUG, "  OEM Auth        : %s",
+			buf2str(special, 16));
+	} else {
+		memcpy(msg_data + 2, s->challenge, 16);
+	}
+
+	/* setup initial outbound sequence number */
+	get_random(msg_data+18, 4);
+
+	req.msg.data = msg_data;
+	req.msg.data_len = 22;
+
+	s->active = 1;
+
+	lprintf(LOG_DEBUG, "  Privilege Level : %s",
+		val2str(msg_data[1], ipmi_privlvl_vals));
+	lprintf(LOG_DEBUG, "  Auth Type       : %s",
+		val2str(s->authtype, ipmi_authtype_session_vals));
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Activate Session command failed");
+		s->active = 0;
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "activate_session");
+
+	if (rsp->ccode) {
+		fprintf(stderr, "Activate Session error:");
+		switch (rsp->ccode) {
+		case 0x81:
+			lprintf(LOG_ERR, "\tNo session slot available");
+			break;
+		case 0x82:
+			lprintf(LOG_ERR, "\tNo slot available for given user - "
+				"limit reached");
+			break;
+		case 0x83:
+			lprintf(LOG_ERR, "\tNo slot available to support user "
+				"due to maximum privilege capacity");
+			break;
+		case 0x84:
+			lprintf(LOG_ERR, "\tSession sequence out of range");
+			break;
+		case 0x85:
+			lprintf(LOG_ERR, "\tInvalid session ID in request");
+			break;
+		case 0x86:
+			lprintf(LOG_ERR, "\tRequested privilege level "
+				"exceeds limit");
+			break;
+		case 0xd4:
+			lprintf(LOG_ERR, "\tInsufficient privilege level");
+			break;
+		default:
+			lprintf(LOG_ERR, "\t%s",
+				val2str(rsp->ccode, completion_code_vals));
+		}
+		return -1;
+	}
+
+	memcpy(&s->session_id, rsp->data + 1, 4);
+	s->in_seq = rsp->data[8] << 24 | rsp->data[7] << 16 | rsp->data[6] << 8 | rsp->data[5];
+	if (s->in_seq == 0)
+		++s->in_seq;
+
+	if (s->authstatus & IPMI_AUTHSTATUS_PER_MSG_DISABLED)
+		s->authtype = IPMI_SESSION_AUTHTYPE_NONE;
+	else if (s->authtype != (rsp->data[0] & 0xf)) {
+		lprintf(LOG_ERR, "Invalid Session AuthType %s in response",
+			val2str(s->authtype, ipmi_authtype_session_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "\nSession Activated");
+	lprintf(LOG_DEBUG, "  Auth Type       : %s",
+		val2str(rsp->data[0], ipmi_authtype_session_vals));
+	lprintf(LOG_DEBUG, "  Max Priv Level  : %s",
+		val2str(rsp->data[9], ipmi_privlvl_vals));
+	lprintf(LOG_DEBUG, "  Session ID      : %08lx", (long)s->session_id);
+	lprintf(LOG_DEBUG, "  Inbound Seq     : %08lx\n", (long)s->in_seq);
+
+	return 0;
+}
+
+
+/*
+ * IPMI Set Session Privilege Level Command
+ */
+static int
+ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t privlvl = intf->ssn_params.privlvl;
+	uint8_t backup_bridge_possible = bridge_possible;
+
+	if (privlvl <= IPMI_SESSION_PRIV_USER)
+		return 0;	/* no need to set higher */
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn		= IPMI_NETFN_APP;
+	req.msg.cmd		= 0x3b;
+	req.msg.data		= &privlvl;
+	req.msg.data_len	= 1;
+
+	bridge_possible = 0;
+	rsp = intf->sendrecv(intf, &req);
+	bridge_possible = backup_bridge_possible;
+
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Session Privilege Level to %s failed",
+			val2str(privlvl, ipmi_privlvl_vals));
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "set_session_privlvl");
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Session Privilege Level to %s failed: %s",
+			val2str(privlvl, ipmi_privlvl_vals),
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Set Session Privilege Level to %s\n",
+		val2str(rsp->data[0], ipmi_privlvl_vals));
+
+	return 0;
+}
+
+static int
+ipmi_close_session_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4];
+	uint32_t session_id = intf->session->session_id;
+
+	if (intf->session->active == 0)
+		return -1;
+
+	intf->target_addr = IPMI_BMC_SLAVE_ADDR;
+	bridge_possible = 0;  /* Not a bridge message */
+
+	memcpy(&msg_data, &session_id, 4);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn		= IPMI_NETFN_APP;
+	req.msg.cmd		= 0x3c;
+	req.msg.data		= msg_data;
+	req.msg.data_len	= 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Close Session command failed");
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "close_session");
+
+	if (rsp->ccode == 0x87) {
+		lprintf(LOG_ERR, "Failed to Close Session: invalid "
+			"session ID %08lx", (long)session_id);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Close Session command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Closed Session %08lx\n", (long)session_id);
+
+	return 0;
+}
+
+/*
+ * IPMI LAN Session Activation (IPMI spec v1.5 section 12.9)
+ *
+ * 1. send "RMCP Presence Ping" message, response message will
+ *    indicate whether the platform supports IPMI
+ * 2. send "Get Channel Authentication Capabilities" command
+ *    with AUTHTYPE = none, response packet will contain information
+ *    about supported challenge/response authentication types
+ * 3. send "Get Session Challenge" command with AUTHTYPE = none
+ *    and indicate the authentication type in the message, response
+ *    packet will contain challenge string and temporary session ID.
+ * 4. send "Activate Session" command, authenticated with AUTHTYPE
+ *    sent in previous message.  Also sends the initial value for
+ *    the outbound sequence number for BMC.
+ * 5. BMC returns response confirming session activation and
+ *    session ID for this session and initial inbound sequence.
+ */
+static int
+ipmi_lan_activate_session(struct ipmi_intf * intf)
+{
+	int rc;
+
+	/* don't fail on ping because its not always supported.
+	 * Supermicro's IPMI LAN 1.5 cards don't tolerate pings.
+	 */
+	if (!ipmi_oem_active(intf, "supermicro"))
+		ipmi_lan_ping(intf);
+
+	/* Some particular Intel boards need special help
+	 */
+	if (ipmi_oem_active(intf, "intelwv2"))
+		ipmi_lan_thump_first(intf);
+
+	rc = ipmi_get_auth_capabilities_cmd(intf);
+	if (rc < 0) {
+		goto fail;
+	}
+
+	rc = ipmi_get_session_challenge_cmd(intf);
+	if (rc < 0)
+		goto fail;
+
+	rc = ipmi_activate_session_cmd(intf);
+	if (rc < 0)
+		goto fail;
+
+	intf->abort = 0;
+
+	rc = ipmi_set_session_privlvl_cmd(intf);
+	if (rc < 0)
+		goto close_fail;
+
+	return 0;
+
+ close_fail:
+	ipmi_close_session_cmd(intf);
+ fail:
+	lprintf(LOG_ERR, "Error: Unable to establish LAN session");
+	return -1;
+}
+
+void
+ipmi_lan_close(struct ipmi_intf * intf)
+{
+	if (!intf->abort && intf->session)
+		ipmi_close_session_cmd(intf);
+
+	if (intf->fd >= 0) {
+		close(intf->fd);
+		intf->fd = -1;
+	}
+
+	ipmi_req_clear_entries();
+	ipmi_intf_session_cleanup(intf);
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+	intf = NULL;
+}
+
+static int
+ipmi_lan_open(struct ipmi_intf * intf)
+{
+	int rc;
+	struct ipmi_session *s;
+	struct ipmi_session_params *p;
+
+	if (intf == NULL || intf->opened)
+		return -1;
+
+	s = intf->session;
+	p = &intf->ssn_params;
+
+	if (p->port == 0)
+		p->port = IPMI_LAN_PORT;
+	if (p->privlvl == 0)
+		p->privlvl = IPMI_SESSION_PRIV_ADMIN;
+	if (p->timeout == 0)
+		p->timeout = IPMI_LAN_TIMEOUT;
+	if (p->retry == 0)
+		p->retry = IPMI_LAN_RETRY;
+
+	if (p->hostname == NULL || strlen((const char *)p->hostname) == 0) {
+		lprintf(LOG_ERR, "No hostname specified!");
+		return -1;
+	}
+
+	if (ipmi_intf_socket_connect(intf) == -1) {
+		lprintf(LOG_ERR, "Could not open socket!");
+		return -1;
+	}
+
+	s = (struct ipmi_session *)malloc(sizeof(struct ipmi_session));
+	if (!s) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		goto fail;
+	}
+
+	intf->opened = 1;
+	intf->abort = 1;
+
+	intf->session = s;
+
+	memset(s, 0, sizeof(struct ipmi_session));
+	s->sol_data.sequence_number = 1;
+	s->timeout = p->timeout;
+	memcpy(&s->authcode, &p->authcode_set, sizeof(s->authcode));
+	s->addrlen = sizeof(s->addr);
+	if (getsockname(intf->fd, (struct sockaddr *)&s->addr, &s->addrlen)) {
+		goto fail;
+	}
+
+	/* try to open session */
+	rc = ipmi_lan_activate_session(intf);
+	if (rc < 0) {
+	    goto fail;
+	}
+
+	/* automatically detect interface request and response sizes */
+	hpm2_detect_max_payload_size(intf);
+
+	/* set manufactirer OEM id */
+	intf->manufacturer_id = ipmi_get_oem(intf);
+
+	/* now allow bridging */
+	bridge_possible = 1;
+	return intf->fd;
+
+ fail:
+	lprintf(LOG_ERR, "Error: Unable to establish IPMI v1.5 / RMCP session");
+	intf->close(intf);
+	return -1;
+}
+
+static int
+ipmi_lan_setup(struct ipmi_intf * intf)
+{
+	/* setup default LAN maximum request and response sizes */
+	intf->max_request_data_size = IPMI_LAN_MAX_REQUEST_SIZE;
+	intf->max_response_data_size = IPMI_LAN_MAX_RESPONSE_SIZE;
+
+	return 0;
+}
+
+static void
+ipmi_lan_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (size + 7 > 0xFF) {
+		size = 0xFF - 7;
+	}
+
+	intf->max_request_data_size = size;
+}
+
+static void
+ipmi_lan_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (size + 8 > 0xFF) {
+		size = 0xFF - 8;
+	}
+
+	intf->max_response_data_size = size;
+}
diff --git a/src/plugins/lan/lan.h b/src/plugins/lan/lan.h
new file mode 100644
index 0000000..3ba3055
--- /dev/null
+++ b/src/plugins/lan/lan.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_LAN_H
+#define IPMI_LAN_H
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+
+extern struct ipmi_intf ipmi_lan_intf;
+
+#endif /*IPMI_LAN_H*/
diff --git a/src/plugins/lan/md5.c b/src/plugins/lan/md5.c
new file mode 100644
index 0000000..572c7c8
--- /dev/null
+++ b/src/plugins/lan/md5.c
@@ -0,0 +1,381 @@
+/*
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.1 2003/11/18 17:56:02 iceblink Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+	either statically or dynamically; added missing #include <string.h>
+	in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+	type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+	unsigned in ANSI C, signed in traditional"; made test program
+	self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+#include <string.h>
+
+#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+	a = pms->abcd[0], b = pms->abcd[1],
+	c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+	/*
+	 * Determine dynamically whether this is a big-endian or
+	 * little-endian machine, since we can use a more efficient
+	 * algorithm on the latter.
+	 */
+	static const int w = 1;
+
+	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0		/* little-endian */
+	{
+	    /*
+	     * On little-endian machines, we can process properly aligned
+	     * data without copying it.
+	     */
+	    if (!((data - (const md5_byte_t *)0) & 3)) {
+		/* data are properly aligned */
+		X = (const md5_word_t *)data;
+	    } else {
+		/* not aligned */
+		memcpy(xbuf, data, 64);
+		X = xbuf;
+	    }
+	}
+#endif
+#if BYTE_ORDER == 0
+	else			/* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0		/* big-endian */
+	{
+	    /*
+	     * On big-endian machines, we must arrange the bytes in the
+	     * right order.
+	     */
+	    const md5_byte_t *xp = data;
+	    int i;
+
+#  if BYTE_ORDER == 0
+	    X = xbuf;		/* (dynamic only) */
+#  else
+#    define xbuf X		/* (static only) */
+#  endif
+	    for (i = 0; i < 16; ++i, xp += 4)
+		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+	}
+#endif
+    }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buf + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/src/plugins/lan/md5.h b/src/plugins/lan/md5.h
new file mode 100644
index 0000000..11fd117
--- /dev/null
+++ b/src/plugins/lan/md5.h
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.1 2003/11/18 17:56:02 iceblink Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+	http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+	references to Ghostscript; clarified derivation from RFC 1321;
+	now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];	/* message length in bits, lsw first */
+    md5_word_t abcd[4];		/* digest buffer */
+    md5_byte_t buf[64];		/* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
diff --git a/src/plugins/lan/rmcp.h b/src/plugins/lan/rmcp.h
new file mode 100644
index 0000000..b979d92
--- /dev/null
+++ b/src/plugins/lan/rmcp.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_RMCP_H
+#define IPMI_RMCP_H
+
+#include <ipmitool/helper.h>
+#include "lan.h"
+#include "asf.h"
+
+#define RMCP_VERSION_1		0x06
+
+#define RMCP_UDP_PORT		0x26f /* port 623 */
+#define RMCP_UDP_SECURE_PORT	0x298 /* port 664 */
+
+#define RMCP_TYPE_MASK		0x80
+#define RMCP_TYPE_NORM		0x00
+#define RMCP_TYPE_ACK		0x01
+
+static const struct valstr rmcp_type_vals[] __attribute__((unused)) = {
+	{ RMCP_TYPE_NORM,	"Normal RMCP" },
+	{ RMCP_TYPE_ACK,	"RMCP ACK" },
+	{ 0,			NULL }
+};
+
+#define RMCP_CLASS_MASK		0x1f
+#define RMCP_CLASS_ASF		0x06
+#define RMCP_CLASS_IPMI		0x07
+#define RMCP_CLASS_OEM		0x08
+
+static const struct valstr rmcp_class_vals[] __attribute__((unused)) = {
+	{ RMCP_CLASS_ASF,	"ASF" },
+	{ RMCP_CLASS_IPMI,	"IPMI" },
+	{ RMCP_CLASS_OEM,	"OEM" },
+	{ 0,			NULL }
+};
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+/* RMCP message header */
+struct rmcp_hdr {
+	uint8_t ver;
+	uint8_t __reserved;
+	uint8_t seq;
+	uint8_t class;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct rmcp_pong {
+	struct rmcp_hdr rmcp;
+	struct asf_hdr asf;
+	uint32_t iana;
+	uint32_t oem;
+	uint8_t sup_entities;
+	uint8_t sup_interact;
+	uint8_t reserved[6];
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
+
+#endif /* IPMI_RMCP_H */
diff --git a/src/plugins/lanplus/Makefile.am b/src/plugins/lanplus/Makefile.am
new file mode 100644
index 0000000..219440e
--- /dev/null
+++ b/src/plugins/lanplus/Makefile.am
@@ -0,0 +1,45 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_lanplus.la
+noinst_LTLIBRARIES	= @INTF_LANPLUS_LIB@
+libintf_lanplus_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_lanplus_la_SOURCES	= \
+				rmcp.h asf.h \
+				lanplus.c lanplus.h \
+				lanplus_strings.c \
+				lanplus_crypt.c lanplus_crypt.h \
+				lanplus_dump.h lanplus_dump.c \
+				lanplus_crypt_impl.h lanplus_crypt_impl.c
+
diff --git a/src/plugins/lanplus/Makefile.in b/src/plugins/lanplus/Makefile.in
new file mode 100644
index 0000000..d24775b
--- /dev/null
+++ b/src/plugins/lanplus/Makefile.in
@@ -0,0 +1,649 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/lanplus
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_lanplus_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_lanplus_la_OBJECTS = lanplus.lo lanplus_strings.lo \
+	lanplus_crypt.lo lanplus_dump.lo lanplus_crypt_impl.lo
+libintf_lanplus_la_OBJECTS = $(am_libintf_lanplus_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_lanplus_la_SOURCES)
+DIST_SOURCES = $(libintf_lanplus_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_lanplus.la
+noinst_LTLIBRARIES = @INTF_LANPLUS_LIB@
+libintf_lanplus_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_lanplus_la_SOURCES = \
+				rmcp.h asf.h \
+				lanplus.c lanplus.h \
+				lanplus_strings.c \
+				lanplus_crypt.c lanplus_crypt.h \
+				lanplus_dump.h lanplus_dump.c \
+				lanplus_crypt_impl.h lanplus_crypt_impl.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/lanplus/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/lanplus/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_lanplus.la: $(libintf_lanplus_la_OBJECTS) $(libintf_lanplus_la_DEPENDENCIES) $(EXTRA_libintf_lanplus_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_lanplus_la_OBJECTS) $(libintf_lanplus_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lanplus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lanplus_crypt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lanplus_crypt_impl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lanplus_dump.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lanplus_strings.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/lanplus/asf.h b/src/plugins/lanplus/asf.h
new file mode 100644
index 0000000..7a30418
--- /dev/null
+++ b/src/plugins/lanplus/asf.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_ASF_H
+#define IPMI_ASF_H
+
+#include <ipmitool/helper.h>
+#include "lanplus.h"
+
+#define ASF_RMCP_IANA		0x000011be
+
+#define ASF_TYPE_PING		0x80
+#define ASF_TYPE_PONG		0x40
+
+static const struct valstr asf_type_vals[] __attribute__((unused)) = {
+	{ 0x10, "Reset" },
+	{ 0x11, "Power-up" },
+	{ 0x12, "Unconditional Power-down" },
+	{ 0x13, "Power Cycle" },
+	{ 0x40, "Presence Pong" },
+	{ 0x41, "Capabilities Response" },
+	{ 0x42, "System State Response" },
+	{ 0x80, "Presence Ping" },
+	{ 0x81, "Capabilities Request" },
+	{ 0x82, "System State Request" },
+	{ 0x00, NULL }
+};
+
+/* ASF message header */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct asf_hdr {
+	uint32_t iana;
+	uint8_t type;
+	uint8_t tag;
+	uint8_t __reserved;
+	uint8_t len;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int handle_asf(struct ipmi_intf * intf, uint8_t * data, int data_len);
+
+#endif /* IPMI_ASF_H */
diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
new file mode 100644
index 0000000..a0e388c
--- /dev/null
+++ b/src/plugins/lanplus/lanplus.c
@@ -0,0 +1,3763 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <time.h>
+#include <fcntl.h>
+#include <assert.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_lanp.h>
+#include <ipmitool/ipmi_channel.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/hpm2.h>
+#include <ipmitool/bswap.h>
+#include <openssl/rand.h>
+
+#include "lanplus.h"
+#include "lanplus_crypt.h"
+#include "lanplus_crypt_impl.h"
+#include "lanplus_dump.h"
+#include "rmcp.h"
+#include "asf.h"
+
+/*
+ * LAN interface is required to support 45 byte request transactions and
+ * 42 byte response transactions.
+ */
+#define IPMI_LAN_MAX_REQUEST_SIZE	38	/* 45 - 7 */
+#define IPMI_LAN_MAX_RESPONSE_SIZE	34	/* 42 - 8 */
+
+extern const struct valstr ipmi_rakp_return_codes[];
+extern const struct valstr ipmi_priv_levels[];
+extern const struct valstr ipmi_auth_algorithms[];
+extern const struct valstr ipmi_integrity_algorithms[];
+extern const struct valstr ipmi_encryption_algorithms[];
+
+static struct ipmi_rq_entry * ipmi_req_entries;
+static struct ipmi_rq_entry * ipmi_req_entries_tail;
+
+
+static int ipmi_lanplus_setup(struct ipmi_intf * intf);
+static int ipmi_lanplus_keepalive(struct ipmi_intf * intf);
+static int ipmi_lan_send_packet(struct ipmi_intf * intf, uint8_t * data, int data_len);
+static struct ipmi_rs * ipmi_lan_recv_packet(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lan_poll_recv(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lanplus_send_ipmi_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
+static struct ipmi_rs * ipmi_lanplus_send_payload(struct ipmi_intf * intf,
+												  struct ipmi_v2_payload * payload);
+static void getIpmiPayloadWireRep(
+								  struct ipmi_intf       * intf,
+								  struct ipmi_v2_payload * payload,  /* in  */
+								  uint8_t  * out,
+								  struct ipmi_rq * req,
+								  uint8_t    rq_seq,
+								  uint8_t curr_seq);
+static void getSolPayloadWireRep(
+								  struct ipmi_intf       * intf,
+								 uint8_t          * msg,
+								 struct ipmi_v2_payload * payload);
+static void read_open_session_response(struct ipmi_rs * rsp, int offset);
+static void read_rakp2_message(struct ipmi_rs * rsp, int offset, uint8_t alg);
+static void read_rakp4_message(struct ipmi_rs * rsp, int offset, uint8_t alg);
+static void read_session_data(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
+static void read_session_data_v15(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
+static void read_session_data_v2x(struct ipmi_rs * rsp, int * offset, struct ipmi_session *s);
+static void read_ipmi_response(struct ipmi_rs * rsp, int * offset);
+static void read_sol_packet(struct ipmi_rs * rsp, int * offset);
+static struct ipmi_rs * ipmi_lanplus_recv_sol(struct ipmi_intf * intf);
+static struct ipmi_rs * ipmi_lanplus_send_sol(
+											  struct ipmi_intf * intf,
+											  struct ipmi_v2_payload * payload);
+static int check_sol_packet_for_new_data(
+									 struct ipmi_intf * intf,
+									 struct ipmi_rs *rsp);
+static void ack_sol_packet(
+							struct ipmi_intf * intf,
+							struct ipmi_rs * rsp);
+static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size);
+static void ipmi_lanp_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size);
+
+static uint8_t bridgePossible = 0;
+
+struct ipmi_intf ipmi_lanplus_intf = {
+	.name = "lanplus",
+	.desc = "IPMI v2.0 RMCP+ LAN Interface",
+	.setup = ipmi_lanplus_setup,
+	.open = ipmi_lanplus_open,
+	.close = ipmi_lanplus_close,
+	.sendrecv = ipmi_lanplus_send_ipmi_cmd,
+	.recv_sol = ipmi_lanplus_recv_sol,
+	.send_sol = ipmi_lanplus_send_sol,
+	.keepalive = ipmi_lanplus_keepalive,
+	.set_max_request_data_size = ipmi_lanp_set_max_rq_data_size,
+	.set_max_response_data_size = ipmi_lanp_set_max_rp_data_size,
+	.target_addr = IPMI_BMC_SLAVE_ADDR,
+};
+
+
+extern int verbose;
+
+
+
+/*
+ * lanplus_get_requested_ciphers
+ *
+ * Set the authentication, integrity and encryption algorithms based
+ * on the cipher suite ID.  See table 22-19 in the IPMIv2 spec for the
+ * source of this information.
+ *
+ * param cipher_suite_id [in]
+ * param auth_alg        [out]
+ * param integrity_alg   [out]
+ * param crypt_alg       [out]
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int lanplus_get_requested_ciphers(int       cipher_suite_id,
+								  uint8_t * auth_alg,
+								  uint8_t * integrity_alg,
+								  uint8_t * crypt_alg)
+{
+#ifdef HAVE_CRYPTO_SHA256
+	if ((cipher_suite_id < 0) || (cipher_suite_id > 17)) {
+		return 1;
+	}
+#else
+	if ((cipher_suite_id < 0) || (cipher_suite_id > 14))
+		return 1;
+#endif /* HAVE_CRYPTO_SHA256 */
+		/* See table 22-19 for the source of the statement */
+	switch (cipher_suite_id)
+	{
+	case 0:
+		*auth_alg      = IPMI_AUTH_RAKP_NONE;
+		*integrity_alg = IPMI_INTEGRITY_NONE;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 1:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+		*integrity_alg = IPMI_INTEGRITY_NONE;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 2:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 3:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+		break;
+	case 4:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+		break;
+	case 5:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+		break;
+	case 6:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_NONE;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 7:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 8:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+		break;
+	case 9:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+		break;
+	case 10:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+		break;
+	case 11:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 12:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+		break;
+	case 13:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+		break;
+	case 14:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+		break;
+#ifdef HAVE_CRYPTO_SHA256
+	case 15:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+		*integrity_alg = IPMI_INTEGRITY_NONE;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 16:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;
+		*crypt_alg     = IPMI_CRYPT_NONE;
+		break;
+	case 17:
+		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;
+		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+		break;
+#endif /* HAVE_CRYPTO_SHA256 */
+	}
+
+	return 0;
+}
+
+
+
+/*
+ * Reverse the order of arbitrarily long strings of bytes
+ */
+void lanplus_swap(
+				  uint8_t * buffer,
+						int             length)
+{
+	int i;
+	uint8_t temp;
+
+	for (i =0; i < length/2; ++i)
+	{
+		temp = buffer[i];
+		buffer[i] = buffer[length - 1 - i];
+		buffer[length - 1 - i] = temp;
+	}
+}
+
+
+
+static const struct valstr plus_payload_types_vals[] = {
+	 { IPMI_PAYLOAD_TYPE_IPMI,              "IPMI (0)" },	// IPMI Message
+	 { IPMI_PAYLOAD_TYPE_SOL,               "SOL  (1)" },	// SOL (Serial over LAN)
+	 { IPMI_PAYLOAD_TYPE_OEM,               "OEM  (2)" },	// OEM Explicid
+
+	 { IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST, "OpenSession Req (0x10)" },
+	 { IPMI_PAYLOAD_TYPE_RMCP_OPEN_RESPONSE,"OpenSession Resp (0x11)" },
+	 { IPMI_PAYLOAD_TYPE_RAKP_1,            "RAKP1 (0x12)" },
+	 { IPMI_PAYLOAD_TYPE_RAKP_2,            "RAKP2 (0x13)" },
+	 { IPMI_PAYLOAD_TYPE_RAKP_3,            "RAKP3 (0x14)" },
+	 { IPMI_PAYLOAD_TYPE_RAKP_4,            "RAKP4 (0x15)" },
+	{ 0x00, NULL },
+};
+
+
+static struct ipmi_rq_entry *
+ipmi_req_add_entry(struct ipmi_intf * intf, struct ipmi_rq * req, uint8_t req_seq)
+{
+	struct ipmi_rq_entry * e;
+
+	e = malloc(sizeof(struct ipmi_rq_entry));
+	if (e == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+
+	memset(e, 0, sizeof(struct ipmi_rq_entry));
+	memcpy(&e->req, req, sizeof(struct ipmi_rq));
+
+	e->intf = intf;
+	e->rq_seq = req_seq;
+
+	if (ipmi_req_entries == NULL)
+		ipmi_req_entries = e;
+	else
+		ipmi_req_entries_tail->next = e;
+
+	ipmi_req_entries_tail = e;
+	lprintf(LOG_DEBUG+3, "added list entry seq=0x%02x cmd=0x%02x",
+		e->rq_seq, e->req.msg.cmd);     
+	return e;
+}
+
+
+static struct ipmi_rq_entry *
+ipmi_req_lookup_entry(uint8_t seq, uint8_t cmd)
+{
+	struct ipmi_rq_entry * e = ipmi_req_entries;
+
+	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
+		if (e == e->next)
+			return NULL;
+		e = e->next;
+	}
+	return e;
+}
+
+static void
+ipmi_req_remove_entry(uint8_t seq, uint8_t cmd)
+{
+	struct ipmi_rq_entry * p, * e, * saved_next_entry;
+
+	e = p = ipmi_req_entries;
+
+	while (e && (e->rq_seq != seq || e->req.msg.cmd != cmd)) {
+		p = e;
+		e = e->next;
+	}
+	if (e) {
+		lprintf(LOG_DEBUG+3, "removed list entry seq=0x%02x cmd=0x%02x",
+			seq, cmd);
+		saved_next_entry = e->next;
+		p->next = (p->next == e->next) ? NULL : e->next;
+		/* If entry being removed is first in list, fix up list head */
+		if (ipmi_req_entries == e) {
+			if (ipmi_req_entries != p)
+				ipmi_req_entries = p;
+			else
+				ipmi_req_entries = saved_next_entry;
+		}
+		/* If entry being removed is last in list, fix up list tail */
+		if (ipmi_req_entries_tail == e) {
+			if (ipmi_req_entries_tail != p)
+				ipmi_req_entries_tail = p;
+			else
+				ipmi_req_entries_tail = NULL;
+		}
+
+		if (e->msg_data) {
+			free(e->msg_data);
+			e->msg_data = NULL;
+		}
+		free(e);
+		e = NULL;
+	}
+}
+
+static void
+ipmi_req_clear_entries(void)
+{
+	struct ipmi_rq_entry * p, * e;
+
+	e = ipmi_req_entries;
+	while (e) {
+		lprintf(LOG_DEBUG+3, "cleared list entry seq=0x%02x cmd=0x%02x",
+			e->rq_seq, e->req.msg.cmd);
+		p = e->next;
+		free(e);
+		e = p;
+	}
+
+	ipmi_req_entries = NULL;
+	ipmi_req_entries_tail = NULL;
+}
+
+
+int
+ipmi_lan_send_packet(
+					 struct ipmi_intf * intf,
+					 uint8_t * data, int
+					 data_len)
+{
+	if (verbose >= 5)
+		printbuf(data, data_len, ">> sending packet");
+
+	return send(intf->fd, data, data_len, 0);
+}
+
+
+
+struct ipmi_rs *
+ipmi_lan_recv_packet(struct ipmi_intf * intf)
+{
+	static struct ipmi_rs rsp;
+	fd_set read_set, err_set;
+	struct timeval tmout;
+	int ret;
+
+	FD_ZERO(&read_set);
+	FD_SET(intf->fd, &read_set);
+
+	FD_ZERO(&err_set);
+	FD_SET(intf->fd, &err_set);
+
+	tmout.tv_sec = intf->session->timeout;
+	tmout.tv_usec = 0;
+
+	ret = select(intf->fd + 1, &read_set, NULL, &err_set, &tmout);
+	if (ret < 0 || FD_ISSET(intf->fd, &err_set) || !FD_ISSET(intf->fd, &read_set))
+		return NULL;
+
+	/* the first read may return ECONNREFUSED because the rmcp ping
+	 * packet--sent to UDP port 623--will be processed by both the
+	 * BMC and the OS.
+	 *
+	 * The problem with this is that the ECONNREFUSED takes
+	 * priority over any other received datagram; that means that
+	 * the Connection Refused shows up _before_ the response packet,
+	 * regardless of the order they were sent out.  (unless the
+	 * response is read before the connection refused is returned)
+	 */
+	ret = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0);
+
+	if (ret < 0) {
+		FD_ZERO(&read_set);
+		FD_SET(intf->fd, &read_set);
+
+		FD_ZERO(&err_set);
+		FD_SET(intf->fd, &err_set);
+
+		tmout.tv_sec = intf->session->timeout;
+		tmout.tv_usec = 0;
+
+		ret = select(intf->fd + 1, &read_set, NULL, &err_set, &tmout);
+		if (ret < 0 || FD_ISSET(intf->fd, &err_set) || !FD_ISSET(intf->fd, &read_set))
+			return NULL;
+
+		ret = recv(intf->fd, &rsp.data, IPMI_BUF_SIZE, 0);
+		if (ret < 0)
+			return NULL;
+	}
+
+	if (ret == 0)
+		return NULL;
+
+	rsp.data[ret] = '\0';
+	rsp.data_len = ret;
+
+	if (verbose >= 5)
+		printbuf(rsp.data, rsp.data_len, "<< received packet");
+
+	return &rsp;
+}
+
+
+
+/*
+ * parse response RMCP "pong" packet
+ *
+ * return -1 if ping response not received
+ * returns 0 if IPMI is NOT supported
+ * returns 1 if IPMI is supported
+ *
+ * udp.source	= 0x026f	// RMCP_UDP_PORT
+ * udp.dest	= ?		// udp.source from rmcp-ping
+ * udp.len	= ?
+ * udp.check	= ?
+ * rmcp.ver	= 0x06		// RMCP Version 1.0
+ * rmcp.__res	= 0x00		// RESERVED
+ * rmcp.seq	= 0xff		// no RMCP ACK
+ * rmcp.class	= 0x06		// RMCP_CLASS_ASF
+ * asf.iana	= 0x000011be	// ASF_RMCP_IANA
+ * asf.type	= 0x40		// ASF_TYPE_PONG
+ * asf.tag	= ?		// asf.tag from rmcp-ping
+ * asf.__res	= 0x00		// RESERVED
+ * asf.len	= 0x10		// 16 bytes
+ * asf.data[3:0]= 0x000011be	// IANA# = RMCP_ASF_IANA if no OEM
+ * asf.data[7:4]= 0x00000000	// OEM-defined (not for IPMI)
+ * asf.data[8]	= 0x81		// supported entities
+ * 				// [7]=IPMI [6:4]=RES [3:0]=ASF_1.0
+ * asf.data[9]	= 0x00		// supported interactions (reserved)
+ * asf.data[f:a]= 0x000000000000
+ */
+static int
+ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp)
+{
+	struct rmcp_pong {
+		struct rmcp_hdr rmcp;
+		struct asf_hdr asf;
+		uint32_t iana;
+		uint32_t oem;
+		uint8_t sup_entities;
+		uint8_t sup_interact;
+		uint8_t reserved[6];
+	} * pong;
+
+	if (!rsp)
+		return -1;
+
+	pong = (struct rmcp_pong *)rsp->data;
+
+	if (verbose)
+		printf("Received IPMI/RMCP response packet: "
+				"IPMI%s Supported\n",
+				(pong->sup_entities & 0x80) ? "" : " NOT");
+
+	if (verbose > 1)
+		printf("  ASF Version %s\n"
+				"  RMCP Version %s\n"
+				"  RMCP Sequence %d\n"
+				"  IANA Enterprise %lu\n\n",
+				(pong->sup_entities & 0x01) ? "1.0" : "unknown",
+				(pong->rmcp.ver == 6) ? "1.0" : "unknown",
+				pong->rmcp.seq,
+				(unsigned long)ntohl(pong->iana));
+
+	return (pong->sup_entities & 0x80) ? 1 : 0;
+}
+
+
+/* build and send RMCP presence ping packet
+ *
+ * RMCP ping
+ *
+ * udp.source	= ?
+ * udp.dest	= 0x026f	// RMCP_UDP_PORT
+ * udp.len	= ?
+ * udp.check	= ?
+ * rmcp.ver	= 0x06		// RMCP Version 1.0
+ * rmcp.__res	= 0x00		// RESERVED
+ * rmcp.seq	= 0xff		// no RMCP ACK
+ * rmcp.class	= 0x06		// RMCP_CLASS_ASF
+ * asf.iana	= 0x000011be	// ASF_RMCP_IANA
+ * asf.type	= 0x80		// ASF_TYPE_PING
+ * asf.tag	= ?		// ASF sequence number
+ * asf.__res	= 0x00		// RESERVED
+ * asf.len	= 0x00
+ *
+ */
+int
+ipmiv2_lan_ping(struct ipmi_intf * intf)
+{
+	struct asf_hdr asf_ping = {
+		.iana	= htonl(ASF_RMCP_IANA),
+		.type	= ASF_TYPE_PING,
+	};
+	struct rmcp_hdr rmcp_ping = {
+		.ver	= RMCP_VERSION_1,
+		.class	= RMCP_CLASS_ASF,
+		.seq	= 0xff,
+	};
+	uint8_t * data;
+	int len = sizeof(rmcp_ping) + sizeof(asf_ping);
+	int rv;
+
+	data = malloc(len);
+	if (data == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return -1;
+	}
+	memset(data, 0, len);
+	memcpy(data, &rmcp_ping, sizeof(rmcp_ping));
+	memcpy(data+sizeof(rmcp_ping), &asf_ping, sizeof(asf_ping));
+
+	lprintf(LOG_DEBUG, "Sending IPMI/RMCP presence ping packet");
+
+	rv = ipmi_lan_send_packet(intf, data, len);
+
+	free(data);
+	data = NULL;
+
+	if (rv < 0) {
+		lprintf(LOG_ERR, "Unable to send IPMI presence ping packet");
+		return -1;
+	}
+
+	if (ipmi_lan_poll_recv(intf) == 0)
+		return 0;
+
+	return 1;
+}
+
+
+/**
+ *
+ * ipmi_lan_poll_single
+ *
+ * Receive whatever comes back.  Ignore received packets that don't correspond
+ * to a request we've sent.
+ *
+ * Returns: the ipmi_rs packet describing the/a response we expect.
+ */
+static struct ipmi_rs *
+ipmi_lan_poll_single(struct ipmi_intf * intf)
+{
+	struct rmcp_hdr * rmcp_rsp;
+	struct ipmi_rs * rsp;
+	struct ipmi_session * session = intf->session;
+	int offset, rv;
+	uint16_t payload_size;
+
+	/* receive packet */
+	rsp = ipmi_lan_recv_packet(intf);
+
+	/* check if no packet has come */
+	if (rsp == NULL) {
+		return NULL;
+	}
+
+	/* parse response headers */
+	rmcp_rsp = (struct rmcp_hdr *)rsp->data;
+
+	if (rmcp_rsp->class == RMCP_CLASS_ASF) {
+		/* might be ping response packet */
+		rv = ipmi_handle_pong(intf, rsp);
+		return (rv <= 0) ? NULL : rsp;
+	}
+
+	if (rmcp_rsp->class != RMCP_CLASS_IPMI) {
+		lprintf(LOG_DEBUG, "Invalid RMCP class: %x", rmcp_rsp->class);
+		/* read one more packet */
+		return (struct ipmi_rs *)1;
+	}
+
+	/*
+	 * The authtype / payload type determines what we are receiving
+	 */
+	offset = 4;
+
+	/*--------------------------------------------------------------------
+	 *
+	 * The current packet could be one of several things:
+	 *
+	 * 1) An IPMI 1.5 packet (the response to our GET CHANNEL
+	 *    AUTHENTICATION CAPABILITIES request)
+	 * 2) An RMCP+ message with an IPMI response payload
+	 * 3) AN RMCP+ open session response
+	 * 4) An RAKP-2 message (response to an RAKP 1 message)
+	 * 5) An RAKP-4 message (response to an RAKP 3 message)
+	 * 6) A Serial Over LAN packet
+	 * 7) An Invalid packet (one that doesn't match a request)
+	 * -------------------------------------------------------------------
+	 */
+
+	read_session_data(rsp, &offset, intf->session);
+
+	/*
+	 * Skip packets that are not intended for this session
+	 */
+	if ((session->v2_data.session_state == LANPLUS_STATE_ACTIVE)    &&
+		 (rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+		 (rsp->session.id != intf->session->v2_data.console_id))
+	{
+		lprintf(LOG_INFO, "packet session id 0x%x does not "
+			"match active session 0x%0x",
+			rsp->session.id, intf->session->v2_data.console_id);
+		lprintf(LOG_ERR, "ERROR: Received an Unexpected message ID");
+		/* read one more packet */
+		return (struct ipmi_rs *)1;
+	}
+
+	if (lanplus_has_valid_auth_code(rsp, intf->session) == 0) {
+		lprintf(LOG_ERR, "ERROR: Received message with invalid authcode!");
+		return NULL;
+	}
+
+	if ((session->v2_data.session_state == LANPLUS_STATE_ACTIVE)    &&
+			(rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+			(rsp->session.bEncrypted)) {
+		lanplus_decrypt_payload(session->v2_data.crypt_alg,
+				session->v2_data.k2,
+				rsp->data + offset,
+				rsp->session.msglen,
+				rsp->data + offset,
+				&payload_size);
+	} else {
+		payload_size = rsp->session.msglen;
+	}
+
+	/*
+	 * Handle IPMI responses (case #1 and #2) -- all IPMI responses
+	 */
+	if (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_IPMI) {
+		struct ipmi_rq_entry * entry;
+		int payload_start = offset;
+		int extra_data_length;
+		int loop = 1;
+
+		while (loop--) {
+			/* fill-in response data */
+			read_ipmi_response(rsp, &offset);
+
+			lprintf(LOG_DEBUG+1, "<< IPMI Response Session Header");
+			lprintf(LOG_DEBUG+1, "<<   Authtype                : %s",
+				val2str(rsp->session.authtype, ipmi_authtype_session_vals));
+			lprintf(LOG_DEBUG+1, "<<   Payload type            : %s",
+				val2str(rsp->session.payloadtype, plus_payload_types_vals));
+			lprintf(LOG_DEBUG+1, "<<   Session ID              : 0x%08lx",
+				(long)rsp->session.id);
+			lprintf(LOG_DEBUG+1, "<<   Sequence                : 0x%08lx",
+				(long)rsp->session.seq);
+			lprintf(LOG_DEBUG+1, "<<   IPMI Msg/Payload Length : %d",
+				rsp->session.msglen);
+			lprintf(LOG_DEBUG+1, "<< IPMI Response Message Header");
+			lprintf(LOG_DEBUG+1, "<<   Rq Addr    : %02x",
+				rsp->payload.ipmi_response.rq_addr);
+			lprintf(LOG_DEBUG+1, "<<   NetFn      : %02x",
+				rsp->payload.ipmi_response.netfn);
+			lprintf(LOG_DEBUG+1, "<<   Rq LUN     : %01x",
+				rsp->payload.ipmi_response.rq_lun);
+			lprintf(LOG_DEBUG+1, "<<   Rs Addr    : %02x",
+				rsp->payload.ipmi_response.rs_addr);
+			lprintf(LOG_DEBUG+1, "<<   Rq Seq     : %02x",
+				rsp->payload.ipmi_response.rq_seq);
+			lprintf(LOG_DEBUG+1, "<<   Rs Lun     : %01x",
+				rsp->payload.ipmi_response.rs_lun);
+			lprintf(LOG_DEBUG+1, "<<   Command    : %02x",
+				rsp->payload.ipmi_response.cmd);
+			lprintf(LOG_DEBUG+1, "<<   Compl Code : 0x%02x",
+				rsp->ccode);
+
+			/* Are we expecting this packet? */
+			entry = ipmi_req_lookup_entry(rsp->payload.ipmi_response.rq_seq,
+								rsp->payload.ipmi_response.cmd);
+
+			if (entry == NULL) {
+				lprintf(LOG_INFO, "IPMI Request Match NOT FOUND");
+				/* read one more packet */
+				return (struct ipmi_rs *)1;
+			};
+
+			uint8_t target_cmd = entry->req.msg.target_cmd;
+
+			lprintf(LOG_DEBUG+2, "IPMI Request Match found");
+
+			if (entry->bridging_level) {
+				/* Check completion code */
+				if (rsp->ccode) {
+					lprintf(LOG_DEBUG, "WARNING: Bridged "
+							"cmd ccode = 0x%02x", rsp->ccode);
+				} else {
+					/* decrement bridging level */
+					entry->bridging_level--;
+					if (!entry->bridging_level) {
+						entry->req.msg.cmd = entry->req.msg.target_cmd;
+					}
+
+					/* check if bridged response is embedded */
+					if (payload_size > 8) {
+						printbuf(&rsp->data[offset], (rsp->data_len-offset-1),
+								"bridge command response");
+						/*
+						 * decrement payload size
+						 * (cks2 for outer Send Message)
+						 */
+						payload_size--;
+
+						/*
+						 * need to make a loop for embedded bridged response
+						 */
+						loop++;
+					} else {
+						lprintf(LOG_DEBUG, "Bridged command answer,"
+								" waiting for next answer... ");
+						/* read one more packet */
+						return (struct ipmi_rs *)1;
+					}
+				}
+			}
+
+			/* Remove request entry */
+			ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
+					rsp->payload.ipmi_response.cmd);
+
+			/*
+			 * Good packet.  Shift response data to start of array.
+			 * rsp->data becomes the variable length IPMI response data
+			 * rsp->data_len becomes the length of that data
+			 */
+			extra_data_length = payload_size - (offset - payload_start) - 1;
+			if (extra_data_length) {
+				rsp->data_len = extra_data_length;
+				memmove(rsp->data, rsp->data + offset, extra_data_length);
+			} else {
+				rsp->data_len = 0;
+			}
+		}
+	/*
+	 * Open Response
+	 */
+	} else if (rsp->session.payloadtype ==
+			IPMI_PAYLOAD_TYPE_RMCP_OPEN_RESPONSE) {
+		if (session->v2_data.session_state !=
+				LANPLUS_STATE_OPEN_SESSION_SENT) {
+			lprintf(LOG_ERR, "Error: Received an Unexpected Open Session "
+					"Response");
+			/* read one more packet */
+			return (struct ipmi_rs *)1;
+		}
+		read_open_session_response(rsp, offset);
+	/*
+	 * RAKP 2
+	 */
+	} else if (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_RAKP_2) {
+		if (session->v2_data.session_state != LANPLUS_STATE_RAKP_1_SENT) {
+			lprintf(LOG_ERR, "Error: Received an Unexpected RAKP 2 message");
+			/* read one more packet */
+			return (struct ipmi_rs *)1;
+		}
+		read_rakp2_message(rsp, offset, session->v2_data.auth_alg);
+	/*
+	 * RAKP 4
+	 */
+	} else if (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_RAKP_4) {
+		if (session->v2_data.session_state != LANPLUS_STATE_RAKP_3_SENT) {
+			lprintf(LOG_ERR, "Error: Received an Unexpected RAKP 4 message");
+			/* read one more packet */
+			return (struct ipmi_rs *)1;
+		}
+		read_rakp4_message(rsp, offset, session->v2_data.auth_alg);
+	/*
+	 * SOL
+	 */
+	} else if (rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL) {
+		int payload_start = offset;
+		int extra_data_length;
+
+		if (session->v2_data.session_state != LANPLUS_STATE_ACTIVE) {
+			lprintf(LOG_ERR, "Error: Received an Unexpected SOL packet");
+			/* read one more packet */
+			return (struct ipmi_rs *)1;
+		}
+		read_sol_packet(rsp, &offset);
+		extra_data_length = payload_size - (offset - payload_start);
+		if (rsp && extra_data_length) {
+			rsp->data_len = extra_data_length;
+			memmove(rsp->data, rsp->data + offset, extra_data_length);
+		} else {
+			rsp->data_len = 0;
+		}
+	/*
+	 * Unknown Payload type
+	 */
+	} else {
+		lprintf(LOG_ERR, "Invalid RMCP+ payload type : 0x%x",
+				rsp->session.payloadtype);
+		/* read one more packet */
+		return (struct ipmi_rs *)1;
+	}
+
+	return rsp;
+}
+
+
+
+/**
+ *
+ * ipmi_lan_poll_recv
+ *
+ * Receive whatever comes back.  Ignore received packets that don't correspond
+ * to a request we've sent.
+ *
+ * Returns: the ipmi_rs packet describing the/a response we expect.
+ */
+static struct ipmi_rs *
+ipmi_lan_poll_recv(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+
+	do {
+		/* poll single packet */
+		rsp = ipmi_lan_poll_single(intf);
+	} while (rsp == (struct ipmi_rs *) 1);
+
+	return rsp;
+}
+
+
+
+/*
+ * read_open_session_response
+ *
+ * Initialize the ipmi_rs from the IPMI 2.x open session response data.
+ *
+ * The offset should point to the first byte of the the Open Session Response
+ * payload when this function is called.
+ *
+ * param rsp    [in/out] reading from the data and writing to the open_session_response
+ *              section
+ * param offset [in] tells us where the Open Session Response payload starts
+ *
+ * returns 0 on success, 1 on error
+ */
+void
+read_open_session_response(struct ipmi_rs * rsp, int offset)
+{
+	memset(&rsp->payload.open_session_response, 0,
+			 sizeof(rsp->payload.open_session_response));
+
+	 /*  Message tag */
+	 rsp->payload.open_session_response.message_tag = rsp->data[offset];
+
+	 /* RAKP response code */
+	 rsp->payload.open_session_response.rakp_return_code = rsp->data[offset + 1];
+
+	 /* Maximum privilege level */
+	 rsp->payload.open_session_response.max_priv_level = rsp->data[offset + 2];
+
+	 /*** offset + 3 is reserved ***/
+
+	 /* Remote console session ID */
+	 memcpy(&(rsp->payload.open_session_response.console_id),
+			rsp->data + offset + 4,
+			4);
+	 #if WORDS_BIGENDIAN
+	 rsp->payload.open_session_response.console_id =
+		 BSWAP_32(rsp->payload.open_session_response.console_id);
+	 #endif
+
+	/* only tag, status, privlvl, and console id are returned if error */
+	 if (rsp->payload.open_session_response.rakp_return_code !=
+		  IPMI_RAKP_STATUS_NO_ERRORS)
+		 return;
+
+	 /* BMC session ID */
+	 memcpy(&(rsp->payload.open_session_response.bmc_id),
+			rsp->data + offset + 8,
+			4);
+	 #if WORDS_BIGENDIAN
+	 rsp->payload.open_session_response.bmc_id =
+		 BSWAP_32(rsp->payload.open_session_response.bmc_id);
+	 #endif
+
+	 /* And of course, our negotiated algorithms */
+	 rsp->payload.open_session_response.auth_alg      = rsp->data[offset + 16];
+	 rsp->payload.open_session_response.integrity_alg = rsp->data[offset + 24];
+	 rsp->payload.open_session_response.crypt_alg     = rsp->data[offset + 32];
+}
+
+
+
+/*
+ * read_rakp2_message
+ *
+ * Initialize the ipmi_rs from the IPMI 2.x RAKP 2 message
+ *
+ * The offset should point the first byte of the the RAKP 2 payload when this
+ * function is called.
+ *
+ * param rsp [in/out] reading from the data variable and writing to the rakp 2
+ *       section
+ * param offset [in] tells us where hte rakp2 payload starts
+ * param auth_alg [in] describes the authentication algorithm was agreed upon in
+ *       the open session request/response phase.  We need to know that here so
+ *       that we know how many bytes (if any) to read fromt the packet.
+ *
+ * returns 0 on success, 1 on error
+ */
+void
+read_rakp2_message(
+					struct ipmi_rs * rsp,
+					int offset,
+					uint8_t auth_alg)
+{
+	 int i;
+
+	 /*  Message tag */
+	 rsp->payload.rakp2_message.message_tag = rsp->data[offset];
+
+	 /* RAKP response code */
+	 rsp->payload.rakp2_message.rakp_return_code = rsp->data[offset + 1];
+
+	 /* Console session ID */
+	 memcpy(&(rsp->payload.rakp2_message.console_id),
+			rsp->data + offset + 4,
+			4);
+	 #if WORDS_BIGENDIAN
+	 rsp->payload.rakp2_message.console_id =
+		 BSWAP_32(rsp->payload.rakp2_message.console_id);
+	 #endif
+
+	 /* BMC random number */
+	 memcpy(&(rsp->payload.rakp2_message.bmc_rand),
+			rsp->data + offset + 8,
+			16);
+	 #if WORDS_BIGENDIAN
+	 lanplus_swap(rsp->payload.rakp2_message.bmc_rand, 16);
+	 #endif
+
+	 /* BMC GUID */
+	 memcpy(&(rsp->payload.rakp2_message.bmc_guid),
+			rsp->data + offset + 24,
+			16);
+	 #if WORDS_BIGENDIAN
+	 lanplus_swap(rsp->payload.rakp2_message.bmc_guid, 16);
+	 #endif
+	 
+	 /* Key exchange authentication code */
+	 switch (auth_alg)
+	 {
+	 case  IPMI_AUTH_RAKP_NONE:
+		 /* Nothing to do here */
+		 break;
+
+	 case IPMI_AUTH_RAKP_HMAC_SHA1:
+		/* We need to copy 20 bytes */
+		for (i = 0; i < IPMI_SHA_DIGEST_LENGTH; ++i) {
+			rsp->payload.rakp2_message.key_exchange_auth_code[i] =
+				rsp->data[offset + 40 + i];
+		}
+		break;
+
+	 case IPMI_AUTH_RAKP_HMAC_MD5:
+		/* We need to copy 16 bytes */
+		for (i = 0; i < IPMI_MD5_DIGEST_LENGTH; ++i) {
+			rsp->payload.rakp2_message.key_exchange_auth_code[i] =
+				rsp->data[offset + 40 + i];
+		}
+		break;
+
+#ifdef HAVE_CRYPTO_SHA256
+	 case IPMI_AUTH_RAKP_HMAC_SHA256:
+		/* We need to copy 32 bytes */
+		for (i = 0; i < IPMI_SHA256_DIGEST_LENGTH; ++i) {
+			rsp->payload.rakp2_message.key_exchange_auth_code[i] =
+				rsp->data[offset + 40 + i];
+		}
+		break;
+#endif /* HAVE_CRYPTO_SHA256 */
+
+	 default:
+		lprintf(LOG_ERR, "read_rakp2_message: no support "
+			"for authentication algorithm 0x%x", auth_alg);
+		 assert(0);
+		 break;
+	 }
+}
+
+
+
+/*
+ * read_rakp4_message
+ *
+ * Initialize the ipmi_rs from the IPMI 2.x RAKP 4 message
+ *
+ * The offset should point the first byte of the the RAKP 4 payload when this
+ * function is called.
+ *
+ * param rsp [in/out] reading from the data variable and writing to the rakp
+ *       4 section
+ * param offset [in] tells us where hte rakp4 payload starts
+ * param integrity_alg [in] describes the authentication algorithm was
+ *       agreed upon in the open session request/response phase.  We need
+ *       to know that here so that we know how many bytes (if any) to read
+ *       from the packet.
+ *
+ * returns 0 on success, 1 on error
+ */
+void
+read_rakp4_message(
+					struct ipmi_rs * rsp,
+					int offset,
+					uint8_t auth_alg)
+{
+	 int i;
+
+	 /*  Message tag */
+	 rsp->payload.rakp4_message.message_tag = rsp->data[offset];
+
+	 /* RAKP response code */
+	 rsp->payload.rakp4_message.rakp_return_code = rsp->data[offset + 1];
+
+	 /* Console session ID */
+	 memcpy(&(rsp->payload.rakp4_message.console_id),
+			rsp->data + offset + 4,
+			4);
+	 #if WORDS_BIGENDIAN
+	 rsp->payload.rakp4_message.console_id =
+		 BSWAP_32(rsp->payload.rakp4_message.console_id);
+	 #endif
+
+	 
+	 /* Integrity check value */
+	 switch (auth_alg)
+	 {
+	 case  IPMI_AUTH_RAKP_NONE:
+		 /* Nothing to do here */
+		 break;
+
+	 case IPMI_AUTH_RAKP_HMAC_SHA1:
+		/* We need to copy 12 bytes */
+		for (i = 0; i < IPMI_SHA1_AUTHCODE_SIZE; ++i) {
+			rsp->payload.rakp4_message.integrity_check_value[i] =
+				rsp->data[offset + 8 + i];
+		}
+		break;
+
+	 case IPMI_AUTH_RAKP_HMAC_MD5:
+		/* We need to copy 16 bytes */
+		for (i = 0; i < IPMI_HMAC_MD5_AUTHCODE_SIZE; ++i) {
+			rsp->payload.rakp4_message.integrity_check_value[i] =
+				rsp->data[offset + 8 + i];
+		}
+		break;
+
+#ifdef HAVE_CRYPTO_SHA256
+	 case IPMI_AUTH_RAKP_HMAC_SHA256:
+		/* We need to copy 16 bytes */
+		for (i = 0; i < IPMI_HMAC_SHA256_AUTHCODE_SIZE; ++i) {
+			rsp->payload.rakp4_message.integrity_check_value[i] =
+				rsp->data[offset + 8 + i];
+		}
+		break;
+#endif /* HAVE_CRYPTO_SHA256 */
+
+	 default:
+		 lprintf(LOG_ERR, "read_rakp4_message: no support "
+			 "for authentication algorithm 0x%x", auth_alg);
+		 assert(0);
+		 break;	 
+	 }
+}
+
+
+
+
+/*
+ * read_session_data
+ *
+ * Initialize the ipmi_rsp from the session data in the packet
+ *
+ * The offset should point the first byte of the the IPMI session when this
+ * function is called.
+ *
+ * param rsp     [in/out] we read from the data buffer and populate the session
+ *               specific fields.
+ * param offset  [in/out] should point to the beginning of the session when
+ *               this function is called.  The offset will be adjusted to
+ *               point to the end of the session when this function exits.
+ * param session holds our session state
+ */
+void
+read_session_data(
+				  struct ipmi_rs * rsp,
+				  int * offset,
+				  struct ipmi_session * s)
+{
+	/* We expect to read different stuff depending on the authtype */
+	rsp->session.authtype = rsp->data[*offset];
+
+	if (rsp->session.authtype == IPMI_SESSION_AUTHTYPE_RMCP_PLUS)
+		read_session_data_v2x(rsp, offset, s);
+	else
+		read_session_data_v15(rsp, offset, s);
+}
+
+
+
+/*
+ * read_session_data_v2x
+ *
+ * Initialize the ipmi_rsp from the v2.x session header of the packet.
+ *
+ * The offset should point to the first byte of the the IPMI session when this
+ * function is called.  When this function exits, offset will point to the
+ * start of payload.
+ *
+ * Should decrypt and perform integrity checking here?
+ *
+ * param rsp    [in/out] we read from the data buffer and populate the session
+ *              specific fields.
+ * param offset [in/out] should point to the beginning of the session when this
+ *              function is called.  The offset will be adjusted to point to
+ *              the end of the session when this function exits.
+ *  param s      holds our session state
+ */
+void
+read_session_data_v2x(
+					  struct ipmi_rs      * rsp,
+					  int                 * offset,
+					  struct ipmi_session * s)
+{
+	rsp->session.authtype = rsp->data[(*offset)++];
+
+	rsp->session.bEncrypted     = (rsp->data[*offset] & 0x80 ? 1 : 0);
+	rsp->session.bAuthenticated = (rsp->data[*offset] & 0x40 ? 1 : 0);
+
+
+	/* Payload type */
+	rsp->session.payloadtype = rsp->data[(*offset)++] & 0x3F;
+
+	/* Session ID */
+	memcpy(&rsp->session.id, rsp->data + *offset, 4);
+	*offset += 4;
+	#if WORDS_BIGENDIAN
+	rsp->session.id = BSWAP_32(rsp->session.id);
+	#endif
+
+
+	/* Ignored, so far */
+	memcpy(&rsp->session.seq, rsp->data + *offset, 4);
+	*offset += 4;
+	#if WORDS_BIGENDIAN
+	rsp->session.seq = BSWAP_32(rsp->session.seq);
+	#endif		
+
+	memcpy(&rsp->session.msglen, rsp->data + *offset, 2);
+	*offset += 2;
+	#if WORDS_BIGENDIAN
+	rsp->session.msglen = BSWAP_16(rsp->session.msglen);
+	#endif
+}
+
+
+
+/*
+ * read_session_data_v15
+ *
+ * Initialize the ipmi_rsp from the session header of the packet. 
+ *
+ * The offset should point the first byte of the the IPMI session when this
+ * function is called.  When this function exits, the offset will point to
+ * the start of the IPMI message.
+ *
+ * param rsp    [in/out] we read from the data buffer and populate the session
+ *              specific fields.
+ * param offset [in/out] should point to the beginning of the session when this
+ *              function is called.  The offset will be adjusted to point to the
+ *              end of the session when this function exits.
+ * param s      holds our session state
+ */
+void read_session_data_v15(
+							struct ipmi_rs * rsp,
+							int * offset,
+							struct ipmi_session * s)
+{
+	/* All v15 messages are IPMI messages */
+	rsp->session.payloadtype = IPMI_PAYLOAD_TYPE_IPMI;
+
+	rsp->session.authtype = rsp->data[(*offset)++];
+
+	/* All v15 messages that we will receive are unencrypted/unauthenticated */
+	rsp->session.bEncrypted     = 0;
+	rsp->session.bAuthenticated = 0;
+
+	/* skip the session id and sequence number fields */
+	*offset += 8;
+
+	/* This is the size of the whole payload */
+	rsp->session.msglen = rsp->data[(*offset)++];
+}
+
+
+
+/*
+ * read_ipmi_response
+ *
+ * Initialize the ipmi_rs from with the IPMI response specific data
+ *
+ * The offset should point the first byte of the the IPMI payload when this
+ * function is called. 
+ *
+ * param rsp    [in/out] we read from the data buffer and populate the IPMI
+ *              specific fields.
+ * param offset [in/out] should point to the beginning of the IPMI payload when
+ *              this function is called.
+ */
+void read_ipmi_response(struct ipmi_rs * rsp, int * offset)
+{
+	/*
+	 * The data here should be decrypted by now.
+	 */
+	rsp->payload.ipmi_response.rq_addr = rsp->data[(*offset)++];
+	rsp->payload.ipmi_response.netfn   = rsp->data[*offset] >> 2;
+	rsp->payload.ipmi_response.rq_lun  = rsp->data[(*offset)++] & 0x3;
+	(*offset)++;		/* checksum */
+	rsp->payload.ipmi_response.rs_addr = rsp->data[(*offset)++];
+	rsp->payload.ipmi_response.rq_seq  = rsp->data[*offset] >> 2;
+	rsp->payload.ipmi_response.rs_lun  = rsp->data[(*offset)++] & 0x3;
+	rsp->payload.ipmi_response.cmd     = rsp->data[(*offset)++]; 
+	rsp->ccode                         = rsp->data[(*offset)++];
+
+}
+
+
+
+/*
+ * read_sol_packet
+ *
+ * Initialize the ipmi_rs with the SOL response data
+ *
+ * The offset should point the first byte of the the SOL payload when this
+ * function is called. 
+ *
+ * param rsp    [in/out] we read from the data buffer and populate the
+ *              SOL specific fields.
+ * param offset [in/out] should point to the beginning of the SOL payload
+ *              when this function is called.
+ */
+void read_sol_packet(struct ipmi_rs * rsp, int * offset)
+{
+
+	/*
+	 * The data here should be decrypted by now.
+	 */
+	rsp->payload.sol_packet.packet_sequence_number =
+		rsp->data[(*offset)++] & 0x0F;
+
+	rsp->payload.sol_packet.acked_packet_number =
+		rsp->data[(*offset)++] & 0x0F;
+
+	rsp->payload.sol_packet.accepted_character_count =
+		rsp->data[(*offset)++];
+
+	rsp->payload.sol_packet.is_nack =
+		rsp->data[*offset] & 0x40;
+
+	rsp->payload.sol_packet.transfer_unavailable =
+		rsp->data[*offset] & 0x20;
+
+	rsp->payload.sol_packet.sol_inactive =
+		rsp->data[*offset] & 0x10;
+
+	rsp->payload.sol_packet.transmit_overrun =
+		rsp->data[*offset] & 0x08;
+
+	rsp->payload.sol_packet.break_detected =
+		rsp->data[(*offset)++] & 0x04;
+
+	lprintf(LOG_DEBUG, "<<<<<<<<<< RECV FROM BMC <<<<<<<<<<<");
+	lprintf(LOG_DEBUG, "< SOL sequence number     : 0x%02x",
+		rsp->payload.sol_packet.packet_sequence_number);
+	lprintf(LOG_DEBUG, "< SOL acked packet        : 0x%02x",
+		rsp->payload.sol_packet.acked_packet_number);
+	lprintf(LOG_DEBUG, "< SOL accepted char count : 0x%02x",
+		rsp->payload.sol_packet.accepted_character_count);
+	lprintf(LOG_DEBUG, "< SOL is nack             : %s",
+		rsp->payload.sol_packet.is_nack? "true" : "false");
+	lprintf(LOG_DEBUG, "< SOL xfer unavailable    : %s",
+		rsp->payload.sol_packet.transfer_unavailable? "true" : "false");
+	lprintf(LOG_DEBUG, "< SOL inactive            : %s",
+		rsp->payload.sol_packet.sol_inactive? "true" : "false");
+	lprintf(LOG_DEBUG, "< SOL transmit overrun    : %s",
+		rsp->payload.sol_packet.transmit_overrun? "true" : "false");
+	lprintf(LOG_DEBUG, "< SOL break detected      : %s",
+		rsp->payload.sol_packet.break_detected? "true" : "false");
+	lprintf(LOG_DEBUG, "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+
+	if (verbose >= 5)
+		printbuf(rsp->data + *offset - 4, 4, "SOL MSG FROM BMC");
+}
+
+
+
+/*
+ * getIpmiPayloadWireRep
+ *
+ * param out [out] will contain our wire representation
+ * param req [in] is the IPMI request to be written
+ * param crypt_alg [in] specifies the encryption to use
+ * param rq_seq [in] is the IPMI command sequence number.
+ */
+void getIpmiPayloadWireRep(
+							struct ipmi_intf       * intf,  /* in out */
+							struct ipmi_v2_payload * payload,  /* in  */
+							uint8_t  * msg,
+							struct ipmi_rq * req,
+							uint8_t    rq_seq,
+							uint8_t curr_seq)
+{
+	int cs, tmp, len;
+	int cs2 = 0;
+	int cs3 = 0;
+	uint8_t ourAddress = intf->my_addr;
+	uint8_t bridgedRequest = 0;
+
+	if (ourAddress == 0)
+		ourAddress = IPMI_BMC_SLAVE_ADDR;
+
+	len = 0;
+
+	/* IPMI Message Header -- Figure 13-4 of the IPMI v2.0 spec */
+	if ((intf->target_addr == ourAddress) || (!bridgePossible)) {
+		cs = len;
+	} else {
+		bridgedRequest = 1;
+
+		if(intf->transit_addr != ourAddress && intf->transit_addr != 0)
+		{
+			bridgedRequest++;
+		}
+		/* bridged request: encapsulate w/in Send Message */
+		cs = len;
+		msg[len++] = IPMI_BMC_SLAVE_ADDR;
+		msg[len++] = IPMI_NETFN_APP << 2;
+		tmp = len - cs;
+		msg[len++] = ipmi_csum(msg+cs, tmp);
+		cs2 = len;
+		msg[len++] = IPMI_REMOTE_SWID;
+		msg[len++] = curr_seq << 2;
+
+		
+		msg[len++] = 0x34;			/* Send Message rqst */
+		if(bridgedRequest == 2)
+			msg[len++] = (0x40|intf->transit_channel); /* Track request*/
+		else
+			msg[len++] = (0x40|intf->target_channel);    /* Track request*/
+			
+		payload->payload_length += 7;
+		cs = len;
+		
+		if(bridgedRequest == 2)
+		{
+			/* bridged request: encapsulate w/in Send Message */
+			cs = len;
+			msg[len++] = intf->transit_addr;
+			msg[len++] = IPMI_NETFN_APP << 2;
+			tmp = len - cs;
+			msg[len++] = ipmi_csum(msg+cs, tmp);
+			cs3 = len;
+			msg[len++] = IPMI_REMOTE_SWID;
+			msg[len++] = curr_seq << 2;
+			msg[len++] = 0x34;			/* Send Message rqst */
+			msg[len++] = (0x40|intf->target_channel); /* Track request*/
+
+			payload->payload_length += 7;
+
+			cs = len;
+		}
+	}
+
+        lprintf(LOG_DEBUG,"%s RqAddr %#x transit %#x:%#x target %#x:%#x "
+		"bridgePossible %d",
+		bridgedRequest ? "Bridging" : "Local",
+		intf->my_addr, intf->transit_addr, intf->transit_channel,
+		intf->target_addr, intf->target_channel,
+		bridgePossible);
+
+	/* rsAddr */
+	if (bridgedRequest)
+		msg[len++] = intf->target_addr;
+	else
+		msg[len++] = IPMI_BMC_SLAVE_ADDR;
+
+	/* net Fn */
+	msg[len++] = req->msg.netfn << 2 | (req->msg.lun & 3);
+	tmp = len - cs;
+
+	/* checkSum */
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+	cs = len;
+
+	/* rqAddr */
+	if (bridgedRequest < 2)
+		msg[len++] = IPMI_REMOTE_SWID;
+	else  /* Bridged message */
+		msg[len++] = intf->my_addr;
+
+	/* rqSeq / rqLUN */
+	msg[len++] = rq_seq << 2;
+
+	/* cmd */
+	msg[len++] = req->msg.cmd;
+
+	/* message data */
+	if (req->msg.data_len) {
+		memcpy(msg + len, req->msg.data, req->msg.data_len);
+		len += req->msg.data_len;
+	}
+
+	/* second checksum */
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+
+	/* Dual bridged request: 2nd checksum */
+	if (bridgedRequest == 2) {
+		tmp = len - cs3;
+		msg[len++] = ipmi_csum(msg+cs3, tmp);
+		payload->payload_length += 1;
+	}
+
+	/* bridged request: 2nd checksum */
+	if (bridgedRequest) {
+		tmp = len - cs2;
+		msg[len++] = ipmi_csum(msg+cs2, tmp);
+		payload->payload_length += 1;
+	}
+}
+
+
+
+/*
+ * getSolPayloadWireRep
+ *
+ * param msg [out] will contain our wire representation
+ * param payload [in] holds the v2 payload with our SOL data
+ */
+void getSolPayloadWireRep(
+						  struct ipmi_intf       * intf,  /* in out */
+						  uint8_t          * msg,     /* output */
+						  struct ipmi_v2_payload * payload) /* input */
+{
+	int i = 0;
+
+	lprintf(LOG_DEBUG, ">>>>>>>>>> SENDING TO BMC >>>>>>>>>>");
+	lprintf(LOG_DEBUG, "> SOL sequence number     : 0x%02x",
+		payload->payload.sol_packet.packet_sequence_number);
+	lprintf(LOG_DEBUG, "> SOL acked packet        : 0x%02x",
+		payload->payload.sol_packet.acked_packet_number);
+	lprintf(LOG_DEBUG, "> SOL accepted char count : 0x%02x",
+		payload->payload.sol_packet.accepted_character_count);
+	lprintf(LOG_DEBUG, "> SOL is nack             : %s",
+		payload->payload.sol_packet.is_nack ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL assert ring wor     : %s",
+		payload->payload.sol_packet.assert_ring_wor ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL generate break      : %s",
+		payload->payload.sol_packet.generate_break ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL deassert cts        : %s",
+		payload->payload.sol_packet.deassert_cts ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL deassert dcd dsr    : %s",
+		payload->payload.sol_packet.deassert_dcd_dsr ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL flush inbound       : %s",
+		payload->payload.sol_packet.flush_inbound ? "true" : "false");
+	lprintf(LOG_DEBUG, "> SOL flush outbound      : %s",
+		payload->payload.sol_packet.flush_outbound ? "true" : "false");
+
+	msg[i++] = payload->payload.sol_packet.packet_sequence_number;
+	msg[i++] = payload->payload.sol_packet.acked_packet_number;
+	msg[i++] = payload->payload.sol_packet.accepted_character_count;
+
+	msg[i]    = payload->payload.sol_packet.is_nack           ? 0x40 : 0;
+	msg[i]   |= payload->payload.sol_packet.assert_ring_wor   ? 0x20 : 0;
+	msg[i]   |= payload->payload.sol_packet.generate_break    ? 0x10 : 0;
+	msg[i]   |= payload->payload.sol_packet.deassert_cts      ? 0x08 : 0;
+	msg[i]   |= payload->payload.sol_packet.deassert_dcd_dsr  ? 0x04 : 0;
+	msg[i]   |= payload->payload.sol_packet.flush_inbound     ? 0x02 : 0;
+	msg[i++] |= payload->payload.sol_packet.flush_outbound    ? 0x01 : 0;
+
+	/* We may have data to add */
+	memcpy(msg + i,
+			payload->payload.sol_packet.data,
+			payload->payload.sol_packet.character_count);
+
+	lprintf(LOG_DEBUG, "> SOL character count     : %d",
+		payload->payload.sol_packet.character_count);
+	lprintf(LOG_DEBUG, ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
+	if (verbose >= 5 && payload->payload.sol_packet.character_count)
+		printbuf(payload->payload.sol_packet.data, payload->payload.sol_packet.character_count, "SOL SEND DATA");
+
+	/*
+	 * At this point, the payload length becomes the whole payload
+	 * length, including the 4 bytes at the beginning of the SOL
+	 * packet
+	 */
+	payload->payload_length = payload->payload.sol_packet.character_count + 4;
+}
+
+
+
+/*
+ * ipmi_lanplus_build_v2x_msg
+ *
+ * Encapsulates the payload data to create the IPMI v2.0 / RMCP+ packet.
+ * 
+ *
+ * IPMI v2.0 LAN Request Message Format
+ * +----------------------+
+ * |  rmcp.ver            | 4 bytes
+ * |  rmcp.__reserved     |
+ * |  rmcp.seq            |
+ * |  rmcp.class          |
+ * +----------------------+
+ * |  session.authtype    | 10 bytes
+ * |  session.payloadtype |
+ * |  session.id          |
+ * |  session.seq         |
+ * +----------------------+
+ * |  message length      | 2 bytes
+ * +----------------------+
+ * | Confidentiality Hdr  | var (possibly absent)
+ * +----------------------+
+ * |  Paylod              | var Payload
+ * +----------------------+
+ * | Confidentiality Trlr | var (possibly absent)
+ * +----------------------+
+ * | Integrity pad        | var (possibly absent)
+ * +----------------------+
+ * | Pad length           | 1 byte (WTF?)
+ * +----------------------+
+ * | Next Header          | 1 byte (WTF?)
+ * +----------------------+
+ * | Authcode             | var (possibly absent)
+ * +----------------------+
+ */
+void
+ipmi_lanplus_build_v2x_msg(
+							struct ipmi_intf       * intf,     /* in  */
+							struct ipmi_v2_payload * payload,  /* in  */
+							int                    * msg_len,  /* out */
+							uint8_t         ** msg_data, /* out */
+							uint8_t curr_seq)
+{
+	uint32_t session_trailer_length = 0;
+	struct ipmi_session * session = intf->session;
+	struct rmcp_hdr rmcp = {
+		.ver		= RMCP_VERSION_1,
+		.class		= RMCP_CLASS_IPMI,
+		.seq		= 0xff,
+	};
+
+	/* msg will hold the entire message to be sent */
+	uint8_t * msg;
+	int len = 0;
+
+
+	len =
+		sizeof(rmcp)                +  // RMCP Header (4)
+		10                          +  // IPMI Session Header
+		2                           +  // Message length
+		payload->payload_length     +  // The actual payload
+		IPMI_MAX_INTEGRITY_PAD_SIZE +  // Integrity Pad
+		1                           +  // Pad Length
+		1                           +  // Next Header
+		IPMI_MAX_AUTH_CODE_SIZE;       // Authcode
+
+
+	msg = malloc(len);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return;
+	}
+	memset(msg, 0, len);
+
+	/*
+	 *------------------------------------------
+	 * RMCP HEADER
+	 *------------------------------------------
+	 */
+	memcpy(msg, &rmcp, sizeof(rmcp));
+	len = sizeof(rmcp);
+
+
+	/*
+	 *------------------------------------------
+	 * IPMI SESSION HEADER
+	 *------------------------------------------
+	 */
+	/* ipmi session Auth Type / Format is always 0x06 for IPMI v2 */
+	msg[IPMI_LANPLUS_OFFSET_AUTHTYPE] = 0x06;
+
+	/* Payload Type -- also specifies whether were authenticated/encyrpted */
+	msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] = payload->payload_type;
+
+	if (session->v2_data.session_state == LANPLUS_STATE_ACTIVE)
+	{
+		msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
+			((session->v2_data.crypt_alg != IPMI_CRYPT_NONE	)? 0x80 : 0x00);
+		msg[IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE] |=
+			((session->v2_data.integrity_alg  != IPMI_INTEGRITY_NONE)? 0x40 : 0x00);
+	}
+
+	if (session->v2_data.session_state == LANPLUS_STATE_ACTIVE)
+	{
+		/* Session ID  -- making it LSB */
+		msg[IPMI_LANPLUS_OFFSET_SESSION_ID    ] = session->v2_data.bmc_id         & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 1] = (session->v2_data.bmc_id >> 8)  & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 2] = (session->v2_data.bmc_id >> 16) & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SESSION_ID + 3] = (session->v2_data.bmc_id >> 24) & 0xff;
+
+		/* Sequence Number -- making it LSB */
+		msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM    ] = session->out_seq         & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 1] = (session->out_seq >> 8)  & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 2] = (session->out_seq >> 16) & 0xff;
+		msg[IPMI_LANPLUS_OFFSET_SEQUENCE_NUM + 3] = (session->out_seq >> 24) & 0xff;
+	}
+
+	/*
+	 * Payload Length is set below (we don't know how big the payload is until after
+	 * encryption).
+	 */
+
+	/*
+	 * Payload
+	 *
+	 * At this point we are ready to slam the payload in.
+	 * This includes:
+	 * 1) The confidentiality header
+	 * 2) The payload proper (possibly encrypted)
+	 * 3) The confidentiality trailer
+	 *
+	 */
+	switch (payload->payload_type)
+	{
+	case IPMI_PAYLOAD_TYPE_IPMI:
+		getIpmiPayloadWireRep(intf,
+							  payload,  /* in  */
+							  msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
+							  payload->payload.ipmi_request.request,
+							  payload->payload.ipmi_request.rq_seq,
+							  curr_seq);
+		break;
+
+	case IPMI_PAYLOAD_TYPE_SOL:
+		getSolPayloadWireRep(intf,
+							 msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
+							 payload);
+
+		if (verbose >= 5)
+			printbuf(msg + IPMI_LANPLUS_OFFSET_PAYLOAD, 4, "SOL MSG TO BMC");
+
+		len += payload->payload_length;
+
+		break;
+
+	case IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST:
+		/* never encrypted, so our job is easy */
+		memcpy(msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
+				payload->payload.open_session_request.request,
+				payload->payload_length);
+		len += payload->payload_length;
+		break;
+
+	case IPMI_PAYLOAD_TYPE_RAKP_1:
+		/* never encrypted, so our job is easy */
+		memcpy(msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
+				payload->payload.rakp_1_message.message,
+				payload->payload_length);
+		len += payload->payload_length;
+		break;
+
+	case IPMI_PAYLOAD_TYPE_RAKP_3:
+		/* never encrypted, so our job is easy */
+		memcpy(msg + IPMI_LANPLUS_OFFSET_PAYLOAD,
+				payload->payload.rakp_3_message.message,
+				payload->payload_length);
+		len += payload->payload_length;
+		break;
+
+	default:
+		lprintf(LOG_ERR, "unsupported payload type 0x%x",
+			payload->payload_type);
+		free(msg);
+		msg = NULL;
+		assert(0);
+		break;
+	}
+
+
+	/*
+	 *------------------------------------------
+	 * ENCRYPT THE PAYLOAD IF NECESSARY
+	 *------------------------------------------
+	 */
+	if (session->v2_data.session_state == LANPLUS_STATE_ACTIVE)
+	{
+		/* Payload len is adjusted as necessary by lanplus_encrypt_payload */
+		lanplus_encrypt_payload(session->v2_data.crypt_alg,        /* input  */
+								session->v2_data.k2,               /* input  */
+								msg + IPMI_LANPLUS_OFFSET_PAYLOAD, /* input  */
+								payload->payload_length,           /* input  */
+								msg + IPMI_LANPLUS_OFFSET_PAYLOAD, /* output */
+								&(payload->payload_length));       /* output */
+
+	}
+
+	/* Now we know the payload length */
+	msg[IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE    ] =
+		payload->payload_length        & 0xff;
+	msg[IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE + 1] =
+		(payload->payload_length >> 8) & 0xff;
+
+
+	/*
+	 *------------------------------------------
+	 * SESSION TRAILER
+	 *------------------------------------------
+	 */
+	if ((session->v2_data.session_state == LANPLUS_STATE_ACTIVE) &&
+		(session->v2_data.integrity_alg != IPMI_INTEGRITY_NONE))
+	{
+		uint32_t i;
+		uint32_t hmac_length;
+		uint32_t auth_length = 0;
+		uint32_t integrity_pad_size = 0;
+		uint32_t hmac_input_size;
+		uint8_t * hmac_output;
+		uint32_t start_of_session_trailer =
+			IPMI_LANPLUS_OFFSET_PAYLOAD +
+			payload->payload_length;
+
+
+		/*
+		 * Determine the required integrity pad length.  We have to make the
+		 * data range covered by the authcode a multiple of 4.
+		 */
+		uint32_t length_before_authcode;
+
+		if (ipmi_oem_active(intf, "icts")) {
+			length_before_authcode =
+				12                          + /* the stuff before the payload */
+				payload->payload_length;
+		} else {
+			length_before_authcode =
+				12                          + /* the stuff before the payload */
+				payload->payload_length     +
+				1                           + /* pad length field  */
+				1;                            /* next header field */
+		}
+
+		if (length_before_authcode % 4)
+			integrity_pad_size = 4 - (length_before_authcode % 4);
+
+		for (i = 0; i < integrity_pad_size; ++i)
+			msg[start_of_session_trailer + i] = 0xFF;
+
+		/* Pad length */
+		msg[start_of_session_trailer + integrity_pad_size] = integrity_pad_size;
+
+		/* Next Header */
+		msg[start_of_session_trailer + integrity_pad_size + 1] =
+			0x07; /* Hardcoded per the spec, table 13-8 */
+
+		hmac_input_size =
+			12                      +
+			payload->payload_length +
+			integrity_pad_size      +
+			2;
+
+		hmac_output =
+			msg                         +
+			IPMI_LANPLUS_OFFSET_PAYLOAD +
+			payload->payload_length     +
+			integrity_pad_size          +
+			2;
+
+		if (verbose > 2)
+			printbuf(msg + IPMI_LANPLUS_OFFSET_AUTHTYPE, hmac_input_size, "authcode input");
+
+
+		/* Auth Code */
+		lanplus_HMAC(session->v2_data.integrity_alg,
+					 session->v2_data.k1,                /* key        */
+					 session->v2_data.k1_len,            /* key length */
+					 msg + IPMI_LANPLUS_OFFSET_AUTHTYPE, /* hmac input */
+					 hmac_input_size,
+					 hmac_output,
+					 &hmac_length);
+
+		switch(session->v2_data.integrity_alg) {
+			case IPMI_INTEGRITY_HMAC_SHA1_96:
+				assert(hmac_length == IPMI_SHA_DIGEST_LENGTH);
+				auth_length = IPMI_SHA1_AUTHCODE_SIZE;
+				break;
+			case IPMI_INTEGRITY_HMAC_MD5_128 :
+				assert(hmac_length == IPMI_MD5_DIGEST_LENGTH);
+				auth_length = IPMI_HMAC_MD5_AUTHCODE_SIZE;
+				break;
+#ifdef HAVE_CRYPTO_SHA256
+			case IPMI_INTEGRITY_HMAC_SHA256_128:
+				assert(hmac_length == IPMI_SHA256_DIGEST_LENGTH);
+				auth_length = IPMI_HMAC_SHA256_AUTHCODE_SIZE;
+				break;
+#endif /* HAVE_CRYPTO_SHA256 */
+			default:
+				assert(0);
+				break;
+		}
+
+		if (verbose > 2)
+			printbuf(hmac_output, auth_length, "authcode output");
+
+		/* Set session_trailer_length appropriately */
+		session_trailer_length =
+			integrity_pad_size +
+			2                  + /* pad length + next header */
+			auth_length;         /* Size of the authcode. We only
+			                      * use the first 12(SHA1) or
+			                      * 16(MD5/SHA256) bytes.
+			                      */
+	}
+
+
+	++(session->out_seq);
+	if (!session->out_seq)
+		++(session->out_seq);
+
+	*msg_len =
+		IPMI_LANPLUS_OFFSET_PAYLOAD +
+		payload->payload_length     +
+		session_trailer_length;
+	*msg_data = msg;
+}
+
+
+
+/*
+ * ipmi_lanplus_build_v2x_ipmi_cmd
+ *
+ * Wraps ipmi_lanplus_build_v2x_msg and returns a new entry object for the
+ * command
+ *
+ */
+static struct ipmi_rq_entry *
+ipmi_lanplus_build_v2x_ipmi_cmd(
+								struct ipmi_intf * intf,
+								struct ipmi_rq * req,
+								int isRetry)
+{
+	struct ipmi_v2_payload v2_payload;
+	struct ipmi_rq_entry * entry;
+
+	/*
+	 * We have a problem.  we need to know the sequence number here,
+	 * because we use it in our stored entry.  But we also need to
+	 * know the sequence number when we generate our IPMI
+	 * representation far below.
+	 */
+	static uint8_t curr_seq = 0;
+
+	if( isRetry == 0 )
+		curr_seq += 1;
+
+	if (curr_seq >= 64)
+		curr_seq = 0;
+
+
+	/* IPMI Message Header -- Figure 13-4 of the IPMI v2.0 spec */
+	if ((intf->target_addr == intf->my_addr) || (!bridgePossible)) {
+		entry = ipmi_req_add_entry(intf, req, curr_seq);
+	/* it's a bridge command */
+	} else {
+		unsigned char backup_cmd;
+
+		/* Add entry for cmd */
+		entry = ipmi_req_add_entry(intf, req, curr_seq);
+
+		if (entry) {
+			entry->req.msg.target_cmd = entry->req.msg.cmd;
+			entry->req.msg.cmd = 0x34;
+
+			if (intf->transit_addr &&
+					intf->transit_addr != intf->my_addr)
+				entry->bridging_level = 2;
+			else
+				entry->bridging_level = 1;
+		}
+	}
+
+	if (entry == NULL)
+		return NULL;
+
+	// Build our payload
+	v2_payload.payload_type                 = IPMI_PAYLOAD_TYPE_IPMI;
+	v2_payload.payload_length               = req->msg.data_len + 7;
+	v2_payload.payload.ipmi_request.request = req;
+	v2_payload.payload.ipmi_request.rq_seq  = curr_seq;
+
+	ipmi_lanplus_build_v2x_msg(intf,                // in
+					&v2_payload,         // in
+					&(entry->msg_len),   // out
+					&(entry->msg_data),  // out
+					curr_seq); 		// in
+
+	return entry;
+}
+
+
+
+
+
+/*
+ * IPMI LAN Request Message Format
+ * +--------------------+
+ * |  rmcp.ver          | 4 bytes
+ * |  rmcp.__reserved   |
+ * |  rmcp.seq          |
+ * |  rmcp.class        |
+ * +--------------------+
+ * |  session.authtype  | 9 bytes
+ * |  session.seq       |
+ * |  session.id        |
+ * +--------------------+
+ * | [session.authcode] | 16 bytes (AUTHTYPE != none)
+ * +--------------------+
+ * |  message length    | 1 byte
+ * +--------------------+
+ * |  message.rs_addr   | 6 bytes
+ * |  message.netfn_lun |
+ * |  message.checksum  |
+ * |  message.rq_addr   |
+ * |  message.rq_seq    |
+ * |  message.cmd       |
+ * +--------------------+
+ * | [request data]     | data_len bytes
+ * +--------------------+
+ * |  checksum          | 1 byte
+ * +--------------------+
+ */
+static struct ipmi_rq_entry *
+ipmi_lanplus_build_v15_ipmi_cmd(
+								struct ipmi_intf * intf,
+								struct ipmi_rq * req)
+{
+	struct rmcp_hdr rmcp = {
+		.ver		= RMCP_VERSION_1,
+		.class		= RMCP_CLASS_IPMI,
+		.seq		= 0xff,
+	};
+	uint8_t * msg;
+	int cs, mp, len = 0, tmp;
+	struct ipmi_session  * session = intf->session;
+	struct ipmi_rq_entry * entry;
+
+	entry = ipmi_req_add_entry(intf, req, 0);
+	if (entry == NULL)
+		return NULL;
+
+	len = req->msg.data_len + 21;
+
+	msg = malloc(len);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return NULL;
+	}
+	memset(msg, 0, len);
+
+	/* rmcp header */
+	memcpy(msg, &rmcp, sizeof(rmcp));
+	len = sizeof(rmcp);
+
+	/*
+	 * ipmi session header
+	 */
+	/* Authtype should always be none for 1.5 packets sent from this
+	 * interface
+	 */
+	msg[len++] = IPMI_SESSION_AUTHTYPE_NONE;
+
+	msg[len++] = session->out_seq & 0xff;
+	msg[len++] = (session->out_seq >> 8) & 0xff;
+	msg[len++] = (session->out_seq >> 16) & 0xff;
+	msg[len++] = (session->out_seq >> 24) & 0xff;
+
+	/*
+	 * The session ID should be all zeroes for pre-session commands.  We
+	 * should only be using the 1.5 interface for the pre-session Get
+	 * Channel Authentication Capabilities command
+	 */
+	msg[len++] = 0;
+	msg[len++] = 0;
+	msg[len++] = 0;
+	msg[len++] = 0;
+
+	/* message length */
+	msg[len++] = req->msg.data_len + 7;
+
+	/* ipmi message header */
+	cs = mp = len;
+	msg[len++] = IPMI_BMC_SLAVE_ADDR;
+	msg[len++] = req->msg.netfn << 2;
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+	cs = len;
+	msg[len++] = IPMI_REMOTE_SWID;
+
+	entry->rq_seq = 0;
+
+	msg[len++] = entry->rq_seq << 2;
+	msg[len++] = req->msg.cmd;
+
+	lprintf(LOG_DEBUG+1, ">> IPMI Request Session Header");
+	lprintf(LOG_DEBUG+1, ">>   Authtype   : %s",
+		val2str(IPMI_SESSION_AUTHTYPE_NONE, ipmi_authtype_session_vals));
+	lprintf(LOG_DEBUG+1, ">>   Sequence   : 0x%08lx",
+		(long)session->out_seq);
+	lprintf(LOG_DEBUG+1, ">>   Session ID : 0x%08lx",
+		(long)0);
+
+	lprintf(LOG_DEBUG+1, ">> IPMI Request Message Header");
+	lprintf(LOG_DEBUG+1, ">>   Rs Addr    : %02x", IPMI_BMC_SLAVE_ADDR);
+	lprintf(LOG_DEBUG+1, ">>   NetFn      : %02x", req->msg.netfn);
+	lprintf(LOG_DEBUG+1, ">>   Rs LUN     : %01x", 0);
+	lprintf(LOG_DEBUG+1, ">>   Rq Addr    : %02x", IPMI_REMOTE_SWID);
+	lprintf(LOG_DEBUG+1, ">>   Rq Seq     : %02x", entry->rq_seq);
+	lprintf(LOG_DEBUG+1, ">>   Rq Lun     : %01x", 0);
+	lprintf(LOG_DEBUG+1, ">>   Command    : %02x", req->msg.cmd);
+
+	/* message data */
+	if (req->msg.data_len) {
+		memcpy(msg+len, req->msg.data, req->msg.data_len);
+		len += req->msg.data_len;
+	}
+
+	/* second checksum */
+	tmp = len - cs;
+	msg[len++] = ipmi_csum(msg+cs, tmp);
+
+	entry->msg_len = len;
+	entry->msg_data = msg;
+
+	return entry;
+}
+
+
+
+/*
+ * is_sol_packet
+ */
+static int
+is_sol_packet(struct ipmi_rs * rsp)
+{
+	return (rsp                                                           &&
+			(rsp->session.authtype    == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+			(rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL));
+}
+
+
+
+/*
+ * sol_response_acks_packet
+ */
+static int
+sol_response_acks_packet(
+						 struct ipmi_rs         * rsp,
+						 struct ipmi_v2_payload * payload)
+{
+	return (is_sol_packet(rsp)                                            &&
+			payload                                                       &&
+			(payload->payload_type    == IPMI_PAYLOAD_TYPE_SOL)           && 
+			(rsp->payload.sol_packet.acked_packet_number ==
+			 payload->payload.sol_packet.packet_sequence_number));
+}
+
+
+
+/*
+ * ipmi_lanplus_send_payload
+ *
+ */
+struct ipmi_rs *
+ipmi_lanplus_send_payload(
+						  struct ipmi_intf * intf,
+						  struct ipmi_v2_payload * payload)
+{
+	struct ipmi_rs      * rsp = NULL;
+	uint8_t             * msg_data = NULL;
+	int                   msg_length;
+	struct ipmi_session * session = intf->session;
+	struct ipmi_rq_entry * entry = NULL;
+	int                   try = 0;
+	int                   xmit = 1;
+	time_t                ltime;
+	uint32_t	      saved_timeout;
+
+	if (!intf->opened && intf->open && intf->open(intf) < 0)
+		return NULL;
+
+	/*
+	 * The session timeout is initialized in the above interface open,
+	 * so it will only be valid after the open completes.
+	 */
+	saved_timeout = session->timeout;
+	while (try < intf->ssn_params.retry) {
+		//ltime = time(NULL);
+
+		if (xmit) {
+			ltime = time(NULL);
+
+			if (payload->payload_type == IPMI_PAYLOAD_TYPE_IPMI)
+			{
+				/*
+				 * Build an IPMI v1.5 or v2 command
+				 */
+				struct ipmi_rq * ipmi_request = payload->payload.ipmi_request.request;
+
+				lprintf(LOG_DEBUG, "");
+				lprintf(LOG_DEBUG, ">> Sending IPMI command payload");
+				lprintf(LOG_DEBUG, ">>    netfn   : 0x%02x", ipmi_request->msg.netfn);
+				lprintf(LOG_DEBUG, ">>    command : 0x%02x", ipmi_request->msg.cmd);
+
+				if (verbose > 1)
+				{
+					uint16_t i;
+					fprintf(stderr, ">>    data    : ");
+					for (i = 0; i < ipmi_request->msg.data_len; ++i)
+						fprintf(stderr, "0x%02x ", ipmi_request->msg.data[i]);
+					fprintf(stderr, "\n\n");
+				}
+
+
+				/*
+				 * If we are presession, and the command is GET CHANNEL AUTHENTICATION
+				 * CAPABILITIES, we will build the command in v1.5 format.  This is so
+				 * that we can ask any server whether it supports IPMI v2 / RMCP+
+				 * before we attempt to open a v2.x session.
+				 */
+				if ((ipmi_request->msg.netfn == IPMI_NETFN_APP) &&
+					 (ipmi_request->msg.cmd   == IPMI_GET_CHANNEL_AUTH_CAP) &&
+					 (session->v2_data.bmc_id  == 0)) // jme - check
+				{
+					lprintf(LOG_DEBUG+1, "BUILDING A v1.5 COMMAND");
+					entry = ipmi_lanplus_build_v15_ipmi_cmd(intf, ipmi_request);
+				}
+				else
+				{
+					int isRetry = ( try > 0 ? 1 : 0 );
+
+					lprintf(LOG_DEBUG+1, "BUILDING A v2 COMMAND");
+					entry = ipmi_lanplus_build_v2x_ipmi_cmd(intf, ipmi_request, isRetry);
+				}
+
+				if (entry == NULL) {
+					lprintf(LOG_ERR, "Aborting send command, unable to build");
+					return NULL;
+				}
+
+				msg_data   = entry->msg_data;
+				msg_length = entry->msg_len;
+			}
+
+			else if (payload->payload_type == IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST)
+			{
+				lprintf(LOG_DEBUG, ">> SENDING AN OPEN SESSION REQUEST\n");
+				assert(session->v2_data.session_state == LANPLUS_STATE_PRESESSION
+						|| session->v2_data.session_state == LANPLUS_STATE_OPEN_SESSION_SENT);
+
+				ipmi_lanplus_build_v2x_msg(intf,        /* in  */
+								payload,     /* in  */
+								&msg_length, /* out */
+								&msg_data,   /* out */
+								0);  /* irrelevant for this msg*/
+
+			}
+
+			else if (payload->payload_type == IPMI_PAYLOAD_TYPE_RAKP_1)
+			{
+				lprintf(LOG_DEBUG, ">> SENDING A RAKP 1 MESSAGE\n");
+				assert(session->v2_data.session_state ==
+						 LANPLUS_STATE_OPEN_SESSION_RECEIEVED);
+
+				ipmi_lanplus_build_v2x_msg(intf,        /* in  */
+								payload,     /* in  */
+								&msg_length, /* out */
+								&msg_data,   /* out */
+								0);  /* irrelevant for this msg*/
+
+			}
+
+			else if (payload->payload_type == IPMI_PAYLOAD_TYPE_RAKP_3)
+			{
+				lprintf(LOG_DEBUG, ">> SENDING A RAKP 3 MESSAGE\n");
+				assert(session->v2_data.session_state ==
+						 LANPLUS_STATE_RAKP_2_RECEIVED);
+
+				ipmi_lanplus_build_v2x_msg(intf,        /* in  */
+								payload,     /* in  */
+								&msg_length, /* out */
+								&msg_data,   /* out */
+								0);  /* irrelevant for this msg*/
+
+			}
+
+			else if (payload->payload_type == IPMI_PAYLOAD_TYPE_SOL)
+			{
+				lprintf(LOG_DEBUG, ">> SENDING A SOL MESSAGE\n");
+				assert(session->v2_data.session_state == LANPLUS_STATE_ACTIVE);
+
+				ipmi_lanplus_build_v2x_msg(intf,        /* in  */
+								payload,     /* in  */
+								&msg_length, /* out */
+								&msg_data,   /* out */
+								0);  /* irrelevant for this msg*/
+			}
+
+			else
+			{
+				lprintf(LOG_ERR, "Payload type 0x%0x is unsupported!",
+					payload->payload_type);
+				assert(0);
+			}
+
+
+			if (ipmi_lan_send_packet(intf, msg_data, msg_length) < 0) {
+				lprintf(LOG_ERR, "IPMI LAN send command failed");
+				return NULL;
+			}
+		}
+
+		/* if we are set to noanswer we do not expect response */
+		if (intf->noanswer)
+			break;
+
+		usleep(100); 			/* Not sure what this is for */
+
+		/* Remember our connection state */
+		switch (payload->payload_type)
+		{
+		case IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST:
+			session->v2_data.session_state = LANPLUS_STATE_OPEN_SESSION_SENT;
+			/* not retryable for timeouts, force no retry */
+			try = intf->ssn_params.retry;
+			break;
+		case IPMI_PAYLOAD_TYPE_RAKP_1:
+			session->v2_data.session_state = LANPLUS_STATE_RAKP_1_SENT;
+			/* not retryable for timeouts, force no retry */
+			try = intf->ssn_params.retry;
+			break;
+		case IPMI_PAYLOAD_TYPE_RAKP_3:
+			/* not retryable for timeouts, force no retry */
+			try = intf->ssn_params.retry;
+			session->v2_data.session_state = LANPLUS_STATE_RAKP_3_SENT;
+			break;
+		}
+
+
+		/*
+		 * Special case for SOL outbound packets.
+		 */
+		if (payload->payload_type == IPMI_PAYLOAD_TYPE_SOL)
+		{
+			if (! payload->payload.sol_packet.packet_sequence_number)
+			{
+				/* We're just sending an ACK.  No need to retry. */
+				break;
+			}
+
+
+			rsp = ipmi_lanplus_recv_sol(intf); /* Grab the next packet */
+
+			if (!is_sol_packet(rsp)) {
+				break;
+			}
+
+			if (sol_response_acks_packet(rsp, payload))
+				break;
+
+			else if (is_sol_packet(rsp) && rsp->data_len)
+			{
+				/*
+				 * We're still waiting for our ACK, but we more data from
+				 * the BMC
+				 */
+				intf->session->sol_data.sol_input_handler(rsp);
+				/* In order to avoid duplicate output, just set data_len to 0 */
+				rsp->data_len = 0;
+				break;
+			}
+		}
+
+
+		/* Non-SOL processing */
+		else
+		{
+			rsp = ipmi_lan_poll_recv(intf);
+
+			/* Duplicate Request ccode most likely indicates a response to
+			   a previous retry. Ignore and keep polling. */
+			while ((rsp != NULL) && (rsp->ccode == 0xcf))
+			{
+				rsp = NULL;
+				rsp = ipmi_lan_poll_recv(intf);
+			}
+
+			if (rsp)
+				break;
+			/* This payload type is retryable for timeouts. */
+			if ((payload->payload_type == IPMI_PAYLOAD_TYPE_IPMI) && entry) {
+				ipmi_req_remove_entry( entry->rq_seq, entry->req.msg.cmd);
+			}
+		}
+
+		/* only timeout if time exceeds the timeout value */
+		xmit = ((time(NULL) - ltime) >= session->timeout);
+
+		usleep(5000);
+
+		if (xmit) {
+			/* increment session timeout by 1 second each retry */
+			session->timeout++;
+		}
+
+		try++;
+	}
+	session->timeout = saved_timeout;
+
+	/* IPMI messages are deleted under ipmi_lan_poll_recv() */
+	switch (payload->payload_type) {
+	case IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST:
+	case IPMI_PAYLOAD_TYPE_RAKP_1:
+	case IPMI_PAYLOAD_TYPE_RAKP_3:
+	case IPMI_PAYLOAD_TYPE_SOL:
+		free(msg_data);
+		msg_data = NULL;
+		break;
+	}
+
+	return rsp;
+}
+
+
+
+/*
+ * is_sol_partial_ack
+ *
+ * Determine if the response is a partial ACK/NACK that indicates
+ * we need to resend part of our packet.
+ *
+ * returns the number of characters we need to resend, or
+ *         0 if this isn't an ACK or we don't need to resend anything
+ */
+int is_sol_partial_ack(
+						struct ipmi_intf       * intf,
+						struct ipmi_v2_payload * v2_payload,
+						struct ipmi_rs         * rs)
+{
+	int chars_to_resend = 0;
+
+	if (v2_payload                               &&
+		rs                                       &&
+		is_sol_packet(rs)                        &&
+		sol_response_acks_packet(rs, v2_payload) &&
+		(rs->payload.sol_packet.accepted_character_count <
+		 v2_payload->payload.sol_packet.character_count))
+	{
+		if (ipmi_oem_active(intf, "intelplus") &&
+			 rs->payload.sol_packet.accepted_character_count == 0)
+			return 0;
+
+		chars_to_resend =
+			v2_payload->payload.sol_packet.character_count -
+			rs->payload.sol_packet.accepted_character_count;
+	}
+
+	return chars_to_resend;
+}
+
+
+
+/*
+ * set_sol_packet_sequence_number
+ */
+static void set_sol_packet_sequence_number(
+											struct ipmi_intf * intf,
+											struct ipmi_v2_payload * v2_payload)
+{
+	/* Keep our sequence number sane */
+	if (intf->session->sol_data.sequence_number > 0x0F)
+		intf->session->sol_data.sequence_number = 1;
+
+	v2_payload->payload.sol_packet.packet_sequence_number =
+		intf->session->sol_data.sequence_number++;
+}
+
+
+
+/*
+ * ipmi_lanplus_send_sol
+ *
+ * Sends a SOL packet..  We handle partial ACK/NACKs from the BMC here.
+ *
+ * Returns a pointer to the SOL ACK we received, or
+ *         0 on failure
+ * 
+ */
+struct ipmi_rs *
+ipmi_lanplus_send_sol(
+					  struct ipmi_intf * intf,
+					  struct ipmi_v2_payload * v2_payload)
+{
+	struct ipmi_rs * rs;
+
+	/*
+	 * chars_to_resend indicates either that we got a NACK telling us
+	 * that we need to resend some part of our data.
+	 */
+	int chars_to_resend = 0;
+
+	v2_payload->payload_type   = IPMI_PAYLOAD_TYPE_SOL;
+
+	/*
+	 * Payload length is just the length of the character
+	 * data here.
+	 */
+	v2_payload->payload_length = v2_payload->payload.sol_packet.character_count;
+
+	v2_payload->payload.sol_packet.acked_packet_number = 0; /* NA */
+
+	set_sol_packet_sequence_number(intf, v2_payload);
+
+	v2_payload->payload.sol_packet.accepted_character_count = 0; /* NA */
+
+	rs = ipmi_lanplus_send_payload(intf, v2_payload);
+
+	/* Determine if we need to resend some of our data */
+	chars_to_resend = is_sol_partial_ack(intf, v2_payload, rs);
+
+	while (rs && !rs->payload.sol_packet.transfer_unavailable &&
+			 !rs->payload.sol_packet.is_nack &&
+			 chars_to_resend)
+	{
+		/*
+		 * We first need to handle any new data we might have
+		 * received in our NACK
+		 */
+		if (rs->data_len)
+			intf->session->sol_data.sol_input_handler(rs);
+
+		set_sol_packet_sequence_number(intf, v2_payload);
+
+		/* Just send the required data */
+		memmove(v2_payload->payload.sol_packet.data,
+				v2_payload->payload.sol_packet.data +
+				rs->payload.sol_packet.accepted_character_count,
+				chars_to_resend);
+
+		v2_payload->payload.sol_packet.character_count = chars_to_resend;
+
+		v2_payload->payload_length = v2_payload->payload.sol_packet.character_count;
+
+		rs = ipmi_lanplus_send_payload(intf, v2_payload);
+
+		chars_to_resend = is_sol_partial_ack(intf, v2_payload, rs);
+	}
+
+	return rs;
+}
+
+
+
+/*
+ * check_sol_packet_for_new_data
+ *
+ * Determine whether the SOL packet has already been seen
+ * and whether the packet has new data for us.
+ *
+ * This function has the side effect of removing an previously
+ * seen data, and moving new data to the front.
+ *
+ * It also "Remembers" the data so we don't get repeats.
+ *
+ * returns the number of new bytes in the SOL packet
+ */
+static int
+check_sol_packet_for_new_data(
+							  struct ipmi_intf * intf,
+							  struct ipmi_rs *rsp)
+{
+	static uint8_t last_received_sequence_number = 0;
+	static uint8_t last_received_byte_count      = 0;
+	int new_data_size                                  = 0;
+
+
+	if (rsp &&
+		(rsp->session.authtype    == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+		(rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL))
+	{
+		/* Store the data length before we mod it */
+		uint8_t unaltered_data_len = rsp->data_len;
+
+		if (rsp->payload.sol_packet.packet_sequence_number ==
+			last_received_sequence_number)
+		{
+
+			/*
+			 * This is the same as the last packet, but may include
+			 * extra data
+			 */
+			new_data_size = rsp->data_len - last_received_byte_count;
+
+			if (new_data_size > 0)
+			{
+				/* We have more data to process */
+				memmove(rsp->data,
+						rsp->data +
+						rsp->data_len - new_data_size,
+						new_data_size);
+			}
+
+			rsp->data_len = new_data_size;
+		}
+
+
+		/*
+		 *Rember the data for next round
+		 */
+		if (rsp->payload.sol_packet.packet_sequence_number)
+		{
+			last_received_sequence_number =
+				rsp->payload.sol_packet.packet_sequence_number;
+
+			last_received_byte_count = unaltered_data_len;
+		}
+	}
+
+
+	return new_data_size;
+}
+
+
+
+/*
+ * ack_sol_packet
+ *
+ * Provided the specified packet looks reasonable, ACK it.
+ */
+static void
+ack_sol_packet(
+				struct ipmi_intf * intf,
+				struct ipmi_rs * rsp)
+{
+	if (rsp                                                           &&
+		(rsp->session.authtype    == IPMI_SESSION_AUTHTYPE_RMCP_PLUS) &&
+		(rsp->session.payloadtype == IPMI_PAYLOAD_TYPE_SOL)           &&
+		(rsp->payload.sol_packet.packet_sequence_number))
+	{
+		struct ipmi_v2_payload ack;
+
+		memset(&ack, 0, sizeof(struct ipmi_v2_payload));
+
+		ack.payload_type   = IPMI_PAYLOAD_TYPE_SOL;
+
+		/*
+		 * Payload length is just the length of the character
+		 * data here.
+		 */
+		ack.payload_length = 0;
+
+		/* ACK packets have sequence numbers of 0 */
+		ack.payload.sol_packet.packet_sequence_number = 0;
+
+		ack.payload.sol_packet.acked_packet_number =
+			rsp->payload.sol_packet.packet_sequence_number;
+
+		ack.payload.sol_packet.accepted_character_count = rsp->data_len;
+
+		ipmi_lanplus_send_payload(intf, &ack);
+	}
+}
+
+
+
+/*
+ * ipmi_lanplus_recv_sol
+ *
+ * Receive a SOL packet and send an ACK in response.
+ *
+ */
+struct ipmi_rs *
+ipmi_lanplus_recv_sol(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp = ipmi_lan_poll_recv(intf);
+
+	if (rsp && rsp->session.authtype != 0)
+	{
+		ack_sol_packet(intf, rsp);
+
+		/*
+		 * Remembers the data sent, and alters the data to just
+		 * include the new stuff.
+		 */
+		check_sol_packet_for_new_data(intf, rsp);
+	}
+	return rsp;
+}
+
+
+
+/**
+ * ipmi_lanplus_send_ipmi_cmd
+ *
+ * Build a payload request and dispatch it.
+ */
+struct ipmi_rs *
+ipmi_lanplus_send_ipmi_cmd(
+							struct ipmi_intf * intf,
+							struct ipmi_rq * req)
+{
+	struct ipmi_v2_payload v2_payload;
+
+	v2_payload.payload_type = IPMI_PAYLOAD_TYPE_IPMI;
+	v2_payload.payload.ipmi_request.request = req;
+
+	return ipmi_lanplus_send_payload(intf, &v2_payload);
+}
+
+
+/*
+ * ipmi_get_auth_capabilities_cmd
+ *
+ * This command may have to be sent twice.  We first ask for the
+ * authentication capabilities with the "request IPMI v2 data bit"
+ * set.  If this fails, we send the same command without that bit
+ * set.
+ *
+ * param intf is the initialized (but possibly) pre-session interface
+ *       on which we will send the command
+ * param auth_cap [out] will be initialized to hold the Get Channel
+ *       Authentication Capabilities return data on success.  Its
+ *       contents will be undefined on error.
+ * 
+ * returns 0 on success
+ *         non-zero if we were unable to contact the BMC, or we cannot
+ *         get a successful response
+ *
+ */
+static int
+ipmi_get_auth_capabilities_cmd(
+								struct ipmi_intf * intf,
+								struct get_channel_auth_cap_rsp * auth_cap)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[2];
+	uint8_t backupBridgePossible;
+
+	backupBridgePossible = bridgePossible;
+
+	bridgePossible = 0;
+
+	msg_data[0] = IPMI_LAN_CHANNEL_E | 0x80; // Ask for IPMI v2 data as well
+	msg_data[1] = intf->ssn_params.privlvl;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn    = IPMI_NETFN_APP;            // 0x06
+	req.msg.cmd      = IPMI_GET_CHANNEL_AUTH_CAP; // 0x38
+	req.msg.data     = msg_data;
+	req.msg.data_len = 2;
+
+	rsp = intf->sendrecv(intf, &req);
+
+	if (rsp == NULL || rsp->ccode > 0) {
+		/*
+		 * It's very possible that this failed because we asked for IPMI
+		 * v2 data. Ask again, without requesting IPMI v2 data.
+		 */
+		msg_data[0] &= 0x7F;
+
+		rsp = intf->sendrecv(intf, &req);
+
+		if (rsp == NULL) {
+			lprintf(LOG_INFO, "Get Auth Capabilities error");
+			return 1;
+		}
+		if (rsp->ccode > 0) {
+			lprintf(LOG_INFO, "Get Auth Capabilities error: %s",
+				val2str(rsp->ccode, completion_code_vals));
+			return 1;
+		}
+	}
+
+
+	memcpy(auth_cap,
+			rsp->data,
+			sizeof(struct get_channel_auth_cap_rsp));
+
+	bridgePossible = backupBridgePossible;
+
+	return 0;
+}
+
+
+
+static int
+ipmi_close_session_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t msg_data[4];
+	uint32_t bmc_session_lsbf;
+	uint8_t backupBridgePossible;
+
+	if (intf->session == NULL
+			|| intf->session->v2_data.session_state != LANPLUS_STATE_ACTIVE)
+		return -1;
+
+	backupBridgePossible = bridgePossible;
+
+	intf->target_addr = IPMI_BMC_SLAVE_ADDR;
+	bridgePossible = 0;
+
+	bmc_session_lsbf = intf->session->v2_data.bmc_id;
+#if WORDS_BIGENDIAN
+	bmc_session_lsbf = BSWAP_32(bmc_session_lsbf);
+#endif
+
+	memcpy(&msg_data, &bmc_session_lsbf, 4);
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn		= IPMI_NETFN_APP;
+	req.msg.cmd		    = 0x3c;
+	req.msg.data		= msg_data;
+	req.msg.data_len	= 4;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		/* Looks like the session was closed */
+		lprintf(LOG_ERR, "Close Session command failed");
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "close_session");
+
+	if (rsp->ccode == 0x87) {
+		lprintf(LOG_ERR, "Failed to Close Session: invalid "
+			"session ID %08lx",
+			(long)intf->session->v2_data.bmc_id);
+		return -1;
+	}
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Close Session command failed: %s",
+			val2str(rsp->ccode, completion_code_vals));
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Closed Session %08lx\n",
+		(long)intf->session->v2_data.bmc_id);
+
+	bridgePossible = backupBridgePossible;
+
+	return 0;
+}
+
+
+
+/*
+ * ipmi_lanplus_open_session
+ *
+ * Build and send the open session command.  See section 13.17 of the IPMI
+ * v2 specification for details.
+ */
+static int
+ipmi_lanplus_open_session(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload v2_payload;
+	struct ipmi_session * session = intf->session;
+	uint8_t * msg;
+	struct ipmi_rs * rsp;
+	/* 0 = success, 1 = error, 2 = timeout */
+	int rc = 0;
+
+
+	/*
+	 * Build an Open Session Request Payload
+	 */
+	msg = (uint8_t*)malloc(IPMI_OPEN_SESSION_REQUEST_SIZE);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+	memset(msg, 0, IPMI_OPEN_SESSION_REQUEST_SIZE);
+
+	msg[0] = 0; /* Message tag */
+	if (ipmi_oem_active(intf, "intelplus") || intf->ssn_params.privlvl != IPMI_SESSION_PRIV_ADMIN)
+		msg[1] = intf->ssn_params.privlvl;
+	else
+		msg[1] = 0; /* Give us highest privlg level based on supported algorithms */
+	msg[2] = 0; /* reserved */
+	msg[3] = 0; /* reserved */
+
+	/* Choose our session ID for easy recognition in the packet dump */
+	session->v2_data.console_id = 0xA0A2A3A4;
+	msg[4] = session->v2_data.console_id & 0xff;
+	msg[5] = (session->v2_data.console_id >> 8)  & 0xff;
+	msg[6] = (session->v2_data.console_id >> 16) & 0xff;
+	msg[7] = (session->v2_data.console_id >> 24) & 0xff;
+
+
+	if (lanplus_get_requested_ciphers(intf->ssn_params.cipher_suite_id,
+									  &(session->v2_data.requested_auth_alg),
+									  &(session->v2_data.requested_integrity_alg),
+									  &(session->v2_data.requested_crypt_alg)))
+	{
+		lprintf(LOG_WARNING, "Unsupported cipher suite ID : %d\n",
+				intf->ssn_params.cipher_suite_id);
+		free(msg);
+		msg = NULL;
+		return 1;
+	}
+
+
+	/*
+	 * Authentication payload
+	 */
+	msg[8]  = 0; /* specifies authentication payload */
+	msg[9]  = 0; /* reserved */
+	msg[10] = 0; /* reserved */
+	msg[11] = 8; /* payload length */
+	msg[12] = session->v2_data.requested_auth_alg;
+	msg[13] = 0; /* reserved */	
+	msg[14] = 0; /* reserved */
+	msg[15] = 0; /* reserved */	
+
+	/*
+	 * Integrity payload
+	 */
+	msg[16] = 1; /* specifies integrity payload */
+	msg[17] = 0; /* reserved */
+	msg[18] = 0; /* reserved */
+	msg[19] = 8; /* payload length */
+	msg[20] = session->v2_data.requested_integrity_alg;
+	msg[21] = 0; /* reserved */	
+	msg[22] = 0; /* reserved */
+	msg[23] = 0; /* reserved */
+
+	/*
+	 * Confidentiality/Encryption payload
+	 */
+	msg[24] = 2; /* specifies confidentiality payload */
+	msg[25] = 0; /* reserved */
+	msg[26] = 0; /* reserved */
+	msg[27] = 8; /* payload length */
+	msg[28] = session->v2_data.requested_crypt_alg;
+	msg[29] = 0; /* reserved */	
+	msg[30] = 0; /* reserved */
+	msg[31] = 0; /* reserved */
+
+
+	v2_payload.payload_type   = IPMI_PAYLOAD_TYPE_RMCP_OPEN_REQUEST;
+	v2_payload.payload_length = IPMI_OPEN_SESSION_REQUEST_SIZE;
+	v2_payload.payload.open_session_request.request = msg;
+
+	rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
+
+	free(msg);
+	msg = NULL;
+	if (rsp == NULL ) {
+		lprintf(LOG_DEBUG, "Timeout in open session response message.");
+		return 2;
+	}
+	if (verbose)
+		lanplus_dump_open_session_response(rsp);
+
+	if (rsp->payload.open_session_response.rakp_return_code !=
+		IPMI_RAKP_STATUS_NO_ERRORS)
+	{
+		lprintf(LOG_WARNING, "Error in open session response message : %s\n",
+			val2str(rsp->payload.open_session_response.rakp_return_code,
+				ipmi_rakp_return_codes));
+		return 1;
+	}
+	else
+	{
+		if (rsp->payload.open_session_response.console_id !=
+			 session->v2_data.console_id) {
+			lprintf(LOG_WARNING, "Warning: Console session ID is not "
+				"what we requested");
+		}
+
+		session->v2_data.max_priv_level =
+			rsp->payload.open_session_response.max_priv_level;
+		session->v2_data.bmc_id         =
+			rsp->payload.open_session_response.bmc_id;
+		session->v2_data.auth_alg       =
+			rsp->payload.open_session_response.auth_alg;
+		session->v2_data.integrity_alg  =
+			rsp->payload.open_session_response.integrity_alg;
+		session->v2_data.crypt_alg      =
+			rsp->payload.open_session_response.crypt_alg;
+		session->v2_data.session_state  =
+			LANPLUS_STATE_OPEN_SESSION_RECEIEVED;
+
+
+		/*
+		 * Verify that we have agreed on a cipher suite
+		 */
+		if (rsp->payload.open_session_response.auth_alg !=
+			session->v2_data.requested_auth_alg)
+		{
+			lprintf(LOG_WARNING, "Authentication algorithm 0x%02x is "
+					"not what we requested 0x%02x\n",
+					rsp->payload.open_session_response.auth_alg,
+					session->v2_data.requested_auth_alg);
+			rc = 1;
+		}
+		else if (rsp->payload.open_session_response.integrity_alg !=
+				 session->v2_data.requested_integrity_alg)
+		{
+			lprintf(LOG_WARNING, "Integrity algorithm 0x%02x is "
+					"not what we requested 0x%02x\n",
+					rsp->payload.open_session_response.integrity_alg,
+					session->v2_data.requested_integrity_alg);
+			rc = 1;
+		}
+		else if (rsp->payload.open_session_response.crypt_alg !=
+				 session->v2_data.requested_crypt_alg)
+		{
+			lprintf(LOG_WARNING, "Encryption algorithm 0x%02x is "
+					"not what we requested 0x%02x\n",
+					rsp->payload.open_session_response.crypt_alg,
+					session->v2_data.requested_crypt_alg);
+			rc = 1;
+		}
+
+	}
+
+	return rc;
+}
+
+
+
+/*
+ * ipmi_lanplus_rakp1
+ *
+ * Build and send the RAKP 1 message as part of the IPMI v2 / RMCP+ session
+ * negotiation protocol.  We also read and validate the RAKP 2 message received
+ * from the BMC, here.  See section 13.20 of the IPMI v2 specification for
+ * details.
+ *
+ * returns 0 on success
+ *         1 on failure
+ *
+ * Note that failure is only indicated if we have an internal error of
+ * some kind. If we actually get a RAKP 2 message in response to our
+ * RAKP 1 message, any errors will be stored in
+ * session->v2_data.rakp2_return_code and sent to the BMC in the RAKP
+ * 3 message.
+ */
+static int
+ipmi_lanplus_rakp1(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload v2_payload;
+	struct ipmi_session * session = intf->session;
+	uint8_t * msg;
+	struct ipmi_rs * rsp;
+	int rc = 0;    /* 0 = success, 1 = error, 2 = timeout */
+
+	/*
+	 * Build a RAKP 1 message
+	 */
+	msg = (uint8_t*)malloc(IPMI_RAKP1_MESSAGE_SIZE);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+	memset(msg, 0, IPMI_RAKP1_MESSAGE_SIZE);
+
+
+	msg[0] = 0; /* Message tag */
+
+	msg[1] = 0; /* reserved */
+	msg[2] = 0; /* reserved */
+	msg[3] = 0; /* reserved */
+
+	/* BMC session ID */
+	msg[4] = session->v2_data.bmc_id & 0xff;
+	msg[5] = (session->v2_data.bmc_id >> 8)  & 0xff;
+	msg[6] = (session->v2_data.bmc_id >> 16) & 0xff;
+	msg[7] = (session->v2_data.bmc_id >> 24) & 0xff;
+
+
+	/* We need a 16 byte random number */
+	if (lanplus_rand(session->v2_data.console_rand, 16))
+	{
+		// ERROR;
+		lprintf(LOG_ERR, "ERROR generating random number "
+			"in ipmi_lanplus_rakp1");
+		free(msg);
+		msg = NULL;
+		return 1;
+	}
+	memcpy(msg + 8, session->v2_data.console_rand, 16);
+	#if WORDS_BIGENDIAN
+	lanplus_swap(msg + 8, 16);
+	#endif
+
+	if (verbose > 1)
+		printbuf(session->v2_data.console_rand, 16,
+				 ">> Console generated random number");
+
+
+	/*
+	 * Requested maximum privilege level.
+	 */
+	msg[24] = intf->ssn_params.privlvl | intf->ssn_params.lookupbit;
+	session->v2_data.requested_role = msg[24];
+	msg[25] = 0; /* reserved */
+	msg[26] = 0; /* reserved */
+
+
+	/* Username specification */
+	msg[27] = strlen((const char *)intf->ssn_params.username);
+	if (msg[27] > IPMI_MAX_USER_NAME_LENGTH)
+	{
+		lprintf(LOG_ERR, "ERROR: user name too long.  "
+			"(Exceeds %d characters)",
+			IPMI_MAX_USER_NAME_LENGTH);
+		free(msg);
+		msg = NULL;
+		return 1;
+	}
+	memcpy(msg + 28, intf->ssn_params.username, msg[27]);
+
+	v2_payload.payload_type = IPMI_PAYLOAD_TYPE_RAKP_1;
+	if (ipmi_oem_active(intf, "i82571spt")) {
+		/*
+		 * The IPMI v2.0 spec hints on that all user name bytes
+		 * must be occupied (29:44).  The Intel 82571 GbE refuses
+		 * to establish a session if this field is shorter.
+		 */
+		v2_payload.payload_length = IPMI_RAKP1_MESSAGE_SIZE;
+	} else {
+		v2_payload.payload_length =
+			IPMI_RAKP1_MESSAGE_SIZE - (16 - msg[27]);
+	}
+	v2_payload.payload.rakp_1_message.message = msg;
+
+	rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
+
+	free(msg);
+	msg = NULL;
+
+	if (rsp == NULL)
+	{
+		lprintf(LOG_WARNING, "> Error: no response from RAKP 1 message");
+		return 2;
+	}
+
+	session->v2_data.session_state = LANPLUS_STATE_RAKP_2_RECEIVED;
+
+	if (verbose)
+		lanplus_dump_rakp2_message(rsp, session->v2_data.auth_alg);
+
+
+
+	if (rsp->payload.rakp2_message.rakp_return_code != IPMI_RAKP_STATUS_NO_ERRORS)
+	{
+		lprintf(LOG_INFO, "RAKP 2 message indicates an error : %s",
+			val2str(rsp->payload.rakp2_message.rakp_return_code,
+				ipmi_rakp_return_codes));
+		rc = 1;
+	}
+
+	else
+	{
+		memcpy(session->v2_data.bmc_rand, rsp->payload.rakp2_message.bmc_rand, 16);
+		memcpy(session->v2_data.bmc_guid, rsp->payload.rakp2_message.bmc_guid, 16);
+
+		if (verbose > 2)
+			printbuf(session->v2_data.bmc_rand, 16, "bmc_rand");
+
+		/*
+		 * It is at this point that we have to decode the random number and determine
+		 * whether the BMC has authenticated.
+		 */
+		if (! lanplus_rakp2_hmac_matches(session,
+										 rsp->payload.rakp2_message.key_exchange_auth_code, 
+										 intf))
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> RAKP 2 HMAC is invalid");
+			session->v2_data.rakp2_return_code = IPMI_RAKP_STATUS_INVALID_INTEGRITY_CHECK_VALUE;
+								rc = 1;
+		}
+		else
+		{
+			/* Success */
+			session->v2_data.rakp2_return_code = IPMI_RAKP_STATUS_NO_ERRORS;
+		}
+	}
+
+	return rc;
+}
+
+
+
+/*
+ * ipmi_lanplus_rakp3
+ *
+ * Build and send the RAKP 3 message as part of the IPMI v2 / RMCP+ session
+ * negotiation protocol.  We also read and validate the RAKP 4 message received
+ * from the BMC, here.  See section 13.20 of the IPMI v2 specification for
+ * details.
+ *
+ * If the RAKP 2 return code is not IPMI_RAKP_STATUS_NO_ERRORS, we will
+ * exit with an error code immediately after sendint the RAKP 3 message.
+ *
+ * param intf is the intf that holds all the state we are concerned with
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+static int
+ipmi_lanplus_rakp3(struct ipmi_intf * intf)
+{
+	struct ipmi_v2_payload v2_payload;
+	struct ipmi_session * session = intf->session;
+	uint8_t * msg;
+	struct ipmi_rs * rsp;
+
+	assert(session->v2_data.session_state == LANPLUS_STATE_RAKP_2_RECEIVED);
+	
+	/*
+	 * Build a RAKP 3 message
+	 */
+	msg = (uint8_t*)malloc(IPMI_RAKP3_MESSAGE_MAX_SIZE);
+	if (msg == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+	memset(msg, 0, IPMI_RAKP3_MESSAGE_MAX_SIZE);
+
+
+	msg[0] = 0; /* Message tag */
+	msg[1] = session->v2_data.rakp2_return_code;
+	
+	msg[2] = 0; /* reserved */
+	msg[3] = 0; /* reserved */
+
+	/* BMC session ID */
+	msg[4] = session->v2_data.bmc_id & 0xff;
+	msg[5] = (session->v2_data.bmc_id >> 8)  & 0xff;
+	msg[6] = (session->v2_data.bmc_id >> 16) & 0xff;
+	msg[7] = (session->v2_data.bmc_id >> 24) & 0xff;
+
+	v2_payload.payload_type                   = IPMI_PAYLOAD_TYPE_RAKP_3;
+	v2_payload.payload_length                 = 8;
+	v2_payload.payload.rakp_3_message.message = msg;
+
+	/*
+	 * If the rakp2 return code indicates and error, we don't have to
+	 * generate an authcode or session integrity key.  In that case, we
+	 * are simply sending a RAKP 3 message to indicate to the BMC that the
+	 * RAKP 2 message caused an error.
+	 */
+	if (session->v2_data.rakp2_return_code == IPMI_RAKP_STATUS_NO_ERRORS)
+	{
+		uint32_t auth_length;
+		
+		if (lanplus_generate_rakp3_authcode(msg + 8, session, &auth_length, intf))
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> Error generating RAKP 3 authcode");
+			free(msg);
+			msg = NULL;
+			return 1;
+		}
+		else
+		{
+			/* Success */
+			v2_payload.payload_length += auth_length;
+		}
+
+		/* Generate our Session Integrity Key, K1, and K2 */
+		if (lanplus_generate_sik(session, intf))
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> Error generating session integrity key");
+			free(msg);
+			msg = NULL;
+			return 1;
+		}
+		else if (lanplus_generate_k1(session))
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> Error generating K1 key");
+			free(msg);
+			msg = NULL;
+			return 1;
+		}
+		else if (lanplus_generate_k2(session))
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> Error generating K1 key");
+			free(msg);
+			msg = NULL;
+			return 1;
+		}
+	}
+	
+
+	rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
+
+	free(msg);
+	msg = NULL;
+
+	if (session->v2_data.rakp2_return_code != IPMI_RAKP_STATUS_NO_ERRORS)
+	{
+		/*
+		 * If the previous RAKP 2 message received was deemed erroneous,
+		 * we have nothing else to do here.  We only sent the RAKP 3 message
+		 * to indicate to the BMC that the RAKP 2 message failed.
+		 */
+		return 1;
+	}
+	else if (rsp == NULL)
+	{
+		lprintf(LOG_WARNING, "> Error: no response from RAKP 3 message");
+		return 2;
+	}
+
+
+	/*
+	 * We have a RAKP 4 message to chew on.
+	 */
+	if (verbose)
+		lanplus_dump_rakp4_message(rsp, session->v2_data.auth_alg);
+	
+
+	if (rsp->payload.open_session_response.rakp_return_code != IPMI_RAKP_STATUS_NO_ERRORS)
+	{
+		lprintf(LOG_INFO, "RAKP 4 message indicates an error : %s",
+			val2str(rsp->payload.rakp4_message.rakp_return_code,
+				ipmi_rakp_return_codes));
+		return 1;
+	}
+
+	else
+	{
+		/* Validate the authcode */
+		if (lanplus_rakp4_hmac_matches(session,
+										rsp->payload.rakp4_message.integrity_check_value,
+										intf))
+		{
+			/* Success */
+			session->v2_data.session_state = LANPLUS_STATE_ACTIVE;
+		}
+		else
+		{
+			/* Error */
+			lprintf(LOG_INFO, "> RAKP 4 message has invalid integrity check value");
+			return 1;
+		}
+	}
+
+	intf->abort = 0;
+	return 0;
+}
+
+
+
+/**
+ * ipmi_lan_close
+ */
+void
+ipmi_lanplus_close(struct ipmi_intf * intf)
+{
+	if (!intf->abort && intf->session)
+		ipmi_close_session_cmd(intf);
+
+	if (intf->fd >= 0) {
+		close(intf->fd);
+		intf->fd = -1;
+	}
+
+	ipmi_req_clear_entries();
+	ipmi_intf_session_cleanup(intf);
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+	intf = NULL;
+}
+
+
+
+static int
+ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req;
+	uint8_t backupBridgePossible;
+	uint8_t privlvl = intf->ssn_params.privlvl;
+
+	if (privlvl <= IPMI_SESSION_PRIV_USER)
+		return 0;	/* no need to set higher */
+
+	backupBridgePossible = bridgePossible;
+
+	bridgePossible = 0;
+
+	memset(&req, 0, sizeof(req));
+	req.msg.netfn		= IPMI_NETFN_APP;
+	req.msg.cmd		= 0x3b;
+	req.msg.data		= &privlvl;
+	req.msg.data_len	= 1;
+
+	rsp = intf->sendrecv(intf, &req);
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Set Session Privilege Level to %s failed",
+			val2str(privlvl, ipmi_privlvl_vals));
+		bridgePossible = backupBridgePossible;
+		return -1;
+	}
+	if (verbose > 2)
+		printbuf(rsp->data, rsp->data_len, "set_session_privlvl");
+
+	if (rsp->ccode > 0) {
+		lprintf(LOG_ERR, "Set Session Privilege Level to %s failed: %s",
+			val2str(privlvl, ipmi_privlvl_vals),
+			val2str(rsp->ccode, completion_code_vals));
+		bridgePossible = backupBridgePossible;
+		return -1;
+	}
+
+	lprintf(LOG_DEBUG, "Set Session Privilege Level to %s\n",
+		val2str(rsp->data[0], ipmi_privlvl_vals));
+
+	bridgePossible = backupBridgePossible;
+
+	return 0;
+}
+
+/**
+ * ipmi_lanplus_open
+ */
+int
+ipmi_lanplus_open(struct ipmi_intf * intf)
+{
+	int rc;
+	int retry;
+	struct get_channel_auth_cap_rsp auth_cap;
+	struct ipmi_session_params *params;
+	struct ipmi_session *session;
+
+	if (!intf)
+		return -1;
+
+	if (intf->opened)
+		return intf->fd;
+
+	params = &intf->ssn_params;
+
+	if (!params->port)
+		params->port = IPMI_LANPLUS_PORT;
+	if (!params->privlvl)
+		params->privlvl = IPMI_SESSION_PRIV_ADMIN;
+	if (!params->timeout)
+		params->timeout = IPMI_LAN_TIMEOUT;
+	if (!params->retry)
+		params->retry = IPMI_LAN_RETRY;
+
+	if (params->hostname == NULL || strlen((const char *)params->hostname) == 0) {
+		lprintf(LOG_ERR, "No hostname specified!");
+		return -1;
+	}
+
+	if (ipmi_intf_socket_connect(intf) == -1) {
+		lprintf(LOG_ERR, "Could not open socket!");
+		goto fail;
+	}
+
+	session = (struct ipmi_session *)malloc(sizeof (struct ipmi_session));
+	if (!session) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		goto fail;
+	}
+
+	intf->session = session;
+
+	/* Setup our lanplus session state */
+	memset(session, 0, sizeof(struct ipmi_session));
+	session->timeout = params->timeout;
+	memcpy(&session->authcode, &params->authcode_set, sizeof(session->authcode));
+	session->v2_data.auth_alg         = IPMI_AUTH_RAKP_NONE;
+	session->v2_data.crypt_alg        = IPMI_CRYPT_NONE;
+	session->sol_data.sequence_number = 1;
+
+	intf->opened = 1;
+	intf->abort = 1;
+
+	/*
+	 *
+	 * Make sure the BMC supports IPMI v2 / RMCP+
+	 */
+	if (!ipmi_oem_active(intf, "i82571spt") &&
+			ipmi_get_auth_capabilities_cmd(intf, &auth_cap)) {
+		lprintf(LOG_INFO, "Error issuing Get Channel "
+			"Authentication Capabilities request");
+		goto fail;
+	}
+
+	if (!ipmi_oem_active(intf, "i82571spt") && ! auth_cap.v20_data_available) {
+		lprintf(LOG_INFO, "This BMC does not support IPMI v2 / RMCP+");
+		goto fail;
+	}
+
+	/*
+	 * If the open/rakp1/rakp3 sequence encounters a timeout, the whole sequence
+	 * needs to restart. The individual messages are not individually retryable,
+	 * as the session state is advancing.
+	 */
+	for (retry = 0; retry < IPMI_LAN_RETRY; retry++) {
+		session->v2_data.session_state = LANPLUS_STATE_PRESESSION;
+		/*
+		 * Open session
+		 */
+		if ((rc = ipmi_lanplus_open_session(intf)) == 1) {
+			goto fail;
+		}
+		if (rc == 2) {
+			lprintf(LOG_DEBUG, "Retry lanplus open session, %d", retry);
+			continue;
+		}
+		/*
+		 * RAKP 1
+		 */
+		if ((rc = ipmi_lanplus_rakp1(intf)) == 1) {
+			goto fail;
+		}
+		if (rc == 2) {
+			lprintf(LOG_DEBUG, "Retry lanplus rakp1, %d", retry);
+			continue;
+		}
+		/*
+		 * RAKP 3
+		 */
+		if ((rc = ipmi_lanplus_rakp3(intf)) == 1) {
+			goto fail;
+		}
+		if (rc == 0) break;
+		lprintf(LOG_DEBUG,"Retry lanplus rakp3, %d", retry);
+	}
+
+	lprintf(LOG_DEBUG, "IPMIv2 / RMCP+ SESSION OPENED SUCCESSFULLY\n");
+
+	intf->abort = 0;
+
+	if (!ipmi_oem_active(intf, "i82571spt")) {
+		rc = ipmi_set_session_privlvl_cmd(intf);
+		if (rc < 0) {
+			goto fail;
+		}
+
+		/* automatically detect interface request and response sizes */
+		hpm2_detect_max_payload_size(intf);
+	}
+
+	bridgePossible = 1;
+
+	if (!ipmi_oem_active(intf, "i82571spt")) {
+		intf->manufacturer_id = ipmi_get_oem(intf);
+	}
+
+	return intf->fd;
+
+ fail:
+	lprintf(LOG_ERR, "Error: Unable to establish IPMI v2 / RMCP+ session");
+	intf->close(intf);
+	return -1;
+}
+
+
+
+void test_crypt1(void)
+{
+	uint8_t key[]  =
+		{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+		 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14};
+
+	uint16_t  bytes_encrypted;
+	uint16_t  bytes_decrypted;
+	uint8_t   decrypt_buffer[1000];
+	uint8_t   encrypt_buffer[1000];
+
+	uint8_t data[] =
+		{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+		 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
+		 0x11, 0x12};
+
+	printbuf(data, sizeof(data), "original data");
+
+	if (lanplus_encrypt_payload(IPMI_CRYPT_AES_CBC_128,
+								key,
+								data,
+								sizeof(data),
+								encrypt_buffer,
+								&bytes_encrypted))
+	{
+		lprintf(LOG_ERR, "Encrypt test failed");
+		assert(0);
+	}
+	printbuf(encrypt_buffer, bytes_encrypted, "encrypted payload");
+	
+
+	if (lanplus_decrypt_payload(IPMI_CRYPT_AES_CBC_128,
+								key,
+								encrypt_buffer,
+								bytes_encrypted,
+								decrypt_buffer,
+								&bytes_decrypted))
+	{
+		lprintf(LOG_ERR, "Decrypt test failed\n");
+		assert(0);
+	}	
+	printbuf(decrypt_buffer, bytes_decrypted, "decrypted payload");
+	
+	lprintf(LOG_DEBUG, "\nDone testing the encrypt/decyrpt methods!\n");
+	exit(0);
+}	
+
+
+
+void test_crypt2(void)
+{
+	uint8_t key[]  =
+		{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+		 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14};
+	uint8_t iv[]  =
+		  {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+			0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14};
+	uint8_t data[8] = "12345678";
+
+	uint8_t encrypt_buffer[1000];
+	uint8_t decrypt_buffer[1000];
+	uint32_t bytes_encrypted;
+	uint32_t bytes_decrypted;
+
+	printbuf((const uint8_t *)data, strlen((const char *)data), "input data");
+
+	lanplus_encrypt_aes_cbc_128(iv,
+								key,
+								data,
+								strlen((const char *)data),
+								encrypt_buffer,
+								&bytes_encrypted);
+	printbuf((const uint8_t *)encrypt_buffer, bytes_encrypted, "encrypt_buffer");
+
+	lanplus_decrypt_aes_cbc_128(iv,
+								key,
+								encrypt_buffer,
+								bytes_encrypted,
+								decrypt_buffer,
+								&bytes_decrypted);
+	printbuf((const uint8_t *)decrypt_buffer, bytes_decrypted, "decrypt_buffer");
+
+	lprintf(LOG_INFO, "\nDone testing the encrypt/decyrpt methods!\n");
+	exit(0);
+}
+
+
+/**
+ * send a get device id command to keep session active
+ */
+static int
+ipmi_lanplus_keepalive(struct ipmi_intf * intf)
+{
+	struct ipmi_rs * rsp;
+	struct ipmi_rq req = {
+		.msg = {
+			.netfn = IPMI_NETFN_APP,
+			.cmd = 1,
+		}
+	};
+
+	if (!intf->opened)
+		return 0;
+
+	rsp = intf->sendrecv(intf, &req);
+	while (rsp != NULL && is_sol_packet(rsp)) {
+					 /* rsp was SOL data instead of our answer */
+					 /* since it didn't go through the sol recv, do sol recv stuff here */
+					 ack_sol_packet(intf, rsp);
+					 check_sol_packet_for_new_data(intf, rsp);
+					 if (rsp->data_len)
+								intf->session->sol_data.sol_input_handler(rsp);
+		rsp = ipmi_lan_poll_recv(intf);
+		if (rsp == NULL) /* the get device id answer never got back, but retry mechanism was bypassed by SOL data */
+			return 0; /* so get device id command never returned, the connection is still alive */
+		  }
+
+	if (rsp == NULL)
+		return -1;
+	if (rsp->ccode > 0)
+		return -1;
+
+	return 0;
+}
+
+
+/**
+ * ipmi_lanplus_setup
+ */
+static int ipmi_lanplus_setup(struct ipmi_intf * intf)
+{
+	//test_crypt1();
+	assert("ipmi_lanplus_setup");
+
+	if (lanplus_seed_prng(16))
+		return -1;
+
+    /* setup default LAN maximum request and response sizes */
+    intf->max_request_data_size = IPMI_LAN_MAX_REQUEST_SIZE;
+    intf->max_response_data_size = IPMI_LAN_MAX_RESPONSE_SIZE;
+
+	return 0;
+}
+
+static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (intf->ssn_params.cipher_suite_id == 3) {
+		/*
+		 * encrypted payload can only be multiple of 16 bytes
+		 */
+		size &= ~15;
+
+		/*
+		 * decrement payload size on confidentiality header size
+		 * plus minimal confidentiality trailer size
+		 */
+		size -= (16 + 1);
+	}
+
+	intf->max_request_data_size = size;
+}
+
+static void ipmi_lanp_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size)
+{
+	if (intf->ssn_params.cipher_suite_id == 3) {
+		/*
+		 * encrypted payload can only be multiple of 16 bytes
+		 */
+		size &= ~15;
+
+		/*
+		 * decrement payload size on confidentiality header size
+		 * plus minimal confidentiality trailer size
+		 */
+		size -= (16 + 1);
+	}
+
+	intf->max_response_data_size = size;
+}
diff --git a/src/plugins/lanplus/lanplus.h b/src/plugins/lanplus/lanplus.h
new file mode 100644
index 0000000..d967462
--- /dev/null
+++ b/src/plugins/lanplus/lanplus.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_LANPLUS_H
+#define IPMI_LANPLUS_H
+
+#include <ipmitool/ipmi.h>
+
+#define IPMI_LANPLUS_PORT           0x26f
+
+/*
+ * RAKP return codes.  These values come from table 13-15 of the IPMI v2
+ * specification.
+ */
+#define IPMI_RAKP_STATUS_NO_ERRORS                          0x00
+#define IPMI_RAKP_STATUS_INSUFFICIENT_RESOURCES_FOR_SESSION 0x01
+#define IPMI_RAKP_STATUS_INVALID_SESSION_ID                 0x02
+#define IPMI_RAKP_STATUS_INVALID_PAYLOAD_TYPE               0x03
+#define IPMI_RAKP_STATUS_INVALID_AUTHENTICATION_ALGORITHM   0x04
+#define IPMI_RAKP_STATUS_INVALID_INTEGRITTY_ALGORITHM       0x05
+#define IPMI_RAKP_STATUS_NO_MATCHING_AUTHENTICATION_PAYLOAD 0x06
+#define IPMI_RAKP_STATUS_NO_MATCHING_INTEGRITY_PAYLOAD      0x07
+#define IPMI_RAKP_STATUS_INACTIVE_SESSION_ID                0x08
+#define IPMI_RAKP_STATUS_INVALID_ROLE                       0x09
+#define IPMI_RAKP_STATUS_UNAUTHORIZED_ROLE_REQUESTED        0x0A
+#define IPMI_RAKP_STATUS_INSUFFICIENT_RESOURCES_FOR_ROLE    0x0B
+#define IPMI_RAKP_STATUS_INVALID_NAME_LENGTH                0x0C
+#define IPMI_RAKP_STATUS_UNAUTHORIZED_NAME                  0x0D
+#define IPMI_RAKP_STATUS_UNAUTHORIZED_GUID                  0x0E
+#define IPMI_RAKP_STATUS_INVALID_INTEGRITY_CHECK_VALUE      0x0F
+#define IPMI_RAKP_STATUS_INVALID_CONFIDENTIALITY_ALGORITHM  0x10
+#define IPMI_RAKP_STATUS_NO_CIPHER_SUITE_MATCH              0x11
+#define IPMI_RAKP_STATUS_ILLEGAL_PARAMTER                   0x12	
+
+
+#define IPMI_LAN_CHANNEL_1	0x07
+#define IPMI_LAN_CHANNEL_2	0x06
+#define IPMI_LAN_CHANNEL_E	0x0e
+
+#define IPMI_LAN_TIMEOUT	1
+#define IPMI_LAN_RETRY		4
+
+#define IPMI_PRIV_CALLBACK 1
+#define IPMI_PRIV_USER     2
+#define IPMI_PRIV_OPERATOR 3
+#define IPMI_PRIV_ADMIN    4
+#define IPMI_PRIV_OEM      5
+
+
+#define IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE 0x10
+
+
+/* Session message offsets, from table 13-8 of the v2 specification */
+#define IPMI_LANPLUS_OFFSET_AUTHTYPE     0x04
+#define IPMI_LANPLUS_OFFSET_PAYLOAD_TYPE 0x05
+#define IPMI_LANPLUS_OFFSET_SESSION_ID   0x06
+#define IPMI_LANPLUS_OFFSET_SEQUENCE_NUM 0x0A
+#define IPMI_LANPLUS_OFFSET_PAYLOAD_SIZE 0x0E
+#define IPMI_LANPLUS_OFFSET_PAYLOAD      0x10
+
+
+#define IPMI_GET_CHANNEL_AUTH_CAP 0x38
+
+/*
+ * TODO: these are wild guesses and should be checked
+ */
+#define IPMI_MAX_CONF_HEADER_SIZE   0x20
+#define IPMI_MAX_PAYLOAD_SIZE       0xFFFF /* Includes confidentiality header/trailer */
+#define IPMI_MAX_CONF_TRAILER_SIZE  0x20
+#define IPMI_MAX_INTEGRITY_PAD_SIZE IPMI_MAX_MD_SIZE
+#define IPMI_MAX_AUTH_CODE_SIZE     IPMI_MAX_MD_SIZE
+
+#define IPMI_REQUEST_MESSAGE_SIZE   0x07
+#define IPMI_MAX_MAC_SIZE           IPMI_MAX_MD_SIZE /* The largest mac we ever expect to generate */
+
+#define IPMI_SHA1_AUTHCODE_SIZE          12
+#define IPMI_HMAC_MD5_AUTHCODE_SIZE      16
+#define IPMI_MD5_AUTHCODE_SIZE           16
+#define IPMI_HMAC_SHA256_AUTHCODE_SIZE   16
+
+#define IPMI_SHA_DIGEST_LENGTH                20
+#define IPMI_MD5_DIGEST_LENGTH                16
+#define IPMI_SHA256_DIGEST_LENGTH             32
+
+/*
+ *This is accurate, as long as we're only passing 1 auth algorithm,
+ * one integrity algorithm, and 1 encyrption alogrithm
+ */
+#define IPMI_OPEN_SESSION_REQUEST_SIZE 32
+#define IPMI_RAKP1_MESSAGE_SIZE        44
+#define IPMI_RAKP3_MESSAGE_MAX_SIZE    (8 + IPMI_MAX_MD_SIZE)
+
+#define IPMI_MAX_USER_NAME_LENGTH      16
+
+extern const struct valstr ipmi_privlvl_vals[];
+extern const struct valstr ipmi_authtype_vals[];
+
+extern struct ipmi_intf ipmi_lanplus_intf;
+
+struct ipmi_rs * ipmi_lan_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req);
+int  ipmi_lanplus_open(struct ipmi_intf * intf);
+void ipmi_lanplus_close(struct ipmi_intf * intf);
+int ipmiv2_lan_ping(struct ipmi_intf * intf);
+
+#endif /*IPMI_LAN_H*/
diff --git a/src/plugins/lanplus/lanplus_crypt.c b/src/plugins/lanplus/lanplus_crypt.c
new file mode 100644
index 0000000..cb963f4
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_crypt.c
@@ -0,0 +1,1060 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <assert.h>
+#include <string.h>
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+#include <ipmitool/bswap.h>
+#include <ipmitool/log.h>
+#include "lanplus.h"
+#include "lanplus_crypt.h"
+#include "lanplus_crypt_impl.h"
+
+
+
+/*
+ * lanplus_rakp2_hmac_matches
+ * 
+ * param session holds all the state data that we need to generate the hmac
+ * param hmac is the HMAC sent by the BMC in the RAKP 2 message
+ *
+ * The HMAC was generated [per RFC2404] from : 
+ * 
+ *     SIDm     - Remote console session ID    
+ *     SIDc     - BMC session ID
+ *     Rm       - Remote console random number
+ *     Rc       - BMC random number
+ *     GUIDc    - BMC guid
+ *     ROLEm    - Requested privilege level (entire byte)
+ *     ULENGTHm - Username length
+ *     <UNAMEm> - Username (absent for null user names)
+ *
+ * generated by using Kuid.  I am aware that the subscripts on the values
+ * look backwards, but that's the way they are written in the specification.
+ *
+ * If the authentication algorithm is IPMI_AUTH_RAKP_NONE, we return success.
+ * 
+ * return 0 on success (the authcode matches)
+ *        1 on failure (the authcode does not match)
+ */
+int
+lanplus_rakp2_hmac_matches(const struct ipmi_session * session,
+		const uint8_t * bmc_mac, struct ipmi_intf * intf)
+{
+	uint8_t       * buffer;
+	int           bufferLength, i;
+	uint8_t       mac[IPMI_MAX_MD_SIZE];
+	uint32_t      macLength;
+
+	uint32_t SIDm_lsbf, SIDc_lsbf;
+
+
+	if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+		return 1;
+	
+	/* We don't yet support other algorithms */
+	assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
+#ifdef HAVE_CRYPTO_SHA256
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
+#endif /* HAVE_CRYPTO_SHA256 */
+	);
+	
+
+	bufferLength =
+		4  +                       /* SIDm     */
+		4  +                       /* SIDc     */
+		16 +                       /* Rm       */
+		16 +                       /* Rc       */
+		16 +                       /* GUIDc    */
+		1  +                       /* ROLEm    */
+		1  +                       /* ULENGTHm */
+		strlen((const char *)intf->ssn_params.username); /* optional */
+
+	buffer = malloc(bufferLength);
+	if (buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+	/*
+	 * Fill the buffer.  I'm assuming that we're using the LSBF representation of the
+	 * multibyte numbers in use.
+	 */
+
+	/* SIDm */
+	SIDm_lsbf = session->v2_data.console_id;
+	#if WORDS_BIGENDIAN
+	SIDm_lsbf = BSWAP_32(SIDm_lsbf);
+	#endif
+
+	memcpy(buffer, &SIDm_lsbf, 4);
+
+	/* SIDc */
+	SIDc_lsbf = session->v2_data.bmc_id;
+	#if WORDS_BIGENDIAN
+	SIDc_lsbf = BSWAP_32(SIDc_lsbf);
+	#endif
+	memcpy(buffer + 4, &SIDc_lsbf, 4);
+
+	/* Rm */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		buffer[8 + i] = session->v2_data.console_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		buffer[8 + i] = session->v2_data.console_rand[i];
+	#endif
+
+	/* Rc */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		buffer[24 + i] = session->v2_data.bmc_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		buffer[24 + i] = session->v2_data.bmc_rand[i];
+	#endif
+
+	/* GUIDc */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		buffer[40 + i] = session->v2_data.bmc_guid[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		buffer[40 + i] = session->v2_data.bmc_guid[i];
+	#endif
+
+	/* ROLEm */
+	buffer[56] = session->v2_data.requested_role;
+
+	if (ipmi_oem_active(intf, "i82571spt")) {
+		/*
+		 * The HMAC calculation code in the Intel 82571 GbE
+		 * skips this bit!  Looks like a GbE bug, but we need
+		 * to work around it here anyway...
+		 */
+		buffer[56] &= ~0x10;
+	}
+
+	/* ULENGTHm */
+	buffer[57] = strlen((const char *)intf->ssn_params.username);
+
+	/* UserName [optional] */
+	for (i = 0; i < buffer[57]; ++i)
+		buffer[58 + i] = intf->ssn_params.username[i];
+
+	if (verbose > 2)
+	{
+		printbuf((const uint8_t *)buffer, bufferLength, ">> rakp2 mac input buffer");
+		printbuf((const uint8_t *)session->authcode, IPMI_AUTHCODE_BUFFER_SIZE, ">> rakp2 mac key");
+	}
+
+	/*
+	 * The buffer is complete.  Let's hash.
+	 */
+	lanplus_HMAC(session->v2_data.auth_alg,
+				 session->authcode,
+				 IPMI_AUTHCODE_BUFFER_SIZE,
+				 buffer,
+				 bufferLength,
+				 mac,
+				 &macLength);
+
+	free(buffer);
+	buffer = NULL;
+
+
+	if (verbose > 2)
+	{
+		printbuf(mac, macLength, ">> rakp2 mac as computed by the remote console");
+	}
+
+	return (memcmp(bmc_mac, mac, macLength) == 0);
+}
+
+
+
+/*
+ * lanplus_rakp4_hmac_matches
+ * 
+ * param session holds all the state data that we need to generate the hmac
+ * param hmac is the HMAC sent by the BMC in the RAKP 4 message
+ *
+ * The HMAC was generated [per RFC2404] from : 
+ * 
+ *     Rm       - Remote console random number
+ *     SIDc     - BMC session ID
+ *     GUIDc    - BMC guid
+ *
+ * generated by using SIK (the session integrity key).  I am aware that the
+ * subscripts on the values look backwards, but that's the way they are
+ * written in the specification.
+ *
+ * If the authentication algorithm is IPMI_AUTH_RAKP_NONE, we return success.
+ * 
+ * return 1 on success (the authcode matches)
+ *        0 on failure (the authcode does not match)
+ *
+ */
+int
+lanplus_rakp4_hmac_matches(const struct ipmi_session * session,
+		const uint8_t * bmc_mac, struct ipmi_intf * intf)
+{
+	uint8_t       * buffer;
+	int           bufferLength, i;
+	uint8_t       mac[IPMI_MAX_MD_SIZE];
+	uint32_t      macLength;
+	uint32_t      cmpLength;
+	uint32_t      SIDc_lsbf;
+
+	if (ipmi_oem_active(intf, "intelplus")){
+		/* Intel BMC responds with the integrity Algorithm in RAKP4 */
+		if (session->v2_data.integrity_alg == IPMI_INTEGRITY_NONE)
+			return 1;
+
+		/* We don't yet support other algorithms */
+		assert((session->v2_data.integrity_alg == IPMI_INTEGRITY_HMAC_SHA1_96)
+			|| (session->v2_data.integrity_alg == IPMI_INTEGRITY_HMAC_MD5_128));
+	} else {
+		if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+			return 1;
+
+		/* We don't yet support other algorithms */
+		assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
+			|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
+#ifdef HAVE_CRYPTO_SHA256
+			|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
+#endif /* HAVE_CRYPTO_SHA256 */
+		);
+	}
+
+	bufferLength =
+		16 +   /* Rm    */
+		4  +   /* SIDc  */
+		16;    /* GUIDc */
+
+	buffer = (uint8_t *)malloc(bufferLength);
+	if (buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+	/*
+	 * Fill the buffer.  I'm assuming that we're using the LSBF representation of the
+	 * multibyte numbers in use.
+	 */
+
+	/* Rm */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		buffer[i] = session->v2_data.console_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		buffer[i] = session->v2_data.console_rand[i];
+	#endif
+
+
+	/* SIDc */
+	SIDc_lsbf = session->v2_data.bmc_id;
+	#if WORDS_BIGENDIAN
+	SIDc_lsbf = BSWAP_32(SIDc_lsbf);
+	#endif
+	memcpy(buffer + 16, &SIDc_lsbf, 4);
+	
+
+	/* GUIDc */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		buffer[i +  20] = session->v2_data.bmc_guid[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		buffer[i +  20] = session->v2_data.bmc_guid[i];
+	#endif
+
+
+	if (verbose > 2)
+	{
+		printbuf((const uint8_t *)buffer, bufferLength, ">> rakp4 mac input buffer");
+		printbuf(session->v2_data.sik, session->v2_data.sik_len,
+				">> rakp4 mac key (sik)");
+	}
+
+
+	/*
+	 * The buffer is complete.  Let's hash.
+	 */
+	lanplus_HMAC((ipmi_oem_active(intf, "intelplus")) 
+	             ? session->v2_data.integrity_alg 
+	             : session->v2_data.auth_alg ,
+				 session->v2_data.sik,
+				 session->v2_data.sik_len,
+				 buffer,
+				 bufferLength,
+				 mac,
+				 &macLength);
+
+	if (verbose > 2)
+	{
+		printbuf(bmc_mac, macLength, ">> rakp4 mac as computed by the BMC");
+		printbuf(mac,     macLength, ">> rakp4 mac as computed by the remote console");
+	}
+
+	if (ipmi_oem_active(intf, "intelplus")) {
+		/* Intel BMC responds with the integrity Algorithm in RAKP4 */
+		switch(session->v2_data.integrity_alg) {
+			case IPMI_INTEGRITY_HMAC_SHA1_96:
+				assert(macLength == IPMI_SHA_DIGEST_LENGTH);
+				cmpLength = IPMI_SHA1_AUTHCODE_SIZE;
+				break;
+			case IPMI_INTEGRITY_HMAC_MD5_128:
+				assert(macLength == IPMI_MD5_DIGEST_LENGTH);
+				cmpLength = IPMI_HMAC_MD5_AUTHCODE_SIZE;
+				break;
+			default:
+				assert(0);
+				break;
+		}
+	} else {
+		/* We don't yet support other algorithms */
+		switch(session->v2_data.auth_alg) {
+			case IPMI_AUTH_RAKP_HMAC_SHA1:
+				assert(macLength == IPMI_SHA_DIGEST_LENGTH);
+				cmpLength = IPMI_SHA1_AUTHCODE_SIZE;
+				break;
+			case IPMI_AUTH_RAKP_HMAC_MD5:
+				assert(macLength == IPMI_MD5_DIGEST_LENGTH);
+				cmpLength = IPMI_HMAC_MD5_AUTHCODE_SIZE;
+				break;
+#ifdef HAVE_CRYPTO_SHA256
+			case IPMI_AUTH_RAKP_HMAC_SHA256:
+				assert(macLength == IPMI_SHA256_DIGEST_LENGTH);
+				cmpLength = IPMI_HMAC_SHA256_AUTHCODE_SIZE;
+				break;
+#endif /* HAVE_CRYPTO_SHA256 */
+			default:
+				assert(0);
+				break;
+		}
+	}
+
+	free(buffer);
+	buffer = NULL;
+	assert(macLength >= cmpLength);
+	return (memcmp(bmc_mac, mac, cmpLength) == 0);
+}
+
+
+
+/*
+ * lanplus_generate_rakp3_auth_code
+ *
+ * This auth code is an HMAC generated with :
+ *
+ *     Rc         - BMC random number
+ *     SIDm       - Console session ID
+ *     ROLEm      - Requested privilege level (entire byte)
+ *     ULENGTHm   - Username length
+ *     <USERNAME> - Usename (absent for null usernames)
+ *
+ * The key used to generated the MAC is Kuid
+ *
+ * I am aware that the subscripts look backwards, but that is the way they are
+ * written in the spec.
+ * 
+ * param output_buffer [out] will hold the generated MAC
+ * param session       [in]  holds all the state data we need to generate the auth code
+ * param mac_length    [out] will be set to the length of the auth code
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int
+lanplus_generate_rakp3_authcode(uint8_t * output_buffer,
+		const struct ipmi_session * session,
+		uint32_t * mac_length, struct ipmi_intf * intf)
+{
+	int ret = 0;
+	int input_buffer_length, i;
+	uint8_t * input_buffer;
+	uint32_t SIDm_lsbf;
+	
+
+	if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+	{
+		*mac_length = 0;
+		return 0;
+	}
+
+	/* We don't yet support other algorithms */
+	assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
+#ifdef HAVE_CRYPTO_SHA256
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
+#endif /* HAVE_CRYPTO_SHA256 */
+	);
+
+	input_buffer_length =
+		16 + /* Rc       */
+		4  + /* SIDm     */
+		1  + /* ROLEm    */
+		1  + /* ULENGTHm */
+		strlen((const char *)intf->ssn_params.username);
+
+	input_buffer = malloc(input_buffer_length);
+	if (input_buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+	/*
+	 * Fill the buffer.  I'm assuming that we're using the LSBF representation of the
+	 * multibyte numbers in use.
+	 */
+	
+	/* Rc */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		input_buffer[i] = session->v2_data.bmc_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		input_buffer[i] = session->v2_data.bmc_rand[i];
+	#endif
+
+	/* SIDm */
+	SIDm_lsbf = session->v2_data.console_id;
+	#if WORDS_BIGENDIAN
+	SIDm_lsbf = BSWAP_32(SIDm_lsbf);
+	#endif
+	memcpy(input_buffer + 16, &SIDm_lsbf, 4);
+	
+	/* ROLEm */
+	if (ipmi_oem_active(intf, "intelplus") || ipmi_oem_active(intf, "i82571spt"))
+		input_buffer[20] = intf->ssn_params.privlvl;
+	else 
+		input_buffer[20] = session->v2_data.requested_role;
+
+	/* ULENGTHm */
+	input_buffer[21] = strlen((const char *)intf->ssn_params.username);
+
+	/* USERNAME */
+	for (i = 0; i < input_buffer[21]; ++i)
+		input_buffer[22 + i] = intf->ssn_params.username[i];
+
+	if (verbose > 2)
+	{
+		printbuf((const uint8_t *)input_buffer, input_buffer_length, ">> rakp3 mac input buffer");
+		printbuf((const uint8_t *)session->authcode, IPMI_AUTHCODE_BUFFER_SIZE, ">> rakp3 mac key");
+	}
+    
+	lanplus_HMAC(session->v2_data.auth_alg,
+				 session->authcode,
+				 IPMI_AUTHCODE_BUFFER_SIZE,
+				 input_buffer,
+				 input_buffer_length,
+				 output_buffer,
+				 mac_length);
+
+	if (verbose > 2)
+		printbuf((const uint8_t *)output_buffer, *mac_length, "generated rakp3 mac");
+
+	
+	free(input_buffer);
+	input_buffer = NULL;
+
+	return ret;
+}
+
+
+
+/*
+ * lanplus_generate_sik
+ *
+ * Generate the session integrity key (SIK) used for integrity checking 
+ * during the IPMI v2 / RMCP+ session
+ *
+ * This session integrity key is a HMAC generated with :
+ *
+ *     Rm         - Console generated random number
+ *     Rc         - BMC generated random number
+ *     ROLEm      - Requested privilege level (entire byte)
+ *     ULENGTHm   - Username length
+ *     <USERNAME> - Usename (absent for null usernames)
+ *
+ * The key used to generated the SIK is Kg if Kg is not null (two-key logins are
+ * enabled).  Otherwise Kuid (the user authcode) is used as the key to genereate
+ * the SIK.
+ *
+ * I am aware that the subscripts look backwards, but that is the way they are
+ * written in the spec.
+ * 
+ * param session [in/out] contains our input and output fields.
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int
+lanplus_generate_sik(struct ipmi_session * session, struct ipmi_intf * intf)
+{
+	uint8_t * input_buffer;
+	int input_buffer_length, i;
+	uint8_t * input_key;
+	uint32_t mac_length;
+	
+
+	memset(session->v2_data.sik, 0, sizeof(session->v2_data.sik));
+	session->v2_data.sik_len = 0;
+
+	if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+		return 0;
+
+	/* We don't yet support other algorithms */
+	assert((session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1)
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_MD5)
+#ifdef HAVE_CRYPTO_SHA256
+		|| (session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA256)
+#endif /* HAVE_CRYPTO_SHA256 */
+	);
+
+	input_buffer_length =
+		16 +  /* Rm       */
+		16 +  /* Rc       */
+		1  +  /* ROLEm     */
+		1  +  /* ULENGTHm  */
+		strlen((const char *)intf->ssn_params.username);
+
+	input_buffer = malloc(input_buffer_length);
+	if (input_buffer == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+	/*
+	 * Fill the buffer.  I'm assuming that we're using the LSBF representation of the
+	 * multibyte numbers in use.
+	 */
+
+	/* Rm */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		input_buffer[i] = session->v2_data.console_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		input_buffer[i] = session->v2_data.console_rand[i];
+	#endif
+	
+
+	/* Rc */
+	#if WORDS_BIGENDIAN
+	for (i = 0; i < 16; ++i)
+		input_buffer[16 + i] = session->v2_data.bmc_rand[16 - 1 - i];
+	#else
+	for (i = 0; i < 16; ++i)
+		input_buffer[16 + i] = session->v2_data.bmc_rand[i];
+	#endif
+
+	/* ROLEm */
+	input_buffer[32] = session->v2_data.requested_role;
+
+	if (ipmi_oem_active(intf, "i82571spt")) {
+		/*
+		 * The HMAC calculation code in the Intel 82571 GbE
+		 * skips this bit!  Looks like a GbE bug, but we need
+		 * to work around it here anyway...
+		 */
+		input_buffer[32] &= ~0x10;
+	}
+
+	/* ULENGTHm */
+	input_buffer[33] = strlen((const char *)intf->ssn_params.username);
+
+	/* USERNAME */
+	for (i = 0; i < input_buffer[33]; ++i)
+		input_buffer[34 + i] = intf->ssn_params.username[i];
+
+	if (intf->ssn_params.kg[0])
+	{
+		/* We will be hashing with Kg */
+		/*
+		 * Section 13.31 of the IPMI v2 spec describes the SIK creation
+		 * using Kg.  It specifies that Kg should not be truncated.
+		 * Kg is set in ipmi_intf.
+		 */
+		input_key        = intf->ssn_params.kg;
+	}
+	else
+	{
+		/* We will be hashing with Kuid */
+		input_key        = session->authcode;
+	}
+
+	
+	if (verbose >= 2)
+		printbuf((const uint8_t *)input_buffer, input_buffer_length, "session integrity key input");
+
+	lanplus_HMAC(session->v2_data.auth_alg,
+				 input_key,
+				 IPMI_AUTHCODE_BUFFER_SIZE,
+				 input_buffer,
+				 input_buffer_length,
+				 session->v2_data.sik,
+				 &mac_length);
+
+	free(input_buffer);
+	input_buffer = NULL;
+	switch (session->v2_data.auth_alg) {
+		case IPMI_AUTH_RAKP_HMAC_SHA1:
+			assert(mac_length == IPMI_SHA_DIGEST_LENGTH);
+			break;
+		case IPMI_AUTH_RAKP_HMAC_MD5:
+			assert(mac_length == IPMI_MD5_DIGEST_LENGTH);
+			break;
+#ifdef HAVE_CRYPTO_SHA256
+		case IPMI_AUTH_RAKP_HMAC_SHA256:
+			assert(mac_length == IPMI_SHA256_DIGEST_LENGTH);
+			break;
+#endif /* HAVE_CRYPTO_SHA256 */
+		default:
+			assert(0);
+			break;
+	}
+
+	session->v2_data.sik_len = mac_length;
+
+	/*
+	 * The key MAC generated is 20 bytes, but we will only be using the first
+	 * 12 for SHA1 96
+	 */
+	if (verbose >= 2) {
+		printbuf(session->v2_data.sik, session->v2_data.sik_len,
+				"Generated session integrity key");
+	}
+	return 0;
+}
+
+
+
+/*
+ * lanplus_generate_k1
+ *
+ * Generate K1, the key presumably used to generate integrity authcodes
+ *
+ * We use the authentication algorithm to generated the HMAC, using
+ * the session integrity key (SIK) as our key.
+ *
+ * param session [in/out].
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int
+lanplus_generate_k1(struct ipmi_session * session)
+{
+	uint32_t mac_length;
+
+	uint8_t CONST_1[] =
+		{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+		 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
+
+	if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+		memcpy(session->v2_data.k1, CONST_1, 20);
+	else
+	{
+		lanplus_HMAC(session->v2_data.auth_alg,
+					 session->v2_data.sik,
+					 session->v2_data.sik_len, /* SIK length */
+					 CONST_1,
+					 20,
+					 session->v2_data.k1,
+					 &mac_length);
+		switch (session->v2_data.auth_alg) {
+			case IPMI_AUTH_RAKP_HMAC_SHA1:
+				assert(mac_length == IPMI_SHA_DIGEST_LENGTH);
+				break;
+			case IPMI_AUTH_RAKP_HMAC_MD5:
+				assert(mac_length == IPMI_MD5_DIGEST_LENGTH);
+				break;
+#ifdef HAVE_CRYPTO_SHA256
+			case IPMI_AUTH_RAKP_HMAC_SHA256:
+				assert(mac_length == IPMI_SHA256_DIGEST_LENGTH);
+				break;
+#endif /* HAVE_CRYPTO_SHA256 */
+			default:
+				assert(0);
+				break;
+		}
+		session->v2_data.k1_len = mac_length;
+	}
+
+	if (verbose >= 2)
+		printbuf(session->v2_data.k1, session->v2_data.k1_len, "Generated K1");
+
+	return 0;
+}
+
+
+
+/*
+ * lanplus_generate_k2
+ *
+ * Generate K2, the key used for RMCP+ AES encryption.
+ *
+ * We use the authentication algorithm to generated the HMAC, using
+ * the session integrity key (SIK) as our key.
+ *
+ * param session [in/out].
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int
+lanplus_generate_k2(struct ipmi_session * session)
+{
+	uint32_t mac_length;
+
+	uint8_t CONST_2[] =
+		{0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+		 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02};
+
+	if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
+		memcpy(session->v2_data.k2, CONST_2, 20);
+	else
+	{
+		lanplus_HMAC(session->v2_data.auth_alg,
+					 session->v2_data.sik,
+					 session->v2_data.sik_len, /* SIK length */
+					 CONST_2,
+					 20,
+					 session->v2_data.k2,
+					 &mac_length);
+		switch (session->v2_data.auth_alg) {
+			case IPMI_AUTH_RAKP_HMAC_SHA1:
+				assert(mac_length == IPMI_SHA_DIGEST_LENGTH);
+				break;
+			case IPMI_AUTH_RAKP_HMAC_MD5:
+				assert(mac_length == IPMI_MD5_DIGEST_LENGTH);
+				break;
+#ifdef HAVE_CRYPTO_SHA256
+			case IPMI_AUTH_RAKP_HMAC_SHA256:
+				assert(mac_length == IPMI_SHA256_DIGEST_LENGTH);
+				break;
+#endif /* HAVE_CRYPTO_SHA256 */
+			default:
+				assert(0);
+				break;
+		}
+		session->v2_data.k2_len = mac_length;
+	}
+
+	if (verbose >= 2)
+		printbuf(session->v2_data.k2, session->v2_data.k2_len, "Generated K2");
+
+	return 0;
+}
+
+
+
+/*
+ * lanplus_encrypt_payload
+ *
+ * Perform the appropriate encryption on the input data.  Output the encrypted
+ * data to output, including the required confidentiality header and trailer.
+ * If the crypt_alg is IPMI_CRYPT_NONE, simply copy the input to the output and
+ * set bytes_written to input_length.
+ * 
+ * param crypt_alg specifies the encryption algorithm (from table 13-19 of the
+ *       IPMI v2 spec)
+ * param key is the used as input to the encryption algorithmf
+ * param input is the input data to be encrypted
+ * param input_length is the length of the input data to be encrypted
+ * param output is the cipher text generated by the encryption process
+ * param bytes_written is the number of bytes written during the encryption
+ *       process
+ *
+ * returns 0 on success
+ *         1 on failure
+ */
+int
+lanplus_encrypt_payload(uint8_t crypt_alg,
+		const uint8_t * key, const uint8_t * input,
+		uint32_t input_length, uint8_t * output,
+		uint16_t * bytes_written)
+{
+	uint8_t * padded_input;
+	uint32_t    mod, i, bytes_encrypted;
+	uint8_t   pad_length = 0;
+
+	if (crypt_alg == IPMI_CRYPT_NONE)
+	{
+		/* Just copy the input to the output */
+		*bytes_written = input_length;
+		return 0;
+	}
+	
+	/* Currently, we only support AES */
+	assert(crypt_alg == IPMI_CRYPT_AES_CBC_128);
+	assert(input_length <= IPMI_MAX_PAYLOAD_SIZE);
+
+
+	/*
+	 * The input to the AES encryption algorithm has to be a multiple of the
+	 * block size (16 bytes).  The extra byte we are adding is the pad length
+	 * byte.
+	 */
+	mod = (input_length + 1) % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE;
+	if (mod)
+		pad_length = IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE - mod;
+
+	padded_input = (uint8_t*)malloc(input_length + pad_length + 1);
+	if (padded_input == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+	memcpy(padded_input, input, input_length);
+
+	/* add the pad */
+	for (i = 0; i < pad_length; ++i)
+		padded_input[input_length + i] = i + 1;
+
+	/* add the pad length */
+	padded_input[input_length + pad_length] = pad_length;
+
+	/* Generate an initialization vector, IV, for the encryption process */
+	if (lanplus_rand(output, IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE))
+	{
+		lprintf(LOG_ERR, "lanplus_encrypt_payload: Error generating IV");
+		if (padded_input != NULL) {
+			free(padded_input);
+			padded_input = NULL;
+		}
+		return 1;
+	}
+
+	if (verbose > 2)
+		printbuf(output, IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE, ">> Initialization vector");
+
+
+
+	lanplus_encrypt_aes_cbc_128(output,                                     /* IV              */
+								key,                                        /* K2              */
+								padded_input,                               /* Data to encrypt */
+								input_length + pad_length + 1,              /* Input length    */
+								output + IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE, /* output          */
+								&bytes_encrypted);                          /* bytes written   */
+
+	*bytes_written =
+		IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE + /* IV */
+		bytes_encrypted;
+
+	free(padded_input);
+	padded_input = NULL;
+
+	return 0;
+}
+
+
+
+/*
+ * lanplus_has_valid_auth_code
+ *
+ * Determine whether the packets authcode field is valid for packet.
+ * 
+ * We always return success if any of the following are true. 
+ *  - this is not an IPMIv2 packet
+ *  - the session is not yet active
+ *  - the packet specifies that it is not authenticated
+ *  - the integrity algorithm agreed upon during session creation is "none"
+ *
+ * The authcode is computed using the specified integrity algorithm starting
+ * with the AuthType / Format field, and ending with the field immediately
+ * preceeding the authcode itself.
+ *
+ * The key key used to generate the authcode MAC is K1.
+ * 
+ * param rs holds the response structure.
+ * param session holds our session state, including our chosen algorithm, key, etc.
+ *
+ * returns 1 on success (authcode is valid)
+ *         0 on failure (autchode integrity check failed)
+ */
+int
+lanplus_has_valid_auth_code(struct ipmi_rs * rs, struct ipmi_session * session)
+{
+	uint8_t * bmc_authcode;
+	uint8_t generated_authcode[IPMI_MAX_MAC_SIZE];
+	uint32_t generated_authcode_length;
+	uint32_t authcode_length;
+	
+
+	if ((rs->session.authtype != IPMI_SESSION_AUTHTYPE_RMCP_PLUS) ||
+		(session->v2_data.session_state != LANPLUS_STATE_ACTIVE)  ||
+		(! rs->session.bAuthenticated)                            ||
+		(session->v2_data.integrity_alg == IPMI_INTEGRITY_NONE))
+		return 1;
+	
+	switch (session->v2_data.integrity_alg) {
+		case IPMI_INTEGRITY_HMAC_SHA1_96:
+			authcode_length = IPMI_SHA1_AUTHCODE_SIZE;
+			break;
+		case IPMI_INTEGRITY_HMAC_MD5_128:
+			authcode_length = IPMI_HMAC_MD5_AUTHCODE_SIZE;
+			break;
+#ifdef HAVE_CRYPTO_SHA256
+		case IPMI_INTEGRITY_HMAC_SHA256_128:
+			authcode_length = IPMI_HMAC_SHA256_AUTHCODE_SIZE;
+			break;
+#endif /* HAVE_CRYPTO_SHA256 */
+		/* Unsupported */
+		default:
+			assert(0);
+			break;
+	}
+
+	/*
+	 * For SHA1-96, the authcode will be the last 12 bytes in the packet
+	 * For SHA256-128 or MD5-128, the authcode will be the last 16 bytes in the packet
+	 */
+	bmc_authcode = rs->data + (rs->data_len - authcode_length);
+
+	lanplus_HMAC(session->v2_data.integrity_alg,
+				 session->v2_data.k1,
+				 session->v2_data.k1_len,
+				 rs->data + IPMI_LANPLUS_OFFSET_AUTHTYPE,
+				 rs->data_len - IPMI_LANPLUS_OFFSET_AUTHTYPE - authcode_length,
+				 generated_authcode,
+				 &generated_authcode_length);
+
+	if (verbose > 3)
+	{
+		lprintf(LOG_DEBUG+2, "Validating authcode");
+		printbuf(session->v2_data.k1, session->v2_data.k1_len, "K1");
+		printbuf(rs->data + IPMI_LANPLUS_OFFSET_AUTHTYPE,
+				 rs->data_len - IPMI_LANPLUS_OFFSET_AUTHTYPE - authcode_length,
+				 "Authcode Input Data");
+		printbuf(generated_authcode, generated_authcode_length, "Generated authcode");
+		printbuf(bmc_authcode,       authcode_length, "Expected authcode");
+	}
+
+	assert(generated_authcode_length >= authcode_length);
+	return (memcmp(bmc_authcode, generated_authcode, authcode_length) == 0);
+}
+
+
+
+/*
+ * lanplus_decrypt_payload
+ *
+ * 
+ * param input points to the beginning of the payload (which will be the IV if
+ *       we are using AES)
+ * param payload_size [out] will be set to the size of the payload EXCLUDING
+ * padding
+ * 
+ * returns 0 on success (we were able to successfully decrypt the packet)
+ *         1 on failure (we were unable to successfully decrypt the packet)
+ */
+int
+lanplus_decrypt_payload(uint8_t crypt_alg, const uint8_t * key,
+		const uint8_t * input, uint32_t input_length,
+		uint8_t * output, uint16_t * payload_size)
+{
+	uint8_t * decrypted_payload;
+	uint32_t    bytes_decrypted;
+
+	if (crypt_alg == IPMI_CRYPT_NONE)
+	{
+		/* We are not encrypted.  The paylaod size is is everything. */
+		*payload_size = input_length;
+		memmove(output, input, input_length);
+		return 0;
+	}
+
+	/* We only support AES */
+	assert(crypt_alg == IPMI_CRYPT_AES_CBC_128);
+
+	decrypted_payload = (uint8_t*)malloc(input_length);
+	if (decrypted_payload == NULL) {
+		lprintf(LOG_ERR, "ipmitool: malloc failure");
+		return 1;
+	}
+
+
+	lanplus_decrypt_aes_cbc_128(input,                                /* IV              */
+								key,                                  /* Key             */
+								input                        +
+								IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE,    /* Data to decrypt */
+								input_length -
+								IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE,    /* Input length    */
+								decrypted_payload,                    /* output          */
+								&bytes_decrypted);                    /* bytes written   */
+
+	if (bytes_decrypted != 0)
+	{
+		/* Success */
+		uint8_t conf_pad_length;
+		int i;
+
+		memmove(output,
+				decrypted_payload,
+				bytes_decrypted);
+
+		/*
+		 * We have to determine the payload size, by substracting the padding, etc.
+		 * The last byte of the decrypted payload is the confidentiality pad length.
+		 */
+		conf_pad_length = decrypted_payload[bytes_decrypted - 1];
+		*payload_size = bytes_decrypted - conf_pad_length - 1;
+
+		/*
+		 * Extra test to make sure that the padding looks like it should (should start
+		 * with 0x01, 0x02, 0x03, etc...
+		 */
+		for (i = 0; i < conf_pad_length; ++i)
+		{
+			if (decrypted_payload[*payload_size + i] != (i + 1))
+			{
+				lprintf(LOG_ERR, "Malformed payload padding");
+				assert(0);
+			}
+		}
+	}
+	else
+	{
+		lprintf(LOG_ERR, "ERROR: lanplus_decrypt_aes_cbc_128 decryptd 0 bytes");
+		assert(0);
+	}
+
+	free(decrypted_payload);
+	decrypted_payload = NULL;
+	return (bytes_decrypted == 0);
+}
diff --git a/src/plugins/lanplus/lanplus_crypt.h b/src/plugins/lanplus/lanplus_crypt.h
new file mode 100644
index 0000000..d69cc9b
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_crypt.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_LANPLUS_CRYPT_H
+#define IPMI_LANPLUS_CRYPT_H
+
+#include <ipmitool/ipmi_intf.h>
+
+/*
+ * See the implementation file for documentation
+ * ipmi_intf can be used for oem specific implementations 
+ * e.g. if (ipmi_oem_active(intf, "OEM_XYZ"))
+ */
+
+int lanplus_rakp2_hmac_matches(const struct ipmi_session * session,
+							   const uint8_t             * hmac,
+							   struct ipmi_intf          * intf);
+int lanplus_rakp4_hmac_matches(const struct ipmi_session * session,
+							   const uint8_t             * hmac,
+							   struct ipmi_intf          * intf);
+int lanplus_generate_rakp3_authcode(uint8_t                      * buffer,
+									const struct ipmi_session * session,
+									uint32_t                  * auth_length,
+									struct ipmi_intf          * intf);
+int lanplus_generate_sik(struct ipmi_session * session, struct ipmi_intf * intf);
+int lanplus_generate_k1(struct ipmi_session * session);
+int lanplus_generate_k2(struct ipmi_session * session);
+int lanplus_encrypt_payload(uint8_t         crypt_alg,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint16_t      * bytesWritten);
+int lanplus_decrypt_payload(uint8_t         crypt_alg,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint16_t      * payload_size);
+int lanplus_has_valid_auth_code(struct ipmi_rs * rs,
+								struct ipmi_session * session);
+
+
+
+
+#endif /* IPMI_LANPLUS_CRYPT_H  */
diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
new file mode 100644
index 0000000..d5fac37
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_crypt_impl.c
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "ipmitool/log.h"
+#include "ipmitool/ipmi_constants.h"
+#include "lanplus.h"
+#include "lanplus_crypt_impl.h"
+#include <openssl/hmac.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <assert.h>
+
+
+
+/*
+ * lanplus_seed_prng
+ *
+ * Seed our PRNG with the specified number of bytes from /dev/random
+ * 
+ * param bytes specifies the number of bytes to read from /dev/random
+ * 
+ * returns 0 on success
+ *         1 on failure
+ */
+int lanplus_seed_prng(uint32_t bytes)
+{
+	if (! RAND_load_file("/dev/urandom", bytes))
+		return 1;
+	else
+		return 0;
+}
+
+
+
+/*
+ * lanplus_rand
+ *
+ * Generate a random number of the specified size
+ * 
+ * param num_bytes [in]  is the size of the random number to be
+ *       generated
+ * param buffer [out] is where we will place our random number
+ * 
+ * return 0 on success
+ *        1 on failure
+ */
+int
+lanplus_rand(uint8_t * buffer, uint32_t num_bytes)
+{
+#undef IPMI_LANPLUS_FAKE_RAND
+#ifdef IPMI_LANPLUS_FAKE_RAND
+
+	/*
+	 * This code exists so that we can easily find the generated random number
+	 * in the hex dumps.
+	 */
+ 	int i;
+	for (i = 0; i < num_bytes; ++i)
+		buffer[i] = 0x70 | i;
+
+	return 0;
+#else
+	return (! RAND_bytes(buffer, num_bytes));
+#endif
+}
+
+
+
+/*
+ * lanplus_HMAC
+ *
+ * param mac specifies the algorithm to be used, currently SHA1, SHA256 and MD5
+ *     are supported
+ * param key is the key used for HMAC generation
+ * param key_len is the lenght of key
+ * param d is the data to be MAC'd
+ * param n is the length of the data at d
+ * param md is the result of the HMAC algorithm
+ * param md_len is the length of md
+ *
+ * returns a pointer to md
+ */
+uint8_t *
+lanplus_HMAC(uint8_t        mac,
+			 const void          *key,
+			 int                  key_len,
+			 const uint8_t *d,
+			 int                  n,
+			 uint8_t       *md,
+			 uint32_t        *md_len)
+{
+	const EVP_MD *evp_md = NULL;
+
+	if ((mac == IPMI_AUTH_RAKP_HMAC_SHA1) ||
+		(mac == IPMI_INTEGRITY_HMAC_SHA1_96))
+		evp_md = EVP_sha1();
+	else if ((mac == IPMI_AUTH_RAKP_HMAC_MD5) ||
+			 (mac == IPMI_INTEGRITY_HMAC_MD5_128))
+		evp_md = EVP_md5();
+#ifdef HAVE_CRYPTO_SHA256
+	else if ((mac == IPMI_AUTH_RAKP_HMAC_SHA256) ||
+			 (mac == IPMI_INTEGRITY_HMAC_SHA256_128))
+		evp_md = EVP_sha256();
+#endif /* HAVE_CRYPTO_SHA256 */
+	else
+	{
+		lprintf(LOG_DEBUG, "Invalid mac type 0x%x in lanplus_HMAC\n", mac);
+		assert(0);
+	}
+
+	return HMAC(evp_md, key, key_len, d, n, md, (unsigned int *)md_len);
+}
+
+
+/*
+ * lanplus_encrypt_aes_cbc_128
+ *
+ * Encrypt with the AES CBC 128 algorithm
+ *
+ * param iv is the 16 byte initialization vector
+ * param key is the 16 byte key used by the AES algorithm
+ * param input is the data to be encrypted
+ * param input_length is the number of bytes to be encrypted.  This MUST
+ *       be a multiple of the block size, 16.
+ * param output is the encrypted output
+ * param bytes_written is the number of bytes written.  This param is set
+ *       to 0 on failure, or if 0 bytes were input.
+ */
+void
+lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint32_t        * bytes_written)
+{
+	EVP_CIPHER_CTX ctx;
+	EVP_CIPHER_CTX_init(&ctx);
+	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+	
+
+	*bytes_written = 0;
+
+	if (input_length == 0)
+		return;
+
+	if (verbose >= 5)
+	{
+		printbuf(iv,  16, "encrypting with this IV");
+		printbuf(key, 16, "encrypting with this key");
+		printbuf(input, input_length, "encrypting this data");
+	}
+
+
+	/*
+	 * The default implementation adds a whole block of padding if the input
+	 * data is perfectly aligned.  We would like to keep that from happening.
+	 * We have made a point to have our input perfectly padded.
+	 */
+	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+
+
+	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
+	{
+		/* Error */
+		*bytes_written = 0;
+		return;
+	}
+	else
+	{
+		uint32_t tmplen;
+
+		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
+		{
+			*bytes_written = 0;
+			return; /* Error */
+		}
+		else
+		{
+			/* Success */
+			*bytes_written += tmplen;
+			EVP_CIPHER_CTX_cleanup(&ctx);
+		}
+	}
+}
+
+
+
+/*
+ * lanplus_decrypt_aes_cbc_128
+ *
+ * Decrypt with the AES CBC 128 algorithm
+ *
+ * param iv is the 16 byte initialization vector
+ * param key is the 16 byte key used by the AES algorithm
+ * param input is the data to be decrypted
+ * param input_length is the number of bytes to be decrypted.  This MUST
+ *       be a multiple of the block size, 16.
+ * param output is the decrypted output
+ * param bytes_written is the number of bytes written.  This param is set
+ *       to 0 on failure, or if 0 bytes were input.
+ */
+void
+lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint32_t        * bytes_written)
+{
+	EVP_CIPHER_CTX ctx;
+	EVP_CIPHER_CTX_init(&ctx);
+	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+
+
+	if (verbose >= 5)
+	{
+		printbuf(iv,  16, "decrypting with this IV");
+		printbuf(key, 16, "decrypting with this key");
+		printbuf(input, input_length, "decrypting this data");
+	}
+
+
+	*bytes_written = 0;
+
+	if (input_length == 0)
+		return;
+
+	/*
+	 * The default implementation adds a whole block of padding if the input
+	 * data is perfectly aligned.  We would like to keep that from happening.
+	 * We have made a point to have our input perfectly padded.
+	 */
+	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+
+
+	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
+	{
+		/* Error */
+		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+		*bytes_written = 0;
+		return;
+	}
+	else
+	{
+		uint32_t tmplen;
+
+		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
+		{
+			char buffer[1000];
+			ERR_error_string(ERR_get_error(), buffer);
+			lprintf(LOG_DEBUG, "the ERR error %s", buffer);
+			lprintf(LOG_DEBUG, "ERROR: decrypt final failed");
+			*bytes_written = 0;
+			return; /* Error */
+		}
+		else
+		{
+			/* Success */
+			*bytes_written += tmplen;
+			EVP_CIPHER_CTX_cleanup(&ctx);
+		}
+	}
+
+	if (verbose >= 5)
+	{
+		lprintf(LOG_DEBUG, "Decrypted %d encrypted bytes", input_length);
+		printbuf(output, *bytes_written, "Decrypted this data");
+	}
+}
diff --git a/src/plugins/lanplus/lanplus_crypt_impl.h b/src/plugins/lanplus/lanplus_crypt_impl.h
new file mode 100644
index 0000000..ff534bc
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_crypt_impl.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_LANPLUS_CRYPT_IMPL_H
+#define IPMI_LANPLUS_CRYPT_IMPL_H
+
+
+int
+lanplus_seed_prng(uint32_t bytes);
+
+int
+lanplus_rand(uint8_t * buffer,  uint32_t num_bytes);
+
+uint8_t *
+lanplus_HMAC(uint8_t mac, const void *key, int key_len,
+			 const uint8_t *d, int n, uint8_t *md,
+			 uint32_t *md_len);
+
+void
+lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint32_t        * bytes_written);
+
+
+void
+lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+							const uint8_t * key,
+							const uint8_t * input,
+							uint32_t          input_length,
+							uint8_t       * output,
+							uint32_t        * bytes_written);
+
+
+#endif /* IPMI_LANPLUS_CRYPT_IMPL_H */
diff --git a/src/plugins/lanplus/lanplus_dump.c b/src/plugins/lanplus/lanplus_dump.c
new file mode 100644
index 0000000..bbfc1b0
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_dump.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include "lanplus.h"
+#include "lanplus_crypt.h"
+#include "lanplus_dump.h"
+
+extern const struct valstr ipmi_rakp_return_codes[];
+extern const struct valstr ipmi_priv_levels[];
+extern const struct valstr ipmi_auth_algorithms[];
+extern const struct valstr ipmi_integrity_algorithms[];
+extern const struct valstr ipmi_encryption_algorithms[];
+
+#define DUMP_PREFIX_INCOMING "<<"
+
+void lanplus_dump_open_session_response(const struct ipmi_rs * rsp)
+{
+	if (verbose < 2)
+		return;
+
+ 	printf("%sOPEN SESSION RESPONSE\n", DUMP_PREFIX_INCOMING);
+
+	printf("%s  Message tag                        : 0x%02x\n",
+		   DUMP_PREFIX_INCOMING,
+		   rsp->payload.open_session_response.message_tag);
+	printf("%s  RMCP+ status                       : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.open_session_response.rakp_return_code,
+				   ipmi_rakp_return_codes));
+	printf("%s  Maximum privilege level            : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.open_session_response.max_priv_level,
+				   ipmi_priv_levels));
+	printf("%s  Console Session ID                 : 0x%08lx\n",
+		   DUMP_PREFIX_INCOMING,
+		   (long)rsp->payload.open_session_response.console_id);
+
+	/* only tag, status, privlvl, and console id are returned if error */
+	if (rsp->payload.open_session_response.rakp_return_code !=
+	    IPMI_RAKP_STATUS_NO_ERRORS)
+		return;
+
+	printf("%s  BMC Session ID                     : 0x%08lx\n",
+		   DUMP_PREFIX_INCOMING,
+		   (long)rsp->payload.open_session_response.bmc_id);
+	printf("%s  Negotiated authenticatin algorithm : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.open_session_response.auth_alg,
+				   ipmi_auth_algorithms));
+	printf("%s  Negotiated integrity algorithm     : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.open_session_response.integrity_alg,
+				   ipmi_integrity_algorithms));
+	printf("%s  Negotiated encryption algorithm    : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.open_session_response.crypt_alg,
+				   ipmi_encryption_algorithms));
+	printf("\n");
+}
+
+
+
+void lanplus_dump_rakp2_message(const struct ipmi_rs * rsp, uint8_t auth_alg)
+{
+	int i;
+
+	if (verbose < 2)
+		return;
+
+	printf("%sRAKP 2 MESSAGE\n", DUMP_PREFIX_INCOMING);
+
+	printf("%s  Message tag                   : 0x%02x\n",
+		   DUMP_PREFIX_INCOMING,
+		   rsp->payload.rakp2_message.message_tag);
+
+	printf("%s  RMCP+ status                  : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.rakp2_message.rakp_return_code,
+				   ipmi_rakp_return_codes));
+
+	printf("%s  Console Session ID            : 0x%08lx\n",
+		   DUMP_PREFIX_INCOMING,
+		   (long)rsp->payload.rakp2_message.console_id);
+
+	printf("%s  BMC random number             : 0x", DUMP_PREFIX_INCOMING);
+	for (i = 0; i < 16; ++i)
+		printf("%02x", rsp->payload.rakp2_message.bmc_rand[i]);
+	printf("\n");
+
+	printf("%s  BMC GUID                      : 0x", DUMP_PREFIX_INCOMING);
+	for (i = 0; i < 16; ++i)
+		printf("%02x", rsp->payload.rakp2_message.bmc_guid[i]);
+	printf("\n");
+
+	switch(auth_alg)
+	{
+	case IPMI_AUTH_RAKP_NONE:
+		printf("%s  Key exchange auth code         : none\n", DUMP_PREFIX_INCOMING);
+		break;
+	case IPMI_AUTH_RAKP_HMAC_SHA1:
+		printf("%s  Key exchange auth code [sha1] : 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_SHA_DIGEST_LENGTH; ++i) {
+			printf("%02x", rsp->payload.rakp2_message.key_exchange_auth_code[i]);
+		}
+		printf("\n");
+		break;
+	case IPMI_AUTH_RAKP_HMAC_MD5:
+		printf("%s  Key exchange auth code [md5]   : 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_MD5_DIGEST_LENGTH; ++i) {
+			printf("%02x", rsp->payload.rakp2_message.key_exchange_auth_code[i]);
+		}
+		printf("\n");
+		break;
+#ifdef HAVE_CRYPTO_SHA256
+	case IPMI_AUTH_RAKP_HMAC_SHA256:
+		printf("%s  Key exchange auth code [sha256]: 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_SHA256_DIGEST_LENGTH; ++i) {
+			printf("%02x", rsp->payload.rakp2_message.key_exchange_auth_code[i]);
+		}
+		printf("\n");
+		break;
+#endif /* HAVE_CRYPTO_SHA256 */
+	default:
+		printf("%s  Key exchange auth code         : invalid", DUMP_PREFIX_INCOMING);
+	}
+	printf("\n");
+}
+
+
+
+void lanplus_dump_rakp4_message(const struct ipmi_rs * rsp, uint8_t auth_alg)
+{
+	int i;
+
+	if (verbose < 2)
+		return;
+
+	printf("%sRAKP 4 MESSAGE\n", DUMP_PREFIX_INCOMING);
+
+	printf("%s  Message tag                   : 0x%02x\n",
+		   DUMP_PREFIX_INCOMING,
+		   rsp->payload.rakp4_message.message_tag);
+
+	printf("%s  RMCP+ status                  : %s\n",
+		   DUMP_PREFIX_INCOMING,
+		   val2str(rsp->payload.rakp4_message.rakp_return_code,
+				   ipmi_rakp_return_codes));
+
+	printf("%s  Console Session ID            : 0x%08lx\n",
+		   DUMP_PREFIX_INCOMING,
+		   (long)rsp->payload.rakp4_message.console_id);
+
+	switch(auth_alg)
+	{
+	case IPMI_AUTH_RAKP_NONE:
+		printf("%s  Key exchange auth code        : none\n", DUMP_PREFIX_INCOMING);
+		break;
+	case IPMI_AUTH_RAKP_HMAC_SHA1:
+		printf("%s  Key exchange auth code [sha1] : 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_SHA1_AUTHCODE_SIZE; ++i) {
+			printf("%02x", rsp->payload.rakp4_message.integrity_check_value[i]);
+		}
+		printf("\n");
+		break;
+	case IPMI_AUTH_RAKP_HMAC_MD5:
+		printf("%s  Key exchange auth code [md5]   : 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_HMAC_MD5_AUTHCODE_SIZE; ++i) {
+			printf("%02x", rsp->payload.rakp4_message.integrity_check_value[i]);
+		}
+		printf("\n");
+		break;
+#ifdef HAVE_CRYPTO_SHA256
+	case IPMI_AUTH_RAKP_HMAC_SHA256:
+		printf("%s  Key exchange auth code [sha256]: 0x", DUMP_PREFIX_INCOMING);
+		for (i = 0; i < IPMI_HMAC_SHA256_AUTHCODE_SIZE; ++i) {
+			printf("%02x", rsp->payload.rakp4_message.integrity_check_value[i]);
+		}
+		printf("\n");
+		break;
+#endif /* HAVE_CRYPTO_SHA256 */
+	default:
+		printf("%s  Key exchange auth code         : invalid", DUMP_PREFIX_INCOMING);
+	}
+	printf("\n");
+}
+
diff --git a/src/plugins/lanplus/lanplus_dump.h b/src/plugins/lanplus/lanplus_dump.h
new file mode 100644
index 0000000..4e29ebb
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_dump.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+
+#ifndef IPMI_LANPLUS_DUMP_H
+#define IPMI_LANPLUS_DUMP_H
+
+#include <ipmitool/ipmi_intf.h>
+
+/* See the implementation file for documentation */
+void lanplus_dump_open_session_response(const struct ipmi_rs * rsp);
+void lanplus_dump_rakp2_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
+void lanplus_dump_rakp4_message(const struct ipmi_rs * rsp, uint8_t auth_alg);
+
+
+#endif /* IPMI_LANPLUS_DUMP_H  */
diff --git a/src/plugins/lanplus/lanplus_strings.c b/src/plugins/lanplus/lanplus_strings.c
new file mode 100644
index 0000000..074f898
--- /dev/null
+++ b/src/plugins/lanplus/lanplus_strings.c
@@ -0,0 +1,39 @@
+#include "lanplus.h"
+#include "ipmitool/ipmi_constants.h"
+
+const struct valstr ipmi_rakp_return_codes[] = {
+
+	{ IPMI_RAKP_STATUS_NO_ERRORS,                          "no errors"                           },
+	{ IPMI_RAKP_STATUS_INSUFFICIENT_RESOURCES_FOR_SESSION, "insufficient resources for session"  },
+	{ IPMI_RAKP_STATUS_INVALID_SESSION_ID,                 "invalid session ID"                  },
+	{ IPMI_RAKP_STATUS_INVALID_PAYLOAD_TYPE,               "invalid payload type"                },
+	{ IPMI_RAKP_STATUS_INVALID_AUTHENTICATION_ALGORITHM,   "invalid authentication algorithm"    },
+	{ IPMI_RAKP_STATUS_INVALID_INTEGRITTY_ALGORITHM,       "invalid integrity algorithm"         },
+	{ IPMI_RAKP_STATUS_NO_MATCHING_AUTHENTICATION_PAYLOAD, "no matching authentication algorithm"},
+	{ IPMI_RAKP_STATUS_NO_MATCHING_INTEGRITY_PAYLOAD,      "no matching integrity payload"       },
+	{ IPMI_RAKP_STATUS_INACTIVE_SESSION_ID,                "inactive session ID"                 },
+	{ IPMI_RAKP_STATUS_INVALID_ROLE,                       "invalid role"                        },
+	{ IPMI_RAKP_STATUS_UNAUTHORIZED_ROLE_REQUESTED,        "unauthorized role requested"         },
+	{ IPMI_RAKP_STATUS_INSUFFICIENT_RESOURCES_FOR_ROLE,    "insufficient resources for role"     },
+	{ IPMI_RAKP_STATUS_INVALID_NAME_LENGTH,                "invalid name length"                 },
+	{ IPMI_RAKP_STATUS_UNAUTHORIZED_NAME,                  "unauthorized name"                   },
+	{ IPMI_RAKP_STATUS_UNAUTHORIZED_GUID,                  "unauthorized GUID"                   },
+	{ IPMI_RAKP_STATUS_INVALID_INTEGRITY_CHECK_VALUE,      "invalid integrity check value"       },
+	{ IPMI_RAKP_STATUS_INVALID_CONFIDENTIALITY_ALGORITHM,  "invalid confidentiality algorithm"   },
+	{ IPMI_RAKP_STATUS_NO_CIPHER_SUITE_MATCH,              "no matching cipher suite"            },
+	{ IPMI_RAKP_STATUS_ILLEGAL_PARAMTER,                   "illegal parameter"                   },
+	{ 0,                                                   0                                     },
+};
+
+
+const struct valstr ipmi_priv_levels[] = {
+	{ IPMI_PRIV_CALLBACK, "callback" },
+	{ IPMI_PRIV_USER,     "user"     },
+	{ IPMI_PRIV_OPERATOR, "operator" },
+	{ IPMI_PRIV_ADMIN,    "admin"    },
+	{ IPMI_PRIV_OEM,      "oem"      },
+	{ 0,                  0          },
+};
+
+
+
diff --git a/src/plugins/lanplus/rmcp.h b/src/plugins/lanplus/rmcp.h
new file mode 100644
index 0000000..51dc44d
--- /dev/null
+++ b/src/plugins/lanplus/rmcp.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_RMCP_H
+#define IPMI_RMCP_H
+
+#include <ipmitool/helper.h>
+#include "lanplus.h"
+
+#define RMCP_VERSION_1		0x06
+
+#define RMCP_UDP_PORT		0x26f /* port 623 */
+#define RMCP_UDP_SECURE_PORT	0x298 /* port 664 */
+
+#define RMCP_TYPE_MASK		0x80
+#define RMCP_TYPE_NORM		0x00
+#define RMCP_TYPE_ACK		0x01
+
+static const struct valstr rmcp_type_vals[] __attribute__((unused)) = {
+	{ RMCP_TYPE_NORM,	"Normal RMCP" },
+	{ RMCP_TYPE_ACK,	"RMCP ACK" },
+	{ 0,			NULL }
+};
+
+#define RMCP_CLASS_MASK		0x1f
+#define RMCP_CLASS_ASF		0x06
+#define RMCP_CLASS_IPMI		0x07
+#define RMCP_CLASS_OEM		0x08
+
+static const struct valstr rmcp_class_vals[] __attribute__((unused)) = {
+	{ RMCP_CLASS_ASF,	"ASF" },
+	{ RMCP_CLASS_IPMI,	"IPMI" },
+	{ RMCP_CLASS_OEM,	"OEM" },
+	{ 0,			NULL }
+};
+
+/* RMCP message header */
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(1)
+#endif
+struct rmcp_hdr {
+	uint8_t ver;
+	uint8_t __reserved;
+	uint8_t seq;
+	uint8_t class;
+} ATTRIBUTE_PACKING;
+#ifdef HAVE_PRAGMA_PACK
+#pragma pack(0)
+#endif
+
+int handle_rmcp(struct ipmi_intf * intf, uint8_t * data, int data_len);
+
+#endif /* IPMI_RMCP_H */
diff --git a/src/plugins/lipmi/Makefile.am b/src/plugins/lipmi/Makefile.am
new file mode 100644
index 0000000..ca7aa0a
--- /dev/null
+++ b/src/plugins/lipmi/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES		= Makefile.in
+
+AM_CPPFLAGS			= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES		= libintf_lipmi.la
+noinst_LTLIBRARIES		= @INTF_LIPMI_LIB@
+libintf_lipmi_la_LIBADD		= $(top_builddir)/lib/libipmitool.la
+libintf_lipmi_la_SOURCES	= lipmi.c
+
diff --git a/src/plugins/lipmi/Makefile.in b/src/plugins/lipmi/Makefile.in
new file mode 100644
index 0000000..be4996d
--- /dev/null
+++ b/src/plugins/lipmi/Makefile.in
@@ -0,0 +1,637 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/lipmi
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_lipmi_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_lipmi_la_OBJECTS = lipmi.lo
+libintf_lipmi_la_OBJECTS = $(am_libintf_lipmi_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_lipmi_la_SOURCES)
+DIST_SOURCES = $(libintf_lipmi_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_lipmi.la
+noinst_LTLIBRARIES = @INTF_LIPMI_LIB@
+libintf_lipmi_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_lipmi_la_SOURCES = lipmi.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/lipmi/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/lipmi/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_lipmi.la: $(libintf_lipmi_la_OBJECTS) $(libintf_lipmi_la_DEPENDENCIES) $(EXTRA_libintf_lipmi_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_lipmi_la_OBJECTS) $(libintf_lipmi_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lipmi.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/lipmi/lipmi.c b/src/plugins/lipmi/lipmi.c
new file mode 100644
index 0000000..fa7845d
--- /dev/null
+++ b/src/plugins/lipmi/lipmi.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stropts.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+
+#include <sys/lipmi/lipmi_intf.h>
+
+#define IPMI_LIPMI_DEV		"/dev/lipmi"
+
+extern int verbose;
+
+static int ipmi_lipmi_open(struct ipmi_intf * intf)
+{
+	intf->fd = open(IPMI_LIPMI_DEV, O_RDWR);
+	if (intf->fd < 0) {
+		perror("Could not open lipmi device");
+		return -1;
+	}
+	intf->opened = 1;
+	intf->manufacturer_id = ipmi_get_oem(intf);
+	return intf->fd;
+}
+
+static void ipmi_lipmi_close(struct ipmi_intf * intf)
+{
+	if (intf && intf->fd >= 0)
+		close(intf->fd);
+	intf->fd = -1;
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+}
+
+static struct ipmi_rs * ipmi_lipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	struct strioctl istr;
+	static struct lipmi_reqrsp reqrsp;
+	static struct ipmi_rs rsp;	
+	static int curr_seq = 0;
+
+	if (!intf || !req)
+		return NULL;
+
+	if (!intf->opened && intf->open && intf->open(intf) < 0)
+		return NULL;
+
+	memset(&reqrsp, 0, sizeof(reqrsp));
+	reqrsp.req.fn = req->msg.netfn;
+	reqrsp.req.lun = 0;
+	reqrsp.req.cmd = req->msg.cmd;
+	reqrsp.req.datalength = req->msg.data_len;
+	memcpy(reqrsp.req.data, req->msg.data, req->msg.data_len);
+	reqrsp.rsp.datalength = RECV_MAX_PAYLOAD_SIZE;
+
+	istr.ic_cmd = IOCTL_IPMI_KCS_ACTION;
+	istr.ic_timout = 0;
+	istr.ic_dp = (char *)&reqrsp;
+	istr.ic_len = sizeof(struct lipmi_reqrsp);
+
+	if (verbose > 1) {
+		printf("LIPMI req.fn         : %x\n", reqrsp.req.fn);
+		printf("LIPMI req.lun        : %x\n", reqrsp.req.lun);
+		printf("LIPMI req.cmd        : %x\n", reqrsp.req.cmd);
+		printf("LIPMI req.datalength : %d\n", reqrsp.req.datalength);
+	}
+
+	if (ioctl(intf->fd, I_STR, &istr) < 0) {
+		perror("LIPMI IOCTL: I_STR");
+		return NULL;
+	}
+
+	memset(&rsp, 0, sizeof(struct ipmi_rs));
+	rsp.ccode = reqrsp.rsp.ccode;
+	rsp.data_len = reqrsp.rsp.datalength;
+
+	if (!rsp.ccode && rsp.data_len)
+		memcpy(rsp.data, reqrsp.rsp.data, rsp.data_len);
+
+	return &rsp;
+}
+
+struct ipmi_intf ipmi_lipmi_intf = {
+	name:		"lipmi",
+	desc:		"Solaris x86 LIPMI Interface",
+	open:		ipmi_lipmi_open,
+	close:		ipmi_lipmi_close,
+	sendrecv:	ipmi_lipmi_send_cmd,
+	target_addr:	IPMI_BMC_SLAVE_ADDR,
+};
+
diff --git a/src/plugins/open/Makefile.am b/src/plugins/open/Makefile.am
new file mode 100644
index 0000000..edc4916
--- /dev/null
+++ b/src/plugins/open/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_open.la
+noinst_LTLIBRARIES	= @INTF_OPEN_LIB@
+libintf_open_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_open_la_SOURCES	= open.c open.h
+
diff --git a/src/plugins/open/Makefile.in b/src/plugins/open/Makefile.in
new file mode 100644
index 0000000..c4b7714
--- /dev/null
+++ b/src/plugins/open/Makefile.in
@@ -0,0 +1,637 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/open
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_open_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_open_la_OBJECTS = open.lo
+libintf_open_la_OBJECTS = $(am_libintf_open_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_open_la_SOURCES)
+DIST_SOURCES = $(libintf_open_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_open.la
+noinst_LTLIBRARIES = @INTF_OPEN_LIB@
+libintf_open_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_open_la_SOURCES = open.c open.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/open/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/open/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_open.la: $(libintf_open_la_OBJECTS) $(libintf_open_la_DEPENDENCIES) $(EXTRA_libintf_open_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_open_la_OBJECTS) $(libintf_open_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/open/open.c b/src/plugins/open/open.c
new file mode 100644
index 0000000..5beeac7
--- /dev/null
+++ b/src/plugins/open/open.c
@@ -0,0 +1,459 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _POSIX_C_SOURCE 1
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/stat.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_sel.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#if defined(HAVE_SYS_IOCCOM_H)
+# include <sys/ioccom.h>
+#endif
+
+#if defined(HAVE_OPENIPMI_H)
+# if defined(HAVE_LINUX_COMPILER_H)
+#  include <linux/compiler.h>
+# endif
+# include <linux/ipmi.h>
+#elif defined(HAVE_FREEBSD_IPMI_H)
+/* FreeBSD OpenIPMI-compatible header */
+# include <sys/ipmi.h>
+#else
+# include "open.h"
+#endif
+
+/**
+ * Maximum input message size for KCS/SMIC is 40 with 2 utility bytes and
+ * 38 bytes of data.
+ * Maximum input message size for BT is 42 with 4 utility bytes and
+ * 38 bytes of data.
+ */
+#define IPMI_OPENIPMI_MAX_RQ_DATA_SIZE 38
+
+/**
+ * Maximum output message size for KCS/SMIC is 38 with 2 utility bytes, a byte
+ * for completion code and 35 bytes of data.
+ * Maximum output message size for BT is 40 with 4 utility bytes, a byte
+ * for completion code and 35 bytes of data.
+ */
+#define IPMI_OPENIPMI_MAX_RS_DATA_SIZE 35
+
+/* Timeout for reading data from BMC in seconds */
+#define IPMI_OPENIPMI_READ_TIMEOUT 15
+
+extern int verbose;
+
+static int
+ipmi_openipmi_open(struct ipmi_intf * intf)
+{
+	int i = 0;
+
+	char ipmi_dev[16];
+	char ipmi_devfs[16];
+	char ipmi_devfs2[16];
+	int devnum = 0;
+
+	devnum = intf->devnum;
+
+	sprintf(ipmi_dev, "/dev/ipmi%d", devnum);
+	sprintf(ipmi_devfs, "/dev/ipmi/%d", devnum);
+	sprintf(ipmi_devfs2, "/dev/ipmidev/%d", devnum);
+	lprintf(LOG_DEBUG, "Using ipmi device %d", devnum);
+
+	intf->fd = open(ipmi_dev, O_RDWR);
+
+	if (intf->fd < 0) {
+		intf->fd = open(ipmi_devfs, O_RDWR);
+		if (intf->fd < 0) {
+			intf->fd = open(ipmi_devfs2, O_RDWR);
+		}
+		if (intf->fd < 0) {
+			lperror(LOG_ERR, "Could not open device at %s or %s or %s",
+			ipmi_dev, ipmi_devfs , ipmi_devfs2);
+			return -1;
+		}
+	}
+
+	if (ioctl(intf->fd, IPMICTL_SET_GETS_EVENTS_CMD, &i) < 0) {
+		lperror(LOG_ERR, "Could not enable event receiver");
+		return -1;
+	}
+ 
+	intf->opened = 1;
+
+   /* This is never set to 0, the default is IPMI_BMC_SLAVE_ADDR */
+	if (intf->my_addr != 0) {
+		if (intf->set_my_addr(intf, intf->my_addr) < 0) {
+			lperror(LOG_ERR, "Could not set IPMB address");
+			return -1;
+		}
+		lprintf(LOG_DEBUG, "Set IPMB address to 0x%x",
+			intf->my_addr );
+	}
+
+	intf->manufacturer_id = ipmi_get_oem(intf);
+	return intf->fd;
+}
+static int
+ipmi_openipmi_set_my_addr(struct ipmi_intf *intf, uint8_t addr)
+{
+	unsigned int a = addr;
+	if (ioctl(intf->fd, IPMICTL_SET_MY_ADDRESS_CMD, &a) < 0) {
+		lperror(LOG_ERR, "Could not set IPMB address");
+		return -1;
+	}
+	intf->my_addr = addr;
+	return 0;
+}
+
+static void
+ipmi_openipmi_close(struct ipmi_intf * intf)
+{
+	if (intf->fd >= 0) {
+		close(intf->fd);
+		intf->fd = -1;
+	}
+
+	intf->opened = 0;
+	intf->manufacturer_id = IPMI_OEM_UNKNOWN;
+}
+
+static struct ipmi_rs *
+ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	struct ipmi_recv recv;
+	struct ipmi_addr addr;
+	struct ipmi_system_interface_addr bmc_addr = {
+		.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE,
+		.channel = IPMI_BMC_CHANNEL,
+	};
+	struct ipmi_ipmb_addr ipmb_addr = {
+		.addr_type = IPMI_IPMB_ADDR_TYPE,
+	};
+	struct ipmi_req _req;
+	static struct ipmi_rs rsp;
+	struct timeval read_timeout;
+	static int curr_seq = 0;
+	fd_set rset;
+
+	uint8_t * data = NULL;
+	int data_len = 0;
+	int retval = 0;
+
+
+	if (intf == NULL || req == NULL)
+		return NULL;
+
+	ipmb_addr.channel = intf->target_channel & 0x0f;
+
+	if (intf->opened == 0 && intf->open != NULL)
+		if (intf->open(intf) < 0)
+			return NULL;
+
+	if (verbose > 2) {
+		fprintf(stderr, "OpenIPMI Request Message Header:\n");
+		fprintf(stderr, "  netfn     = 0x%x\n",  req->msg.netfn );
+		fprintf(stderr, "  cmd       = 0x%x\n", req->msg.cmd);
+		printbuf(req->msg.data, req->msg.data_len, "OpenIPMI Request Message Data");
+	}
+		
+
+
+	/*
+	 * setup and send message
+	 */
+
+	memset(&_req, 0, sizeof(struct ipmi_req));
+
+	if (intf->target_addr != 0 &&
+	    intf->target_addr != intf->my_addr) {
+		/* use IPMB address if needed */
+		ipmb_addr.slave_addr = intf->target_addr;
+		ipmb_addr.lun = req->msg.lun;
+		lprintf(LOG_DEBUG, "Sending request 0x%x to "
+			"IPMB target @ 0x%x:0x%x (from 0x%x)", 
+			req->msg.cmd,
+			intf->target_addr,intf->target_channel, intf->my_addr);
+
+		if(intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) { 
+		   uint8_t index = 0;
+      
+		   lprintf(LOG_DEBUG, "Encapsulating data sent to "
+			   "end target [0x%02x,0x%02x] using transit [0x%02x,0x%02x] from 0x%x ",
+			   (0x40 | intf->target_channel),
+			   intf->target_addr,
+			   intf->transit_channel,
+			   intf->transit_addr,
+			   intf->my_addr
+			   );      
+
+		   /* Convert Message to 'Send Message' */
+		   /* Supplied req : req , internal req : _req  */
+
+		   if (verbose > 4) {
+		      fprintf(stderr, "Converting message:\n");
+		      fprintf(stderr, "  netfn     = 0x%x\n",  req->msg.netfn );
+		      fprintf(stderr, "  cmd       = 0x%x\n", req->msg.cmd);
+		      if (req->msg.data && req->msg.data_len) {
+			 fprintf(stderr, "  data_len  = %d\n", req->msg.data_len);
+			 fprintf(stderr, "  data      = %s\n",
+				 buf2str(req->msg.data,req->msg.data_len));
+		      }
+		   }
+
+		   /* Modify target address to use 'transit' instead */
+		   ipmb_addr.slave_addr = intf->transit_addr;
+		   ipmb_addr.channel    = intf->transit_channel;
+
+		   /* FIXME backup "My address" */
+		   data_len = req->msg.data_len + 8;
+		   data = malloc(data_len);
+		   if (data == NULL) {
+		      lprintf(LOG_ERR, "ipmitool: malloc failure");
+		      return NULL;
+		   }
+
+		   memset(data, 0, data_len);
+
+		   data[index++] = (0x40|intf->target_channel);
+		   data[index++] = intf->target_addr;
+		   data[index++] = (  req->msg.netfn << 2 ) |  req->msg.lun ;
+		   data[index++] = ipmi_csum(data+1, 2);
+		   data[index++] = 0xFF;    /* normally 0x20 , overwritten by IPMC  */
+		   data[index++] = ( (0)  << 2) | 0 ;           /* FIXME */
+		   data[index++] = req->msg.cmd;
+		   memcpy( (data+index) , req->msg.data, req->msg.data_len);
+		   index += req->msg.data_len;
+		   data[index++] = ipmi_csum( (data+4),(req->msg.data_len + 3)  );
+          
+		   if (verbose > 4) {
+		      fprintf(stderr, "Encapsulated message:\n");
+		      fprintf(stderr, "  netfn     = 0x%x\n", IPMI_NETFN_APP  );
+		      fprintf(stderr, "  cmd       = 0x%x\n", 0x34 );
+		      if (data && data_len) {
+			 fprintf(stderr, "  data_len  = %d\n", data_len);
+			 fprintf(stderr, "  data      = %s\n",
+				 buf2str(data,data_len));
+		      }
+		   }
+		}
+		_req.addr = (unsigned char *) &ipmb_addr;
+		_req.addr_len = sizeof(ipmb_addr);
+	} else {
+	   /* otherwise use system interface */
+	   lprintf(LOG_DEBUG+2, "Sending request 0x%x to "
+		   "System Interface", req->msg.cmd);
+	   bmc_addr.lun = req->msg.lun;
+	   _req.addr = (unsigned char *) &bmc_addr;
+	   _req.addr_len = sizeof(bmc_addr);
+	}
+
+	_req.msgid = curr_seq++;
+
+	/* In case of a bridge request */
+	if( data != NULL && data_len != 0 ) {
+	   _req.msg.data = data;
+	   _req.msg.data_len = data_len;
+	   _req.msg.netfn = IPMI_NETFN_APP;
+	   _req.msg.cmd   = 0x34;
+
+	} else {
+	   _req.msg.data = req->msg.data;
+	   _req.msg.data_len = req->msg.data_len;
+	   _req.msg.netfn = req->msg.netfn;
+	   _req.msg.cmd = req->msg.cmd;
+	}
+   
+	if (ioctl(intf->fd, IPMICTL_SEND_COMMAND, &_req) < 0) {
+	   lperror(LOG_ERR, "Unable to send command");
+	   if (data != NULL) {
+	      free(data);
+				data = NULL;
+		 }
+	   return NULL;
+	}
+
+	/*
+	 * wait for and retrieve response
+	 */
+
+	if (intf->noanswer) {
+	   if (data != NULL) {
+	      free(data);
+				data = NULL;
+		 }
+	   return NULL;
+	}
+
+	FD_ZERO(&rset);
+	FD_SET(intf->fd, &rset);
+	read_timeout.tv_sec = IPMI_OPENIPMI_READ_TIMEOUT;
+	read_timeout.tv_usec = 0;
+	retval = select(intf->fd+1, &rset, NULL, NULL, &read_timeout);
+	if (retval < 0) {
+	   lperror(LOG_ERR, "I/O Error");
+	   if (data != NULL) {
+	      free(data);
+				data = NULL;
+		 }
+	   return NULL;
+	} else if (retval == 0) {
+		lprintf(LOG_ERR, "No data available");
+		if (data != NULL) {
+			free(data);
+			data = NULL;
+		}
+		return NULL;
+	}
+	if (FD_ISSET(intf->fd, &rset) == 0) {
+	   lprintf(LOG_ERR, "No data available");
+	   if (data != NULL) {
+	      free(data);
+				data = NULL;
+		 }
+	   return NULL;
+	}
+
+	recv.addr = (unsigned char *) &addr;
+	recv.addr_len = sizeof(addr);
+	recv.msg.data = rsp.data;
+	recv.msg.data_len = sizeof(rsp.data);
+
+	/* get data */
+	if (ioctl(intf->fd, IPMICTL_RECEIVE_MSG_TRUNC, &recv) < 0) {
+	   lperror(LOG_ERR, "Error receiving message");
+	   if (errno != EMSGSIZE) {
+	      if (data != NULL) {
+					free(data);
+					data = NULL;
+				}
+	      return NULL;
+	   }
+	}
+
+	if (verbose > 4) {
+	   fprintf(stderr, "Got message:");
+	   fprintf(stderr, "  type      = %d\n", recv.recv_type);
+	   fprintf(stderr, "  channel   = 0x%x\n", addr.channel);
+	   fprintf(stderr, "  msgid     = %ld\n", recv.msgid);
+	   fprintf(stderr, "  netfn     = 0x%x\n", recv.msg.netfn);
+	   fprintf(stderr, "  cmd       = 0x%x\n", recv.msg.cmd);
+	   if (recv.msg.data && recv.msg.data_len) {
+	      fprintf(stderr, "  data_len  = %d\n", recv.msg.data_len);
+	      fprintf(stderr, "  data      = %s\n",
+		      buf2str(recv.msg.data, recv.msg.data_len));
+	   }
+	}
+
+	if(intf->transit_addr != 0 && intf->transit_addr != intf->my_addr) {
+	   /* ipmb_addr.transit_slave_addr = intf->transit_addr; */
+	   lprintf(LOG_DEBUG, "Decapsulating data received from transit "
+		   "IPMB target @ 0x%x", intf->transit_addr);
+
+	   /* comp code */
+	   /* Check data */
+
+	   if( recv.msg.data[0] == 0 ) {
+	      recv.msg.netfn = recv.msg.data[2] >> 2;
+	      recv.msg.cmd   = recv.msg.data[6];
+
+	      recv.msg.data = memmove(recv.msg.data ,recv.msg.data+7 , recv.msg.data_len - 7);
+	      recv.msg.data_len -=8;
+       
+	      if (verbose > 4) {   
+		 fprintf(stderr, "Decapsulated  message:\n");
+		 fprintf(stderr, "  netfn     = 0x%x\n",   recv.msg.netfn );
+		 fprintf(stderr, "  cmd       = 0x%x\n",  recv.msg.cmd);
+		 if (recv.msg.data && recv.msg.data_len) {
+		    fprintf(stderr, "  data_len  = %d\n",  recv.msg.data_len);
+		    fprintf(stderr, "  data      = %s\n",
+			    buf2str(recv.msg.data,recv.msg.data_len));
+		 }
+	      }
+	   }
+	}
+
+	/* save completion code */
+	rsp.ccode = recv.msg.data[0];
+	rsp.data_len = recv.msg.data_len - 1;
+
+	/* save response data for caller */
+	if (rsp.ccode == 0 && rsp.data_len > 0) {
+	   memmove(rsp.data, rsp.data + 1, rsp.data_len);
+	   rsp.data[rsp.data_len] = 0;
+	}
+
+	if (data != NULL) {
+	   free(data);
+		 data = NULL;
+	}
+
+	return &rsp;
+}
+
+int ipmi_openipmi_setup(struct ipmi_intf * intf)
+{
+	/* set default payload size */
+	intf->max_request_data_size = IPMI_OPENIPMI_MAX_RQ_DATA_SIZE;
+	intf->max_response_data_size = IPMI_OPENIPMI_MAX_RS_DATA_SIZE;
+
+	return 0;
+}
+
+struct ipmi_intf ipmi_open_intf = {
+	.name = "open",
+	.desc = "Linux OpenIPMI Interface",
+	.setup = ipmi_openipmi_setup,
+	.open = ipmi_openipmi_open,
+	.close = ipmi_openipmi_close,
+	.sendrecv = ipmi_openipmi_send_cmd,
+	.set_my_addr = ipmi_openipmi_set_my_addr,
+	.my_addr = IPMI_BMC_SLAVE_ADDR,
+	.target_addr = 0, /* init so -m local_addr does not cause bridging */
+};
diff --git a/src/plugins/open/open.h b/src/plugins/open/open.h
new file mode 100644
index 0000000..5d7aa5b
--- /dev/null
+++ b/src/plugins/open/open.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#ifndef IPMI_OPENIPMI_H
+#define IPMI_OPENIPMI_H
+
+#define IPMI_MAX_ADDR_SIZE		0x20
+#define IPMI_BMC_CHANNEL		0xf
+#define IPMI_NUM_CHANNELS		0x10
+
+#define IPMI_SYSTEM_INTERFACE_ADDR_TYPE	0x0c
+#define IPMI_IPMB_ADDR_TYPE		0x01
+#define IPMI_IPMB_BROADCAST_ADDR_TYPE	0x41
+
+#define IPMI_RESPONSE_RECV_TYPE		1
+#define IPMI_ASYNC_EVENT_RECV_TYPE	2
+#define IPMI_CMD_RECV_TYPE		3
+
+struct ipmi_addr {
+	int addr_type;
+	short channel;
+	char data[IPMI_MAX_ADDR_SIZE];
+};
+
+struct ipmi_msg {
+	unsigned char netfn;
+        unsigned char cmd;
+        unsigned short data_len;
+        unsigned char *data;
+};
+
+struct ipmi_req {
+	unsigned char *addr;
+	unsigned int addr_len;
+	long msgid;
+	struct ipmi_msg msg;
+};
+
+struct ipmi_recv {
+	int recv_type;
+	unsigned char *addr;
+	unsigned int addr_len;
+	long msgid;
+	struct ipmi_msg msg;
+};
+
+struct ipmi_cmdspec {
+	unsigned char netfn;
+	unsigned char cmd;
+};
+
+struct ipmi_system_interface_addr {
+	int addr_type;
+	short channel;
+	unsigned char lun;
+};
+
+struct ipmi_ipmb_addr {
+	int addr_type;
+	short channel;
+	unsigned char slave_addr;
+	unsigned char lun;
+};
+
+#define IPMI_IOC_MAGIC			'i'
+#define IPMICTL_RECEIVE_MSG_TRUNC	_IOWR(IPMI_IOC_MAGIC, 11, struct ipmi_recv)
+#define IPMICTL_RECEIVE_MSG		_IOWR(IPMI_IOC_MAGIC, 12, struct ipmi_recv)
+#define IPMICTL_SEND_COMMAND		_IOR(IPMI_IOC_MAGIC, 13, struct ipmi_req)
+#define IPMICTL_REGISTER_FOR_CMD	_IOR(IPMI_IOC_MAGIC, 14, struct ipmi_cmdspec)
+#define IPMICTL_UNREGISTER_FOR_CMD	_IOR(IPMI_IOC_MAGIC, 15, struct ipmi_cmdspec)
+#define IPMICTL_SET_GETS_EVENTS_CMD	_IOR(IPMI_IOC_MAGIC, 16, int)
+#define IPMICTL_SET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 17, unsigned int)
+#define IPMICTL_GET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 18, unsigned int)
+#define IPMICTL_SET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 19, unsigned int)
+#define IPMICTL_GET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 20, unsigned int)
+
+#endif /*IPMI_OPENIPMI_H*/
diff --git a/src/plugins/serial/Makefile.am b/src/plugins/serial/Makefile.am
new file mode 100644
index 0000000..c1a3083
--- /dev/null
+++ b/src/plugins/serial/Makefile.am
@@ -0,0 +1,38 @@
+# * Copyright (c) 2012 Pigeon Point Systems.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Pigeon Point Systems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_serial.la
+noinst_LTLIBRARIES	= @INTF_SERIAL_LIB@
+libintf_serial_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_serial_la_SOURCES	= serial_terminal.c serial_basic.c
diff --git a/src/plugins/serial/Makefile.in b/src/plugins/serial/Makefile.in
new file mode 100644
index 0000000..aa03dd8
--- /dev/null
+++ b/src/plugins/serial/Makefile.in
@@ -0,0 +1,638 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# * Copyright (c) 2012 Pigeon Point Systems.  All Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistribution of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 
+# Redistribution in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 
+# Neither the name of Pigeon Point Systems, Inc. or the names of
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any kind.
+# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+# PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+# PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+# EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/serial
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_serial_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_serial_la_OBJECTS = serial_terminal.lo serial_basic.lo
+libintf_serial_la_OBJECTS = $(am_libintf_serial_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_serial_la_SOURCES)
+DIST_SOURCES = $(libintf_serial_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_serial.la
+noinst_LTLIBRARIES = @INTF_SERIAL_LIB@
+libintf_serial_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_serial_la_SOURCES = serial_terminal.c serial_basic.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/serial/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/serial/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_serial.la: $(libintf_serial_la_OBJECTS) $(libintf_serial_la_DEPENDENCIES) $(EXTRA_libintf_serial_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_serial_la_OBJECTS) $(libintf_serial_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serial_basic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serial_terminal.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/serial/serial_basic.c b/src/plugins/serial/serial_basic.c
new file mode 100644
index 0000000..21a239a
--- /dev/null
+++ b/src/plugins/serial/serial_basic.c
@@ -0,0 +1,1014 @@
+/*
+ * Copyright (c) 2012 Pigeon Point Systems.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pigeon Point Systems nor the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _GNU_SOURCE 1
+
+/* Serial Interface, Basic Mode plugin. */
+
+#if defined HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <stdio.h>
+#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <poll.h>
+#include <termios.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#define SERIAL_BM_MAX_MSG_SIZE	47
+#define SERIAL_BM_MAX_RQ_SIZE	33	/* 40 - 7 */
+#define SERIAL_BM_MAX_RS_SIZE	32	/* 40 - 8 */
+#define	SERIAL_BM_TIMEOUT	5
+#define SERIAL_BM_RETRY_COUNT	5
+#define SERIAL_BM_MAX_BUFFER_SIZE 250
+
+#define BM_START		0xA0
+#define BM_STOP			0xA5
+#define BM_HANDSHAKE	0xA6
+#define BM_ESCAPE		0xAA
+
+/*
+ *	IPMB message header
+ */
+struct ipmb_msg_hdr {
+	unsigned char rsSA;
+	unsigned char netFn;	/* NET FN | RS LUN */
+	unsigned char csum1;
+	unsigned char rqSA;
+	unsigned char rqSeq;	/* RQ SEQ | RQ LUN */
+	unsigned char cmd;
+	unsigned char data[];
+};
+
+/*
+ *	Send Message command request for IPMB-format
+ */
+struct ipmi_send_message_rq {
+	unsigned char channel;
+	struct ipmb_msg_hdr msg;
+};
+
+/*
+ *	Get Message command response for IPMB-format
+ */
+struct ipmi_get_message_rp {
+	unsigned char completion;
+	unsigned char channel;
+	unsigned char netFn;
+	unsigned char csum1;
+	unsigned char rsSA;
+	unsigned char rqSeq;
+	unsigned char cmd;
+	unsigned char data[];
+};
+
+/*
+ *	State for the received message
+ */
+enum {
+	MSG_NONE,
+	MSG_IN_PROGRESS,
+	MSG_DONE
+};
+
+/*
+ *	Message parsing context
+ */
+struct  serial_bm_parse_ctx{
+	int state;
+	uint8_t * msg;
+	size_t msg_len;
+	size_t max_len;
+	int escape;
+};
+
+/*
+ *	Receiving context
+ */
+struct serial_bm_recv_ctx {
+	uint8_t buffer[SERIAL_BM_MAX_BUFFER_SIZE];
+	size_t buffer_size;
+	size_t max_buffer_size;
+};
+
+/*
+ *	Sending context
+ */
+struct serial_bm_request_ctx {
+	uint8_t rsSA;
+	uint8_t netFn;
+	uint8_t rqSA;
+	uint8_t rqSeq;
+	uint8_t cmd;
+};
+
+/*
+ *	Table of supported baud rates
+ */
+static const struct {
+	int baudinit;
+	int baudrate;
+} rates[] = {
+	{ B2400, 2400 },
+	{ B9600, 9600 },
+	{ B19200, 19200 },
+	{ B38400, 38400 },
+	{ B57600, 57600 },
+	{ B115200, 115200 },
+	{ B230400, 230400 },
+#ifdef B460800
+	{ B460800, 460800 },
+#endif
+};
+
+/*
+ *	Table of special characters
+ */
+static const struct {
+	uint8_t character;
+	uint8_t escape;
+} characters[] = {
+	{ BM_START,		0xB0 },	/* start */
+	{ BM_STOP,		0xB5 },	/* stop */
+	{ BM_HANDSHAKE,	0xB6 },	/* packet handshake */
+	{ BM_ESCAPE,	0xBA },	/* data escape */
+	{ 0x1B, 0x3B }			/* escape */
+};
+
+static int is_system;
+
+/*
+ *	Setup serial interface
+ */
+static int
+serial_bm_setup(struct ipmi_intf * intf)
+{
+	/* setup default LAN maximum request and response sizes */
+	intf->max_request_data_size = SERIAL_BM_MAX_RQ_SIZE;
+	intf->max_response_data_size = SERIAL_BM_MAX_RS_SIZE;
+
+	return 0;
+}
+
+/*
+ *	Open serial interface
+ */
+static int
+serial_bm_open(struct ipmi_intf * intf)
+{
+	struct termios ti;
+	unsigned int rate = 9600;
+	char *p;
+	int i;
+
+	if (!intf->devfile) {
+		lprintf(LOG_ERR, "Serial device is not specified");
+		return -1;
+	}
+
+	is_system = 0;
+
+	/* check if baud rate is specified */
+	if ((p = strchr(intf->devfile, ':'))) {
+		char * pp;
+
+		/* separate device name from baud rate */
+		*p++ = '\0';
+
+		/* check for second colon */
+		if ((pp = strchr(p, ':'))) {
+			/* this is needed to normally acquire baud rate */
+			*pp++ = '\0';
+
+			/* check if it is a system interface */
+			if (pp[0] == 'S' || pp[0] == 's') {
+				is_system = 1;
+			}
+		}
+
+		if (str2uint(p, &rate)) {
+			lprintf(LOG_ERR, "Invalid baud rate specified\n");
+			return -1;
+		}
+	}
+
+	intf->fd = open(intf->devfile, O_RDWR | O_NONBLOCK, 0);
+	if (intf->fd < 0) {
+		lperror(LOG_ERR, "Could not open device at %s", intf->devfile);
+		return -1;
+	}
+
+	for (i = 0; i < sizeof(rates) / sizeof(rates[0]); i++) {
+		if (rates[i].baudrate == rate) {
+			break;
+		}
+	}
+	if (i >= sizeof(rates) / sizeof(rates[0])) {
+		lprintf(LOG_ERR, "Unsupported baud rate %i specified", rate);
+		return -1;
+	}
+
+	tcgetattr(intf->fd, &ti);
+
+	cfsetispeed(&ti, rates[i].baudinit);
+	cfsetospeed(&ti, rates[i].baudinit);
+
+	/* 8N1 */
+	ti.c_cflag &= ~PARENB;
+	ti.c_cflag &= ~CSTOPB;
+	ti.c_cflag &= ~CSIZE;
+	ti.c_cflag |= CS8;
+
+	/* enable the receiver and set local mode */
+	ti.c_cflag |= (CLOCAL | CREAD);
+
+	/* no flow control */
+	ti.c_cflag &= ~CRTSCTS;
+	ti.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | INPCK | ISTRIP
+			| IXON | IXOFF | IXANY);
+#ifdef IUCLC
+        /* Only disable uppercase-to-lowercase mapping on input for
+	   platforms supporting the flag. */
+	ti.c_iflag &= ~(IUCLC);
+#endif
+
+
+	ti.c_oflag &= ~(OPOST);
+	ti.c_lflag &= ~(ICANON | ISIG | ECHO | ECHONL | NOFLSH);
+
+	/* set the new options for the port with flushing */
+	tcsetattr(intf->fd, TCSAFLUSH, &ti);
+
+	if (intf->ssn_params.timeout == 0)
+		intf->ssn_params.timeout = SERIAL_BM_TIMEOUT;
+	if (intf->ssn_params.retry == 0)
+		intf->ssn_params.retry = SERIAL_BM_RETRY_COUNT;
+
+	intf->opened = 1;
+
+	return 0;
+}
+
+/*
+ *	Close serial interface
+ */
+static void
+serial_bm_close(struct ipmi_intf * intf)
+{
+	if (intf->opened) {
+		close(intf->fd);
+		intf->fd = -1;
+	}
+	ipmi_intf_session_cleanup(intf);
+	intf->opened = 0;
+}
+
+/*
+ *	Allocate sequence number for tracking
+ */
+static uint8_t
+serial_bm_alloc_seq(void)
+{
+	static uint8_t seq = 0;
+	if (++seq == 64) {
+		seq = 0;
+	}
+	return seq;
+}
+
+/*
+ *	Flush the buffers
+ */
+static int
+serial_bm_flush(struct ipmi_intf * intf)
+{
+#if defined(TCFLSH)
+    return ioctl(intf->fd, TCFLSH, TCIOFLUSH);
+#elif defined(TIOCFLUSH)
+    return ioctl(intf->fd, TIOCFLUSH);
+#else
+#   error "unsupported platform, missing flush support (TCFLSH/TIOCFLUSH)"
+#endif
+}
+
+/*
+ *	Return escaped character for the given one
+ */
+static inline uint8_t
+serial_bm_get_escaped_char(uint8_t c)
+{
+	int i;
+
+	for (i = 0; i < 5; i++) {
+		if (characters[i].character == c) {
+			return characters[i].escape;
+		}
+	}
+
+	return c;
+}
+
+/*
+ *	Return unescaped character for the given one
+ */
+static inline uint8_t
+serial_bm_get_unescaped_char(uint8_t c)
+{
+	int i;
+
+	for (i = 0; i < 5; i++) {
+		if (characters[i].escape == c) {
+			return characters[i].character;
+		}
+	}
+
+	return c;
+}
+
+/*
+ *	Send message to serial port
+ */
+static int
+serial_bm_send_msg(struct ipmi_intf * intf, uint8_t * msg, int msg_len)
+{
+	int i, size, tmp = 0;
+	uint8_t * buf, * data;
+
+	if (verbose > 3) {
+		fprintf(stderr, "Sending request:\n");
+		fprintf(stderr, "  rsSA         = 0x%x\n", msg[0]);
+		fprintf(stderr, "  NetFN/rsLUN  = 0x%x\n", msg[1]);
+		fprintf(stderr, "  rqSA         = 0x%x\n", msg[3]);
+		fprintf(stderr, "  rqSeq/rqLUN  = 0x%x\n", msg[4]);
+		fprintf(stderr, "  cmd          = 0x%x\n", msg[5]);
+		if (msg_len > 7) {
+			fprintf(stderr, "  data_len     = %d\n", msg_len - 7);
+			fprintf(stderr, "  data         = %s\n",
+					buf2str(msg + 6, msg_len - 7));
+		}
+	}
+
+	if (verbose > 4) {
+		fprintf(stderr, "Message data:\n");
+		fprintf(stderr, " %s\n", buf2str(msg, msg_len));
+	}
+
+	/* calculate escaped characters number */
+	for (i = 0; i < msg_len; i++) {
+		if (serial_bm_get_escaped_char(msg[i]) != msg[i]) {
+			tmp++;
+		}
+	}
+
+	/* calculate required buffer size */
+	size = msg_len + tmp + 2;
+
+	/* allocate buffer for output data */
+	buf = data = (uint8_t *) alloca(size);
+
+	if (!buf) {
+		lperror(LOG_ERR, "ipmitool: alloca error");
+		return -1;
+	}
+
+	/* start character */
+	*buf++ = 0xA0;
+
+	for (i = 0; i < msg_len; i++) {
+		tmp = serial_bm_get_escaped_char(msg[i]);
+		if (tmp != msg[i]) {
+			*buf++ = 0xAA;
+		}
+
+		*buf++ = tmp;
+	}
+
+	/* stop character */
+	*buf++ = 0xA5;
+
+	if (verbose > 5) {
+		fprintf(stderr, "Sent serial data:\n %s\n", buf2str(data, size));
+	}
+
+	/* write data to serial port */
+	tmp = write(intf->fd, data, size);
+	if (tmp <= 0) {
+		lperror(LOG_ERR, "ipmitool: write error");
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ *	This function waits for incoming data
+ */
+static int
+serial_bm_wait_for_data(struct ipmi_intf * intf)
+{
+	int n;
+	struct pollfd pfd;
+
+	pfd.fd = intf->fd;
+	pfd.events = POLLIN;
+	pfd.revents = 0;
+
+	n = poll(&pfd, 1, intf->ssn_params.timeout * 1000);
+	if (n < 0) {
+		lperror(LOG_ERR, "Poll for serial data failed");
+		return -1;
+	} else if (!n) {
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ *	This function parses incoming data in basic mode format to IPMB message
+ */
+static int
+serial_bm_parse_buffer(const uint8_t * data, int data_len,
+		struct serial_bm_parse_ctx * ctx)
+{
+	int i, tmp;
+
+	for (i = 0; i < data_len; i++) {
+		/* check for start of new message */
+		if (data[i] == BM_START) {
+			ctx->state = MSG_IN_PROGRESS;
+			ctx->escape = 0;
+			ctx->msg_len = 0;
+		/* check if message is not started */
+		} else if (ctx->state != MSG_IN_PROGRESS) {
+			/* skip character */
+			continue;
+		/* continue escape sequence */
+		} else	if (ctx->escape) {
+			/* get original character */
+			tmp = serial_bm_get_unescaped_char(data[i]);
+
+			/* check if not special character */
+			if (tmp == data[i]) {
+				lprintf(LOG_ERR, "ipmitool: bad response");
+				/* reset message state */
+				ctx->state = MSG_NONE;
+				continue;
+			}
+
+			/* check message length */
+			if (ctx->msg_len >= ctx->max_len) {
+				lprintf(LOG_ERR, "ipmitool: response is too long");
+				/* reset message state */
+				ctx->state = MSG_NONE;
+				continue;
+			}
+
+			/* add parsed character */
+			ctx->msg[ctx->msg_len++] = tmp;
+
+			/* clear escape flag */
+			ctx->escape = 0;
+		/* check for escape character */
+		} else if (data[i] == BM_ESCAPE) {
+			ctx->escape = 1;
+			continue;
+		/* check for stop character */
+		} else if (data[i] == BM_STOP) {
+			ctx->state = MSG_DONE;
+			return i + 1;
+		/* check for packet handshake character */
+		} else if (data[i] == BM_HANDSHAKE) {
+			/* just skip it */
+			continue;
+		} else {
+			/* check message length */
+			if (ctx->msg_len >= ctx->max_len) {
+				lprintf(LOG_ERR, "ipmitool: response is too long");
+				return -1;
+			}
+
+			/* add parsed character */
+			ctx->msg[ctx->msg_len++] = data[i];
+		}
+	}
+
+	/* return number of parsed characters */
+	return i;
+}
+
+/*
+ *	Read and parse data from serial port
+ */
+static int
+serial_bm_recv_msg(struct ipmi_intf * intf,
+		struct serial_bm_recv_ctx * recv_ctx,
+		uint8_t * msg_data, size_t msg_len)
+{
+	struct serial_bm_parse_ctx parse_ctx;
+	int rv;
+
+	parse_ctx.state = MSG_NONE;
+	parse_ctx.msg = msg_data;
+	parse_ctx.max_len = msg_len;
+
+	do {
+		/* wait for data in the port */
+		if (serial_bm_wait_for_data(intf)) {
+			return 0;
+		}
+
+		/* read data into buffer */
+		rv = read(intf->fd, recv_ctx->buffer + recv_ctx->buffer_size,
+				recv_ctx->max_buffer_size - recv_ctx->buffer_size);
+
+		if (rv < 0) {
+			lperror(LOG_ERR, "ipmitool: read error");
+			return -1;
+		}
+
+		if (verbose > 5) {
+			fprintf(stderr, "Received serial data:\n %s\n",
+					buf2str(recv_ctx->buffer + recv_ctx->buffer_size, rv));
+		}
+
+		/* increment buffer size */
+		recv_ctx->buffer_size += rv;
+
+		/* parse buffer */
+		rv = serial_bm_parse_buffer(recv_ctx->buffer,
+				recv_ctx->buffer_size, &parse_ctx);
+
+		if (rv < recv_ctx->buffer_size) {
+			/* move non-parsed part of the buffer to the beginning */
+			memmove(recv_ctx->buffer, recv_ctx->buffer + rv,
+					recv_ctx->buffer_size - rv);
+		}
+
+		/* decrement buffer size */
+		recv_ctx->buffer_size -= rv;
+	} while (parse_ctx.state != MSG_DONE);
+
+	if (verbose > 4) {
+		printf("Received message:\n %s\n",
+				buf2str(msg_data, parse_ctx.msg_len));
+	}
+
+	/* received a message */
+	return parse_ctx.msg_len;
+}
+
+/*
+ *	Build IPMB message to be transmitted
+ */
+static int
+serial_bm_build_msg(const struct ipmi_intf * intf,
+		const struct ipmi_rq * req, uint8_t * msg, size_t max_len,
+		struct serial_bm_request_ctx * ctx, int * msg_len
+		)
+{
+	uint8_t * data = msg, seq;
+	struct ipmb_msg_hdr * hdr = (struct ipmb_msg_hdr *) msg;
+	struct ipmi_send_message_rq * inner_rq = NULL, * outer_rq = NULL;
+	int bridging_level;
+
+	/* acquire bridging level */
+	if (intf->target_addr && intf->target_addr != intf->my_addr) {
+		if (intf->transit_addr != 0) {
+			bridging_level = 2;
+		} else {
+			bridging_level = 1;
+		}
+	} else {
+		bridging_level = 0;
+	}
+
+	/* check overall packet length */
+	if(req->msg.data_len + 7 + bridging_level * 8 > max_len) {
+		lprintf(LOG_ERR, "ipmitool: Message data is too long");
+		return -1;
+	}
+
+	/* allocate new sequence number */
+	seq = serial_bm_alloc_seq() << 2;
+
+	if (bridging_level) {
+		/* compose send message request */
+		hdr->netFn = 0x18;
+		hdr->cmd = 0x34;
+
+		/* set pointer to send message request data */
+		outer_rq = (struct ipmi_send_message_rq *) (hdr + 1);
+
+		/* compose the outer send message request */
+		if (bridging_level == 2) {
+			outer_rq->channel = intf->transit_channel | 0x40;
+			outer_rq->msg.rsSA = intf->transit_addr;
+			outer_rq->msg.netFn = 0x18;
+			outer_rq->msg.csum1 = -(outer_rq->msg.rsSA + outer_rq->msg.netFn);
+			outer_rq->msg.rqSA = intf->my_addr;
+			outer_rq->msg.rqSeq = seq;
+			outer_rq->msg.cmd = 0x34;
+
+			/* inner send message request is further */
+			inner_rq = (outer_rq + 1);
+		} else {
+			/* there is only outer send message reuest */
+			inner_rq = outer_rq;
+		}
+
+		/* compose the inner send message request */
+		inner_rq->channel = intf->target_channel | 0x40;
+		inner_rq->msg.rsSA = intf->target_addr;
+		inner_rq->msg.netFn = (req->msg.netfn << 2) | req->msg.lun;
+		inner_rq->msg.csum1 = -(inner_rq->msg.rsSA + inner_rq->msg.netFn);
+		inner_rq->msg.rqSA = intf->my_addr;
+		inner_rq->msg.rqSeq = seq;
+		inner_rq->msg.cmd = req->msg.cmd;
+
+		/* check if interface is the system one */
+		if (is_system) {
+			/* need response to LUN 2 */
+			outer_rq->msg.rqSeq |= 2;
+
+			/* do not track response */
+			outer_rq->channel &= ~0x40;
+
+			/* restore BMC SA if bridging not to primary IPMB channel */
+			if (outer_rq->channel) {
+				outer_rq->msg.rqSA = IPMI_BMC_SLAVE_ADDR;
+			}
+		}
+
+		/* fill-in the second context */
+		ctx[1].rsSA = outer_rq->msg.rsSA;
+		ctx[1].netFn = outer_rq->msg.netFn;
+		ctx[1].rqSA = outer_rq->msg.rqSA;
+		ctx[1].rqSeq = outer_rq->msg.rqSeq;
+		ctx[1].cmd = outer_rq->msg.cmd;
+
+		/* move write pointer */
+		msg = (uint8_t *)(inner_rq + 1);
+	} else {
+		/* compose direct request */
+		hdr->netFn = (req->msg.netfn << 2) | req->msg.lun;
+		hdr->cmd = req->msg.cmd;
+
+		/* move write pointer */
+		msg = (uint8_t *)(hdr + 1);
+	}
+
+	/* fill-in the rest header fields */
+	hdr->rsSA = IPMI_BMC_SLAVE_ADDR;
+	hdr->csum1 = -(hdr->rsSA + hdr->netFn);
+	hdr->rqSA = IPMI_REMOTE_SWID;
+	hdr->rqSeq = seq;
+
+	/* fill-in the first context */
+	ctx[0].rsSA = hdr->rsSA;
+	ctx[0].netFn = hdr->netFn;
+	ctx[0].rqSA = hdr->rqSA;
+	ctx[0].rqSeq = hdr->rqSeq;
+	ctx[0].cmd = hdr->cmd;
+
+	/* write request data */
+	memcpy(msg, req->msg.data, req->msg.data_len);
+
+	/* move write pointer */
+	msg += req->msg.data_len;
+
+	if (bridging_level) {
+		/* write inner message checksum */
+		*msg++ = ipmi_csum(&inner_rq->msg.rqSA, req->msg.data_len + 3);
+
+		/* check for double bridging */
+		if (bridging_level == 2) {
+			/* write outer message checksum */
+			*msg++ = ipmi_csum(&outer_rq->msg.rqSA, 4);
+		}
+
+		/* write overall message checksum */
+		*msg++ = ipmi_csum(&hdr->rqSA, 4);
+	} else {
+		/* write overall message checksum */
+		*msg++ = ipmi_csum(&hdr->rqSA, req->msg.data_len + 3);
+	}
+
+	/* save message length */
+	*msg_len = msg - data;
+
+	/* return bridging level */
+	return bridging_level;
+}
+
+/*
+ *	Wait for request response
+ */
+static int
+serial_bm_wait_response(struct ipmi_intf * intf,
+		struct serial_bm_request_ctx * req_ctx, struct serial_bm_recv_ctx * read_ctx,
+		uint8_t * msg, size_t max_len)
+{
+	struct ipmb_msg_hdr * hdr = (struct ipmb_msg_hdr *) msg;
+	int msg_len, netFn, rqSeq;
+
+	/* receive and match message */
+	while ((msg_len = serial_bm_recv_msg(intf, read_ctx, msg, max_len)) > 0) {
+		/* validate message size */
+		if (msg_len < 8) {
+			lprintf(LOG_ERR, "ipmitool: response is too short");
+			continue;
+		}
+
+		/* validate checksum 1 */
+		if (ipmi_csum(msg, 3)) {
+			lprintf(LOG_ERR, "ipmitool: bad checksum 1");
+			continue;
+		}
+
+		/* validate checksum 2 */
+		if (ipmi_csum(msg + 3, msg_len - 3)) {
+			lprintf(LOG_ERR, "ipmitool: bad checksum 2");
+			continue;
+		}
+
+		/* swap requester and responder LUNs */
+		netFn = ((req_ctx->netFn|4) & ~3) | (req_ctx->rqSeq & 3);
+		rqSeq = (req_ctx->rqSeq & ~3) | (req_ctx->netFn & 3);
+
+		/* check for the waited response */
+		if (hdr->rsSA == req_ctx->rqSA
+				&& hdr->netFn == netFn
+				&& hdr->rqSA == req_ctx->rsSA
+				&& hdr->rqSeq == rqSeq
+				&& hdr->cmd == req_ctx->cmd) {
+			/* check if something new has been parsed */
+			if (verbose > 3) {
+				fprintf(stderr, "Got response:\n");
+				fprintf(stderr, "  rsSA            = 0x%x\n", msg[0]);
+				fprintf(stderr, "  NetFN/rsLUN     = 0x%x\n", msg[1]);
+				fprintf(stderr, "  rqSA            = 0x%x\n", msg[3]);
+				fprintf(stderr, "  rqSeq/rqLUN     = 0x%x\n", msg[4]);
+				fprintf(stderr, "  cmd             = 0x%x\n", msg[5]);
+				fprintf(stderr, "  completion code = 0x%x\n", msg[6]);
+				if (msg_len > 8) {
+					fprintf(stderr, "  data_len        = %d\n", msg_len - 8);
+					fprintf(stderr, "  data            = %s\n",
+							buf2str(msg + 7, msg_len - 8));
+				}
+			}
+
+			/* copy only completion and response data */
+			memmove(msg, hdr + 1, msg_len - sizeof (*hdr) - 1);
+
+			/* update message length */
+			msg_len -= sizeof (*hdr) + 1;
+
+			/* the waited one */
+			break;
+		}
+	}
+
+	return msg_len;
+}
+
+/*
+ *	Get message from receive message queue
+ */
+static int
+serial_bm_get_message(struct ipmi_intf * intf,
+		struct serial_bm_request_ctx * req_ctx,
+		struct serial_bm_recv_ctx * read_ctx,
+		uint8_t * msg, size_t max_len)
+{
+	uint8_t data[SERIAL_BM_MAX_MSG_SIZE];
+	struct serial_bm_request_ctx tmp_ctx;
+	struct ipmi_get_message_rp * rp = (struct ipmi_get_message_rp *) data;
+	struct ipmb_msg_hdr * hdr = (struct ipmb_msg_hdr *) data;
+	clock_t start, tm;
+	int rv, netFn, rqSeq;
+
+	start = clock();
+
+	do {
+		/* fill-in request context */
+		tmp_ctx.rsSA = IPMI_BMC_SLAVE_ADDR;
+		tmp_ctx.netFn = 0x18;
+		tmp_ctx.rqSA = IPMI_REMOTE_SWID;
+		tmp_ctx.rqSeq = serial_bm_alloc_seq() << 2;
+		tmp_ctx.cmd = 0x33;
+
+		/* fill-in request data */
+		hdr->rsSA = tmp_ctx.rsSA;
+		hdr->netFn = tmp_ctx.netFn;
+		hdr->csum1 = ipmi_csum(data, 2);
+		hdr->rqSA = tmp_ctx.rqSA;
+		hdr->rqSeq = tmp_ctx.rqSeq;
+		hdr->cmd = tmp_ctx.cmd;
+		hdr->data[0] = ipmi_csum(&hdr->rqSA, 3);
+
+		/* send request */
+		serial_bm_flush(intf);
+		serial_bm_send_msg(intf, data, 7);
+
+		/* wait for response */
+		rv = serial_bm_wait_response(intf, &tmp_ctx, read_ctx,
+				data, sizeof (data));
+
+		/* check for IO error or timeout */
+		if (rv <= 0) {
+			return rv;
+		}
+
+		/* check completion code */
+		if (rp->completion == 0) {
+			/* swap requester and responder LUNs */
+			netFn = ((req_ctx->netFn|4) & ~3) | (req_ctx->rqSeq & 3);
+			rqSeq = (req_ctx->rqSeq & ~3) | (req_ctx->netFn & 3);
+
+			/* check for the waited response */
+			if (rp->netFn == netFn
+					&& rp->rsSA == req_ctx->rsSA
+					&& rp->rqSeq == rqSeq
+					&& rp->cmd == req_ctx->cmd) {
+				/* copy the rest of message */
+				memcpy(msg, rp->data, rv - sizeof (*rp) - 1);
+				return rv - sizeof (*rp) - 1;
+			}
+		} else if (rp->completion != 0x80) {
+			return 0;
+		}
+
+		tm = clock() - start;
+
+		tm /= CLOCKS_PER_SEC;
+	} while (tm < intf->ssn_params.timeout);
+
+	return 0;
+}
+
+static struct ipmi_rs *
+serial_bm_send_request(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	static struct ipmi_rs rsp;
+	uint8_t msg[SERIAL_BM_MAX_MSG_SIZE], * resp = msg;
+	struct serial_bm_request_ctx req_ctx[3];
+	struct serial_bm_recv_ctx read_ctx;
+	int retry, rv, msg_len, bridging_level;
+
+	if (!intf->opened && intf->open && intf->open(intf) < 0) {
+		return NULL;
+	}
+
+	/* reset receive context */
+	read_ctx.buffer_size = 0;
+	read_ctx.max_buffer_size = SERIAL_BM_MAX_BUFFER_SIZE;
+
+	/* Send the message and receive the answer */
+	for (retry = 0; retry < intf->ssn_params.retry; retry++) {
+		/* build output message */
+		bridging_level = serial_bm_build_msg(intf, req, msg,
+				sizeof (msg), req_ctx, &msg_len);
+		if (msg_len < 0) {
+			return NULL;
+		}
+
+		/* send request */
+		serial_bm_flush(intf);
+		serial_bm_send_msg(intf, msg, msg_len);
+
+		/* wait for response */
+		rv = serial_bm_wait_response(intf, &req_ctx[0],
+				&read_ctx, msg, sizeof (msg));
+
+		/* check for IO error */
+		if (rv < 0) {
+			return NULL;
+		}
+
+		/* check for timeout */
+		if (rv == 0) {
+			continue;
+		}
+
+		/* check for bridging */
+		if (bridging_level && msg[0] == 0) {
+			/* in the case of payload interface we check receive message queue */
+			if (is_system) {
+				/* check message flags */
+				rv = serial_bm_get_message(intf, &req_ctx[1],
+						&read_ctx, msg, sizeof (msg));
+
+				/* check for IO error */
+				if (rv < 0) {
+					return NULL;
+				}
+
+				/* check for timeout */
+				if (rv == 0) {
+					continue;
+				}
+			/* check if response for inner request is not encapsulated */
+			} else if (rv == 1) {
+				/* wait for response for inner request */
+				rv = serial_bm_wait_response(intf, &req_ctx[1],
+						&read_ctx, msg, sizeof (msg));
+
+				/* check for IO error */
+				if (rv < 0) {
+					return NULL;
+				}
+
+				/* check for timeout */
+				if (rv == 0) {
+					continue;
+				}
+			} else {
+				/* skip outer level header */
+				resp = msg + 7;
+				/* decrement response size */
+				rv -= 8;
+			}
+
+			/* check response size */
+			if (resp[0] == 0 && bridging_level == 2 && rv < 8) {
+				lprintf(LOG_ERR, "ipmitool: Message response is too short");
+				/* invalid message length */
+				return NULL;
+			}
+		}
+
+		/* check for double bridging */
+		if (bridging_level == 2 && resp[0] == 0) {
+			/* get completion code */
+			rsp.ccode = resp[7];
+			rsp.data_len = rv - 9;
+			memcpy(rsp.data, resp + 8, rsp.data_len);
+		} else {
+			rsp.ccode = resp[0];
+			rsp.data_len = rv - 1;
+			memcpy(rsp.data, resp + 1, rsp.data_len);
+		}
+
+		/* return response */
+		return &rsp;
+	}
+
+	/* no valid response */
+	return NULL;
+}
+
+/*
+ *	Serial BM interface
+ */
+struct ipmi_intf ipmi_serial_bm_intf = {
+	.name = "serial-basic",
+	.desc = "Serial Interface, Basic Mode",
+	.setup = serial_bm_setup,
+	.open = serial_bm_open,
+	.close = serial_bm_close,
+	.sendrecv = serial_bm_send_request,
+};
diff --git a/src/plugins/serial/serial_terminal.c b/src/plugins/serial/serial_terminal.c
new file mode 100644
index 0000000..4459f64
--- /dev/null
+++ b/src/plugins/serial/serial_terminal.c
@@ -0,0 +1,904 @@
+/*
+ * Copyright (c) 2007-2012 Pigeon Point Systems.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Pigeon Point Systems nor the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * PIGEON POINT SYSTEMS ("PPS") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * PPS OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+#define _GNU_SOURCE 1
+
+/* Serial Interface, Terminal Mode plugin. */
+
+#if defined HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <poll.h>
+#include <termios.h>
+
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#define	IPMI_SERIAL_TIMEOUT		5
+#define IPMI_SERIAL_RETRY		5
+#define IPMI_SERIAL_MAX_RESPONSE	256
+
+/*
+ *	Terminal Mode interface is required to support 40 byte transactions.
+ */
+#define IPMI_SERIAL_MAX_RQ_SIZE	37	/* 40 - 3 */
+#define IPMI_SERIAL_MAX_RS_SIZE	36	/* 40 - 4 */
+
+/*
+ *	IPMB message header
+ */
+struct ipmb_msg_hdr {
+	unsigned char rsSA;
+	unsigned char netFn;	/* NET FN | RS LUN */
+	unsigned char csum1;
+	unsigned char rqSA;
+	unsigned char rqSeq;	/* RQ SEQ | RQ LUN */
+	unsigned char cmd;
+	unsigned char data[];
+};
+
+/*
+ *	Send Message command request for IPMB-format
+ */
+struct ipmi_send_message_rq {
+	unsigned char channel;
+	struct ipmb_msg_hdr msg;
+};
+
+/*
+ *	Get Message command response for IPMB-format
+ */
+struct ipmi_get_message_rp {
+	unsigned char completion;
+	unsigned char channel;
+	unsigned char netFn;
+	unsigned char csum1;
+	unsigned char rsSA;
+	unsigned char rqSeq;
+	unsigned char cmd;
+	unsigned char data[];
+};
+
+/*
+ *	Terminal mode message header
+ */
+struct serial_term_hdr {
+	unsigned char netFn;
+	unsigned char seq;
+	unsigned char cmd;
+};
+
+/*
+ *	Sending context
+ */
+struct serial_term_request_ctx {
+	uint8_t netFn;
+	uint8_t sa;
+	uint8_t seq;
+	uint8_t cmd;
+};
+
+/*
+ *	Table of supported baud rates
+ */
+static const struct {
+	int baudinit;
+	int baudrate;
+} rates[] = {
+	{ B2400, 2400 },
+	{ B9600, 9600 },
+	{ B19200, 19200 },
+	{ B38400, 38400 },
+	{ B57600, 57600 },
+	{ B115200, 115200 },
+	{ B230400, 230400 },
+#ifdef B460800
+	{ B460800, 460800 },
+#endif
+};
+
+static int is_system;
+
+static int
+ipmi_serial_term_open(struct ipmi_intf * intf)
+{
+	struct termios ti;
+	unsigned int rate = 9600;
+	char *p;
+	int i;
+
+	if (!intf->devfile) {
+		lprintf(LOG_ERR, "Serial device is not specified");
+		return -1;
+	}
+
+	is_system = 0;
+
+	/* check if baud rate is specified */
+	if ((p = strchr(intf->devfile, ':'))) {
+		char * pp;
+
+		/* separate device name from baud rate */
+		*p++ = '\0';
+
+		/* check for second colon */
+		if ((pp = strchr(p, ':'))) {
+			/* this is needed to normally acquire baud rate */
+			*pp++ = '\0';
+
+			/* check if it is a system interface */
+			if (pp[0] == 'S' || pp[0] == 's') {
+				is_system = 1;
+			}
+		}
+
+		if (str2uint(p, &rate)) {
+			lprintf(LOG_ERR, "Invalid baud rate specified\n");
+			return -1;
+		}
+	}
+
+	intf->fd = open(intf->devfile, O_RDWR | O_NONBLOCK, 0);
+	if (intf->fd < 0) {
+		lperror(LOG_ERR, "Could not open device at %s", intf->devfile);
+		return -1;
+	}
+
+	for (i = 0; i < sizeof(rates) / sizeof(rates[0]); i++) {
+		if (rates[i].baudrate == rate) {
+			break;
+		}
+	}
+	if (i >= sizeof(rates) / sizeof(rates[0])) {
+		lprintf(LOG_ERR, "Unsupported baud rate %i specified", rate);
+		return -1;
+	}
+
+	tcgetattr(intf->fd, &ti);
+
+	cfsetispeed(&ti, rates[i].baudinit);
+	cfsetospeed(&ti, rates[i].baudinit);
+
+	/* 8N1 */
+	ti.c_cflag &= ~PARENB;
+	ti.c_cflag &= ~CSTOPB;
+	ti.c_cflag &= ~CSIZE;
+	ti.c_cflag |= CS8;
+
+	/* enable the receiver and set local mode */
+	ti.c_cflag |= (CLOCAL | CREAD);
+
+	/* no flow control */
+	ti.c_cflag &= ~CRTSCTS;
+	ti.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | INPCK | ISTRIP
+			| IXON | IXOFF | IXANY);
+#ifdef IUCLC
+        /* Only disable uppercase-to-lowercase mapping on input for
+	   platforms supporting the flag. */
+	ti.c_iflag &= ~(IUCLC);
+#endif
+
+	ti.c_oflag &= ~(OPOST);
+	ti.c_lflag &= ~(ICANON | ISIG | ECHO | ECHONL | NOFLSH);
+
+	/* set the new options for the port with flushing */
+	tcsetattr(intf->fd, TCSAFLUSH, &ti);
+
+	if (intf->ssn_params.timeout == 0)
+		intf->ssn_params.timeout = IPMI_SERIAL_TIMEOUT;
+	if (intf->ssn_params.retry == 0)
+		intf->ssn_params.retry = IPMI_SERIAL_RETRY;
+
+	intf->opened = 1;
+
+	return 0;
+}
+
+static void
+ipmi_serial_term_close(struct ipmi_intf * intf)
+{
+	if (intf->opened) {
+		close(intf->fd);
+		intf->fd = -1;
+	}
+	ipmi_intf_session_cleanup(intf);
+	intf->opened = 0;
+}
+
+/*
+ *	This function waits for incoming byte during timeout (ms).
+ */
+static int
+serial_wait_for_data(struct ipmi_intf * intf)
+{
+	int n;
+	struct pollfd pfd;
+
+	pfd.fd = intf->fd;
+	pfd.events = POLLIN;
+	pfd.revents = 0;
+
+	n = poll(&pfd, 1, intf->ssn_params.timeout*1000);
+	if (n < 0) {
+		lperror(LOG_ERR, "Poll for serial data failed");
+		return -1;
+	} else if (!n) {
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ *	Read a line from serial port
+ *	Returns > 0 if there is a line, < 0 on error or timeout
+ */
+static int
+serial_read_line(struct ipmi_intf * intf, char *str, int len)
+{
+	int rv, i;
+
+	*str = 0;
+	i = 0;
+	while (i < len) {
+		if (serial_wait_for_data(intf)) {
+			return -1;
+		}
+		rv = read(intf->fd, str + i, 1);
+		if (rv < 0) {
+			return -1;
+		} else if (!rv) {
+			lperror(LOG_ERR, "Serial read failed: %s", strerror(errno));
+			return -1;
+		}
+		if (str[i] == '\n' || str[i] == '\r') {
+			if (verbose > 4) {
+				char c = str[i];
+				str[i] = '\0';
+				fprintf(stderr, "Received data: %s\n", str);
+				str[i] = c;
+			}
+			return i + 1;
+		} else {
+			i++;
+		}
+	}
+
+	lprintf(LOG_ERR, "Serial data is too long");
+	return -1;
+}
+
+/*
+ *	Send zero-terminated string to serial port
+ *	Returns the string length or negative error code
+ */
+static int
+serial_write_line(struct ipmi_intf * intf, const char *str)
+{
+	int rv, cnt = 0;
+	int cb = strlen(str);
+
+	while (cnt < cb) {
+		rv = write(intf->fd, str + cnt, cb - cnt);
+		if (rv < 0) {
+			return -1;
+		} else if (rv == 0) {
+			return -1;
+		}
+		cnt += rv;
+	}
+
+	return cnt;
+}
+
+/*
+ *	Flush the buffers
+ */
+static int
+serial_flush(struct ipmi_intf * intf)
+{
+#if defined(TCFLSH)
+    return ioctl(intf->fd, TCFLSH, TCIOFLUSH);
+#elif defined(TIOCFLUSH)
+    return ioctl(intf->fd, TIOCFLUSH);
+#else
+#   error "unsupported platform, missing flush support (TCFLSH/TIOCFLUSH)"
+#endif
+
+}
+
+/*
+ *	Receive IPMI response from the device
+ *	Len: buffer size
+ *	Returns: -1 or response lenth on success
+ */
+static int
+recv_response(struct ipmi_intf * intf, unsigned char *data, int len)
+{
+	char hex_rs[IPMI_SERIAL_MAX_RESPONSE * 3];
+	int i, j, resp_len = 0;
+	long rv;
+	char *p, *pp;
+	char ch, str_hex[3];
+
+	p = hex_rs;
+	while (1) {
+		if ((rv = serial_read_line(intf, p, sizeof(hex_rs) - resp_len)) < 0) {
+			/* error */
+			return -1;
+		}
+		p += rv;
+		resp_len += rv;
+		if (resp_len >= 2 && *(p - 2) == ']'
+			&& (*(p - 1) == '\n' || *(p - 1) == '\r')) {
+			*(p - 1) = 0; /* overwrite EOL */
+			break;
+		}
+	}
+
+	p = strrchr(hex_rs, '[');
+	if (!p) {
+		lprintf(LOG_ERR, "Serial response is invalid");
+		return -1;
+	}
+
+	p++;
+	pp = strchr(p, ']');
+	if (!pp) {
+		lprintf(LOG_ERR, "Serial response is invalid");
+		return -1;
+	}
+	*pp = 0;
+
+	/* was it an error? */
+	if (strncmp(p, "ERR ", 4) == 0) {
+		serial_write_line(intf, "\r\r\r\r");
+		sleep(1);
+		serial_flush(intf);
+		errno = 0;
+		rv = strtoul(p + 4, &p, 16);
+		if ((rv && rv < 0x100 && *p == '\0')
+				|| (rv == 0 && !errno)) {
+			/* The message didn't get it through. The upper
+			   level will have to re-send */
+			return 0;
+		} else {
+			lprintf(LOG_ERR, "Serial response is invalid");
+			return -1;
+		}
+	}
+
+	/* this is needed for correct string to long conversion */
+	str_hex[2] = 0;
+
+	/* parse the response */
+	i = 0;
+	j = 0;
+	while (*p) {
+		if (i >= len) {
+			lprintf(LOG_ERR, "Serial response is too long(%d, %d)", i, len);
+			return -1;
+		}
+		ch = *(p++);
+		if (isxdigit(ch)) {
+			str_hex[j++] = ch;
+		} else {
+			if (j == 1 || !isspace(ch)) {
+				lprintf(LOG_ERR, "Serial response is invalid");
+				return -1;
+			}
+		}
+		if (j == 2) {
+			unsigned long tmp;
+			errno = 0;
+			/* parse the hex number */
+			tmp = strtoul(str_hex, NULL, 16);
+			if ( tmp > 0xFF || ( !tmp && errno ) ) {
+				lprintf(LOG_ERR, "Serial response is invalid");
+				return -1;
+			}
+			data[i++] = tmp;
+			j = 0;
+		}
+	}
+
+	return i;
+}
+
+/*
+ *	Allocate sequence number for tracking
+ */
+static uint8_t
+serial_term_alloc_seq(void)
+{
+	static uint8_t seq = 0;
+	if (++seq == 64) {
+		seq = 0;
+	}
+	return seq;
+}
+
+/*
+ *	Build IPMB message to be transmitted
+ */
+static int
+serial_term_build_msg(const struct ipmi_intf * intf,
+		const struct ipmi_rq * req, uint8_t * msg, size_t max_len,
+		struct serial_term_request_ctx * ctx, int * msg_len)
+{
+	uint8_t * data = msg, seq;
+	struct serial_term_hdr * term_hdr = (struct serial_term_hdr *) msg;
+	struct ipmi_send_message_rq * outer_rq = NULL;
+	struct ipmi_send_message_rq * inner_rq = NULL;
+	int bridging_level;
+
+	/* acquire bridging level */
+	if (intf->target_addr && intf->target_addr != intf->my_addr) {
+		if (intf->transit_addr != 0) {
+			bridging_level = 2;
+		} else {
+			bridging_level = 1;
+		}
+	} else {
+		bridging_level = 0;
+	}
+
+	/* check overall packet length */
+	if(req->msg.data_len + 3 + bridging_level * 8 > max_len) {
+		lprintf(LOG_ERR, "ipmitool: Message data is too long");
+		return -1;
+	}
+
+	/* allocate new sequence number */
+	seq = serial_term_alloc_seq() << 2;
+
+	/* check for bridging */
+	if (bridging_level) {
+		/* compose terminal message header */
+		term_hdr->netFn = 0x18;
+		term_hdr->seq = seq;
+		term_hdr->cmd = 0x34;
+
+		/* set pointer to send message request data */
+		outer_rq = (struct ipmi_send_message_rq *) (term_hdr + 1);
+
+		if (bridging_level == 2) {
+			/* compose the outer send message request */
+			outer_rq->channel = intf->transit_channel | 0x40;
+			outer_rq->msg.rsSA = intf->transit_addr;
+			outer_rq->msg.netFn = 0x18;
+			outer_rq->msg.csum1 = -(outer_rq->msg.rsSA + outer_rq->msg.netFn);
+			outer_rq->msg.rqSA = intf->my_addr;
+			outer_rq->msg.rqSeq = seq;
+			outer_rq->msg.cmd = 0x34;
+
+			/* inner request is further */
+			inner_rq = (outer_rq + 1);
+		} else {
+			/* there is only one header */
+			inner_rq = outer_rq;
+		}
+
+		/* compose the inner send message request */
+		inner_rq->channel = intf->target_channel | 0x40;
+		inner_rq->msg.rsSA = intf->target_addr;
+		inner_rq->msg.netFn = (req->msg.netfn << 2) | req->msg.lun;
+		inner_rq->msg.csum1 = -(inner_rq->msg.rsSA + inner_rq->msg.netFn);
+		inner_rq->msg.rqSA = intf->my_addr;
+		inner_rq->msg.rqSeq = seq;
+		inner_rq->msg.cmd = req->msg.cmd;
+
+		/* check if interface is the system one */
+		if (is_system) {
+			/* need response to LUN 2 */
+			outer_rq->msg.rqSeq |= 2;
+
+			/* do not track response */
+			outer_rq->channel &= ~0x40;
+
+			/* restore BMC SA if bridging not to primary IPMB channel */
+			if (outer_rq->channel) {
+				outer_rq->msg.rqSA = IPMI_BMC_SLAVE_ADDR;
+			}
+		}
+
+		/* fill the second context */
+		ctx[1].netFn = outer_rq->msg.netFn;
+		ctx[1].sa = outer_rq->msg.rsSA;
+		ctx[1].seq = outer_rq->msg.rqSeq;
+		ctx[1].cmd = outer_rq->msg.cmd;
+
+		/* move write pointer */
+		msg = (uint8_t *)(inner_rq + 1);
+	} else {
+		/* compose terminal message header */
+		term_hdr->netFn = (req->msg.netfn << 2) | req->msg.lun;
+		term_hdr->seq = seq;
+		term_hdr->cmd = req->msg.cmd;
+
+		/* move write pointer */
+		msg = (uint8_t *)(term_hdr + 1);
+	}
+
+	/* fill the first context */
+	ctx[0].netFn = term_hdr->netFn;
+	ctx[0].seq = term_hdr->seq;
+	ctx[0].cmd = term_hdr->cmd;
+
+	/* write request data */
+	memcpy(msg, req->msg.data, req->msg.data_len);
+
+	/* move write pointer */
+	msg += req->msg.data_len;
+
+	if (bridging_level) {
+		/* write inner message checksum */
+		*msg++ = ipmi_csum(&inner_rq->msg.rqSA, req->msg.data_len + 3);
+
+		/* check for double bridging */
+		if (bridging_level == 2) {
+			/* write outer message checksum */
+			*msg++ = ipmi_csum(&outer_rq->msg.rqSA, 4);
+		}
+	}
+
+
+	/* save message length */
+	*msg_len = msg - data;
+
+	/* return bridging level */
+	return bridging_level;
+}
+
+/*
+ *	Send message to serial port
+ */
+static int
+serial_term_send_msg(struct ipmi_intf * intf, uint8_t * msg, int msg_len)
+{
+	int i, size, tmp = 0;
+	uint8_t * buf, * data;
+
+	if (verbose > 3) {
+		fprintf(stderr, "Sending request:\n");
+		fprintf(stderr, "  NetFN/rsLUN  = 0x%x\n", msg[0]);
+		fprintf(stderr, "  rqSeq        = 0x%x\n", msg[1]);
+		fprintf(stderr, "  cmd          = 0x%x\n", msg[2]);
+		if (msg_len > 7) {
+			fprintf(stderr, "  data_len     = %d\n", msg_len - 3);
+			fprintf(stderr, "  data         = %s\n",
+					buf2str(msg + 3, msg_len - 3));
+		}
+	}
+
+	if (verbose > 4) {
+		fprintf(stderr, "Message data:\n");
+		fprintf(stderr, " %s\n", buf2str(msg, msg_len));
+	}
+
+	/* calculate required buffer size */
+	size = msg_len * 2 + 4;
+
+	/* allocate buffer for output data */
+	buf = data = (uint8_t *) alloca(size);
+
+	if (!buf) {
+		lperror(LOG_ERR, "ipmitool: alloca error");
+		return -1;
+	}
+
+	/* start character */
+	*buf++ = '[';
+
+	/* body */
+	for (i = 0; i < msg_len; i++) {
+		buf += sprintf( buf, "%02x", msg[i]);
+	}
+
+	/* stop character */
+	*buf++ = ']';
+
+	/* carriage return */
+	*buf++ = '\r';
+
+	/* line feed */
+	*buf++ = '\n';
+
+	/* write data to serial port */
+	tmp = write(intf->fd, data, size);
+	if (tmp <= 0) {
+		lperror(LOG_ERR, "ipmitool: write error");
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ *	Wait for request response
+ */
+static int
+serial_term_wait_response(struct ipmi_intf * intf,
+		struct serial_term_request_ctx * req_ctx,
+		uint8_t * msg, size_t max_len)
+{
+	struct serial_term_hdr * hdr = (struct serial_term_hdr *) msg;
+	int msg_len;
+
+	/* wait for response(s) */
+	do {
+		/* receive message */
+		msg_len = recv_response(intf, msg, max_len);
+
+		/* check if valid message received  */
+		if (msg_len > 0) {
+			/* validate message size */
+			if (msg_len < 4) {
+				/* either bad response or non-related message */
+				continue;
+			}
+
+			/* check for the waited response */
+			if (hdr->netFn == (req_ctx->netFn|4)
+					&& (hdr->seq & ~3) == req_ctx->seq
+					&& hdr->cmd == req_ctx->cmd) {
+				/* check if something new has been parsed */
+				if (verbose > 3) {
+					fprintf(stderr, "Got response:\n");
+					fprintf(stderr, "  NetFN/rsLUN     = 0x%x\n", msg[0]);
+					fprintf(stderr, "  rqSeq/Bridge    = 0x%x\n", msg[1]);
+					fprintf(stderr, "  cmd             = 0x%x\n", msg[2]);
+					fprintf(stderr, "  completion code = 0x%x\n", msg[3]);
+					if (msg_len > 8) {
+						fprintf(stderr, "  data_len        = %d\n",
+								msg_len - 4);
+						fprintf(stderr, "  data            = %s\n",
+								buf2str(msg + 4, msg_len - 4));
+					}
+				}
+
+				/* move to start from completion code */
+				memmove(msg, hdr + 1, msg_len - sizeof (*hdr));
+
+				/* the waited one */
+				return msg_len - sizeof (*hdr);
+			}
+		}
+	} while (msg_len > 0);
+
+	return 0;
+}
+
+/*
+ *	Get message from receive message queue
+ */
+static int
+serial_term_get_message(struct ipmi_intf * intf,
+		struct serial_term_request_ctx * req_ctx,
+		uint8_t * msg, size_t max_len)
+{
+	uint8_t data[IPMI_SERIAL_MAX_RESPONSE];
+	struct serial_term_request_ctx tmp_ctx;
+	struct ipmi_get_message_rp * rp = (struct ipmi_get_message_rp *) data;
+	struct serial_term_hdr hdr;
+	clock_t start, tm;
+	int rv, netFn, rqSeq;
+
+	start = clock();
+
+	do {
+		/* fill-in request context */
+		tmp_ctx.netFn = 0x18;
+		tmp_ctx.seq = serial_term_alloc_seq() << 2;
+		tmp_ctx.cmd = 0x33;
+
+		/* fill-in request data */
+		hdr.netFn = tmp_ctx.netFn;
+		hdr.seq = tmp_ctx.seq;
+		hdr.cmd = tmp_ctx.cmd;
+
+		/* send request */
+		serial_flush(intf);
+		serial_term_send_msg(intf, (uint8_t *) &hdr, 3);
+
+		/* wait for response */
+		rv = serial_term_wait_response(intf, &tmp_ctx, data, sizeof (data));
+
+		/* check for IO error or timeout */
+		if (rv <= 0) {
+			return rv;
+		}
+
+		netFn = (req_ctx->netFn & ~3)|(req_ctx->seq & 3)|4;
+		rqSeq = req_ctx->seq & ~3;
+
+		/* check completion code */
+		if (rp->completion == 0) {
+			/* check for the waited response */
+			if (rp->netFn == netFn
+					&& rp->rsSA == req_ctx->sa
+					&& rp->rqSeq == rqSeq
+					&& rp->cmd == req_ctx->cmd) {
+				/* copy the rest of message */
+				memcpy(msg, rp + 1, rv - sizeof (*rp) - 1);
+				return rv - sizeof (*rp) - 1;
+			}
+		} else if (rp->completion != 0x80) {
+			return 0;
+		}
+
+		tm = clock() - start;
+
+		tm /= CLOCKS_PER_SEC;
+	} while (tm < intf->ssn_params.timeout);
+
+	return 0;
+}
+
+static struct ipmi_rs *
+ipmi_serial_term_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
+{
+	static struct ipmi_rs rsp;
+	uint8_t msg[IPMI_SERIAL_MAX_RESPONSE], * resp = msg;
+	struct serial_term_request_ctx req_ctx[2];
+	int retry, rv, msg_len, bridging_level;
+
+	if (!intf->opened && intf->open && intf->open(intf) < 0) {
+		return NULL;
+	}
+
+	/* Send the message and receive the answer */
+	for (retry = 0; retry < intf->ssn_params.retry; retry++) {
+		/* build output message */
+		bridging_level = serial_term_build_msg(intf, req, msg,
+				sizeof (msg), req_ctx, &msg_len);
+		if (msg_len < 0) {
+			return NULL;
+		}
+
+		/* send request */
+		serial_flush(intf);
+		serial_term_send_msg(intf, msg, msg_len);
+
+		/* wait for response */
+		rv = serial_term_wait_response(intf, &req_ctx[0], msg, sizeof (msg));
+
+		/* check for IO error */
+		if (rv < 0) {
+			return NULL;
+		}
+
+		/* check for timeout */
+		if (rv == 0) {
+			continue;
+		}
+
+		/* check for bridging */
+		if (bridging_level && msg[0] == 0) {
+			/* in the case of payload interface we check receive message queue */
+			if (is_system) {
+				/* check message flags */
+				rv = serial_term_get_message(intf, &req_ctx[1],
+						msg, sizeof (msg));
+
+				/* check for IO error */
+				if (rv < 0) {
+					return NULL;
+				}
+
+				/* check for timeout */
+				if (rv == 0) {
+					continue;
+				}
+			/* check if response for inner request is not encapsulated */
+			} else if (rv == 1) {
+				/* wait for response for inner request */
+				rv = serial_term_wait_response(intf, &req_ctx[1],
+						msg, sizeof (msg));
+
+				/* check for IO error */
+				if (rv < 0) {
+					return NULL;
+				}
+
+				/* check for timeout */
+				if (rv == 0) {
+					continue;
+				}
+			} else {
+				/* skip outer level header */
+				resp = msg + sizeof (struct ipmb_msg_hdr) + 1;
+				/* decrement response size */
+				rv -=  + sizeof (struct ipmb_msg_hdr) + 2;
+			}
+
+			/* check response size */
+			if (resp[0] == 0 && bridging_level == 2 && rv < 8) {
+				lprintf(LOG_ERR, "ipmitool: Message response is too short");
+				/* invalid message length */
+				return NULL;
+			}
+		}
+
+		/* check for double bridging */
+		if (bridging_level == 2 && resp[0] == 0) {
+			/* get completion code */
+			rsp.ccode = resp[7];
+			rsp.data_len = rv - 9;
+			memcpy(rsp.data, resp + 8, rsp.data_len);
+		} else {
+			rsp.ccode = resp[0];
+			rsp.data_len = rv - 1;
+			memcpy(rsp.data, resp + 1, rsp.data_len);
+		}
+
+		/* return response */
+		return &rsp;
+	}
+
+	/* no valid response */
+	return NULL;
+}
+
+static int
+ipmi_serial_term_setup(struct ipmi_intf * intf)
+{
+	/* setup default LAN maximum request and response sizes */
+	intf->max_request_data_size = IPMI_SERIAL_MAX_RQ_SIZE;
+	intf->max_response_data_size = IPMI_SERIAL_MAX_RS_SIZE;
+
+	return 0;
+}
+
+struct ipmi_intf ipmi_serial_term_intf = {
+	.name = "serial-terminal",
+	.desc = "Serial Interface, Terminal Mode",
+	.setup = ipmi_serial_term_setup,
+	.open = ipmi_serial_term_open,
+	.close = ipmi_serial_term_close,
+	.sendrecv = ipmi_serial_term_send_cmd,
+};
diff --git a/src/plugins/usb/Makefile.am b/src/plugins/usb/Makefile.am
new file mode 100644
index 0000000..ce68fb7
--- /dev/null
+++ b/src/plugins/usb/Makefile.am
@@ -0,0 +1,40 @@
+ #
+ # Copyright (c) 2015 American Megatrends, Inc.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification,are permitted provided that the following conditions are met:
+ #
+ # 1. Redistributions of source code must retain the above copyright notice,
+ #    this list of conditions and the following disclaimer.
+ #
+ # 2. Redistributions in binary form must reproduce the above copyright notice,
+ #    this list of conditions and the following disclaimer in the documentation
+ #    and/or other materials provided with the distribution.
+ #
+ # 3. Neither the name of the copyright holder nor the names of its contributors
+ #    may be used to endorse or promote products derived from this software
+ #    without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ # ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ #
+
+MAINTAINERCLEANFILES	= Makefile.in
+
+AM_CPPFLAGS		= -I$(top_srcdir)/include
+
+EXTRA_LTLIBRARIES	= libintf_usb.la
+noinst_LTLIBRARIES	= @INTF_USB_LIB@
+libintf_usb_la_LIBADD	= $(top_builddir)/lib/libipmitool.la
+libintf_usb_la_SOURCES	= usb.c
+
diff --git a/src/plugins/usb/Makefile.in b/src/plugins/usb/Makefile.in
new file mode 100644
index 0000000..c3cfc41
--- /dev/null
+++ b/src/plugins/usb/Makefile.in
@@ -0,0 +1,637 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/usb
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libintf_usb_la_DEPENDENCIES = $(top_builddir)/lib/libipmitool.la
+am_libintf_usb_la_OBJECTS = usb.lo
+libintf_usb_la_OBJECTS = $(am_libintf_usb_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libintf_usb_la_SOURCES)
+DIST_SOURCES = $(libintf_usb_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASEDIR = @BASEDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISTRO = @DISTRO@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTF_BMC = @INTF_BMC@
+INTF_BMC_LIB = @INTF_BMC_LIB@
+INTF_DUMMY = @INTF_DUMMY@
+INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
+INTF_FREE = @INTF_FREE@
+INTF_FREE_LIB = @INTF_FREE_LIB@
+INTF_IMB = @INTF_IMB@
+INTF_IMB_LIB = @INTF_IMB_LIB@
+INTF_LAN = @INTF_LAN@
+INTF_LANPLUS = @INTF_LANPLUS@
+INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
+INTF_LAN_LIB = @INTF_LAN_LIB@
+INTF_LIPMI = @INTF_LIPMI@
+INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
+INTF_OPEN = @INTF_OPEN@
+INTF_OPEN_LIB = @INTF_OPEN_LIB@
+INTF_SERIAL = @INTF_SERIAL@
+INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
+INTF_USB = @INTF_USB@
+INTF_USB_LIB = @INTF_USB_LIB@
+IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POW_LIB = @POW_LIB@
+PSTAMP = @PSTAMP@
+RANLIB = @RANLIB@
+RPMBUILD = @RPMBUILD@
+RPM_RELEASE = @RPM_RELEASE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_configure_args = @ac_configure_args@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -I$(top_srcdir)/include
+EXTRA_LTLIBRARIES = libintf_usb.la
+noinst_LTLIBRARIES = @INTF_USB_LIB@
+libintf_usb_la_LIBADD = $(top_builddir)/lib/libipmitool.la
+libintf_usb_la_SOURCES = usb.c
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/usb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/plugins/usb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libintf_usb.la: $(libintf_usb_la_OBJECTS) $(libintf_usb_la_DEPENDENCIES) $(EXTRA_libintf_usb_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libintf_usb_la_OBJECTS) $(libintf_usb_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usb.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+ #
+ # Copyright (c) 2015 American Megatrends, Inc.
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification,are permitted provided that the following conditions are met:
+ #
+ # 1. Redistributions of source code must retain the above copyright notice,
+ #    this list of conditions and the following disclaimer.
+ #
+ # 2. Redistributions in binary form must reproduce the above copyright notice,
+ #    this list of conditions and the following disclaimer in the documentation
+ #    and/or other materials provided with the distribution.
+ #
+ # 3. Neither the name of the copyright holder nor the names of its contributors
+ #    may be used to endorse or promote products derived from this software
+ #    without specific prior written permission.
+ #
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ # ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ #
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/usb/usb.c b/src/plugins/usb/usb.c
new file mode 100644
index 0000000..0049400
--- /dev/null
+++ b/src/plugins/usb/usb.c
@@ -0,0 +1,614 @@
+/*
+ * Copyright (c) 2015 American Megatrends, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define _BSD_SOURCE
+
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include <ipmitool/bswap.h>
+#include <ipmitool/ipmi.h>
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_oem.h>
+#include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_constants.h>
+#include <scsi/sg.h>
+#include <sys/ioctl.h>
+#include <scsi/scsi_ioctl.h>
+#include <scsi/scsi.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+
+#define PACKED __attribute__ ((packed))
+#define BEGIN_SIG                   "$G2-CONFIG-HOST$"
+#define BEGIN_SIG_LEN               16
+#define MAX_REQUEST_SIZE            64 * 1024
+#define CMD_RESERVED                0x0000
+#define SCSI_AMICMD_CURI_WRITE      0xE2
+#define SCSI_AMICMD_CURI_READ       0xE3
+#define SCSI_AMIDEF_CMD_SECTOR      0x01
+#define SCSI_AMIDEF_DATA_SECTOR     0x02
+#define ERR_SUCCESS                 0       /* Success */
+#define ERR_BIG_DATA                1       /* Too Much Data */
+#define ERR_NO_DATA                 2       /* No/Less Data Available */
+#define ERR_UNSUPPORTED             3       /* Unsupported Command */
+#define IN_PROCESS                  0x8000  /* Bit 15 of Status */
+#define SCSI_AMICMD_ID              0xEE
+
+/* SCSI Command Packets */
+typedef struct {
+	unsigned char   OpCode;
+	unsigned char   Lun;
+	unsigned int    Lba;
+	union {
+		struct {
+			unsigned char   Reserved6;
+			unsigned short  Length;
+			unsigned char   Reserved9[3];
+		} PACKED Cmd10;
+		struct Len32 {
+			unsigned int    Length32;
+			unsigned char   Reserved10[2];
+		} PACKED Cmd12;
+	} PACKED CmdLen;
+} PACKED SCSI_COMMAND_PACKET;
+
+typedef struct {
+	uint8_t byNetFnLUN;
+	uint8_t byCmd;
+	uint8_t byData[MAX_REQUEST_SIZE];
+} PACKED IPMIUSBRequest_T;
+
+typedef struct {
+	uint8_t   BeginSig[BEGIN_SIG_LEN];
+	uint16_t  Command;
+	uint16_t  Status;
+	uint32_t  DataInLen;
+	uint32_t  DataOutLen;
+	uint32_t  InternalUseDataIn;
+	uint32_t  InternalUseDataOut;
+} CONFIG_CMD;
+
+static int ipmi_usb_setup(struct ipmi_intf *intf);
+static struct ipmi_rs *ipmi_usb_send_cmd(struct ipmi_intf *intf,
+		struct ipmi_rq *req);
+
+struct ipmi_intf ipmi_usb_intf = {
+	.name = "usb",
+	.desc = "IPMI USB Interface(OEM Interface for AMI Devices)",
+	.setup = ipmi_usb_setup,
+	.sendrecv = ipmi_usb_send_cmd,
+};
+
+int
+scsiProbeNew(int *num_ami_devices, int *sg_nos)
+{
+	int inplen = *num_ami_devices;
+	int numdevfound = 0;
+	char linebuf[81];
+	char vendor[81];
+	int lineno = 0;
+	FILE *fp;
+
+	fp = fopen("/proc/scsi/sg/device_strs", "r");
+	if (fp == NULL) {
+		/* Return 1 on error */
+		return 1;
+	}
+
+	while (1) {
+		/* Read line by line and search for "AMI" */
+		if (fgets(linebuf, 80, fp) == NULL) {
+			break;
+		}
+
+		if (sscanf(linebuf, "%s", vendor) == 1) {
+			if (strncmp(vendor, "AMI", strlen("AMI")) == 0) {
+				numdevfound++;
+				sg_nos[numdevfound - 1] = lineno;
+				if (numdevfound == inplen) {
+					break;
+				}
+			}
+			lineno++;
+		}
+	}
+
+	*num_ami_devices = numdevfound;
+	if (fp != NULL) {
+		fclose(fp);
+		fp = NULL;
+	}
+
+	return 0;
+}
+
+int
+OpenCD(struct ipmi_intf *intf, char *CDName)
+{
+	intf->fd = open(CDName, O_RDWR);
+	if (intf->fd == (-1)) {
+		lprintf(LOG_ERR, "OpenCD:Unable to open device, %s",
+				strerror(errno));
+		return 1;
+	}
+	return 0;
+}
+
+int
+sendscsicmd_SGIO(int cd_desc, unsigned char *cdb_buf, unsigned char cdb_len,
+		void *data_buf, unsigned int *data_len, int direction,
+		void *sense_buf, unsigned char slen, unsigned int timeout)
+{
+	sg_io_hdr_t io_hdr;
+
+	/* Prepare command */
+	memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
+	io_hdr.interface_id = 'S';
+	io_hdr.cmd_len = cdb_len;
+
+	/* Transfer direction and length */
+	io_hdr.dxfer_direction = direction;
+	io_hdr.dxfer_len = *data_len;
+
+	io_hdr.dxferp = data_buf;
+
+	io_hdr.cmdp = cdb_buf;
+
+	io_hdr.sbp = (unsigned char *)sense_buf;
+	io_hdr.mx_sb_len = slen;
+
+	io_hdr.timeout = timeout;
+
+	if (!timeout) {
+		io_hdr.timeout = 20000;
+	}
+
+	if (ioctl(cd_desc, SG_IO, &io_hdr) < 0) {
+		lprintf(LOG_ERR, "sendscsicmd_SGIO: SG_IO ioctl error");
+		return 1;
+	} else {
+		if (io_hdr.status != 0) {
+			return 1;
+		}
+	}
+
+	if (!timeout) {
+		return 0;
+	}
+
+	if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) {
+		lprintf(LOG_DEBUG, "sendscsicmd_SGIO: SG_INFO_OK - Not OK");
+	} else {
+		lprintf(LOG_DEBUG, "sendscsicmd_SGIO: SG_INFO_OK - OK");
+		return 0;
+	}
+
+	return 1;
+}
+
+int
+AMI_SPT_CMD_Identify(int cd_desc, char *szSignature)
+{
+	SCSI_COMMAND_PACKET IdPkt = {0};
+	int ret;
+	unsigned int siglen = 10;
+
+	IdPkt.OpCode = SCSI_AMICMD_ID;
+	ret = sendscsicmd_SGIO(cd_desc, (unsigned char *)&IdPkt,
+				10, szSignature, &siglen, SG_DXFER_FROM_DEV,
+				NULL, 0, 5000);
+
+	return ret;
+}
+
+int
+IsG2Drive(int cd_desc)
+{
+	char szSignature[15];
+	int ret;
+
+	memset(szSignature, 0, 15);
+
+	flock(cd_desc, LOCK_EX);
+	ret = AMI_SPT_CMD_Identify(cd_desc, szSignature);
+	flock(cd_desc, LOCK_UN);
+	if (ret != 0) {
+		lprintf(LOG_DEBUG,
+				"IsG2Drive:Unable to send ID command to the device");
+		return 1;
+	}
+
+	if (strncmp(szSignature, "$$$AMI$$$", strlen("$$$AMI$$$")) != 0) {
+		lprintf(LOG_ERR,
+				"IsG2Drive:Signature mismatch when ID command sent");
+		return 1;
+	}
+
+	return 0;
+}
+
+int
+FindG2CDROM(struct ipmi_intf *intf)
+{
+	int err = 0;
+	char device[256];
+	int devarray[16];
+	int numdev = 16;
+	int iter;
+	err = scsiProbeNew(&numdev, devarray);
+
+	if (err == 0 && numdev > 0) {
+		for (iter = 0; iter < numdev; iter++) {
+			sprintf(device, "/dev/sg%d", devarray[iter]);
+
+			if (!OpenCD(intf, device)) {
+				if (!IsG2Drive(intf->fd)) {
+					lprintf(LOG_DEBUG, "USB Device found");
+					return 1;
+				}
+				close(intf->fd);
+			}
+		}
+	} else {
+		lprintf(LOG_DEBUG, "Unable to find Virtual CDROM Device");
+	}
+
+	return 0;
+}
+
+static int
+ipmi_usb_setup(struct ipmi_intf *intf)
+{
+	if (FindG2CDROM(intf) == 0) {
+		lprintf(LOG_ERR, "Error in USB session setup \n");
+		return (-1);
+	}
+	intf->opened = 1;
+	return 0;
+}
+
+void
+InitCmdHeader(CONFIG_CMD *pG2CDCmdHeader)
+{
+	memset(pG2CDCmdHeader, 0, sizeof(CONFIG_CMD));
+	memcpy((char *)pG2CDCmdHeader->BeginSig, BEGIN_SIG, BEGIN_SIG_LEN);
+}
+
+int
+AMI_SPT_CMD_SendCmd(int cd_desc, char *Buffer, char type, uint16_t buflen,
+		unsigned int timeout)
+{
+	SCSI_COMMAND_PACKET Cmdpkt;
+	char sensebuff[32];
+	int ret;
+	unsigned int pktLen;
+	int count = 3;
+
+	memset(&Cmdpkt, 0, sizeof(SCSI_COMMAND_PACKET));
+
+	Cmdpkt.OpCode = SCSI_AMICMD_CURI_WRITE;
+	Cmdpkt.Lba = htonl(type);
+	Cmdpkt.CmdLen.Cmd10.Length = htons(1);
+
+	pktLen = buflen;
+	while (count > 0) {
+		ret = sendscsicmd_SGIO(cd_desc, (unsigned char *)&Cmdpkt,
+				10, Buffer, &pktLen, SG_DXFER_TO_DEV,
+				sensebuff, 32, timeout);
+		count--;
+		if (ret == 0) {
+			break;
+		} else {
+			ret = (-1);
+		}
+	}
+
+	return ret;
+}
+
+int
+AMI_SPT_CMD_RecvCmd(int cd_desc, char *Buffer, char type, uint16_t buflen)
+{
+	SCSI_COMMAND_PACKET Cmdpkt;
+	char sensebuff[32];
+	int ret;
+	unsigned int pktLen;
+	int count = 3;
+
+	memset(&Cmdpkt, 0, sizeof(SCSI_COMMAND_PACKET));
+
+	Cmdpkt.OpCode = SCSI_AMICMD_CURI_READ;
+	Cmdpkt.Lba = htonl(type);
+	Cmdpkt.CmdLen.Cmd10.Length = htons(1);
+
+	pktLen = buflen;
+	while (count > 0) {
+		ret = sendscsicmd_SGIO(cd_desc, (unsigned char *)&Cmdpkt,
+				10, Buffer, &pktLen, SG_DXFER_FROM_DEV,
+				sensebuff, 32, 5000);
+		count--;
+		if (0 == ret) {
+			break;
+		} else {
+			ret = (-1);
+		}
+	}
+
+	return ret;
+}
+
+int
+ReadCD(int cd_desc, char CmdData, char *Buffer, uint32_t DataLen)
+{
+	int ret;
+
+	ret = AMI_SPT_CMD_RecvCmd(cd_desc, Buffer, CmdData, DataLen);
+	if (ret != 0) {
+		lprintf(LOG_ERR, "Error while reading CD-Drive");
+		return (-1);
+	}
+	return 0;
+}
+
+int
+WriteCD(int cd_desc, char CmdData, char *Buffer, unsigned int timeout,
+		uint32_t DataLen)
+{
+	int ret;
+
+	ret = AMI_SPT_CMD_SendCmd(cd_desc, Buffer, CmdData, DataLen, timeout);
+	if (ret != 0) {
+		lprintf(LOG_ERR, "Error while writing to CD-Drive");
+		return (-1);
+	}
+	return 0;
+}
+
+int
+WriteSplitData(struct ipmi_intf *intf, char *Buffer, char Sector,
+			uint32_t NumBytes, uint32_t timeout)
+{
+	uint32_t BytesWritten = 0;
+	int retVal;
+
+	if (NumBytes == 0) {
+		return 0;
+	}
+
+	while (BytesWritten < NumBytes) {
+		if ((retVal = WriteCD(intf->fd, Sector,
+						(Buffer + BytesWritten),
+						timeout, NumBytes)) != 0) {
+			return retVal;
+		}
+
+		BytesWritten += NumBytes;
+	}
+
+	return 0;
+}
+
+int
+ReadSplitData(struct ipmi_intf *intf, char *Buffer, char Sector,
+				uint32_t NumBytes)
+{
+	uint32_t BytesRead = 0;
+
+	if (NumBytes == 0) {
+		return 0;
+	}
+
+	while (BytesRead < NumBytes) {
+		if (ReadCD(intf->fd, Sector, (Buffer + BytesRead),
+					NumBytes) == (-1)) {
+			return 1;
+		}
+		BytesRead += NumBytes;
+	}
+
+	return 0;
+}
+
+int
+WaitForCommandCompletion(struct ipmi_intf *intf, CONFIG_CMD *pG2CDCmdHeader,
+		uint32_t timeout, uint32_t DataLen)
+{
+	uint32_t TimeCounter = 0;
+
+	do {
+		if (ReadCD(intf->fd, SCSI_AMIDEF_CMD_SECTOR,
+					(char *)(pG2CDCmdHeader), DataLen) == (-1)) {
+			lprintf(LOG_ERR, "ReadCD returned ERROR");
+			return 1;
+		}
+
+		if (pG2CDCmdHeader->Status & IN_PROCESS) {
+			usleep(1000);
+			if (timeout > 0) {
+				TimeCounter++;
+				if (TimeCounter == (timeout + 1)) {
+					return 2;
+				}
+			}
+		} else {
+			lprintf(LOG_DEBUG, "Command completed");
+			break;
+		}
+	} while (1);
+
+	return 0;
+}
+
+int
+SendDataToUSBDriver(struct ipmi_intf *intf, char *ReqBuffer,
+			unsigned int ReqBuffLen, unsigned char *ResBuffer,
+			int *ResBuffLen, unsigned int timeout)
+{
+	char CmdHeaderBuffer[sizeof(CONFIG_CMD)];
+	int retVal;
+	int waitretval = 0;
+	unsigned int to = 0;
+	uint32_t DataLen = 0;
+
+	CONFIG_CMD *pG2CDCmdHeader = (CONFIG_CMD *)CmdHeaderBuffer;
+
+	/* FillHeader */
+	InitCmdHeader(pG2CDCmdHeader);
+
+	/* Set command number */
+	pG2CDCmdHeader->Command = CMD_RESERVED;
+
+	/* Fill Lengths */
+	pG2CDCmdHeader->DataOutLen = *ResBuffLen;
+	pG2CDCmdHeader->DataInLen = ReqBuffLen;
+
+	if (!timeout) {
+		to = 3000;
+	}
+
+	DataLen = sizeof(CONFIG_CMD);
+
+	if (WriteCD(intf->fd, SCSI_AMIDEF_CMD_SECTOR,
+				(char *)(pG2CDCmdHeader), to, DataLen) == (-1)) {
+		lprintf(LOG_ERR,
+				"Error in Write CD of SCSI_AMIDEF_CMD_SECTOR");
+		return (-1);
+	}
+
+	/* Write the data to hard disk */
+	if ((retVal = WriteSplitData(intf, ReqBuffer,
+					SCSI_AMIDEF_DATA_SECTOR,
+					ReqBuffLen, timeout)) != 0) {
+		lprintf(LOG_ERR,
+				"Error in WriteSplitData of SCSI_AMIDEF_DATA_SECTOR");
+		return (-1);
+	}
+
+	if (!timeout) {
+		return 0;
+	}
+
+	/* Read Status now */
+	waitretval = WaitForCommandCompletion(intf, pG2CDCmdHeader, timeout,
+			DataLen);
+	if (waitretval != 0) {
+		lprintf(LOG_ERR, "WaitForCommandComplete failed");
+		return (0 - waitretval);
+	} else {
+		lprintf(LOG_DEBUG, "WaitForCommandCompletion SUCCESS");
+	}
+
+	switch (pG2CDCmdHeader->Status) {
+		case ERR_SUCCESS:
+			*ResBuffLen = pG2CDCmdHeader->DataOutLen;
+			lprintf(LOG_DEBUG, "Before ReadSplitData %x", *ResBuffLen);
+			if (ReadSplitData(intf, (char *)ResBuffer,
+						SCSI_AMIDEF_DATA_SECTOR,
+						pG2CDCmdHeader->DataOutLen) != 0) {
+				lprintf(LOG_ERR,
+						"Err ReadSplitData SCSI_AMIDEF_DATA_SCTR");
+				return (-1);
+			}
+			/* Additional read to see verify there was not problem
+			 * with the previous read
+			 */
+			DataLen = sizeof(CONFIG_CMD);
+			ReadCD(intf->fd, SCSI_AMIDEF_CMD_SECTOR,
+					(char *)(pG2CDCmdHeader), DataLen);
+			break;
+		case ERR_BIG_DATA:
+			lprintf(LOG_ERR, "Too much data");
+			break;
+		case ERR_NO_DATA:
+			lprintf(LOG_ERR, "Too little data");
+			break;
+		case ERR_UNSUPPORTED:
+			lprintf(LOG_ERR, "Unsupported command");
+			break;
+		default:
+			lprintf(LOG_ERR, "Unknown status");
+	}
+
+	return pG2CDCmdHeader->Status;
+}
+
+static struct ipmi_rs *
+ipmi_usb_send_cmd(struct ipmi_intf *intf, struct ipmi_rq *req)
+{
+	static struct ipmi_rs rsp;
+	long timeout = 20000;
+	uint8_t byRet = 0;
+	char ReqBuff[MAX_REQUEST_SIZE] = {0};
+	IPMIUSBRequest_T *pReqPkt = (IPMIUSBRequest_T *)ReqBuff;
+	int retries = 0;
+	/********** FORM IPMI PACKET *****************/
+	pReqPkt->byNetFnLUN = req->msg.netfn << 2;
+	pReqPkt->byNetFnLUN += req->msg.lun;
+	pReqPkt->byCmd = req->msg.cmd;
+	if (req->msg.data_len) {
+		memcpy(pReqPkt->byData, req->msg.data, req->msg.data_len);
+	}
+
+	/********** SEND DATA TO USB ******************/
+	while (retries < 3) {
+		retries++;
+		byRet = SendDataToUSBDriver(intf, ReqBuff,
+				2 + req->msg.data_len, rsp.data,
+				&rsp.data_len,timeout);
+
+		if (byRet == 0) {
+			break;
+		}
+	}
+
+	if (retries == 3) {
+		lprintf(LOG_ERR,
+				"Error while sending command using",
+				"SendDataToUSBDriver");
+		rsp.ccode = byRet;
+		return &rsp;
+	}
+
+	rsp.ccode = rsp.data[0];
+
+	/* Save response data for caller */
+	if ((rsp.ccode == 0) && (rsp.data_len > 0)) {
+		memmove(rsp.data, rsp.data + 1, rsp.data_len - 1);
+		rsp.data[rsp.data_len] = 0;
+		rsp.data_len -= 1;
+	}
+	return &rsp;
+}