73 lines
3.2 KiB
Diff
73 lines
3.2 KiB
Diff
|
diff -up ipmitool-1.8.9/src/ipmievd.c.open ipmitool-1.8.9/src/ipmievd.c
|
||
|
|
--- ipmitool-1.8.9/src/ipmievd.c.open 2007-08-17 16:27:37.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/src/ipmievd.c 2007-08-17 16:27:52.000000000 +0200
|
||
|
|
@@ -661,7 +661,7 @@ ipmievd_main(struct ipmi_event_intf * ei
|
||
|
|
* so error messages are not lost to syslog and
|
||
|
|
* return code is successfully returned to initscript
|
||
|
|
*/
|
||
|
|
- if (eintf->intf->open(eintf->intf) < 0) {
|
||
|
|
+ if ((eintf->intf->open)(eintf->intf) < 0) {
|
||
|
|
lprintf(LOG_ERR, "Unable to open interface");
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
diff -up ipmitool-1.8.9/src/plugins/lanplus/lanplus.c.open ipmitool-1.8.9/src/plugins/lanplus/lanplus.c
|
||
|
|
--- ipmitool-1.8.9/src/plugins/lanplus/lanplus.c.open 2007-08-17 16:26:09.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/src/plugins/lanplus/lanplus.c 2007-08-17 16:26:35.000000000 +0200
|
||
|
|
@@ -2016,7 +2016,7 @@ ipmi_lanplus_send_payload(
|
||
|
|
int xmit = 1;
|
||
|
|
time_t ltime;
|
||
|
|
|
||
|
|
- if (!intf->opened && intf->open && intf->open(intf) < 0)
|
||
|
|
+ if (!intf->opened && intf->open && (intf->open)(intf) < 0)
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
while (try < session->retry) {
|
||
|
|
diff -up ipmitool-1.8.9/src/plugins/open/open.c.open ipmitool-1.8.9/src/plugins/open/open.c
|
||
|
|
--- ipmitool-1.8.9/src/plugins/open/open.c.open 2007-08-17 16:26:58.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/src/plugins/open/open.c 2007-08-17 16:27:10.000000000 +0200
|
||
|
|
@@ -174,7 +174,7 @@ ipmi_openipmi_send_cmd(struct ipmi_intf
|
||
|
|
if (intf == NULL || req == NULL)
|
||
|
|
return NULL;
|
||
|
|
if (intf->opened == 0 && intf->open != NULL)
|
||
|
|
- if (intf->open(intf) < 0)
|
||
|
|
+ if ((intf->open)(intf) < 0)
|
||
|
|
return NULL;
|
||
|
|
|
||
|
|
if (verbose > 2)
|
||
|
|
diff -up ipmitool-1.8.9/src/plugins/lan/lan.c.open ipmitool-1.8.9/src/plugins/lan/lan.c
|
||
|
|
--- ipmitool-1.8.9/src/plugins/lan/lan.c.open 2007-08-17 16:25:31.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/src/plugins/lan/lan.c 2007-08-17 16:25:46.000000000 +0200
|
||
|
|
@@ -743,7 +743,7 @@ ipmi_lan_send_cmd(struct ipmi_intf * int
|
||
|
|
intf->opened, intf->open);
|
||
|
|
|
||
|
|
if (intf->opened == 0 && intf->open != NULL) {
|
||
|
|
- if (intf->open(intf) < 0) {
|
||
|
|
+ if ((intf->open)(intf) < 0) {
|
||
|
|
lprintf(LOG_DEBUG, "Failed to open LAN interface");
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
diff -up ipmitool-1.8.9/lib/ipmi_tsol.c.open ipmitool-1.8.9/lib/ipmi_tsol.c
|
||
|
|
--- ipmitool-1.8.9/lib/ipmi_tsol.c.open 2007-08-17 16:24:34.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/lib/ipmi_tsol.c 2007-08-17 16:24:47.000000000 +0200
|
||
|
|
@@ -452,7 +452,7 @@ ipmi_tsol_main(struct ipmi_intf * intf,
|
||
|
|
* retrieve local IP address if not supplied on command line
|
||
|
|
*/
|
||
|
|
if (recvip == NULL) {
|
||
|
|
- result = intf->open(intf); /* must connect first */
|
||
|
|
+ result = (intf->open)(intf); /* must connect first */
|
||
|
|
if (result < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
diff -up ipmitool-1.8.9/lib/ipmi_main.c.open ipmitool-1.8.9/lib/ipmi_main.c
|
||
|
|
--- ipmitool-1.8.9/lib/ipmi_main.c.open 2007-08-16 18:08:54.000000000 +0200
|
||
|
|
+++ ipmitool-1.8.9/lib/ipmi_main.c 2007-08-17 16:24:12.000000000 +0200
|
||
|
|
@@ -594,7 +594,7 @@ ipmi_main(int argc, char ** argv,
|
||
|
|
if (target_addr > 0) {
|
||
|
|
/* need to open the interface first */
|
||
|
|
if (intf->open != NULL)
|
||
|
|
- intf->open(intf);
|
||
|
|
+ (intf->open)(intf);
|
||
|
|
intf->target_addr = target_addr;
|
||
|
|
/* must be admin level to do this over lan */
|
||
|
|
ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN);
|