From b18f5bf2db0fba2e7e539f68645836036d940d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 29 Apr 2015 15:44:44 +0200 Subject: Imported Upstream version 2.9.6 --- util/idcmi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'util/idcmi.c') diff --git a/util/idcmi.c b/util/idcmi.c index 1e53ae8..9ab1c82 100644 --- a/util/idcmi.c +++ b/util/idcmi.c @@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "idcmi.h" static char * progname = "idcmi"; -static char * progver = "2.93"; +static char * progver = "2.96"; extern char fdebug; /*from ipmicmd.c*/ static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; @@ -109,7 +109,7 @@ static int dcmi_usage(void) printf(" -m002000 specific MC (bus 00,sa 20,lun 00)\n"); printf(" -s Get DCMI sensor info\n"); printf(" -x Display extra debug messages\n"); - print_lan_opt_usage(); + print_lan_opt_usage(1); printf("where is one of:\n"); printf(" info Get DCMI Capabilities, MC ID, asset tag (default)\n"); printf(" power [get] Get Power reading & limit\n"); @@ -356,7 +356,7 @@ void dcmi_show_power_limit(uchar *cdata, int sdata, int rv) correction_time = cdata[6]; correction_time += (cdata[7] << 8); correction_time += (cdata[8] << 16); - correction_time += (cdata[9] << 24); + correction_time += (ulong)(cdata[9] << 24); if (rv == 0) pstr = "(active)"; else if (rv == 0x80) pstr = "(inactive)"; @@ -747,7 +747,7 @@ main(int argc, char **argv) printf("%s ver %s\n", progname,progver); parse_lan_options('V',"4",0); /*default to admin priv*/ - while ( (c = getopt( argc, argv,"a:d:m:sT:V:J:EYF:P:N:R:U:Z:x?")) != EOF ) + while ( (c = getopt( argc, argv,"a:d:m:p:sT:V:J:EYF:P:N:R:U:Z:x?")) != EOF ) switch (c) { case 'a': set_asset = 1; asset_new = optarg; break; case 'd': set_mcid = 1; mcid_new = optarg; break; @@ -765,6 +765,7 @@ main(int argc, char **argv) break; case 's': do_sensors = 1; break; case 'x': fdebug = 1; break; /* debug messages */ + case 'p': /* port */ case 'N': /* nodename */ case 'U': /* remote username */ case 'P': /* remote password */ -- cgit v1.2.3