diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-11 07:36:21 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-11 07:36:21 +0200 |
| commit | 341aee5e3e3625173e4b684cc4166e60f6eb147f (patch) | |
| tree | 133bb01bc02539bb98f98bfa6807dc084b995bec /util/oem_intel.c | |
| parent | 631fa5250443f5441549bf3184830bc34b0c042e (diff) | |
| parent | 788a8d509d66a15ecb1810599885792a1acaaeb9 (diff) | |
Merge branch 'release/debian/3.1.1-1'debian/3.1.1-1
Diffstat (limited to 'util/oem_intel.c')
| -rw-r--r-- | util/oem_intel.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/util/oem_intel.c b/util/oem_intel.c index a79e73a..e6d397d 100644 --- a/util/oem_intel.c +++ b/util/oem_intel.c @@ -83,8 +83,13 @@ extern char fdebug; /*ipmicmd.c*/ /* * Global variables */ +#ifdef METACOMMAND +extern char * progver; /*from ipmiutil.c*/ +static char * progname = "ipmiutil inteloem"; +#else static char * progver = "3.08"; static char * progname = "iinteloem"; +#endif static char fRelayBits = 0; static uchar g_bus = PUBLIC_BUS; static uchar g_sa = BMC_SA; @@ -1081,7 +1086,7 @@ int decode_mem_intel(int prod, uchar b2, uchar b3, char *desc, int *psz) if (! is_remote()) { fsm_debug = fdebug; rv = get_MemDesc(array,dimm,desc,psz); - /* if (rv != 0) desc has "DIMM[%d}" */ + /* if (rv != 0) desc has "DIMM(%d)" */ } if (rv != 0) { /* either remote, or get_MemDesc failed, use common product defaults*/ @@ -1107,7 +1112,8 @@ int decode_mem_intel(int prod, uchar b2, uchar b3, char *desc, int *psz) n = strlen_(pstr); strncpy(desc, pstr, n+1); } else { - n = sprintf(desc,"DIMM[%d]",dimm); + if (bdata == 0xFF) n = sprintf(desc,DIMM_UNKNOWN); /* invalid */ + else n = sprintf(desc,DIMM_NUM,dimm); } *psz = n; } |