diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2020-04-12 23:13:18 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2020-04-12 23:13:18 +0200 |
| commit | b3f027c605992040981c81d34ccc02a9f1976c07 (patch) | |
| tree | fe768eef31a268f7ef511b8c46240c5d1609fb88 /util | |
| parent | 4d04d317f1e2c8e46b8fc04b4a20689da471a5d3 (diff) | |
| parent | 1396e325ab6f31d20694c57bef57eb4f9ce63205 (diff) | |
Merge branch 'release/debian/3.1.6-1'debian/3.1.6-1
Diffstat (limited to 'util')
| -rw-r--r-- | util/iconfig.c | 2 | ||||
| -rw-r--r-- | util/ievents.c | 2 | ||||
| -rw-r--r-- | util/ipmiutil.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/util/iconfig.c b/util/iconfig.c index 25e0c67..49d690f 100644 --- a/util/iconfig.c +++ b/util/iconfig.c @@ -2681,7 +2681,7 @@ main(int argc, char **argv) } /*endif not readonly*/ do_exit: - if (fd_bmc != stdout) fclose(fd_bmc); + if (fd_bmc != NULL && fd_bmc != stdout) fclose(fd_bmc); ipmi_close_(); if (nerrs > 0) { printf("Warning: %d ok, %d errors occurred, last error = %d\n",ngood,nerrs,lasterr); diff --git a/util/ievents.c b/util/ievents.c index c384b59..bf8f7fb 100644 --- a/util/ievents.c +++ b/util/ievents.c @@ -80,7 +80,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. extern char *progver; /*from ipmiutil.c*/ static char * progname = "ipmiutil events"; #else -static char *progver = "3.15"; +static char *progver = "3.16"; static char *progname = "ievents"; #endif static char fsensdesc = 0; /* 1= get extended sensor descriptions*/ diff --git a/util/ipmiutil.c b/util/ipmiutil.c index 82c7506..9d3a3dc 100644 --- a/util/ipmiutil.c +++ b/util/ipmiutil.c @@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ipmiutil.h" static char *progname = "ipmiutil"; -char *progver = "3.15"; +char *progver = "3.16"; // static char fdebug = 0; /*int ipmiutil(int argc, char **argv); */ @@ -215,6 +215,7 @@ main(int argc, char **argv) } else #endif { + printf("%s ver %s\n", progname,progver); show_usage(); ret = ERR_USAGE; } |