~vcs-imports/nut:issue-500

Last commit made on 2018-03-16
Get this branch:
git clone -b issue-500 https://git.launchpad.net/~vcs-imports/nut

Branch merges

Branch information

Name:
issue-500
Repository:
lp:~vcs-imports/nut

Recent commits

45b01b7... by Daniele Pezzini <email address hidden>

nutscanner: parse debug level opts separately before anything else

In order to have early the value of the desired debug level (needed to correctly debug nutscan_init()), split the parsing of command line options into two loops:
- the first one, before the call to nutscan_init(), will only care about debug level,
- the second one, after the call to nutscan_init(), will consider the remaining (and possibly depending on a nutscan_avail_* var already initialized by nutscan_init()) arguments (and moan in case of errors).

Closes https://github.com/networkupstools/nut/issues/500

5a040c0... by Daniele Pezzini <email address hidden>

Revert "Problem: nutscan_init() called before debug is enabled"

This reverts commit f613d45f78c96c290a1d63d4a2c3f28385d90d42.

When parsing the command line (or showing help), many options rely on a nutscan_avail_* var already initialized by nutscan_init() -- moving that call after the parsing of opts renders those options unavailable.

ace9a27... by Daniele Pezzini <email address hidden>

nutscanner: in scan_usb.c, nullify free()'d pointers that are later reused

We assign 'device_name', 'serialnumber' and 'vendor_name' only if the analyzed device provides that data and, since we use these pointers also to check if those items are available so that we can store and free() them, after free()'ing them we must make them NULL, or the next device, if it does not provide that data, will inherit the old (now free()'d) pointer and will attempt to access it and re-free() it.

8725bf9... by Charles Lepple <email address hidden>

Merge branch 'fix_instcmd_fallback_logging'

77d07d9... by Jim Klimov

Merge pull request #536 from jimklimov/pidfile-debug

main.c upsdrvctl.c : make debug messages a bit more useful

17fb7c3... by Jim Klimov <email address hidden>

main.c upsdrvctl.c : make debug messages a bit more useful

e34d94a... by Charles Lepple <email address hidden>

usbhid-ups: fix instcmd logging before fallback check

The hidups_item pointer needs to be checked for NULL before dereferencing.

b89fd70... by Jim Klimov

Fix the recently added update for Avocent support (#532)

* Problem: snmp-ups segfaults

Solution: base_snmp_template_index() prevented from processing empty argument

Signed-off-by: Barbora Stepankova <email address hidden>

* Problem: index has to be counted for any device not just for daisychain

Solution: counted for both

Signed-off-by: Barbora Stepankova <email address hidden>

* Problem: debug info needs improvement

Solution: added

Signed-off-by: Barbora Stepankova <email address hidden>

* drivers/snmp-ups.c : bump the version for public-release driver fix

* snmp-ups.c : Fix indentation for recent fixes

aa4c2bd... by Arnaud Quette

snmp-ups: Add support for Emerson Avocent PM3000 PDU

Signed-off-by: Arnaud Quette <email address hidden>

b16867f... by Arnaud Quette

snmp-ups: various improvements

This prepares the addition of newer devices

Signed-off-by: Arnaud Quette <email address hidden>