118 lines
4.3 KiB
Plaintext
118 lines
4.3 KiB
Plaintext
--- ipmitool-1.8.10/lib/ipmi_chassis.c.orig 2008-07-09 22:14:42.000000000 +0200
|
|
+++ ipmitool-1.8.10/lib/ipmi_chassis.c 2008-09-26 13:28:16.000000000 +0200
|
|
@@ -33,6 +33,7 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
+#include <time.h>
|
|
|
|
#include <ipmitool/helper.h>
|
|
#include <ipmitool/ipmi.h>
|
|
--- ipmitool-1.8.10/lib/ipmi_ekanalyzer.c.orig 2008-06-10 23:07:39.000000000 +0200
|
|
+++ ipmitool-1.8.10/lib/ipmi_ekanalyzer.c 2008-09-26 13:37:43.000000000 +0200
|
|
@@ -3025,9 +3025,10 @@ ipmi_ek_display_address_table_record( st
|
|
|
|
for ( i = 0; i < entries; i++ ){
|
|
printf("\tHWAddr: 0x%02x - SiteNum: 0x%02x - SiteType: 0x%02x \n",
|
|
- record->data[offset++],
|
|
- record->data[offset++],
|
|
- record->data[offset++]);
|
|
+ record->data[offset+2],
|
|
+ record->data[offset+1],
|
|
+ record->data[offset+0]);
|
|
+ offset += 3;
|
|
}
|
|
}
|
|
|
|
@@ -3148,21 +3149,24 @@ ipmi_ek_display_shelf_ip_connection_reco
|
|
int offset = START_DATA_OFFSET;
|
|
if (offset > record->header.len){
|
|
printf(" Shelf Manager IP Address: %d.%d.%d.%d\n",
|
|
- record->data[offset++], record->data[offset++],
|
|
- record->data[offset++], record->data[offset++]
|
|
+ record->data[offset+3], record->data[offset+2],
|
|
+ record->data[offset+1], record->data[offset+0]
|
|
);
|
|
+ offset += 4;
|
|
}
|
|
if (offset > record->header.len){
|
|
printf(" Default Gateway Address: %d.%d.%d.%d\n",
|
|
- record->data[offset++], record->data[offset++],
|
|
- record->data[offset++], record->data[offset++]
|
|
+ record->data[offset+3], record->data[offset+2],
|
|
+ record->data[offset+1], record->data[offset+0]
|
|
);
|
|
+ offset += 4;
|
|
}
|
|
if (offset > record->header.len){
|
|
- printf(" Subnet Mask: %d.%d.%d.%d\n", record->data[offset++],
|
|
- record->data[offset++], record->data[offset++],
|
|
- record->data[offset++]
|
|
+ printf(" Subnet Mask: %d.%d.%d.%d\n",
|
|
+ record->data[offset+3], record->data[offset+2],
|
|
+ record->data[offset+1], record->data[offset+0]
|
|
);
|
|
+ offset += 4;
|
|
}
|
|
}
|
|
|
|
--- ipmitool-1.8.10/lib/ipmi_fru.c.orig 2008-06-10 23:40:47.000000000 +0200
|
|
+++ ipmitool-1.8.10/lib/ipmi_fru.c 2008-09-26 13:22:52.000000000 +0200
|
|
@@ -1259,7 +1259,8 @@ static void ipmi_fru_picmg_ext_print(uin
|
|
|
|
for (i=0; i<entries; i++) {
|
|
printf(" HWAddr: 0x%02x - SiteNum: 0x%02x - SiteType: 0x%02x \n",
|
|
- fru_data[offset++], fru_data[offset++], fru_data[offset++]);
|
|
+ fru_data[offset+2], fru_data[offset+1], fru_data[offset+0]);
|
|
+ offset += 3;
|
|
}
|
|
}
|
|
break;
|
|
@@ -2353,7 +2353,7 @@ ipmi_fru_edit_multirec(struct ipmi_intf
|
|
fru_data = malloc(fru.size + 1);
|
|
if (fru_data == NULL) {
|
|
lprintf(LOG_ERR, " Out of memory!");
|
|
- return;
|
|
+ return -1;
|
|
}
|
|
memset(fru_data, 0, fru.size + 1);
|
|
|
|
--- ipmitool-1.8.10/lib/ipmi_hpmfwupg.c.orig 2008-06-10 23:02:10.000000000 +0200
|
|
+++ ipmitool-1.8.10/lib/ipmi_hpmfwupg.c 2008-09-26 13:46:19.000000000 +0200
|
|
@@ -877,7 +877,7 @@ void HpmDisplayUpgrade( int skip, unsign
|
|
* Description: This function displays the information about version header
|
|
*
|
|
*****************************************************************************/
|
|
-int HpmDisplayVersionHeader(int mode)
|
|
+void HpmDisplayVersionHeader(int mode)
|
|
{
|
|
|
|
if ( mode & IMAGE_VER)
|
|
@@ -903,7 +903,7 @@ int HpmDisplayVersionHeader(int mode)
|
|
* Description: This function displays the version of the image and target
|
|
*
|
|
*****************************************************************************/
|
|
-int HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
|
|
+void HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
|
|
{
|
|
char descString[12];
|
|
memset(&descString,0x00,12);
|
|
@@ -974,7 +974,7 @@ int HpmfwupgTargetCheck(struct ipmi_intf
|
|
if (rc != HPMFWUPG_SUCCESS)
|
|
{
|
|
lprintf(LOG_NOTICE,"Verify whether the Target board is present \n");
|
|
- return;
|
|
+ return rc;
|
|
}
|
|
|
|
rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
|
|
@@ -3257,7 +3257,7 @@ int ipmi_hpmfwupg_main(struct ipmi_intf
|
|
if ( (argc == 0) || (strcmp(argv[0], "help") == 0) )
|
|
{
|
|
HpmfwupgPrintUsage();
|
|
- return;
|
|
+ return rc;
|
|
}
|
|
if ( (strcmp(argv[0], "check") == 0) )
|
|
{
|