This commit was manufactured by cvs2svn to create tag 'IPMITOOL_1_8_13'.

header size.  Committed for Liebig, Holger

ipmitool/ChangeLog

@@ -1,4 +1,4 @@
-version 1.8.13rc0 2013-08-09
+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
@@ -126,6 +126,7 @@ version 1.8.13rc0 2013-08-09
 	* 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

ipmitool/configure.in

@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.13rc0-cvs])
+AM_INIT_AUTOMAKE([ipmitool], [1.8.13-cvs])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)

ipmitool/contrib/bmc-snmp-proxy

@@ -174,7 +174,7 @@ bmc_alert_dest()
 	# Pick the first active LAN channel
         for CHANNEL in `seq 1 14`
         do
-                [ $(${IPMI_TOOL} -I open channel info ${CHANNEL} 2>/dev/null \
+                [ $(${IPMITOOL} -I open channel info ${CHANNEL} 2>/dev/null \
                         | grep -q "802\.3") ] || break
         done
 

ipmitool/lib/ipmi_sol.c

@@ -1544,6 +1544,10 @@ ipmi_sol_red_pill(struct ipmi_intf * intf, int instance)
 	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");