diff -pruN freeipmi-0.2.0/ChangeLog freeipmi-0.2.0-ab/ChangeLog --- freeipmi-0.2.0/ChangeLog 2006-02-10 17:23:22.000000000 -0800 +++ freeipmi-0.2.0-ab/ChangeLog 2006-04-03 19:13:47.255622784 -0700 @@ -1,3 +1,8 @@ +2006-04-03 Anand Babu + + * fish/extensions/sensors-common.scm: Closes bug# 16093. ipmi-sensors emiting wrong program name. + * libfreeipmi/src/smbios-locate.c: SMBIOS record length check fix.k + 2006-02-10 A Balamurugan * doc/freeipmi.texi: updated. diff -pruN freeipmi-0.2.0/configure.ac freeipmi-0.2.0-ab/configure.ac --- freeipmi-0.2.0/configure.ac 2006-02-09 15:31:46.000000000 -0800 +++ freeipmi-0.2.0-ab/configure.ac 2006-04-03 19:13:38.947537646 -0700 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([freeipmi],[0.2.0],[freeipmi-devel@gnu.org]) +AC_INIT([freeipmi],[0.2.1],[freeipmi-devel@gnu.org]) AC_REVISION([$Id: configure.ac,v 1.41 2006/02/09 22:31:35 chu11 Exp $]) AM_INIT_AUTOMAKE([1.8]) diff -pruN freeipmi-0.2.0/fish/extensions/sensors-common.scm freeipmi-0.2.0-ab/fish/extensions/sensors-common.scm --- freeipmi-0.2.0/fish/extensions/sensors-common.scm 2005-12-28 12:52:41.000000000 -0800 +++ freeipmi-0.2.0-ab/fish/extensions/sensors-common.scm 2006-04-03 19:09:49.340440671 -0700 @@ -1,5 +1,5 @@ ;;; sensors-common.scm: sensors common procedures -;;; authors: Balamurugan +;;; authors: Balamurugan ;;; This program is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU General Public License as @@ -103,7 +103,7 @@ (define (sensors-display-version) (begin (display (string-append "IPMI Sensors [ipmi-sensors-" (fi-version) "]\n")) - (display "Copyright (C) 2003-2005 FreeIPMI Core Team\n") + (display "Copyright (C) 2003-2006 FreeIPMI Core Team\n") (display "This program is free software; you may redistribute it under the terms of\n") (display "the GNU General Public License. This program has absolutely no warranty.\n"))) @@ -179,11 +179,11 @@ (set! driver-type 5)) (else (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f)))) (set! driver-type 0)) (if (list? sensors-cmd-args) @@ -195,11 +195,11 @@ (set! driver-address (string->number driver-address)) (if (boolean? driver-address) (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f))))) (if (list? sensors-cmd-args) (set! sensors-cmd-args (append sensors-cmd-args @@ -217,11 +217,11 @@ (begin (if (> (string-length username) 16) (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f))))) (if (list? sensors-cmd-args) (set! sensors-cmd-args (append sensors-cmd-args @@ -231,11 +231,11 @@ (begin (if (> (string-length password) 16) (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f))))) (if (list? sensors-cmd-args) (set! sensors-cmd-args (append sensors-cmd-args @@ -255,11 +255,11 @@ (set! auth-type 5)) (else (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f)))) (set! auth-type 0)) (if (list? sensors-cmd-args) @@ -280,11 +280,11 @@ (set! priv-level 5)) (else (begin - (display "Usage: bmc-info [OPTION...] \n" + (display "Usage: ipmi-sensors [OPTION...] \n" (current-error-port)) - (display "Try `bmc-info --help' or `bmc-info --usage' for more information.\n" + (display "Try `ipmi-sensors --help' or `ipmi-sensors --usage' for more information.\n" (current-error-port)) - (set! bmc-info-exit-status 64) + (set! sensor-exit-status 64) (set! sensors-cmd-args #f)))) (set! priv-level 2)) (if (list? sensors-cmd-args) diff -pruN freeipmi-0.2.0/libfreeipmi/src/smbios-locate.c freeipmi-0.2.0-ab/libfreeipmi/src/smbios-locate.c --- freeipmi-0.2.0/libfreeipmi/src/smbios-locate.c 2005-12-16 01:33:43.000000000 -0800 +++ freeipmi-0.2.0-ab/libfreeipmi/src/smbios-locate.c 2006-04-03 19:00:30.026171666 -0700 @@ -322,7 +322,7 @@ smbios_get_dev_info (ipmi_interface_type strobed = addr = *(uint64_t*)(bufp+IPMI_SMBIOS_IPMI_DEV_INFO_ADDR_OFFSET); - if (bufp[IPMI_SMBIOS_DEV_INFO_LEN_OFFSET] > IPMI_SMBIOS_IPMI_DEV_INFO_MODIFIER_OFFSET) + if (bufp[IPMI_SMBIOS_DEV_INFO_LEN_OFFSET] >= IPMI_SMBIOS_IPMI_DEV_INFO_MODIFIER_OFFSET) { uint8_t modifier; uint8_t lsb;