diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-24 05:56:41 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-24 05:56:41 +0200 |
commit | 2ae382d10a07feaed2d8e06ce078084ecaf1b447 (patch) | |
tree | b9c8c5ab3485c040b19443e4a573f48b9092d47d /util/ipmicmd.c | |
parent | 7d5dd1122da7acfca715242ec6cb6d1fd844691b (diff) | |
parent | db5e8f26947114f06480dd22b9db7e22e50ee133 (diff) |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
Diffstat (limited to 'util/ipmicmd.c')
-rw-r--r-- | util/ipmicmd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/ipmicmd.c b/util/ipmicmd.c index 369d2e4..ffb59e2 100644 --- a/util/ipmicmd.c +++ b/util/ipmicmd.c @@ -662,8 +662,9 @@ int ipmi_open(char fdebugcmd) /* Use IPMI LAN 2.0 if BMC said it only supports LAN2 */ /* This is a violation of IPMI 2.0 Spec section 13.4, * but some HP firmware behaves this way, so handle it. */ - rc = ipmi_open_lan2(gnode,lanp.user,lanp.pswd,fdebugcmd); fDriverTyp = DRV_LAN2; + rc = ipmi_open_lan2(gnode,lanp.user,lanp.pswd,fdebugcmd); + if (rc != 0) fDriverTyp = DRV_UNKNOWN; } } else { /* local, not lan */ #ifdef WIN32 @@ -1364,7 +1365,7 @@ void parse_lan_options(int c, char *popt, char fdebugcmd) break; case 'F': /* force driver type */ i = set_driver_type(popt); - if (i == 0) fset_dtype = 1; + if (i == 0) fset_dtype = 1; break; case 'T': /* auth type */ i = atoi(popt); |