Changes Integrated since 1.8.14RC2

1. Warnings about "FRU Area Length" based on uninitialized (malloc'd) memory
contents (due to fru->max_read_size not being initialized, left at 0) and
fru_data not being zeroed after malloc() in ipmi_fru_set_field_string().

2. "fru edit" commands for any field index other than 0 would fail (with "Field
not found !" error) due to a couple offset and length calculation errors (for
all the supported "area" types) in ipmi_fru_set_field_string().

3. "fru edit" commands would corrupt the FRU Inventory Area due to incorrect
"source offset" value being specified in write_fru_area() call in
impi_fru_set_field_string().

Commit for Rob Swindell

ChangeLog

@@ -1,4 +1,4 @@
-version 1.8.14 2014-03-28
+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
@@ -23,18 +23,22 @@ version 1.8.14 2014-03-28
 	* 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.
-	* Add support for enabling/disabling PEF policy entries
+	* 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
-	* Incorect byteswap in SOL maximum payload
-	* Fix build error in HPM.2 code
+	* 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
-	* Add new SEL entries for ipmi 2.0 rev 1.1
+	* 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

doc/ipmitool.1

@@ -154,9 +154,6 @@ 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\-M\fR <\fIaddress\fP>
-Set transit local address for bridge request. (dual bridge)
-.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.
@@ -2975,10 +2972,19 @@ number.  The default is 1.
 This command may be used to read SPD (Serial Presence Detect) data using the 
 I2C Master Write\-Read IPMI command.
 
-.TP 
+.TP
 \fIsunoem\fP
 .RS
-.TP 
+.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 environ ment.  If a
+command string is specified, the command string is executed
+on the service processor and the connection is closed.
+.TP
 \fIled\fP
 .RS
 
@@ -2987,65 +2993,139 @@ 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 
+.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 
+.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 
+.TP
 LED Mode is required for set operations:
-.br 
+.br
 \fIOFF\fP         Off
-.br 
+.br
 \fION\fP          Steady On
-.br 
+.br
 \fISTANDBY\fP     100ms on 2900ms off blink rate
-.br 
+.br
 \fISLOW\fP        1HZ blink rate
-.br 
+.br
 \fIFAST\fP        4HZ blink rate
-.TP 
+.TP
 LED Type is optional:
-.br 
+.br
 \fIOK2RM\fP       Ok to Remove
-.br 
+.br
 \fISERVICE\fP     Service Required
-.br 
+.br
 \fIACT\fP         Activity
-.br 
+.br
 \fILOCATE\fP      Locate
 
 .RE
-.TP 
-\fIfan\fP \fIspeed\fP <0-100>
+.TP
+\fInacname\fP <\fBipmi name\fR>
+.br
 
-Set system fan speed (PWM duty cycle).
-.RS
-.TP 
+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 
+.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
+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 
+.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

lib/ipmi_fru.c

@@ -641,7 +641,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
 			fru->max_read_size = 255;
 		} else {
 			/* subtract 1 byte for bytes count */
-			fru->max_write_size = max_rs_size - 1;
+			fru->max_read_size = max_rs_size - 1;
 		}
 
 		/* check word access */
@@ -4717,22 +4717,22 @@ f_type, uint8_t f_index, char *f_string)
 	if (f_type == 'c' ) {
 		header_offset = (header.offset.chassis * 8);
 		read_fru_area(intf ,&fru, fruId, header_offset , 3 , fru_data);
-		fru_field_offset = (header.offset.chassis * 8) + 3;
-		fru_section_len = *(fru_data + header_offset + 1) * 8;
+		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 = (header.offset.board * 8) + 6;
-		fru_section_len = *(fru_data + header_offset + 1) * 8;
+		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 = (header.offset.product * 8) + 3;
-		fru_section_len = *(fru_data + header_offset + 1) * 8;
+		fru_field_offset = 3;
+		fru_section_len = *(fru_data + 1) * 8;
 	}
 	else
 	{
@@ -4782,8 +4782,8 @@ f_type, uint8_t f_index, char *f_string)
 		checksum = (~checksum) + 1;
 		fru_data[header_offset + fru_section_len - 1] = checksum;
 
-		/* Write the updated section to the FRU data */
-		if( write_fru_area(intf, &fru, fruId, header_offset,
+		/* 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");

src/plugins/lanplus/lanplus.c

@@ -2882,17 +2882,13 @@ ipmi_lanplus_open_session(struct ipmi_intf * intf)
 
 	free(msg);
 	msg = NULL;
-	if (!rsp) {
-		lprintf(LOG_WARNING, "Error sending open session message.");
-		return -1;
-	}
-	if (verbose)
-		lanplus_dump_open_session_response(rsp);
-
 	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)
 	{